From bdca0ad15096062da7ea869b9c0178eb682a69ac Mon Sep 17 00:00:00 2001
From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
Date: Mon, 3 Oct 2022 15:28:19 +0530
Subject: [PATCH] fix(ui): show actual count for index requests (#7871)

* fix(ui): show actual count for index requests

* fix maven ci
---
 .../service/resources/teams/UserResourceTest.java    | 12 ++++++------
 .../elastic-search-index.page.tsx                    |  5 ++++-
 .../resources/ui/src/utils/EventPublisherUtils.ts    |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java
index 05ea560403a..fbb1735f04e 100644
--- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java
+++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java
@@ -790,26 +790,26 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
         new RegistrationRequest()
             .withFirstName("Test")
             .withLastName("Test")
-            .withEmail("testBasicAuth@email.com")
+            .withEmail("testBasicAuth123@email.com")
             .withPassword("Test@1234");
 
     TestUtils.post(getResource("users/signup"), newRegistrationRequest, String.class, ADMIN_AUTH_HEADERS);
 
     // jwtAuth Response should be null always
-    User user = getEntityByName("testBasicAuth", "isEmailVerified,authenticationMechanism", ADMIN_AUTH_HEADERS);
+    User user = getEntityByName("testBasicAuth123", null, ADMIN_AUTH_HEADERS);
     assertNull(user.getAuthenticationMechanism());
 
     // Login With Correct Password
-    LoginRequest loginRequest = new LoginRequest().withEmail("testBasicAuth@email.com").withPassword("Test@1234");
+    LoginRequest loginRequest = new LoginRequest().withEmail("testBasicAuth123@email.com").withPassword("Test@1234");
     JwtResponse jwtResponse =
         TestUtils.post(
             getResource("users/login"), loginRequest, JwtResponse.class, OK.getStatusCode(), ADMIN_AUTH_HEADERS);
 
-    validateJwtBasicAuth(jwtResponse, "testBasicAuth");
+    validateJwtBasicAuth(jwtResponse, "testBasicAuth123");
 
     // Login With Wrong email
     LoginRequest failedLoginWithWrongEmail =
-        new LoginRequest().withEmail("testBasicAuth123@email.com").withPassword("Test@1234");
+        new LoginRequest().withEmail("testBasicAuth1234@email.com").withPassword("Test@1234");
     assertResponse(
         () ->
             TestUtils.post(
@@ -823,7 +823,7 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
 
     // Login With Wrong Password
     LoginRequest failedLoginWithWrongPwd =
-        new LoginRequest().withEmail("testBasicAuth@email.com").withPassword("Test1@1234");
+        new LoginRequest().withEmail("testBasicAuth123@email.com").withPassword("Test1@1234");
     assertResponse(
         () ->
             TestUtils.post(
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-search-index.page.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-search-index.page.tsx
index 1656e734087..ab2d2b12364 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-search-index.page.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/ElasticSearchIndexPage/elastic-search-index.page.tsx
@@ -177,12 +177,14 @@ const ElasticSearchIndexPage = () => {
                                 <Badge
                                   className="request-badge running"
                                   count={batchJobData?.stats?.total}
+                                  overflowCount={99999999}
                                   title={`Total index sent: ${batchJobData?.stats?.total}`}
                                 />
 
                                 <Badge
                                   className="request-badge success"
                                   count={batchJobData?.stats?.success}
+                                  overflowCount={99999999}
                                   title={`Success index: ${batchJobData?.stats?.success}`}
                                 />
 
@@ -190,6 +192,7 @@ const ElasticSearchIndexPage = () => {
                                   showZero
                                   className="request-badge failed"
                                   count={batchJobData?.stats?.failed}
+                                  overflowCount={99999999}
                                   title={`Failed index: ${batchJobData?.stats?.failed}`}
                                 />
                               </Space>
@@ -262,7 +265,7 @@ const ElasticSearchIndexPage = () => {
                         Recreate indexes&nbsp;
                         <Tooltip
                           placement="bottomRight"
-                          title="This will delete exiting indexing and create new">
+                          title="This will delete existing indexes and re-create them.">
                           <QuestionCircleOutlined />
                         </Tooltip>
                       </Typography.Text>
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EventPublisherUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/EventPublisherUtils.ts
index 899564283da..ec12490a6f4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EventPublisherUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EventPublisherUtils.ts
@@ -36,7 +36,7 @@ export const getStatusResultBadgeIcon = (status: string) => {
 export const getEventPublisherStatusText = (status?: string) => {
   switch (status) {
     case Status.Idle:
-      return 'Ideal';
+      return 'Idle';
     case Status.Completed:
       return 'Completed';
     case Status.Active: