fix(ui): show actual count for index requests (#7871)

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

* fix maven ci
This commit is contained in:
Chirag Madlani 2022-10-03 15:28:19 +05:30 committed by GitHub
parent 08b3a16568
commit bdca0ad150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions

View File

@ -790,26 +790,26 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
new RegistrationRequest() new RegistrationRequest()
.withFirstName("Test") .withFirstName("Test")
.withLastName("Test") .withLastName("Test")
.withEmail("testBasicAuth@email.com") .withEmail("testBasicAuth123@email.com")
.withPassword("Test@1234"); .withPassword("Test@1234");
TestUtils.post(getResource("users/signup"), newRegistrationRequest, String.class, ADMIN_AUTH_HEADERS); TestUtils.post(getResource("users/signup"), newRegistrationRequest, String.class, ADMIN_AUTH_HEADERS);
// jwtAuth Response should be null always // 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()); assertNull(user.getAuthenticationMechanism());
// Login With Correct Password // 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 = JwtResponse jwtResponse =
TestUtils.post( TestUtils.post(
getResource("users/login"), loginRequest, JwtResponse.class, OK.getStatusCode(), ADMIN_AUTH_HEADERS); getResource("users/login"), loginRequest, JwtResponse.class, OK.getStatusCode(), ADMIN_AUTH_HEADERS);
validateJwtBasicAuth(jwtResponse, "testBasicAuth"); validateJwtBasicAuth(jwtResponse, "testBasicAuth123");
// Login With Wrong email // Login With Wrong email
LoginRequest failedLoginWithWrongEmail = LoginRequest failedLoginWithWrongEmail =
new LoginRequest().withEmail("testBasicAuth123@email.com").withPassword("Test@1234"); new LoginRequest().withEmail("testBasicAuth1234@email.com").withPassword("Test@1234");
assertResponse( assertResponse(
() -> () ->
TestUtils.post( TestUtils.post(
@ -823,7 +823,7 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
// Login With Wrong Password // Login With Wrong Password
LoginRequest failedLoginWithWrongPwd = LoginRequest failedLoginWithWrongPwd =
new LoginRequest().withEmail("testBasicAuth@email.com").withPassword("Test1@1234"); new LoginRequest().withEmail("testBasicAuth123@email.com").withPassword("Test1@1234");
assertResponse( assertResponse(
() -> () ->
TestUtils.post( TestUtils.post(

View File

@ -177,12 +177,14 @@ const ElasticSearchIndexPage = () => {
<Badge <Badge
className="request-badge running" className="request-badge running"
count={batchJobData?.stats?.total} count={batchJobData?.stats?.total}
overflowCount={99999999}
title={`Total index sent: ${batchJobData?.stats?.total}`} title={`Total index sent: ${batchJobData?.stats?.total}`}
/> />
<Badge <Badge
className="request-badge success" className="request-badge success"
count={batchJobData?.stats?.success} count={batchJobData?.stats?.success}
overflowCount={99999999}
title={`Success index: ${batchJobData?.stats?.success}`} title={`Success index: ${batchJobData?.stats?.success}`}
/> />
@ -190,6 +192,7 @@ const ElasticSearchIndexPage = () => {
showZero showZero
className="request-badge failed" className="request-badge failed"
count={batchJobData?.stats?.failed} count={batchJobData?.stats?.failed}
overflowCount={99999999}
title={`Failed index: ${batchJobData?.stats?.failed}`} title={`Failed index: ${batchJobData?.stats?.failed}`}
/> />
</Space> </Space>
@ -262,7 +265,7 @@ const ElasticSearchIndexPage = () => {
Recreate indexes&nbsp; Recreate indexes&nbsp;
<Tooltip <Tooltip
placement="bottomRight" placement="bottomRight"
title="This will delete exiting indexing and create new"> title="This will delete existing indexes and re-create them.">
<QuestionCircleOutlined /> <QuestionCircleOutlined />
</Tooltip> </Tooltip>
</Typography.Text> </Typography.Text>

View File

@ -36,7 +36,7 @@ export const getStatusResultBadgeIcon = (status: string) => {
export const getEventPublisherStatusText = (status?: string) => { export const getEventPublisherStatusText = (status?: string) => {
switch (status) { switch (status) {
case Status.Idle: case Status.Idle:
return 'Ideal'; return 'Idle';
case Status.Completed: case Status.Completed:
return 'Completed'; return 'Completed';
case Status.Active: case Status.Active: