From d591540212351f63f4af31c92a8be5361ca0f85d Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 19 Nov 2024 11:32:29 -0500 Subject: [PATCH 01/15] fix: remove contact preferences --- shared-helpers/__tests__/testHelpers.ts | 1 - .../src/utilities/blankApplication.ts | 1 - shared-helpers/src/utilities/formKeys.ts | 15 ---------- .../sections/DetailsPrimaryApplicant.tsx | 13 --------- .../sections/FormPrimaryApplicant.tsx | 22 +-------------- .../src/lib/applications/FormTypes.ts | 1 - .../lib/applications/formatApplicationData.ts | 4 --- .../cypress/mockData/applicationData.ts | 3 -- sites/public/cypress/support/commands.js | 10 ------- .../components/shared/FormSummaryDetails.tsx | 11 -------- .../pages/applications/contact/address.tsx | 28 ------------------- 11 files changed, 1 insertion(+), 108 deletions(-) diff --git a/shared-helpers/__tests__/testHelpers.ts b/shared-helpers/__tests__/testHelpers.ts index 7a32828de9..103036131b 100644 --- a/shared-helpers/__tests__/testHelpers.ts +++ b/shared-helpers/__tests__/testHelpers.ts @@ -166,7 +166,6 @@ export const application: Application = { createdAt: new Date(), updatedAt: new Date(), }, - contactPreferences: [], preferredUnitTypes: [], householdMember: [ { diff --git a/shared-helpers/src/utilities/blankApplication.ts b/shared-helpers/src/utilities/blankApplication.ts index 3bccea0549..52cc7c4f64 100644 --- a/shared-helpers/src/utilities/blankApplication.ts +++ b/shared-helpers/src/utilities/blankApplication.ts @@ -40,7 +40,6 @@ export const blankApplication = { additionalPhone: false, additionalPhoneNumber: "", additionalPhoneNumberType: "", - contactPreferences: [], householdSize: 0, housingStatus: "", sendMailToMailingAddress: false, diff --git a/shared-helpers/src/utilities/formKeys.ts b/shared-helpers/src/utilities/formKeys.ts index 0018b9271f..c01b8e2f3a 100644 --- a/shared-helpers/src/utilities/formKeys.ts +++ b/shared-helpers/src/utilities/formKeys.ts @@ -70,21 +70,6 @@ export const countyKeys = [ "Sonoma", ] -export const contactPreferencesKeys = [ - { - id: "email", - }, - { - id: "phone", - }, - { - id: "letter", - }, - { - id: "text", - }, -] - export const adaFeatureKeys = ["mobility", "vision", "hearing"] export const relationshipKeys = ["", ...Object.values(HouseholdMemberRelationship)] diff --git a/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsPrimaryApplicant.tsx b/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsPrimaryApplicant.tsx index 8cafaf5eba..fa942a38d6 100644 --- a/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsPrimaryApplicant.tsx +++ b/sites/partners/src/components/applications/PaperApplicationDetails/sections/DetailsPrimaryApplicant.tsx @@ -65,19 +65,6 @@ const DetailsPrimaryApplicant = () => { > {application.additionalPhoneNumber || t("t.n/a")} - - - {(() => { - if (!application.contactPreferences.length) return t("t.n/a") - - return application.contactPreferences.map((item) => ( - - {t(`t.${item}`)} -
- - )) - })()} - diff --git a/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx b/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx index 52c088d008..ac428c86af 100644 --- a/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx +++ b/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx @@ -10,12 +10,7 @@ import { FormAddress, } from "@bloom-housing/ui-components" import { Grid } from "@bloom-housing/ui-seeds" -import { - phoneNumberKeys, - contactPreferencesKeys, - stateKeys, - emailRegex, -} from "@bloom-housing/shared-helpers" +import { phoneNumberKeys, stateKeys, emailRegex } from "@bloom-housing/shared-helpers" import SectionWithGrid from "../../../shared/SectionWithGrid" const FormPrimaryApplicant = () => { @@ -24,11 +19,6 @@ const FormPrimaryApplicant = () => { // eslint-disable-next-line @typescript-eslint/unbound-method const { register, watch, errors, control, setValue, clearErrors } = formMethods - const contactPreferencesOptions = contactPreferencesKeys?.map((item) => ({ - id: item.id, - label: t(`t.${item.id}`), - })) - const mailingAddressValue: boolean = watch("application.sendMailToMailingAddress") const phoneValue: string = watch("phoneNumber") const additionalPhoneValue: string = watch("application.additionalPhoneNumber") @@ -164,16 +154,6 @@ const FormPrimaryApplicant = () => { disabled={!additionalPhoneValue?.length} /> - - - - { const { language, - contactPreferences, sendMailToMailingAddress, applicationsMailingAddress, incomePeriod, @@ -414,7 +411,6 @@ export const mapApiToForm = (applicationData: ApplicationUpdate, listing: Listin additionalPhoneNumber, additionalPhoneNumberType, preferences, - contactPreferences, sendMailToMailingAddress, applicationsMailingAddress, preferredUnit, diff --git a/sites/public/cypress/mockData/applicationData.ts b/sites/public/cypress/mockData/applicationData.ts index 4e8968a73c..897ec4b6b2 100644 --- a/sites/public/cypress/mockData/applicationData.ts +++ b/sites/public/cypress/mockData/applicationData.ts @@ -17,7 +17,6 @@ const idDefaults = { updatedAt: new Date(), } -export const contactPreferencesCheckboxesOrder = ["email", "phone", "letter", "text"] export const alternateContactTypeRadioOrder = [ "familyMember", "friend", @@ -100,7 +99,6 @@ export const ElmVillageApplication: Application = { additionalPhone: true, additionalPhoneNumber: "(555) 555-5555", additionalPhoneNumberType: "home", - contactPreferences: ["email"], householdSize: 2, housingStatus: "", sendMailToMailingAddress: true, @@ -327,7 +325,6 @@ export const minimalDataApplication: Application = { additionalPhone: false, additionalPhoneNumber: "", additionalPhoneNumberType: "", - contactPreferences: ["letter"], householdSize: 1, housingStatus: "", sendMailToMailingAddress: false, diff --git a/sites/public/cypress/support/commands.js b/sites/public/cypress/support/commands.js index 94df0b451d..04f10368bd 100644 --- a/sites/public/cypress/support/commands.js +++ b/sites/public/cypress/support/commands.js @@ -3,7 +3,6 @@ import { applicationStepOrder, - contactPreferencesCheckboxesOrder, alternateContactTypeRadioOrder, howDidYouHearCheckboxesOrder, } from "./../mockData/applicationData" @@ -144,11 +143,6 @@ Cypress.Commands.add("step2PrimaryApplicantAddresses", (application) => { ) } - application.contactPreferences.forEach((contactPreference) => { - const contactPreferenceIndex = contactPreferencesCheckboxesOrder.indexOf(contactPreference) - cy.getByTestId("app-primary-contact-preference").eq(contactPreferenceIndex).check() - }) - cy.goNext() cy.checkErrorAlert("not.exist") cy.checkErrorMessages("not.exist") @@ -478,10 +472,6 @@ Cypress.Commands.add("step18Summary", (application, verify) => { fieldValue: `${application.applicant.applicantAddress.city}, ${application.applicant.applicantAddress.state} ${application.applicant.applicantAddress.zipCode}`, }, - { - id: "app-summary-contact-preference-type", - fieldValue: application.contactPreferences[0], - }, { id: "app-summary-preferred-units", fieldValue: application.preferredUnitTypes diff --git a/sites/public/src/components/shared/FormSummaryDetails.tsx b/sites/public/src/components/shared/FormSummaryDetails.tsx index 308a4a4012..189f256df0 100644 --- a/sites/public/src/components/shared/FormSummaryDetails.tsx +++ b/sites/public/src/components/shared/FormSummaryDetails.tsx @@ -265,17 +265,6 @@ const FormSummaryDetails = ({ )} - - {application.contactPreferences && ( - - {application.contactPreferences?.map((item) => t(`t.${item}`)).join(", ")} - - )} {application.alternateContact.type && application.alternateContact.type !== "noContact" && ( <> diff --git a/sites/public/src/pages/applications/contact/address.tsx b/sites/public/src/pages/applications/contact/address.tsx index 608d199535..2ee20b4561 100644 --- a/sites/public/src/pages/applications/contact/address.tsx +++ b/sites/public/src/pages/applications/contact/address.tsx @@ -4,7 +4,6 @@ import { Alert } from "@bloom-housing/ui-seeds" import { Field, FieldGroup, Form, PhoneField, Select, t } from "@bloom-housing/ui-components" import { CardSection } from "@bloom-housing/ui-seeds/src/blocks/Card" import { - contactPreferencesKeys, phoneNumberKeys, stateKeys, blankApplication, @@ -101,13 +100,6 @@ const ApplicationAddress = () => { const sendMailToMailingAddress = watch("sendMailToMailingAddress") const clientLoaded = OnClientSide() - const contactPreferencesOptions = contactPreferencesKeys?.map((item) => ({ - id: item.id, - label: t(`t.${item.id}`), - defaultChecked: application?.contactPreferences?.includes(item.id) || false, - disabled: disableContactFormOption(item.id, noPhone, application.applicant.noEmail), - })) - useEffect(() => { pushGtmEvent({ event: "pageView", @@ -470,26 +462,6 @@ const ApplicationAddress = () => { )} - - -
- - {t("application.contact.contactPreference")} - - -
- {verifyAddress && ( From 9753dcbe0eead960592b346c58fe59b6857a9d19 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 10:20:43 -0500 Subject: [PATCH 02/15] fix: public unit tests --- .../__tests__/pages/applications/contact/address.test.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/sites/public/__tests__/pages/applications/contact/address.test.tsx b/sites/public/__tests__/pages/applications/contact/address.test.tsx index 53cf8ece33..0b51662ba8 100644 --- a/sites/public/__tests__/pages/applications/contact/address.test.tsx +++ b/sites/public/__tests__/pages/applications/contact/address.test.tsx @@ -41,7 +41,6 @@ describe("applications pages", () => { expect(getByTestId("app-primary-address-state")).toBeInTheDocument() expect(getByTestId("app-primary-address-zip")).toBeInTheDocument() expect(getByTestId("app-primary-send-to-mailing")).toBeInTheDocument() - expect(getAllByTestId("app-primary-contact-preference")).toHaveLength(4) }) it("should require form input", async () => { @@ -54,7 +53,6 @@ describe("applications pages", () => { expect(getByText("Please enter a phone number")).toBeInTheDocument() expect(getByText("Please enter a phone number type")).toBeInTheDocument() expect(getByText("Please enter an address")).toBeInTheDocument() - expect(getByText("Please select at least one option.")).toBeInTheDocument() }) it("should disable phone fields if user indicates they don't have a phone", async () => { From 9147641b68480121c4fb56fa56895bb37e0bcf7d Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 10:36:32 -0500 Subject: [PATCH 03/15] fix: linting updates --- sites/public/src/lib/helpers.tsx | 7 ------- sites/public/src/pages/applications/contact/address.tsx | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/sites/public/src/lib/helpers.tsx b/sites/public/src/lib/helpers.tsx index a3eb834315..5d4e280826 100644 --- a/sites/public/src/lib/helpers.tsx +++ b/sites/public/src/lib/helpers.tsx @@ -33,13 +33,6 @@ export const getGenericAddress = (bloomAddress: Address) => { : null } -export const disableContactFormOption = (id: string, noPhone: boolean, noEmail: boolean) => { - if (id === "phone" || id === "text") { - return noPhone - } - return id === "email" && noEmail -} - export const openInFuture = (listing: Listing) => { const nowTime = dayjs() return listing.applicationOpenDate && nowTime < dayjs(listing.applicationOpenDate) diff --git a/sites/public/src/pages/applications/contact/address.tsx b/sites/public/src/pages/applications/contact/address.tsx index 2ee20b4561..bad2377bf6 100644 --- a/sites/public/src/pages/applications/contact/address.tsx +++ b/sites/public/src/pages/applications/contact/address.tsx @@ -1,7 +1,7 @@ import React, { useContext, useEffect, useState, useMemo } from "react" import { useForm } from "react-hook-form" import { Alert } from "@bloom-housing/ui-seeds" -import { Field, FieldGroup, Form, PhoneField, Select, t } from "@bloom-housing/ui-components" +import { Field, Form, PhoneField, Select, t } from "@bloom-housing/ui-components" import { CardSection } from "@bloom-housing/ui-seeds/src/blocks/Card" import { phoneNumberKeys, @@ -14,7 +14,6 @@ import { mergeDeep, } from "@bloom-housing/shared-helpers" import FormsLayout from "../../../layouts/forms" -import { disableContactFormOption } from "../../../lib/helpers" import { useFormConductor } from "../../../lib/hooks" import { FoundAddress, From 80ba862ec3870489a5c76049857820bd1994bf04 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 10:49:59 -0500 Subject: [PATCH 04/15] fix: update cypress data --- sites/partners/cypress/fixtures/alternateContactOnlyData.json | 1 - sites/partners/cypress/fixtures/applicantOnlyData.json | 1 - sites/partners/cypress/fixtures/application.json | 1 - sites/partners/cypress/fixtures/demographicsOnlyData.json | 1 - sites/partners/cypress/fixtures/emptyApplication.json | 1 - sites/partners/cypress/fixtures/householdDetailsOnlyData.json | 1 - sites/partners/cypress/fixtures/householdIncomeOnlyData.json | 1 - sites/partners/cypress/fixtures/householdMemberOnlyData.json | 1 - sites/partners/cypress/fixtures/partialApplicationA.json | 1 - sites/partners/cypress/support/commands.js | 1 - 10 files changed, 10 deletions(-) diff --git a/sites/partners/cypress/fixtures/alternateContactOnlyData.json b/sites/partners/cypress/fixtures/alternateContactOnlyData.json index d84672e2e9..fd560bcfa9 100644 --- a/sites/partners/cypress/fixtures/alternateContactOnlyData.json +++ b/sites/partners/cypress/fixtures/alternateContactOnlyData.json @@ -53,7 +53,6 @@ "householdMemberName": "n/a", "preferredUnitSize": "n/a", "formattedMonthlyIncome": "n/a", - "preferredContact": "n/a", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/applicantOnlyData.json b/sites/partners/cypress/fixtures/applicantOnlyData.json index a423fa2910..b0998747e0 100644 --- a/sites/partners/cypress/fixtures/applicantOnlyData.json +++ b/sites/partners/cypress/fixtures/applicantOnlyData.json @@ -53,7 +53,6 @@ "householdMemberName": "n/a", "preferredUnitSize": "n/a", "formattedMonthlyIncome": "n/a", - "preferredContact": "Email", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/application.json b/sites/partners/cypress/fixtures/application.json index 99b2b98733..b422e38035 100644 --- a/sites/partners/cypress/fixtures/application.json +++ b/sites/partners/cypress/fixtures/application.json @@ -53,7 +53,6 @@ "householdMemberName": "HouseHold First Name HouseHold Middle Name HouseHold Last Name", "preferredUnitSize": "1 Bedroom", "formattedMonthlyIncome": "$5,000", - "preferredContact": "Email", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/demographicsOnlyData.json b/sites/partners/cypress/fixtures/demographicsOnlyData.json index 8ae2bc6e57..e90cfccb5e 100644 --- a/sites/partners/cypress/fixtures/demographicsOnlyData.json +++ b/sites/partners/cypress/fixtures/demographicsOnlyData.json @@ -53,7 +53,6 @@ "householdMemberName": "n/a", "preferredUnitSize": "n/a", "formattedMonthlyIncome": "n/a", - "preferredContact": "n/a", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/emptyApplication.json b/sites/partners/cypress/fixtures/emptyApplication.json index 40779d36fe..ddf2bc8f02 100644 --- a/sites/partners/cypress/fixtures/emptyApplication.json +++ b/sites/partners/cypress/fixtures/emptyApplication.json @@ -53,7 +53,6 @@ "householdMemberName": "n/a", "preferredUnitSize": "n/a", "formattedMonthlyIncome": "n/a", - "preferredContact": "n/a", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/householdDetailsOnlyData.json b/sites/partners/cypress/fixtures/householdDetailsOnlyData.json index ff30d0954a..782924de54 100644 --- a/sites/partners/cypress/fixtures/householdDetailsOnlyData.json +++ b/sites/partners/cypress/fixtures/householdDetailsOnlyData.json @@ -53,7 +53,6 @@ "householdMemberName": "n/a", "preferredUnitSize": "1 Bedroom", "formattedMonthlyIncome": "n/a", - "preferredContact": "n/a", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/householdIncomeOnlyData.json b/sites/partners/cypress/fixtures/householdIncomeOnlyData.json index 8b1e301dee..bc93a2ec7d 100644 --- a/sites/partners/cypress/fixtures/householdIncomeOnlyData.json +++ b/sites/partners/cypress/fixtures/householdIncomeOnlyData.json @@ -53,7 +53,6 @@ "householdMemberName": "n/a", "preferredUnitSize": "n/a", "formattedMonthlyIncome": "$6,000", - "preferredContact": "n/a", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/householdMemberOnlyData.json b/sites/partners/cypress/fixtures/householdMemberOnlyData.json index 9e861089e6..949df048b4 100644 --- a/sites/partners/cypress/fixtures/householdMemberOnlyData.json +++ b/sites/partners/cypress/fixtures/householdMemberOnlyData.json @@ -53,7 +53,6 @@ "householdMemberName": "household member test", "preferredUnitSize": "n/a", "formattedMonthlyIncome": "n/a", - "preferredContact": "n/a", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/fixtures/partialApplicationA.json b/sites/partners/cypress/fixtures/partialApplicationA.json index 9e8b02c454..356cb17167 100644 --- a/sites/partners/cypress/fixtures/partialApplicationA.json +++ b/sites/partners/cypress/fixtures/partialApplicationA.json @@ -53,7 +53,6 @@ "householdMemberName": "n/a", "preferredUnitSize": "n/a", "formattedMonthlyIncome": "n/a", - "preferredContact": "n/a", "preferredUnit": "oneBdrm", "submittedDate": "n/a", "timeDate": "n/a", diff --git a/sites/partners/cypress/support/commands.js b/sites/partners/cypress/support/commands.js index d0712c6330..dcffad577c 100644 --- a/sites/partners/cypress/support/commands.js +++ b/sites/partners/cypress/support/commands.js @@ -313,7 +313,6 @@ Cypress.Commands.add("verifyPrimaryApplicant", (application, fieldsToSkip = []) { id: "dateOfBirth", fieldKey: "dateOfBirth" }, { id: "phoneNumber", fieldKey: "formattedPhoneNumber" }, { id: "additionalPhoneNumber", fieldKey: "formattedAdditionalPhoneNumber" }, - { id: "preferredContact", fieldKey: "preferredContact" }, { id: "residenceAddress.streetAddress", fieldKey: "applicant.address.street" }, { id: "residenceAddress.street2", fieldKey: "applicant.address.street2" }, { id: "residenceAddress.city", fieldKey: "applicant.address.city" }, From 6236b4522804d8ed9fdb9620e9cc8da5af700792 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 11:30:29 -0500 Subject: [PATCH 05/15] fix: further linting updates --- .../sections/FormPrimaryApplicant.tsx | 10 +--------- .../PaperListingForm/dialogs/CopyListingDialog.tsx | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx b/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx index ac428c86af..e06f5512fa 100644 --- a/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx +++ b/sites/partners/src/components/applications/PaperApplicationForm/sections/FormPrimaryApplicant.tsx @@ -1,14 +1,6 @@ import React, { useEffect } from "react" import { useFormContext } from "react-hook-form" -import { - t, - DOBField, - Select, - Field, - PhoneField, - FieldGroup, - FormAddress, -} from "@bloom-housing/ui-components" +import { t, DOBField, Select, Field, PhoneField, FormAddress } from "@bloom-housing/ui-components" import { Grid } from "@bloom-housing/ui-seeds" import { phoneNumberKeys, stateKeys, emailRegex } from "@bloom-housing/shared-helpers" import SectionWithGrid from "../../../shared/SectionWithGrid" diff --git a/sites/partners/src/components/listings/PaperListingForm/dialogs/CopyListingDialog.tsx b/sites/partners/src/components/listings/PaperListingForm/dialogs/CopyListingDialog.tsx index c5894ec06f..5a8ebbe6b7 100644 --- a/sites/partners/src/components/listings/PaperListingForm/dialogs/CopyListingDialog.tsx +++ b/sites/partners/src/components/listings/PaperListingForm/dialogs/CopyListingDialog.tsx @@ -4,7 +4,6 @@ import { Button, Dialog } from "@bloom-housing/ui-seeds" import { Field, Form, t } from "@bloom-housing/ui-components" import { useForm } from "react-hook-form" import { AuthContext, MessageContext } from "@bloom-housing/shared-helpers" -import { useRouter } from "next/router" export interface CopyListingDialogProps { isOpen: boolean From af09c6e0785f02652a1cf05e0a593dfad9942e2e Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 15:28:40 -0500 Subject: [PATCH 06/15] fix: piece by piece --- api/src/utilities/application-export-helpers.ts | 4 ---- api/test/unit/utilities/application-export-helpers.spec.ts | 4 ---- .../partners/cypress/e2e/default/05-paperApplication.spec.ts | 2 +- sites/partners/cypress/support/commands.js | 4 +--- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/api/src/utilities/application-export-helpers.ts b/api/src/utilities/application-export-helpers.ts index 2ccd627c94..aa83895442 100644 --- a/api/src/utilities/application-export-helpers.ts +++ b/api/src/utilities/application-export-helpers.ts @@ -116,10 +116,6 @@ export const getExportHeaders = ( path: 'additionalPhoneNumber', label: 'Primary Applicant Additional Phone Number', }, - { - path: 'contactPreferences', - label: 'Primary Applicant Preferred Contact Type', - }, { path: 'applicant.applicantAddress.street', label: `Primary Applicant Street`, diff --git a/api/test/unit/utilities/application-export-helpers.spec.ts b/api/test/unit/utilities/application-export-helpers.spec.ts index 79abc0393a..98cb8dd664 100644 --- a/api/test/unit/utilities/application-export-helpers.spec.ts +++ b/api/test/unit/utilities/application-export-helpers.spec.ts @@ -90,10 +90,6 @@ describe('Testing application export helpers', () => { path: 'additionalPhoneNumber', label: 'Primary Applicant Additional Phone Number', }, - { - path: 'contactPreferences', - label: 'Primary Applicant Preferred Contact Type', - }, { path: 'applicant.applicantAddress.street', label: `Primary Applicant Street`, diff --git a/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts b/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts index f705929b36..3577abde33 100644 --- a/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts +++ b/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts @@ -10,7 +10,7 @@ describe("Paper Application Tests", () => { cy.signOut() }) - it("fill paper application form completely", () => { + it.only("fill paper application form completely", () => { cy.fixture("application").then((application) => { cy.fillPrimaryApplicant(application) cy.fillAlternateContact(application) diff --git a/sites/partners/cypress/support/commands.js b/sites/partners/cypress/support/commands.js index dcffad577c..4d498b0a5c 100644 --- a/sites/partners/cypress/support/commands.js +++ b/sites/partners/cypress/support/commands.js @@ -140,9 +140,7 @@ Cypress.Commands.add("fillPrimaryApplicant", (application, fieldsToSkip = []) => { id: "application.applicant.applicantAddress.state", fieldKey: "applicant.address.state" }, ] - const fieldsToClick = [{ id: "email", fieldKey: "email" }] - - fillFields(application, fieldsToType, fieldsToSelect, fieldsToClick, fieldsToSkip) + fillFields(application, fieldsToType, fieldsToSelect, [], fieldsToSkip) }) Cypress.Commands.add("fillAlternateContact", (application, fieldsToSkip = []) => { From 98332b4187ffde1ee02a61e4146db3c6a3d88c34 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 15:54:56 -0500 Subject: [PATCH 07/15] fix: exporter testing update --- api/test/unit/services/application-exporter.service.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/test/unit/services/application-exporter.service.spec.ts b/api/test/unit/services/application-exporter.service.spec.ts index 69d20f5ae1..9564b2fc13 100644 --- a/api/test/unit/services/application-exporter.service.spec.ts +++ b/api/test/unit/services/application-exporter.service.spec.ts @@ -105,7 +105,7 @@ describe('Testing application export service', () => { ); const headerRow = - '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Preferred Contact Type","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Primary Applicant Work Street","Primary Applicant Work Street 2","Primary Applicant Work City","Primary Applicant Work State","Primary Applicant Work Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Preference text 0 - text - Address","Program text 1","Household Size","Household Member (1) First Name","Household Member (1) Middle Name","Household Member (1) Last Name","Household Member (1) First Name","Household Member (1) Birth Day","Household Member (1) Birth Month","Household Member (1) Birth Year","Household Member (1) Same as Primary Applicant","Household Member (1) Relationship","Household Member (1) Work in Region","Household Member (1) Street","Household Member (1) Street 2","Household Member (1) City","Household Member (1) State","Household Member (1) Zip Code","Marked As Duplicate","Flagged As Duplicate"'; + '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Primary Applicant Work Street","Primary Applicant Work Street 2","Primary Applicant Work City","Primary Applicant Work State","Primary Applicant Work Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Preference text 0 - text - Address","Program text 1","Household Size","Household Member (1) First Name","Household Member (1) Middle Name","Household Member (1) Last Name","Household Member (1) First Name","Household Member (1) Birth Day","Household Member (1) Birth Month","Household Member (1) Birth Year","Household Member (1) Same as Primary Applicant","Household Member (1) Relationship","Household Member (1) Work in Region","Household Member (1) Street","Household Member (1) Street 2","Household Member (1) City","Household Member (1) State","Household Member (1) Zip Code","Marked As Duplicate","Flagged As Duplicate"'; const firstApp = '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0",,"application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,"application 0 applicantWorkAddress street","application 0 applicantWorkAddress street2","application 0 applicantWorkAddress city","application 0 applicantWorkAddress state","application 0 applicantWorkAddress zipCode",,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,,,,,,,,,,,,,,,'; From 97b0028175f51375c339830c1fc81ee30d392826 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 16:34:18 -0500 Subject: [PATCH 08/15] fix: string removal --- api/test/unit/services/application-exporter.service.spec.ts | 6 +++--- doorway-ui-components/src/locales/es.json | 1 - doorway-ui-components/src/locales/general.json | 1 - doorway-ui-components/src/locales/tl.json | 1 - doorway-ui-components/src/locales/vi.json | 1 - doorway-ui-components/src/locales/zh.json | 1 - 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/api/test/unit/services/application-exporter.service.spec.ts b/api/test/unit/services/application-exporter.service.spec.ts index 9564b2fc13..39263ddc35 100644 --- a/api/test/unit/services/application-exporter.service.spec.ts +++ b/api/test/unit/services/application-exporter.service.spec.ts @@ -107,7 +107,7 @@ describe('Testing application export service', () => { const headerRow = '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Primary Applicant Work Street","Primary Applicant Work Street 2","Primary Applicant Work City","Primary Applicant Work State","Primary Applicant Work Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Preference text 0 - text - Address","Program text 1","Household Size","Household Member (1) First Name","Household Member (1) Middle Name","Household Member (1) Last Name","Household Member (1) First Name","Household Member (1) Birth Day","Household Member (1) Birth Month","Household Member (1) Birth Year","Household Member (1) Same as Primary Applicant","Household Member (1) Relationship","Household Member (1) Work in Region","Household Member (1) Street","Household Member (1) Street 2","Household Member (1) City","Household Member (1) State","Household Member (1) Zip Code","Marked As Duplicate","Flagged As Duplicate"'; const firstApp = - '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0",,"application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,"application 0 applicantWorkAddress street","application 0 applicantWorkAddress street2","application 0 applicantWorkAddress city","application 0 applicantWorkAddress state","application 0 applicantWorkAddress zipCode",,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,,,,,,,,,,,,,,,'; + '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0","application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,"application 0 applicantWorkAddress street","application 0 applicantWorkAddress street2","application 0 applicantWorkAddress city","application 0 applicantWorkAddress state","application 0 applicantWorkAddress zipCode",,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,,,,,,,,,,,,,,,'; const mockedStream = new PassThrough(); exportResponse.getStream().pipe(mockedStream); @@ -164,9 +164,9 @@ describe('Testing application export service', () => { ); const headerRow = - '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Preferred Contact Type","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Primary Applicant Work Street","Primary Applicant Work Street 2","Primary Applicant Work City","Primary Applicant Work State","Primary Applicant Work Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Program text 1","Household Size","Marked As Duplicate","Flagged As Duplicate","Race","Gender","Sexual Orientation","Spoken Language","How did you Hear?"'; + '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Primary Applicant Work Street","Primary Applicant Work Street 2","Primary Applicant Work City","Primary Applicant Work State","Primary Applicant Work Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Program text 1","Household Size","Marked As Duplicate","Flagged As Duplicate","Race","Gender","Sexual Orientation","Spoken Language","How did you Hear?"'; const firstApp = - '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0",,"application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,"application 0 applicantWorkAddress street","application 0 applicantWorkAddress street2","application 0 applicantWorkAddress city","application 0 applicantWorkAddress state","application 0 applicantWorkAddress zipCode",,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,"Indigenous",,,,"Other"'; + '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0","application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,"application 0 applicantWorkAddress street","application 0 applicantWorkAddress street2","application 0 applicantWorkAddress city","application 0 applicantWorkAddress state","application 0 applicantWorkAddress zipCode",,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,"Indigenous",,,,"Other"'; const mockedStream = new PassThrough(); exportResponse.getStream().pipe(mockedStream); diff --git a/doorway-ui-components/src/locales/es.json b/doorway-ui-components/src/locales/es.json index a0177d4adf..2e3a433ce0 100644 --- a/doorway-ui-components/src/locales/es.json +++ b/doorway-ui-components/src/locales/es.json @@ -83,7 +83,6 @@ "application.contact.phoneNumberTypes.home": "Casa", "application.contact.phoneNumberTypes.prompt": "¿Qué tipo de número es este?", "application.contact.phoneNumberTypes.work": "Trabajo", - "application.contact.preferredContactType": "Tipo de contacto preferido", "application.contact.provideAMailingAddress": "Proporcione una dirección en donde pueda recibir información actualizada y materiales relacionados con su solicitud.", "application.contact.sendMailToMailingAddress": "Envíenme mi correspondencia a una dirección diferente", "application.contact.state": "Estado", diff --git a/doorway-ui-components/src/locales/general.json b/doorway-ui-components/src/locales/general.json index 76e65589d7..c5d9b637b2 100644 --- a/doorway-ui-components/src/locales/general.json +++ b/doorway-ui-components/src/locales/general.json @@ -83,7 +83,6 @@ "application.contact.phoneNumberTypes.home": "Home", "application.contact.phoneNumberTypes.prompt": "What type of number is this?", "application.contact.phoneNumberTypes.work": "Work", - "application.contact.preferredContactType": "Preferred Contact Type", "application.contact.provideAMailingAddress": "Provide an address where you can receive updates and materials about your application.", "application.contact.sendMailToMailingAddress": "Send my mail to a different address", "application.contact.state": "State", diff --git a/doorway-ui-components/src/locales/tl.json b/doorway-ui-components/src/locales/tl.json index 10258d3b21..8dcc0a407a 100644 --- a/doorway-ui-components/src/locales/tl.json +++ b/doorway-ui-components/src/locales/tl.json @@ -83,7 +83,6 @@ "application.contact.phoneNumberTypes.home": "Home", "application.contact.phoneNumberTypes.prompt": "Anong uri ng numero ito?", "application.contact.phoneNumberTypes.work": "Trabaho", - "application.contact.preferredContactType": "Napiling Uri ng Contact", "application.contact.provideAMailingAddress": "Magbigay ng address kung saan maaari kang tumanggap ng mga update at materyal tungkol sa iyong application.", "application.contact.sendMailToMailingAddress": "Ipadala ang aking liham sa ibang address", "application.contact.state": "State", diff --git a/doorway-ui-components/src/locales/vi.json b/doorway-ui-components/src/locales/vi.json index 0f992cbf9f..b89dd544fb 100644 --- a/doorway-ui-components/src/locales/vi.json +++ b/doorway-ui-components/src/locales/vi.json @@ -83,7 +83,6 @@ "application.contact.phoneNumberTypes.home": "Nhà riêng", "application.contact.phoneNumberTypes.prompt": "Kiểu số điện thoại này là gì?", "application.contact.phoneNumberTypes.work": "Sở làm", - "application.contact.preferredContactType": "Loại Liên lạc Ưu tiên", "application.contact.provideAMailingAddress": "Cung cấp địa chỉ nơi quý vị có thể nhận các thông tin cập nhật và tài liệu về đơn ghi danh của mình.", "application.contact.sendMailToMailingAddress": "Gửi thư của tôi đến một địa chỉ khác", "application.contact.state": "Tiểu bang", diff --git a/doorway-ui-components/src/locales/zh.json b/doorway-ui-components/src/locales/zh.json index 77169f213a..de73f5368e 100644 --- a/doorway-ui-components/src/locales/zh.json +++ b/doorway-ui-components/src/locales/zh.json @@ -83,7 +83,6 @@ "application.contact.phoneNumberTypes.home": "住家", "application.contact.phoneNumberTypes.prompt": "這是哪類電話號碼？", "application.contact.phoneNumberTypes.work": "工作", - "application.contact.preferredContactType": "首選聯絡方式", "application.contact.provideAMailingAddress": "請提供一個可收到您最新申請消息和資料的地址。", "application.contact.sendMailToMailingAddress": "請將我的郵件寄往另一地址", "application.contact.state": "州", From ab99603fbd2140ad851a1b1ede8baa64c0accaa5 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 16:56:36 -0500 Subject: [PATCH 09/15] fix: update export fields --- .../utilities/application-export-helpers.ts | 24 ------------------- .../application-exporter.service.spec.ts | 8 +++---- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/api/src/utilities/application-export-helpers.ts b/api/src/utilities/application-export-helpers.ts index aa83895442..d86ed227a6 100644 --- a/api/src/utilities/application-export-helpers.ts +++ b/api/src/utilities/application-export-helpers.ts @@ -156,26 +156,6 @@ export const getExportHeaders = ( path: 'applicationsMailingAddress.zipCode', label: `Primary Applicant Mailing Zip Code`, }, - { - path: 'applicant.applicantWorkAddress.street', - label: `Primary Applicant Work Street`, - }, - { - path: 'applicant.applicantWorkAddress.street2', - label: `Primary Applicant Work Street 2`, - }, - { - path: 'applicant.applicantWorkAddress.city', - label: `Primary Applicant Work City`, - }, - { - path: 'applicant.applicantWorkAddress.state', - label: `Primary Applicant Work State`, - }, - { - path: 'applicant.applicantWorkAddress.zipCode', - label: `Primary Applicant Work Zip Code`, - }, { path: 'alternateContact.firstName', label: 'Alternate Contact First Name', @@ -530,10 +510,6 @@ export const getHouseholdCsvHeaders = ( path: `householdMember.${i}.relationship`, label: `Household Member (${j}) Relationship`, }, - { - path: `householdMember.${i}.workInRegion`, - label: `Household Member (${j}) Work in Region`, - }, { path: `householdMember.${i}.householdMemberAddress.street`, label: `Household Member (${j}) Street`, diff --git a/api/test/unit/services/application-exporter.service.spec.ts b/api/test/unit/services/application-exporter.service.spec.ts index 39263ddc35..4d76a14f26 100644 --- a/api/test/unit/services/application-exporter.service.spec.ts +++ b/api/test/unit/services/application-exporter.service.spec.ts @@ -105,9 +105,9 @@ describe('Testing application export service', () => { ); const headerRow = - '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Primary Applicant Work Street","Primary Applicant Work Street 2","Primary Applicant Work City","Primary Applicant Work State","Primary Applicant Work Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Preference text 0 - text - Address","Program text 1","Household Size","Household Member (1) First Name","Household Member (1) Middle Name","Household Member (1) Last Name","Household Member (1) First Name","Household Member (1) Birth Day","Household Member (1) Birth Month","Household Member (1) Birth Year","Household Member (1) Same as Primary Applicant","Household Member (1) Relationship","Household Member (1) Work in Region","Household Member (1) Street","Household Member (1) Street 2","Household Member (1) City","Household Member (1) State","Household Member (1) Zip Code","Marked As Duplicate","Flagged As Duplicate"'; + '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Preference text 0 - text - Address","Program text 1","Household Size","Household Member (1) First Name","Household Member (1) Middle Name","Household Member (1) Last Name","Household Member (1) First Name","Household Member (1) Birth Day","Household Member (1) Birth Month","Household Member (1) Birth Year","Household Member (1) Same as Primary Applicant","Household Member (1) Relationship","Household Member (1) Street","Household Member (1) Street 2","Household Member (1) City","Household Member (1) State","Household Member (1) Zip Code","Marked As Duplicate","Flagged As Duplicate"'; const firstApp = - '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0","application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,"application 0 applicantWorkAddress street","application 0 applicantWorkAddress street2","application 0 applicantWorkAddress city","application 0 applicantWorkAddress state","application 0 applicantWorkAddress zipCode",,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,,,,,,,,,,,,,,,'; + '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0","application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,,,,,,,,,,,,,,'; const mockedStream = new PassThrough(); exportResponse.getStream().pipe(mockedStream); @@ -164,9 +164,9 @@ describe('Testing application export service', () => { ); const headerRow = - '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Primary Applicant Work Street","Primary Applicant Work Street 2","Primary Applicant Work City","Primary Applicant Work State","Primary Applicant Work Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Program text 1","Household Size","Marked As Duplicate","Flagged As Duplicate","Race","Gender","Sexual Orientation","Spoken Language","How did you Hear?"'; + '"Application Id","Application Confirmation Code","Application Type","Application Submission Date","Application Received At","Application Received By","Primary Applicant First Name","Primary Applicant Middle Name","Primary Applicant Last Name","Primary Applicant Birth Day","Primary Applicant Birth Month","Primary Applicant Birth Year","Primary Applicant Email Address","Primary Applicant Phone Number","Primary Applicant Phone Type","Primary Applicant Additional Phone Number","Primary Applicant Street","Primary Applicant Street 2","Primary Applicant City","Primary Applicant State","Primary Applicant Zip Code","Primary Applicant Mailing Street","Primary Applicant Mailing Street 2","Primary Applicant Mailing City","Primary Applicant Mailing State","Primary Applicant Mailing Zip Code","Alternate Contact First Name","Alternate Contact Last Name","Alternate Contact Type","Alternate Contact Agency","Alternate Contact Other Type","Alternate Contact Email Address","Alternate Contact Phone Number","Alternate Contact Street","Alternate Contact Street 2","Alternate Contact City","Alternate Contact State","Alternate Contact Zip Code","Income","Income Period","Accessibility Mobility","Accessibility Vision","Accessibility Hearing","Expecting Household Changes","Household Includes Student or Member Nearing 18","Vouchers or Subsidies","Requested Unit Types","Preference text 0","Program text 1","Household Size","Marked As Duplicate","Flagged As Duplicate","Race","Gender","Sexual Orientation","Spoken Language","How did you Hear?"'; const firstApp = - '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0","application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,"application 0 applicantWorkAddress street","application 0 applicantWorkAddress street2","application 0 applicantWorkAddress city","application 0 applicantWorkAddress state","application 0 applicantWorkAddress zipCode",,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,"Indigenous",,,,"Other"'; + '"application 0 firstName","application 0 middleName","application 0 lastName","application 0 birthDay","application 0 birthMonth","application 0 birthYear","application 0 emailaddress","application 0 phoneNumber","application 0 phoneNumberType","additionalPhoneNumber 0","application 0 applicantAddress street","application 0 applicantAddress street2","application 0 applicantAddress city","application 0 applicantAddress state","application 0 applicantAddress zipCode",,,,,,,,,,,,,,,,,,"income 0","per month",,,,"true","true","true","Studio,One Bedroom",,,,,,"Indigenous",,,,"Other"'; const mockedStream = new PassThrough(); exportResponse.getStream().pipe(mockedStream); From d66a4a136800a327ffc29e3441a2e22e943323f9 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Wed, 20 Nov 2024 17:00:30 -0500 Subject: [PATCH 10/15] fix: more linting work --- .../__tests__/pages/applications/contact/address.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/public/__tests__/pages/applications/contact/address.test.tsx b/sites/public/__tests__/pages/applications/contact/address.test.tsx index 0b51662ba8..94ddbed43c 100644 --- a/sites/public/__tests__/pages/applications/contact/address.test.tsx +++ b/sites/public/__tests__/pages/applications/contact/address.test.tsx @@ -24,7 +24,7 @@ describe("applications pages", () => { describe("address step", () => { it("should render form fields", () => { - const { getByText, getByTestId, getAllByTestId } = render() + const { getByText, getByTestId } = render() expect( getByText("Now we need to know how to contact you about your application.", { From e7020f2237af3ed8efdb6090da177543f164fc24 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Mon, 25 Nov 2024 15:28:30 -0500 Subject: [PATCH 11/15] fix: update options and translations --- .../household-member-relationship-enum.ts | 21 ++++++++----------- shared-helpers/src/locales/es.json | 16 +++++++------- shared-helpers/src/locales/general.json | 17 +++++++-------- shared-helpers/src/locales/tl.json | 17 +++++++-------- shared-helpers/src/locales/vi.json | 17 +++++++-------- shared-helpers/src/locales/zh.json | 17 +++++++-------- shared-helpers/src/types/backend-swagger.ts | 21 ++++++++----------- .../cypress/mockData/applicationData.ts | 2 +- 8 files changed, 54 insertions(+), 74 deletions(-) diff --git a/api/src/enums/applications/household-member-relationship-enum.ts b/api/src/enums/applications/household-member-relationship-enum.ts index d6be659913..48fe5babd5 100644 --- a/api/src/enums/applications/household-member-relationship-enum.ts +++ b/api/src/enums/applications/household-member-relationship-enum.ts @@ -1,17 +1,14 @@ export enum HouseholdMemberRelationship { - spouse = 'spouse', - registeredDomesticPartner = 'registeredDomesticPartner', - parent = 'parent', + spousePartner = 'spousePartner', + girlfriendBoyfriend = 'girlfriendBoyfriend', child = 'child', - sibling = 'sibling', - cousin = 'cousin', - aunt = 'aunt', - uncle = 'uncle', - nephew = 'nephew', - niece = 'niece', - grandparent = 'grandparent', - greatGrandparent = 'greatGrandparent', - inLaw = 'inLaw', + parent = 'parent', friend = 'friend', + brotherSister = 'brotherSister', + cousin = 'cousin', + auntUncle = 'auntUncle', + nephewNiece = 'nephewNiece', + grandparentGreatGrandparent = 'grandparentGreatGrandparent', + liveInAide = 'liveInAide', other = 'other', } diff --git a/shared-helpers/src/locales/es.json b/shared-helpers/src/locales/es.json index ddc4076660..f9530433d9 100644 --- a/shared-helpers/src/locales/es.json +++ b/shared-helpers/src/locales/es.json @@ -181,21 +181,19 @@ "application.financial.vouchers.title": "¿Recibe usted o algún miembro de su hogar vales de la sección 8 o emitidos por la Autoridad de Vivienda, incluidos los vales de Vivienda de Apoyo para Asuntos de Veteranos (VASH), o ayuda para el alquiler de otras fuentes?", "application.form.general.saveAndFinishLater": "Guardar y terminar más tarde", "application.form.general.saveAndReturn": "Guardar y regresar a revisión", - "application.form.options.relationship.aunt": "Tía", + "application.form.options.relationship.auntUncle": "Tía/Tío", "application.form.options.relationship.child": "Hijo", "application.form.options.relationship.cousin": "Primo", "application.form.options.relationship.friend": "Amigo(a)", - "application.form.options.relationship.grandparent": "Abuelo", - "application.form.options.relationship.greatGrandparent": "Bisabuelo", + "application.form.options.relationship.grandparentGreatGrandparent": "Abuelo/Bisabuelo", "application.form.options.relationship.inLaw": "Pariente político", - "application.form.options.relationship.nephew": "Sobrino", - "application.form.options.relationship.niece": "Sobrina", + "application.form.options.relationship.nephew": "Sobrino/Sobrina", + "application.form.options.relationship.liveInAide": "Asistente Residente", "application.form.options.relationship.other": "Otro", "application.form.options.relationship.parent": "Padre", - "application.form.options.relationship.registeredDomesticPartner": "Pareja de hecho registrada", - "application.form.options.relationship.sibling": "Hermano", - "application.form.options.relationship.spouse": "Cónyuge", - "application.form.options.relationship.uncle": "Tío", + "application.form.options.relationship.girlfriendBoyfriend": "Novia/Novio", + "application.form.options.relationship.brotherSister": "Hermano/Hermana", + "application.form.options.relationship.spousePartner": "Cónyuge/Pareja", "application.household.addMembers.addHouseholdMember": "+ Añadir miembro del hogar", "application.household.addMembers.done": "Ya terminó de añadir personas", "application.household.addMembers.doubleCheck": "Por favor revise la información de cada miembro del hogar.", diff --git a/shared-helpers/src/locales/general.json b/shared-helpers/src/locales/general.json index 9dfc69ab93..b71551fffa 100644 --- a/shared-helpers/src/locales/general.json +++ b/shared-helpers/src/locales/general.json @@ -181,21 +181,18 @@ "application.financial.vouchers.title": "Do you or anyone in your household receive Section 8 or Housing Authority issued vouchers, including Veterans Affairs Supportive Housing (VASH) vouchers, or rental assistance from other sources?", "application.form.general.saveAndFinishLater": "Save and finish later", "application.form.general.saveAndReturn": "Save and return to review", - "application.form.options.relationship.aunt": "Aunt", + "application.form.options.relationship.auntUncle": "Aunt/Uncle", "application.form.options.relationship.child": "Child", "application.form.options.relationship.cousin": "Cousin", "application.form.options.relationship.friend": "Friend", - "application.form.options.relationship.grandparent": "Grandparent", - "application.form.options.relationship.greatGrandparent": "Great Grandparent", - "application.form.options.relationship.inLaw": "In Law", - "application.form.options.relationship.nephew": "Nephew", - "application.form.options.relationship.niece": "Niece", + "application.form.options.relationship.grandparentGreatGrandparent": "Grandparent/Great Grandparent", + "application.form.options.relationship.nephewNiece": "Nephew/Niece", + "application.form.options.relationship.liveInAide": "Live-in Aide", "application.form.options.relationship.other": "Other", "application.form.options.relationship.parent": "Parent", - "application.form.options.relationship.registeredDomesticPartner": "Registered Domestic Partner", - "application.form.options.relationship.sibling": "Sibling", - "application.form.options.relationship.spouse": "Spouse", - "application.form.options.relationship.uncle": "Uncle", + "application.form.options.relationship.girlfriendBoyfriend": "Girlfriend/Boyfriend", + "application.form.options.relationship.brotherSister": "Brother/Sister", + "application.form.options.relationship.spousePartner": "Spouse/Partner", "application.household.addMembers.addHouseholdMember": "+ Add Household Member", "application.household.addMembers.done": "Done adding people", "application.household.addMembers.doubleCheck": "Please double-check the information for each household member.", diff --git a/shared-helpers/src/locales/tl.json b/shared-helpers/src/locales/tl.json index 08d8ad3c10..144c6f0cdd 100644 --- a/shared-helpers/src/locales/tl.json +++ b/shared-helpers/src/locales/tl.json @@ -181,21 +181,18 @@ "application.financial.vouchers.title": "Ikaw ba o sinuman sa iyong sambahayan ay tumatanggap ng Seksyon 8 o Housing Authority na inisyu ng mga voucher, kabilang ang mga voucher ng Veterans Affairs Supportive Housing (VASH), o tulong sa pag-upa mula sa ibang mga mapagkukunan?", "application.form.general.saveAndFinishLater": "I-save at tapusin pagkatapos", "application.form.general.saveAndReturn": "I-save at ibalik para repasuhin", - "application.form.options.relationship.aunt": "Tiyahin", + "application.form.options.relationship.auntUncle": "Tita/Tito", "application.form.options.relationship.child": "Anak", "application.form.options.relationship.cousin": "Pinsan", "application.form.options.relationship.friend": "Kaibigan", - "application.form.options.relationship.grandparent": "Lolo o Lola", - "application.form.options.relationship.greatGrandparent": "Lolo o Lola sa Tuhod", - "application.form.options.relationship.inLaw": "Biyenan o Bayaw o Manugang", - "application.form.options.relationship.nephew": "Pamangkin na lalaki", - "application.form.options.relationship.niece": "Pamangkin na babae", + "application.form.options.relationship.grandparentGreatGrandparent": "Lolo o Lola/Lolo o Lola sa Tuhod", + "application.form.options.relationship.nephewNiece": "Pamangkin na lalaki/Pamangkin na babae", + "application.form.options.relationship.liveInAide": "Live-in Aide", "application.form.options.relationship.other": "Iba pa", "application.form.options.relationship.parent": "Magulang", - "application.form.options.relationship.registeredDomesticPartner": "Nakarehistrong kinakasama", - "application.form.options.relationship.sibling": "Kapatid", - "application.form.options.relationship.spouse": "Asawa", - "application.form.options.relationship.uncle": "Tiyuhin", + "application.form.options.relationship.girlfriendBoyfriend": "Kasintahan", + "application.form.options.relationship.brotherSister": "Kuya/Ate", + "application.form.options.relationship.spousePartner": "Asawa/Kasosyo", "application.household.addMembers.addHouseholdMember": "+ Magdagdag ng miyembro ng sambahayan", "application.household.addMembers.done": "Tapos nang magdagdag ng mga tao", "application.household.addMembers.doubleCheck": "Pakitingnan muli ang impormasyon para sa bawat miyembro ng sambahayan.", diff --git a/shared-helpers/src/locales/vi.json b/shared-helpers/src/locales/vi.json index 565aaaa1c9..a8950e4109 100644 --- a/shared-helpers/src/locales/vi.json +++ b/shared-helpers/src/locales/vi.json @@ -181,21 +181,18 @@ "application.financial.vouchers.title": "Bạn hay ai đó trong hộ gia đình mình có nhận phiếu theo Mục 8 hoặc phiếu do Cơ quan Quản lý Nhà ở cấp, bao gồm các phiếu Nhà ở hỗ trợ Cựu chiến binh (VASH) hoặc sự hỗ trợ tiền thuê nhà từ các nguồn khác không?", "application.form.general.saveAndFinishLater": "Lưu và hoàn thành sau", "application.form.general.saveAndReturn": "Lưu và quay lại để xem", - "application.form.options.relationship.aunt": "Cô/Dì/Bác/Mợ", + "application.form.options.relationship.auntUncle": "Cô/Chú", "application.form.options.relationship.child": "Con", "application.form.options.relationship.cousin": "Anh chị em họ", "application.form.options.relationship.friend": "Bạn", - "application.form.options.relationship.grandparent": "Ông/Bà", - "application.form.options.relationship.greatGrandparent": "Cụ", - "application.form.options.relationship.inLaw": "Người thân bên thông gia", - "application.form.options.relationship.nephew": "Cháu trai", - "application.form.options.relationship.niece": "Cháu gái", + "application.form.options.relationship.grandparentGreatGrandparent": "Ông bà/Ông bà cố", + "application.form.options.relationship.nephewNiece": "Cháu trai/Cháu gái", + "application.form.options.relationship.liveInAide": "Trợ lý nội trú", "application.form.options.relationship.other": "Khác", "application.form.options.relationship.parent": "Phụ huynh", - "application.form.options.relationship.registeredDomesticPartner": "Người đã đăng ký sống cùng", - "application.form.options.relationship.sibling": "Anh chị em", - "application.form.options.relationship.spouse": "Vợ/Chồng/Bạn đời", - "application.form.options.relationship.uncle": "Chú/Cậu/Bác", + "application.form.options.relationship.girlfriendBoyfriend": "Bạn gái/Bạn trai", + "application.form.options.relationship.brotherSister": "Anh trai/Em gái", + "application.form.options.relationship.spousePartner": "Vợ/chồng/đối tác", "application.household.addMembers.addHouseholdMember": "+ Thêm thành viên trong hộ gia đình", "application.household.addMembers.done": "Thêm xong thành viên", "application.household.addMembers.doubleCheck": "Hãy kiểm tra lại thông tin cho mỗi thành viên hộ gia đình.", diff --git a/shared-helpers/src/locales/zh.json b/shared-helpers/src/locales/zh.json index fed951b8c8..590562d552 100644 --- a/shared-helpers/src/locales/zh.json +++ b/shared-helpers/src/locales/zh.json @@ -181,21 +181,18 @@ "application.financial.vouchers.title": "您或您家中是否有人領取第 8 節或住房管理局所發放的住房券，包括退伍軍人事務支援住房（Veterans Affairs Supportive Housing，VASH）券，或其他來源的租金援助？", "application.form.general.saveAndFinishLater": "儲存並於稍後完成", "application.form.general.saveAndReturn": "儲存並返回檢視", - "application.form.options.relationship.aunt": "阿姨/姑姑", + "application.form.options.relationship.auntUncle": "阿姨/姑姑", "application.form.options.relationship.child": "孩子", "application.form.options.relationship.cousin": "表親", "application.form.options.relationship.friend": "朋友", - "application.form.options.relationship.grandparent": "祖父母", - "application.form.options.relationship.greatGrandparent": "曾祖父母", - "application.form.options.relationship.inLaw": "姻親", - "application.form.options.relationship.nephew": "姪兒/外甥", - "application.form.options.relationship.niece": "姪女/外甥女", + "application.form.options.relationship.grandparentGreatGrandparent": "祖父母/曾祖父母", + "application.form.options.relationship.nephewNiece": "姪子/姪女", + "application.form.options.relationship.liveInAide": "住家助理", "application.form.options.relationship.other": "其他", "application.form.options.relationship.parent": "父母", - "application.form.options.relationship.registeredDomesticPartner": "已登記的同居伴侶", - "application.form.options.relationship.sibling": "兄弟姊妹", - "application.form.options.relationship.spouse": "配偶", - "application.form.options.relationship.uncle": "舅舅/叔伯", + "application.form.options.relationship.girlfriendBoyfriend": "女朋友/男朋友", + "application.form.options.relationship.brotherSister": "兄弟/姊妹", + "application.form.options.relationship.spousePartner": "配偶/伴侶", "application.household.addMembers.addHouseholdMember": "+ 新增家庭成員", "application.household.addMembers.done": "完成加入成員", "application.household.addMembers.doubleCheck": "請再次確認每位家庭成員的資訊。", diff --git a/shared-helpers/src/types/backend-swagger.ts b/shared-helpers/src/types/backend-swagger.ts index f42e223d67..449e6ac1e1 100644 --- a/shared-helpers/src/types/backend-swagger.ts +++ b/shared-helpers/src/types/backend-swagger.ts @@ -6659,20 +6659,17 @@ export enum AlternateContactRelationship { } export enum HouseholdMemberRelationship { - "spouse" = "spouse", - "registeredDomesticPartner" = "registeredDomesticPartner", - "parent" = "parent", + "spousePartner" = "spousePartner", + "girlfriendBoyfriend" = "girlfriendBoyfriend", "child" = "child", - "sibling" = "sibling", - "cousin" = "cousin", - "aunt" = "aunt", - "uncle" = "uncle", - "nephew" = "nephew", - "niece" = "niece", - "grandparent" = "grandparent", - "greatGrandparent" = "greatGrandparent", - "inLaw" = "inLaw", + "parent" = "parent", "friend" = "friend", + "brotherSister" = "brotherSister", + "cousin" = "cousin", + "auntUncle" = "auntUncle", + "nephewNiece" = "nephewNiece", + "grandparentGreatGrandparent" = "grandparentGreatGrandparent", + "liveInAide" = "liveInAide", "other" = "other", } export type AllExtraDataTypes = BooleanInput | TextInput | AddressInput diff --git a/sites/public/cypress/mockData/applicationData.ts b/sites/public/cypress/mockData/applicationData.ts index 897ec4b6b2..70325ce677 100644 --- a/sites/public/cypress/mockData/applicationData.ts +++ b/sites/public/cypress/mockData/applicationData.ts @@ -165,7 +165,7 @@ export const ElmVillageApplication: Application = { zipCode: "90223", }, sameAddress: YesNoEnum.no, - relationship: HouseholdMemberRelationship.spouse, + relationship: HouseholdMemberRelationship.spousePartner, }, ], preferredUnitTypes: [ From 2f24e782227854d433f58dff4775462d97ca9a7d Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Mon, 25 Nov 2024 15:31:18 -0500 Subject: [PATCH 12/15] fix: remove inlaw --- shared-helpers/src/locales/es.json | 1 - 1 file changed, 1 deletion(-) diff --git a/shared-helpers/src/locales/es.json b/shared-helpers/src/locales/es.json index f9530433d9..ed3ceb008d 100644 --- a/shared-helpers/src/locales/es.json +++ b/shared-helpers/src/locales/es.json @@ -186,7 +186,6 @@ "application.form.options.relationship.cousin": "Primo", "application.form.options.relationship.friend": "Amigo(a)", "application.form.options.relationship.grandparentGreatGrandparent": "Abuelo/Bisabuelo", - "application.form.options.relationship.inLaw": "Pariente político", "application.form.options.relationship.nephew": "Sobrino/Sobrina", "application.form.options.relationship.liveInAide": "Asistente Residente", "application.form.options.relationship.other": "Otro", From ef48e4729dfb9dfcce82d159864b8a316525e49c Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Mon, 25 Nov 2024 15:50:28 -0500 Subject: [PATCH 13/15] fix: update helper --- .../application-export-helpers.spec.ts | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/api/test/unit/utilities/application-export-helpers.spec.ts b/api/test/unit/utilities/application-export-helpers.spec.ts index 98cb8dd664..badef9ac71 100644 --- a/api/test/unit/utilities/application-export-helpers.spec.ts +++ b/api/test/unit/utilities/application-export-helpers.spec.ts @@ -130,26 +130,6 @@ describe('Testing application export helpers', () => { path: 'applicationsMailingAddress.zipCode', label: `Primary Applicant Mailing Zip Code`, }, - { - path: 'applicant.applicantWorkAddress.street', - label: `Primary Applicant Work Street`, - }, - { - path: 'applicant.applicantWorkAddress.street2', - label: `Primary Applicant Work Street 2`, - }, - { - path: 'applicant.applicantWorkAddress.city', - label: `Primary Applicant Work City`, - }, - { - path: 'applicant.applicantWorkAddress.state', - label: `Primary Applicant Work State`, - }, - { - path: 'applicant.applicantWorkAddress.zipCode', - label: `Primary Applicant Work Zip Code`, - }, { path: 'alternateContact.firstName', label: 'Alternate Contact First Name', From b821d530c3e3a0f7c88ae30fad70b6e21557ebda Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Mon, 25 Nov 2024 16:19:16 -0500 Subject: [PATCH 14/15] fix: update key --- shared-helpers/src/locales/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-helpers/src/locales/es.json b/shared-helpers/src/locales/es.json index ed3ceb008d..1ed6c96b47 100644 --- a/shared-helpers/src/locales/es.json +++ b/shared-helpers/src/locales/es.json @@ -186,7 +186,7 @@ "application.form.options.relationship.cousin": "Primo", "application.form.options.relationship.friend": "Amigo(a)", "application.form.options.relationship.grandparentGreatGrandparent": "Abuelo/Bisabuelo", - "application.form.options.relationship.nephew": "Sobrino/Sobrina", + "application.form.options.relationship.nephewNiece": "Sobrino/Sobrina", "application.form.options.relationship.liveInAide": "Asistente Residente", "application.form.options.relationship.other": "Otro", "application.form.options.relationship.parent": "Padre", From 65688d8ef1ee2884e8e4689e593a28ee426a9464 Mon Sep 17 00:00:00 2001 From: ColinBuyck Date: Tue, 3 Dec 2024 09:20:08 -0500 Subject: [PATCH 15/15] fix: test cleanup --- sites/partners/cypress/e2e/default/05-paperApplication.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts b/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts index 3577abde33..f705929b36 100644 --- a/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts +++ b/sites/partners/cypress/e2e/default/05-paperApplication.spec.ts @@ -10,7 +10,7 @@ describe("Paper Application Tests", () => { cy.signOut() }) - it.only("fill paper application form completely", () => { + it("fill paper application form completely", () => { cy.fixture("application").then((application) => { cy.fillPrimaryApplicant(application) cy.fillAlternateContact(application)