From b27f866956cae9eff6cede49f6530171b98831ed Mon Sep 17 00:00:00 2001 From: Maria Martinez <77364706+mamartinezmejia@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:03:43 -0700 Subject: [PATCH] feat(fe:FSADT1-1487): Client number screen - clickable client number (#1252) * Cleaned up code * feat(fe:FSADT1-1487): Client number screen - clickable client number * Added ID attribute --- frontend/src/assets/styles/global.scss | 8 ++--- frontend/src/pages/FormBCeIDPage.vue | 2 +- .../src/pages/FormStaffConfirmationPage.vue | 29 +++++++++++++++---- frontend/src/pages/FormStaffPage.vue | 2 +- .../src/pages/FormStaffProcessingPage.vue | 2 +- frontend/src/pages/LandingPage.vue | 8 ++--- frontend/src/pages/LogoutPage.vue | 4 +-- .../pages/FormStaffConfirmationPage.spec.ts | 6 ++-- .../entity/ForestClientLocationEntity.java | 1 - ...chIndividualControllerIntegrationTest.java | 2 -- .../ForestClientContactMapperTest.java | 1 - .../app/mappers/ForestClientMapperTest.java | 1 - 12 files changed, 39 insertions(+), 27 deletions(-) diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss index 55b4dd72ca..43e8aca81b 100644 --- a/frontend/src/assets/styles/global.scss +++ b/frontend/src/assets/styles/global.scss @@ -803,7 +803,7 @@ cds-actionable-notification * { gap: 1rem; } -.form-footer-group-buttons { +.form-group-buttons { display: flex; gap: 1rem; } @@ -1762,7 +1762,7 @@ div.internal-grouping-01:has(svg.warning) span.body-compact-01 { align-self: stretch; } - .form-footer-group-buttons { + .form-group-buttons { flex-direction: column-reverse; justify-content: flex-end; align-items: stretch; @@ -2041,11 +2041,11 @@ div.internal-grouping-01:has(svg.warning) span.body-compact-01 { margin-left: 16rem; } - div.form-footer-group-buttons { + div.form-group-buttons { gap: 0.5rem; } - div.form-footer-group-buttons cds-button { + div.form-group-buttons cds-button { margin-top: 1rem; } diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue index 0bd91c74fb..6b2391a1b6 100644 --- a/frontend/src/pages/FormBCeIDPage.vue +++ b/frontend/src/pages/FormBCeIDPage.vue @@ -606,7 +606,7 @@ watch(submissionLimitError, () => { v-if="!isLast && !progressData[currentTab].valid"> All fields must be filled out correctly to enable the "Next" button below -
+
(); const SVG = useSvg(badgePictogram); +const openClientDetails = (clientNumber: string) => { + if (clientNumber) { + const url = `https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${clientNumber}`; + window.open(url, "_blank", "noopener"); + } +}; diff --git a/frontend/src/pages/FormStaffPage.vue b/frontend/src/pages/FormStaffPage.vue index 62465693c4..39207ea8dd 100644 --- a/frontend/src/pages/FormStaffPage.vue +++ b/frontend/src/pages/FormStaffPage.vue @@ -665,7 +665,7 @@ watch(submissionLimitError, () => { All required fields must be filled out correctly to enable the "Next" button below -
+
We’ll send the client number and submission details to {{ clientEmail }} when the process is complete.

-
+
-
+
{ expect(svg.exists()).toBe(true); }); - it('checks button existence and href attribute', () => { + it('checks create another client button existence and href attribute', () => { const wrapper = createComponent({ clientNumber: '123', clientEmail: 'test@example.com' }); - const button = wrapper.find('cds-button'); + const button = wrapper.find('#createAnotherClientBtnId'); expect(button.exists()).toBe(true); expect(button.attributes('href')).toBe('/new-client-staff'); }); -}); \ No newline at end of file +}); diff --git a/legacy/src/main/java/ca/bc/gov/app/entity/ForestClientLocationEntity.java b/legacy/src/main/java/ca/bc/gov/app/entity/ForestClientLocationEntity.java index 3c5ef28f9b..af46222558 100644 --- a/legacy/src/main/java/ca/bc/gov/app/entity/ForestClientLocationEntity.java +++ b/legacy/src/main/java/ca/bc/gov/app/entity/ForestClientLocationEntity.java @@ -1,7 +1,6 @@ package ca.bc.gov.app.entity; import static ca.bc.gov.app.ApplicationConstants.ORACLE_ATTRIBUTE_SCHEMA; -import java.time.LocalDate; import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/legacy/src/test/java/ca/bc/gov/app/controller/ClientSearchIndividualControllerIntegrationTest.java b/legacy/src/test/java/ca/bc/gov/app/controller/ClientSearchIndividualControllerIntegrationTest.java index f45d94e231..0195fcdad5 100644 --- a/legacy/src/test/java/ca/bc/gov/app/controller/ClientSearchIndividualControllerIntegrationTest.java +++ b/legacy/src/test/java/ca/bc/gov/app/controller/ClientSearchIndividualControllerIntegrationTest.java @@ -15,8 +15,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient.ResponseSpec; diff --git a/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientContactMapperTest.java b/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientContactMapperTest.java index 3da5aa9089..fb22f446b7 100644 --- a/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientContactMapperTest.java +++ b/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientContactMapperTest.java @@ -6,7 +6,6 @@ import ca.bc.gov.app.dto.ForestClientContactDto; import ca.bc.gov.app.entity.ForestClientContactEntity; import java.time.LocalDateTime; -import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mapstruct.factory.Mappers; diff --git a/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientMapperTest.java b/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientMapperTest.java index d76f85a94a..deade56e47 100644 --- a/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientMapperTest.java +++ b/legacy/src/test/java/ca/bc/gov/app/mappers/ForestClientMapperTest.java @@ -1,7 +1,6 @@ package ca.bc.gov.app.mappers; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import ca.bc.gov.app.dto.ForestClientDto;