feat(fe:FSADT1-1959): Location – Name default is ‘Mailing address (#1717)

feat(fe:FSADT1-1959): Location – Name default is ‘Mailing address

Author: mamartinezmejia

cypress/cypress/e2e/staffCreate.feature

@@ -19,7 +19,6 @@ Feature: Staff Screens
     Then I click on next
     And I fill the "Primary location" address with the following
       | Field name                      | Value           | Type          |
-      | Location name                   | Office          | text          |
       | Email address                   | jamesbaxter@mail.ca   | text          |
       | Primary phone number            | 2501231568      | text          |
       | Secondary phone number          | 2501233568      | text          |
@@ -33,7 +32,7 @@ Feature: Staff Screens
       | Secondary phone number          | 2501232567      | text          |
       | Fax                             | 2501444567      | text          |
       | Contact type                    | Billing         | select        |
-      | Associated locations            | Office          | multiselect   |
+      | Associated locations            | Mailing address | multiselect   |
     Then I click on next
     Then I submit
     And I wait for the text "has been created!" to appear
@@ -92,4 +91,4 @@ Feature: Staff Screens
       | ID number  | 1234567                   | text   |
     Then I click on next
     And I should see the "warning" message "was found with similar name and birthdate" on the "top"
-    And The field "First name" should have the "warning" message "There's already a client with this name"
+    And The field "First name" should have the "warning" message "There's already a client with this name"

cypress/cypress/e2e/upt_1257.feature

@@ -24,7 +24,7 @@ Feature: Client Type Code
     And I fill the "Primary contact" information with the following
       | Field name                      | Value           | Type          |  
       | First name                      | Testy           | text          | 
-	    | Last name                       | Tester          | text          |
+      | Last name                       | Tester          | text          |
       | Email address                   | mail5@mail.ca   | text          |
       | Primary phone number            | 7780000007      | text          |      
       | Contact type                    | Billing         | select        |

frontend/cypress/e2e/pages/FormStaffPage.cy.ts

@@ -20,7 +20,7 @@ describe("Staff Form", () => {
   };
 
   const locationBaseData = {
-    name_0: "Headquarters",
+    name_0: "Mailing address",
     addr_0: "2975",
   };
 
@@ -46,10 +46,6 @@ describe("Staff Form", () => {
 
     cy.fillFormEntry("#clientIdentification", data.clientIdentification);
 
-    /*cy.get("#birthdateYear").shadow().find("input").type(data.birthdateYear);
-    cy.get("#birthdateMonth").shadow().find("input").type(data.birthdateMonth);
-    cy.get("#birthdateDay").shadow().find("input").type(data.birthdateDay);*/
-
     //This way of filling out data fails locally only with this component
     cy.fillFormEntry("#birthdateYear", data.birthdateYear);
     cy.fillFormEntry("#birthdateMonth", data.birthdateMonth);
@@ -71,8 +67,6 @@ describe("Staff Form", () => {
   };
 
   const fillLocation = (data = locationBaseData) => {
-    cy.get("#name_0").shadow().find("input").type(data.name_0);
-
     cy.get("#addr_0").shadow().find("input").type(data.addr_0, { delay: 0 });
 
     cy.wait("@searchAddress");

frontend/cypress/e2e/pages/FormStaffPageSubmission.cy.ts

@@ -38,8 +38,7 @@ describe("Staff Form Submission", () => {
   const fillLocation = (index: number, extraData: any = {}) => {
     cy.fixture("testdata/locationBaseData").then((fixtureData: any) => {
       const data = { ...fixtureData, ...extraData };
-
-      cy.fillFormEntry(`#name_${index}`, data.name);
+      
       cy.selectAutocompleteEntry(`#addr_${index}`, data.addr, data.addressId);
       cy.fillFormEntry(`#emailAddress_${index}`, data.emailAddress);
       cy.fillFormEntry(`#businessPhoneNumber_${index}`, data.businessPhoneNumber);

frontend/cypress/fixtures/testdata/contactBaseData.json

@@ -7,4 +7,4 @@
   "faxNumber": "1234567890",
   "role": "Person",
   "addressname": "Mailing address"
-}
+}

frontend/src/dto/ApplyClientNumberDto.ts

@@ -98,6 +98,8 @@ export const indexedEmptyAddress = (index: number): Address =>
     }),
   );
 
+export const defaultLocation = { value: "0", text: "Mailing address" };
+
 export const emptyAddress = (): Address => indexedEmptyAddress(0);
 
 export const formatAddresses = (addresses: Address[]): Address[] => {
@@ -107,7 +109,7 @@ export const formatAddresses = (addresses: Address[]): Address[] => {
       locationName: toSentenceCase(address.locationName),
     }));
   }
-  return [{ ...emptyAddress(), locationName: locationName.text }];
+  return [{ ...emptyAddress(), locationName: defaultLocation.text }];
 };
 
 export const indexedEmptyContact = (index: number): Contact =>
@@ -127,8 +129,6 @@ export const indexedEmptyContact = (index: number): Contact =>
 
 export const emptyContact: Contact = indexedEmptyContact(0);
 
-export const locationName = { value: "0", text: "Mailing address" };
-
 export const formDataDto: FormDataDto = {
   businessInformation: {
     district: "",
@@ -158,10 +158,8 @@ export const formDataDto: FormDataDto = {
   notifyClientInd: ""
 };
 
-export const newFormDataDto = (): FormDataDto => JSON.parse(JSON.stringify(formDataDto));
-
-export const newFormDataDtoExternal = (): FormDataDto => {
-  const value = newFormDataDto();
-  value.location.addresses[0].locationName = locationName.text;
+export const newFormDataDto = (): FormDataDto => {
+  const value = JSON.parse(JSON.stringify(formDataDto));
+  value.location.addresses[0].locationName = defaultLocation.text;
   return value;
 };

frontend/src/pages/FormBCSCPage.vue

@@ -2,9 +2,9 @@
 <script setup lang="ts">
 import { ref, reactive, computed, watch, toRef } from "vue";
 import {
-  newFormDataDtoExternal,
+  newFormDataDto,
   emptyContact,
-  locationName as defaultLocation,
+  defaultLocation,
 } from "@/dto/ApplyClientNumberDto";
 import {
   BusinessTypeEnum,
@@ -53,7 +53,7 @@ const submitterContact: Contact = {
   email: submitterInformation?.email ?? "",
 };
 
-let formDataDto = ref<FormDataDto>({ ...newFormDataDtoExternal() });
+let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
 
 const figmaFormatter = new Intl.DateTimeFormat("en-US", {
   year: "numeric",

frontend/src/pages/FormBCeIDPage.vue

@@ -18,7 +18,7 @@ import AddressWizardStep from "@/pages/bceidform/AddressWizardStep.vue";
 import ContactWizardStep from "@/pages/bceidform/ContactWizardStep.vue";
 import ReviewWizardStep from "@/pages/bceidform/ReviewWizardStep.vue";
 // Imported types
-import { newFormDataDtoExternal, locationName as defaultLocation } from "@/dto/ApplyClientNumberDto";
+import { newFormDataDto, defaultLocation } from "@/dto/ApplyClientNumberDto";
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
 import type {
   ValidationMessageType,
@@ -76,7 +76,7 @@ if (!features.BCEID_MULTI_ADDRESS) {
   submitterContact.locationNames = [{ ...defaultLocation }];
 }
 
-let formDataDto = ref<FormDataDto>({ ...newFormDataDtoExternal() });
+let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
 
 //---- Form Data ----//
 let formData = reactive<FormDataDto>({

frontend/src/pages/bceidform/BusinessInformationWizardStep.vue

@@ -15,7 +15,7 @@ import {
   ProgressNotification,
 } from "@/dto/CommonTypesDto";
 import { BusinessTypeEnum, CodeNameType } from "@/dto/CommonTypesDto";
-import { locationName as defaultLocation, formatAddresses } from "@/dto/ApplyClientNumberDto";
+import { defaultLocation, formatAddresses } from "@/dto/ApplyClientNumberDto";
 import type {
   FormDataDto,
   ForestClientDetailsDto,

frontend/src/pages/bceidform/ContactWizardStep.vue

@@ -8,7 +8,7 @@ import { useFetchTo } from "@/composables/useFetch";
 import { useFocus } from "@/composables/useFocus";
 // Type Imports
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
-import { emptyContact, locationName as defaultLocation } from "@/dto/ApplyClientNumberDto";
+import { emptyContact, defaultLocation } from "@/dto/ApplyClientNumberDto";
 import type { CodeNameType, ModalNotification } from "@/dto/CommonTypesDto";
 // Validators
 import { isUniqueDescriptive } from "@/helpers/validators/GlobalValidators";