diff --git a/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx b/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx index 3e3feb011f64..d847ce2599d8 100644 --- a/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx +++ b/src/applications/ask-va/components/FormFields/AddressValidationRadio.jsx @@ -53,7 +53,7 @@ const AddressValidationRadio = props => { state_code: state || militaryState, country_name: 'United States', country_code_iso3: 'USA', - address_pou: 'RESIDENCE/CHOICE', + address_pou: 'RESIDENCE', address_type: 'DOMESTIC', }; diff --git a/src/applications/ask-va/components/RequireSignInModal.jsx b/src/applications/ask-va/components/RequireSignInModal.jsx index 4902af0c954c..fd539d544d3b 100644 --- a/src/applications/ask-va/components/RequireSignInModal.jsx +++ b/src/applications/ask-va/components/RequireSignInModal.jsx @@ -10,7 +10,7 @@ const RequireSignInModal = ({ onClose, show, restrictedItem, message }) => { const openLoginModal = () => { onClose(); - dispatch(toggleLoginModal(true, 'askVA')); + dispatch(toggleLoginModal(true)); }; useEffect( diff --git a/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js b/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js index 4d1dd5c383ec..11211fd53e46 100644 --- a/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js +++ b/src/applications/ask-va/config/chapters/personalInformation/aboutTheVeteran.js @@ -1,22 +1,172 @@ -import { titleUI } from 'platform/forms-system/src/js/web-component-patterns'; -import { CHAPTER_3 } from '../../../constants'; +import React from 'react'; + +import VaTextInputField from 'platform/forms-system/src/js/web-component-fields/VaTextInputField'; +import { + dateOfBirthSchema, + dateOfBirthUI, + selectSchema, + selectUI, + serviceNumberSchema, + serviceNumberUI, + ssnSchema, + ssnUI, + titleUI, + yesNoSchema, + yesNoUI, +} from 'platform/forms-system/src/js/web-component-patterns'; +import VaSelectField from '~/platform/forms-system/src/js/web-component-fields/VaSelectField'; import { - personalInformationFormSchemas, - personalInformationUiSchemas, -} from '../../schema-helpers/personalInformationHelper'; + branchesOfService, + CHAPTER_3, + suffixes, + yesNoOptions, +} from '../../../constants'; +import { isBranchOfServiceRequired } from '../../helpers'; + +const ssnServiceInfo = ( +
+

+ + Social Security or service number + + (*Required) +

+ + Please provide one of the following: + +
+); + +const validateSSandSNGroup = (errors, values, formData) => { + if ( + !( + (formData.whoIsYourQuestionAbout === 'Someone else' && + formData.relationshipToVeteran === + "I'm connected to the Veteran through my work (for example, as a School Certifying Official or fiduciary)") || + (formData.whoIsYourQuestionAbout === 'Someone else' && + formData.relationshipToVeteran === + "I'm a family member of a Veteran") || + formData.whoIsYourQuestionAbout === "It's a general question" + ) && + !Object.keys(values).some(key => values[key]) + ) { + errors.addError( + `Please enter either the Veteran's Social Security number or Service number`, + ); + } +}; const aboutTheVeteranPage = { uiSchema: { ...titleUI(CHAPTER_3.ABOUT_THE_VET.TITLE), - aboutTheVeteran: personalInformationUiSchemas, + aboutTheVeteran: { + first: { + 'ui:title': 'First name', + 'ui:webComponentField': VaTextInputField, + 'ui:autocomplete': 'given-name', + 'ui:required': () => true, + 'ui:errorMessages': { + required: "Please provide the Veteran's first name", + }, + }, + middle: { + 'ui:title': 'Middle name', + 'ui:webComponentField': VaTextInputField, + 'ui:autocomplete': 'additional-name', + }, + last: { + 'ui:title': 'Last name', + 'ui:webComponentField': VaTextInputField, + 'ui:autocomplete': 'family-name', + 'ui:required': () => true, + 'ui:errorMessages': { + required: "Please provide the Veteran's last name", + }, + }, + suffix: { + 'ui:title': 'Suffix', + 'ui:webComponentField': VaSelectField, + 'ui:autocomplete': 'honorific-suffix', + 'ui:options': { + widgetClassNames: 'form-select-medium', + hideEmptyValueInReview: true, + }, + }, + isVeteranDeceased: yesNoUI({ + title: CHAPTER_3.VET_DECEASED.TITLE, + labels: yesNoOptions, + errorMessages: { + required: 'Please let us know if the Veteran is deceased', + }, + }), + socialOrServiceNum: { + 'ui:title': ssnServiceInfo, + 'ui:validations': [validateSSandSNGroup], + 'ui:options': { showFieldLabel: true }, + ssn: ssnUI(), + serviceNumber: serviceNumberUI('Service number'), + }, + branchOfService: selectUI({ + title: CHAPTER_3.VETERANS_BRANCH_OF_SERVICE.TITLE, + errorMessages: { + required: CHAPTER_3.VETERANS_BRANCH_OF_SERVICE.ERROR, + }, + required: formData => { + return !isBranchOfServiceRequired(formData); + }, + hideIf: formData => { + return !isBranchOfServiceRequired(formData); + }, + hideEmptyValueInReview: true, + }), + dateOfBirth: dateOfBirthUI({ + errorMessages: { + required: "Please provide the Veteran's date of birth", + }, + }), + }, }, schema: { type: 'object', - required: [], properties: { aboutTheVeteran: { type: 'object', - properties: personalInformationFormSchemas, + required: ['first', 'last', 'isVeteranDeceased', 'dateOfBirth'], + properties: { + first: { + type: 'string', + pattern: '^[A-Za-z]+$', + minLength: 1, + maxLength: 25, + }, + middle: { + type: 'string', + pattern: '^[A-Za-z]+$', + minLength: 1, + maxLength: 25, + }, + last: { + type: 'string', + pattern: '^[A-Za-z]+$', + minLength: 1, + maxLength: 25, + }, + suffix: selectSchema(suffixes), + isVeteranDeceased: yesNoSchema, + socialOrServiceNum: { + type: 'object', + properties: { + ssn: ssnSchema, + serviceNumber: serviceNumberSchema, + }, + required: [], + }, + branchOfService: { + type: 'string', + enum: branchesOfService, + }, + dateOfBirth: dateOfBirthSchema, + }, }, }, }, diff --git a/src/applications/ask-va/config/chapters/personalInformation/aboutYourselfRelationshipFamilyMember.js b/src/applications/ask-va/config/chapters/personalInformation/aboutYourselfRelationshipFamilyMember.js index a2d2e0d1fd13..95af358eab6a 100644 --- a/src/applications/ask-va/config/chapters/personalInformation/aboutYourselfRelationshipFamilyMember.js +++ b/src/applications/ask-va/config/chapters/personalInformation/aboutYourselfRelationshipFamilyMember.js @@ -1,22 +1,98 @@ -import { titleUI } from 'platform/forms-system/src/js/web-component-patterns'; -import { CHAPTER_3 } from '../../../constants'; +import VaTextInputField from 'platform/forms-system/src/js/web-component-fields/VaTextInputField'; import { - aboutYourselfRelationshipFamilyMemberSchema, - personalInformationAboutYourselfUiSchemas, -} from '../../schema-helpers/personalInformationHelper'; + dateOfBirthSchema, + dateOfBirthUI, + selectSchema, + ssnSchema, + ssnUI, + titleUI, +} from 'platform/forms-system/src/js/web-component-patterns'; +import VaSelectField from '~/platform/forms-system/src/js/web-component-fields/VaSelectField'; +import { CHAPTER_3, suffixes } from '../../../constants'; const aboutYourselfRelationshipFamilyMemberPage = { uiSchema: { ...titleUI(CHAPTER_3.ABOUT_YOURSELF.TITLE), - aboutYourself: personalInformationAboutYourselfUiSchemas, + aboutYourself: { + first: { + 'ui:title': 'First name', + 'ui:webComponentField': VaTextInputField, + 'ui:autocomplete': 'given-name', + 'ui:required': () => true, + 'ui:errorMessages': { required: 'Please provide your first name' }, + }, + middle: { + 'ui:title': 'Middle name', + 'ui:webComponentField': VaTextInputField, + 'ui:autocomplete': 'additional-name', + }, + last: { + 'ui:title': 'Last name', + 'ui:webComponentField': VaTextInputField, + 'ui:autocomplete': 'family-name', + 'ui:required': () => true, + 'ui:errorMessages': { required: 'Please provide your last name' }, + }, + suffix: { + 'ui:title': 'Suffix', + 'ui:webComponentField': VaSelectField, + 'ui:autocomplete': 'honorific-suffix', + 'ui:options': { + widgetClassNames: 'form-select-medium', + hideEmptyValueInReview: true, + }, + }, + socialOrServiceNum: { + ssn: { + ...ssnUI(), + 'ui:errorMessages': { + required: 'Please enter your Social Security Number', + }, + }, + }, + dateOfBirth: { + ...dateOfBirthUI(), + 'ui:errorMessages': { + required: 'Please provide your date of birth', + }, + }, + }, }, schema: { type: 'object', - required: [], properties: { aboutYourself: { type: 'object', - properties: aboutYourselfRelationshipFamilyMemberSchema, + required: ['dateOfBirth', 'first', 'last'], + properties: { + first: { + type: 'string', + pattern: '^[A-Za-z]+$', + minLength: 1, + maxLength: 25, + }, + middle: { + type: 'string', + pattern: '^[A-Za-z]+$', + minLength: 1, + maxLength: 25, + }, + last: { + type: 'string', + pattern: '^[A-Za-z]+$', + minLength: 1, + maxLength: 25, + }, + suffix: selectSchema(suffixes), + socialOrServiceNum: { + type: 'object', + required: ['ssn'], + properties: { + ssn: ssnSchema, + }, + }, + dateOfBirth: dateOfBirthSchema, + }, }, }, }, diff --git a/src/applications/ask-va/config/chapters/personalInformation/yourContactInformation.js b/src/applications/ask-va/config/chapters/personalInformation/yourContactInformation.js index 2e03ab4c6e3b..133e1de669eb 100644 --- a/src/applications/ask-va/config/chapters/personalInformation/yourContactInformation.js +++ b/src/applications/ask-va/config/chapters/personalInformation/yourContactInformation.js @@ -97,7 +97,6 @@ const yourContactInformationPage = { pronouns: checkboxGroupSchema(Object.keys(pronounLabels)), pronounsNotListedText: { type: 'string', - pattern: '^[A-Za-z]+$', minLength: 1, maxLength: 255, }, @@ -143,7 +142,6 @@ const yourContactInformationPage = { pronouns: checkboxGroupSchema(Object.keys(pronounLabels)), pronounsNotListedText: { type: 'string', - pattern: '^[A-Za-z]+$', minLength: 1, maxLength: 255, }, @@ -171,7 +169,6 @@ const yourContactInformationPage = { pronouns: checkboxGroupSchema(Object.values(pronounLabels)), pronounsNotListedText: { type: 'string', - pattern: '^[A-Za-z]+$', minLength: 1, maxLength: 255, }, diff --git a/src/applications/ask-va/config/helpers.jsx b/src/applications/ask-va/config/helpers.jsx index c2146a4d6ec7..e170a21ea3f2 100644 --- a/src/applications/ask-va/config/helpers.jsx +++ b/src/applications/ask-va/config/helpers.jsx @@ -5,6 +5,7 @@ import { CategoryGuardianshipCustodianshipFiduciaryIssues, CategoryHousingAssistanceAndHomeLoans, CategoryVeteranReadinessAndEmployment, + CHAPTER_3, contactOptions, isQuestionAboutVeteranOrSomeoneElseLabels, relationshipOptionsSomeoneElse, @@ -499,8 +500,8 @@ export const isBranchOfServiceRequired = data => { ]; return ( - branchOfServiceRuleforCategories.includes(selectCategory) || - whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.GENERAL + branchOfServiceRuleforCategories.includes(selectCategory) && + whoIsYourQuestionAbout !== whoIsYourQuestionAboutLabels.GENERAL ); }; @@ -531,3 +532,54 @@ export const isHealthFacilityRequired = data => { selectTopic === 'Health care copay debt') ); }; + +// Based on Mural flow to make the YourVAHealthFacility component title dynamic (BE only expects yourHealthFacility for any option) +export const getHealthFacilityTitle = data => { + const { + YOUR_VA_HEALTH_FACILITY, + VETERAN_VA_HEALTH_FACILITY, + FAMILY_MEMBER_VA_HEALTH_FACILITY, + } = CHAPTER_3; + + const { + whoIsYourQuestionAbout, + relationshipToVeteran, + isQuestionAboutVeteranOrSomeoneElse, + } = data; + + if ( + whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.MYSELF || + whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.GENERAL + ) { + return YOUR_VA_HEALTH_FACILITY.TITLE; + } + + if (whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.SOMEONE_ELSE) { + if (relationshipToVeteran === relationshipOptionsSomeoneElse.VETERAN) { + return FAMILY_MEMBER_VA_HEALTH_FACILITY.TITLE; + } + + if ( + relationshipToVeteran === relationshipOptionsSomeoneElse.FAMILY_MEMBER + ) { + if ( + isQuestionAboutVeteranOrSomeoneElse === + isQuestionAboutVeteranOrSomeoneElseLabels.VETERAN + ) { + return VETERAN_VA_HEALTH_FACILITY.TITLE; + } + if ( + isQuestionAboutVeteranOrSomeoneElse === + isQuestionAboutVeteranOrSomeoneElseLabels.SOMEONE_ELSE + ) { + return FAMILY_MEMBER_VA_HEALTH_FACILITY.TITLE; + } + } + + if (relationshipToVeteran === relationshipOptionsSomeoneElse.WORK) { + return VETERAN_VA_HEALTH_FACILITY.TITLE; + } + } + + return YOUR_VA_HEALTH_FACILITY.TITLE; +}; diff --git a/src/applications/ask-va/config/schema-helpers/formFlowHelper.js b/src/applications/ask-va/config/schema-helpers/formFlowHelper.js index caccc51889f4..3d1b95407dec 100644 --- a/src/applications/ask-va/config/schema-helpers/formFlowHelper.js +++ b/src/applications/ask-va/config/schema-helpers/formFlowHelper.js @@ -8,11 +8,11 @@ import { } from '../../constants'; import { isBranchOfServiceRequired, + isHealthFacilityRequired, isLocationOfResidenceRequired, isPostalCodeRequired, isStateOfPropertyRequired, isVRERequired, - isHealthFacilityRequired, } from '../helpers'; // Personal Information @@ -473,18 +473,6 @@ export const flowPages = (obj, list, path) => { flowGroup[key].depends = newCondition; } } - - // If last in the list, on nav forward go to the You question page - if (list.length === index + 1) { - flowGroup[key].onNavForward = ({ goPath }) => - goPath(CHAPTER_2.PAGE_3.PATH); // your-question - } - - // If first in the list, on nav backward go to the Who is your question about page - if (index === 0) { - flowGroup[key].onNavBack = ({ goPath }) => - goPath('/who-is-your-question-about'); - } }); return flowGroup; }; diff --git a/src/applications/ask-va/config/schema-helpers/personalInformationHelper.js b/src/applications/ask-va/config/schema-helpers/personalInformationHelper.js index abec31968564..0e58d51f1107 100644 --- a/src/applications/ask-va/config/schema-helpers/personalInformationHelper.js +++ b/src/applications/ask-va/config/schema-helpers/personalInformationHelper.js @@ -18,6 +18,7 @@ import { suffixes, yesNoOptions, } from '../../constants'; +import { isBranchOfServiceRequired } from '../helpers'; const ssnServiceInfo = (
@@ -80,26 +81,6 @@ export const personalInformationFormSchemas = { branchOfService: selectSchema(branchesOfService), }; -export const aboutYourselfRelationshipFamilyMemberSchema = { - first: { - type: 'string', - pattern: '^[A-Za-z]+$', - minLength: 1, - maxLength: 25, - }, - middle: { - type: 'string', - pattern: '^[A-Za-z]+$', - minLength: 1, - maxLength: 25, - }, - last: { type: 'string', pattern: '^[A-Za-z]+$', minLength: 1, maxLength: 25 }, - suffix: selectSchema(suffixes), - socialNum: ssnSchema, - dateOfBirth: dateOfBirthSchema, - branchOfService: selectSchema(branchesOfService), -}; - export const aboutYourselfGeneralSchema = { first: { type: 'string', @@ -166,7 +147,7 @@ export const personalInformationUiSchemas = { 'ui:title': 'Branch of service', 'ui:webComponentField': VaSelectField, 'ui:options': { - hideIf: () => true, + hideIf: formData => !isBranchOfServiceRequired(formData), }, }, }; @@ -254,28 +235,10 @@ export const personalInformationAboutYourselfUiSchemas = { branchOfService: { 'ui:title': 'Branch of service', 'ui:webComponentField': VaSelectField, - 'ui:required': formData => - (formData.whoIsYourQuestionAbout === 'Myself' || - formData.whoIsYourQuestionAbout === 'Someone else') && - formData.relationshipToVeteran === "I'm the Veteran" && - (formData.selectCategory === 'Veteran Identification Card (VIC)' || - formData.selectCategory === 'Survivor Benefits' || - formData.selectCategory === 'Burial & Memorial Benefits (NCA)' || - formData.selectCategory === "Women Veterans' issues" || - formData.selectCategory === 'Benefits Issues Outside the US'), + 'ui:required': formData => isBranchOfServiceRequired(formData), 'ui:options': { uswds: true, - hideIf: formData => - !( - (formData.whoIsYourQuestionAbout === 'Myself' || - formData.whoIsYourQuestionAbout === 'Someone else') && - formData.relationshipToVeteran === "I'm the Veteran" && - (formData.selectCategory === 'Veteran Identification Card (VIC)' || - formData.selectCategory === 'Survivor Benefits' || - formData.selectCategory === 'Burial & Memorial Benefits (NCA)' || - formData.selectCategory === "Women Veterans' issues" || - formData.selectCategory === 'Benefits Issues Outside the US') - ), + hideIf: formData => !isBranchOfServiceRequired(formData), }, }, }; diff --git a/src/applications/ask-va/constants.js b/src/applications/ask-va/constants.js index 73810a79c18c..3fa8b9249c2e 100644 --- a/src/applications/ask-va/constants.js +++ b/src/applications/ask-va/constants.js @@ -538,6 +538,15 @@ export const CHAPTER_3 = { TITLE: 'Your VA health facility', DESCRIPTION: 'Search by city, postal code, or use your current location.', }, + VETERAN_VA_HEALTH_FACILITY: { + TITLE: "Veteran's VA health facility", + DESCRIPTION: 'Search by city, postal code, or use your current location.', + }, + FAMILY_MEMBER_VA_HEALTH_FACILITY: { + PATH: 'your-va-health-facility', + TITLE: "Family member's VA health facility", + DESCRIPTION: 'Search by city, postal code, or use your current location.', + }, YOUR_VRE_INFORMATION: { TITLE: 'Have you ever applied for Veteran Readiness and Employment benefits and services?', @@ -563,6 +572,10 @@ export const CHAPTER_3 = { DESCRIPTION: 'Select your branch of service', ERROR: 'Please select your branch of service', }, + VETERANS_BRANCH_OF_SERVICE: { + TITLE: 'Branch of service', + ERROR: "Please select the Veteran's branch of service", + }, }; export const noEditBtn = [ diff --git a/src/applications/ask-va/containers/ResponseInboxPage.jsx b/src/applications/ask-va/containers/ResponseInboxPage.jsx index a436e1a28a74..51af9481dc84 100644 --- a/src/applications/ask-va/containers/ResponseInboxPage.jsx +++ b/src/applications/ask-va/containers/ResponseInboxPage.jsx @@ -7,6 +7,7 @@ import { import { isLoggedIn } from '@department-of-veterans-affairs/platform-user/selectors'; import { apiRequest } from '@department-of-veterans-affairs/platform-utilities/api'; import { focusElement } from '@department-of-veterans-affairs/platform-utilities/ui'; +import DOMPurify from 'dompurify'; import PropTypes from 'prop-types'; import React, { useEffect, useState } from 'react'; import { connect } from 'react-redux'; @@ -87,10 +88,7 @@ const ResponseInboxPage = ({ router }) => { useEffect( () => { - if (inquiryId) - getApiData( - `${envUrl}${URL.GET_INQUIRIES}/${inquiryId}?user_mock_data=true`, - ); + if (inquiryId) getApiData(`${envUrl}${URL.GET_INQUIRIES}/${inquiryId}`); }, [inquiryId], ); @@ -226,6 +224,18 @@ const ResponseInboxPage = ({ router }) => {

{correspondence.attributes.description}

+ + {/* Testing what MHV is doing to sanitize html and keep formatting */} +
+ {correspondence.attributes.attachments.length > 0 && (

{RESPONSE_PAGE.ATTACHMENTS} diff --git a/src/applications/ask-va/containers/YourVAHealthFacility.jsx b/src/applications/ask-va/containers/YourVAHealthFacility.jsx index 64ab545d4fda..6b5cc29dff98 100644 --- a/src/applications/ask-va/containers/YourVAHealthFacility.jsx +++ b/src/applications/ask-va/containers/YourVAHealthFacility.jsx @@ -1,11 +1,12 @@ import { apiRequest } from '@department-of-veterans-affairs/platform-utilities/api'; +import { focusElement } from 'platform/utilities/ui'; import PropTypes from 'prop-types'; import React, { useState } from 'react'; -import FormNavButtons from '~/platform/forms-system/src/js/components/FormNavButtons'; -import { focusElement } from 'platform/utilities/ui'; import { connect } from 'react-redux'; +import FormNavButtons from '~/platform/forms-system/src/js/components/FormNavButtons'; import SearchControls from '../components/search/SearchControls'; import SearchItem from '../components/search/SearchItem'; +import { getHealthFacilityTitle } from '../config/helpers'; import { CHAPTER_3, URL, envUrl } from '../constants'; import { convertToLatLng } from '../utils/mapbox'; @@ -80,7 +81,7 @@ const YourVAHealthFacilityPage = props => { return ( <> -

{CHAPTER_3.YOUR_VA_HEALTH_FACILITY.TITLE}

+

{getHealthFacilityTitle(data)}

{CHAPTER_3.YOUR_VA_HEALTH_FACILITY.DESCRIPTION} diff --git a/src/applications/ask-va/tests/config/schema-helpers/formFlowHelper.unit.spec.js b/src/applications/ask-va/tests/config/schema-helpers/formFlowHelper.unit.spec.js index f109fa6ef25b..53a0ddd2e4d5 100644 --- a/src/applications/ask-va/tests/config/schema-helpers/formFlowHelper.unit.spec.js +++ b/src/applications/ask-va/tests/config/schema-helpers/formFlowHelper.unit.spec.js @@ -1,5 +1,3 @@ -// formFlowHelper.test.js - import { expect } from 'chai'; import { flowPages } from '../../../config/schema-helpers/formFlowHelper'; @@ -31,14 +29,4 @@ describe('flowPages', () => { expect(result.page1_testpath.path).to.equal('test-path-1'); expect(result.page2_testpath.path).to.equal('test-path-2'); }); - - it('sets onNavForward handler', () => { - const result = flowPages(testPages, testList, testPath); - expect(result.page2_testpath.onNavForward).to.be.a('function'); - }); - - it('sets onNavBack handler', () => { - const result = flowPages(testPages, testList, testPath); - expect(result.page1_testpath.onNavBack).to.be.a('function'); - }); }); diff --git a/src/applications/ask-va/tests/config/schema-helpers/personalInformationHelper.unit.spec.js b/src/applications/ask-va/tests/config/schema-helpers/personalInformationHelper.unit.spec.js index 29e4f789193a..e1d960df668c 100644 --- a/src/applications/ask-va/tests/config/schema-helpers/personalInformationHelper.unit.spec.js +++ b/src/applications/ask-va/tests/config/schema-helpers/personalInformationHelper.unit.spec.js @@ -5,7 +5,6 @@ import VaSelectField from '~/platform/forms-system/src/js/web-component-fields/V import { aboutYourselfGeneralSchema, aboutYourselfGeneralUISchema, - aboutYourselfRelationshipFamilyMemberSchema, personalInformationAboutYourselfUiSchemas, personalInformationFormSchemas, personalInformationUiSchemas, @@ -41,27 +40,6 @@ describe('Personal Information Form Schemas', () => { }); }); - describe('aboutYourselfRelationshipFamilyMemberSchema', () => { - it('should have correct schema for social number', () => { - const schema = aboutYourselfRelationshipFamilyMemberSchema.socialNum; - expect(schema).to.have.property('type', 'string'); - expect(schema).to.have.property('pattern', '^[0-9]{9}$'); - }); - - it('should have correct schema for branch of service', () => { - const schema = - aboutYourselfRelationshipFamilyMemberSchema.branchOfService; - expect(schema).to.have.property('type', 'string'); - expect(schema.enum).to.include.members([ - 'Army', - 'Navy', - 'Coast Guard', - 'Air Force', - 'Marine Corps', - ]); - }); - }); - describe('aboutYourselfGeneralSchema', () => { it('should have correct schema for general information fields', () => { const schema = aboutYourselfGeneralSchema.first;