Skip to content

Commit

Permalink
Merge branch 'main' of github.com:department-of-veterans-affairs/vets…
Browse files Browse the repository at this point in the history 
…-website into 99454_1010_ezr_confirmation_flow_discovery
  • Loading branch information
@JoshingYou1
JoshingYou1 committed Jan 17, 2025
2 parents 28571ce + cf1bba7 commit 98f9fa5
Show file tree
Hide file tree
Showing 1,406 changed files with 33,447 additions and 21,506 deletions.
7 changes: 4 additions & 3 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ src/applications/proxy-rewrite @department-of-veterans-affairs/platform-design-s
src/applications/auth @department-of-veterans-affairs/octo-identity @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/login @department-of-veterans-affairs/octo-identity @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/sign-in-changes @department-of-veterans-affairs/octo-identity @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/cta-widget @department-of-veterans-affairs/octo-identity @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/terms-of-use @department-of-veterans-affairs/octo-identity @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/verify @department-of-veterans-affairs/octo-identity @department-of-veterans-affairs/va-platform-cop-frontend
src/platform/site-wide/ebenefits/ @department-of-veterans-affairs/octo-identity @department-of-veterans-affairs/va-platform-cop-frontend
Expand Down Expand Up @@ -134,14 +135,13 @@ src/applications/find-forms @department-of-veterans-affairs/vfs-public-websites-
src/applications/discharge-wizard @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/income-limits @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/public-outreach-materials @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/search @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/1010-health-apps-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/search @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/BTSSS-login @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/cta-widget @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/events @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/vfs-facilities-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/homepage @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/homepage-veteran-banner @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/static-pages/i18select @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/resources-and-support @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/1010-health-apps-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/resources-and-support @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/pact-act @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/va-platform-cop-frontend

# Public Websites - unauthed experience only
Expand Down Expand Up @@ -244,6 +244,7 @@ src/applications/static-pages/health-care-manage-benefits/schedule-view-va-appoi

# Benefits Accredited Representative Facing (ARF)
src/applications/accredited-representative-portal @department-of-veterans-affairs/benefits-accredited-rep-facing-engineers @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/accreditation @department-of-veterans-affairs/benefits-accredited-rep-facing-engineers @department-of-veterans-affairs/va-platform-cop-frontend

# Accredited Representation Management (ARM)
src/applications/representative-appoint @department-of-veterans-affairs/accredited-representation-management @department-of-veterans-affairs/va-platform-cop-frontend
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ jobs:
name: Unit Tests
needs: [fetch-allow-lists, tests-prep]
timeout-minutes: 30
runs-on: ubuntu-16-cores-latest
runs-on: ubuntu-16-cores-22.04
outputs:
app_folders: ${{ steps.get-changed-apps.outputs.folders }}
changed-files: ${{ steps.get-changed-apps.outputs.changed_files }}
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@
"@babel/runtime": "^7.15.4",
"@datadog/browser-logs": "^5.8.0",
"@datadog/browser-rum": "^4.49.0",
"@department-of-veterans-affairs/component-library": "^48.3.0",
"@department-of-veterans-affairs/css-library": "^0.16.1",
"@department-of-veterans-affairs/component-library": "^48.4.0",
"@department-of-veterans-affairs/css-library": "^0.17.0",
"@department-of-veterans-affairs/react-jsonschema-form": "^1.2.5",
"@department-of-veterans-affairs/va-forms-system-core": "1.6.1",
"@department-of-veterans-affairs/vagov-platform": "^0.0.1",
Expand Down Expand Up @@ -335,7 +335,7 @@
"url-search-params-polyfill": "^8.1.1",
"uswds": "1.6.10",
"vanilla-lazyload": "^16.1.0",
"vets-json-schema": "https://github.com/department-of-veterans-affairs/vets-json-schema.git#35ca8ea9a798407936e20ccf76a4be0fd75a8f76",
"vets-json-schema": "https://github.com/department-of-veterans-affairs/vets-json-schema.git#75b0a0dd78b479e230867e89989bf3e8262d850c",
"web-vitals": "^4.2.4"
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion src/applications/686c-674/components/IntroductionPageHeader.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PAGE_TITLE } from '../config/constants';
export const IntroductionPageHeader = () => (
<>
<FormTitle title={PAGE_TITLE} />
<p className="vads-u-font-size--h3 vads-u-margin-bottom--0 vads-u-margin-top--neg3">
<p className="vads-u-font-size--h3 vads-u-margin-top--neg1">
VA Form 21-686c and 21-674
</p>
</>
Expand Down
17 changes: 14 additions & 3 deletions ...s/report-add-a-spouse/current-marriage-information/currentMarriageInformationPartThree.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,28 @@ export const uiSchema = {
},
'ui:webComponentField': VaTextInputField,
},

state: {
'ui:title': 'State',
'ui:webComponentField': VaSelectField,
'ui:errorMessages': {
required: 'Select a state',
},
'ui:required': formData =>
!formData?.currentMarriageInformation?.outsideUsa,
'ui:options': {
hideIf: formData => formData?.currentMarriageInformation?.outsideUsa,
},
},
country: {
'ui:title': 'Country',
'ui:webComponentField': VaSelectField,
'ui:errorMessages': {
required: 'Select a state',
required: 'Select a country',
},
'ui:required': formData =>
formData?.currentMarriageInformation?.outsideUsa,
'ui:options': {
hideIf: form => form?.currentMarriageInformation?.outsideUsa,
hideIf: formData => !formData?.currentMarriageInformation?.outsideUsa,
},
},
},
Expand Down
84 changes: 54 additions & 30 deletions ...lications/686c-674/config/chapters/report-add-a-spouse/spouseMarriageHistoryArrayPages.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@ export const spouseMarriageHistoryOptions = {
!item?.endLocation?.location?.city ||
(item?.startLocation?.outsideUsa === false &&
!item?.startLocation?.location?.state) ||
(item?.startLocation?.outsideUsa === true &&
!item?.startLocation?.location?.country) ||
(item?.endLocation?.outsideUsa === false &&
!item?.endLocation?.location?.state),
!item?.endLocation?.location?.state) ||
(item?.endLocation?.outsideUsa === true &&
!item?.endLocation?.location?.country),
maxItems: 20,
text: {
summaryTitle: 'Review your spouse’s former marriages',
Expand Down Expand Up @@ -195,9 +199,7 @@ export const formerMarriageEndDatePage = {

export const formerMarriageStartLocationPage = {
uiSchema: {
...arrayBuilderItemSubsequentPageTitleUI(() => {
return 'Spouse’s former marriage';
}),
...arrayBuilderItemSubsequentPageTitleUI(() => 'Spouse’s former marriage'),
startLocation: {
'ui:title': 'Where did they get married?',
'ui:options': {
Expand All @@ -220,24 +222,35 @@ export const formerMarriageStartLocationPage = {
state: {
'ui:title': 'State',
'ui:webComponentField': VaSelectField,
'ui:required': (formData, index) => {
// See above comment
const isEditMode = formData?.startLocation?.outsideUsa;
const isAddMode =
formData?.spouseMarriageHistory?.[index]?.startLocation
?.outsideUsa;

return !isAddMode && !isEditMode;
'ui:errorMessages': {
required: 'Select a state',
},
'ui:required': (formData, index) =>
!(
formData?.spouseMarriageHistory?.[index]?.startLocation
?.outsideUsa || formData?.startLocation?.outsideUsa
),
'ui:options': {
hideIf: (formData, index) =>
// See above comment
formData?.startLocation?.outsideUsa ||
formData?.spouseMarriageHistory?.[index]?.startLocation
?.outsideUsa,
?.outsideUsa || formData?.startLocation?.outsideUsa,
},
},
country: {
'ui:title': 'Country',
'ui:webComponentField': VaSelectField,
'ui:errorMessages': {
required: 'Select a state',
required: 'Select a country',
},
'ui:required': (formData, index) =>
formData?.spouseMarriageHistory?.[index]?.startLocation
?.outsideUsa || formData?.startLocation?.outsideUsa,
'ui:options': {
hideIf: (formData, index) =>
!(
formData?.spouseMarriageHistory?.[index]?.startLocation
?.outsideUsa || formData?.startLocation?.outsideUsa
),
},
},
},
Expand All @@ -253,9 +266,7 @@ export const formerMarriageStartLocationPage = {

export const formerMarriageEndLocationPage = {
uiSchema: {
...arrayBuilderItemSubsequentPageTitleUI(() => {
return 'Spouse’s former marriage';
}),
...arrayBuilderItemSubsequentPageTitleUI(() => 'Spouse’s former marriage'),
endLocation: {
'ui:title': 'Where did the marriage end?',
'ui:options': {
Expand All @@ -281,22 +292,35 @@ export const formerMarriageEndLocationPage = {
state: {
'ui:title': 'State',
'ui:webComponentField': VaSelectField,
'ui:required': (formData, index) => {
// See above comment
const isEditMode = formData?.endLocation?.outsideUsa;
const isAddMode =
formData?.spouseMarriageHistory?.[index]?.endLocation?.outsideUsa;

return !isAddMode && !isEditMode;
'ui:errorMessages': {
required: 'Select a state',
},
'ui:required': (formData, index) =>
!(
formData?.spouseMarriageHistory?.[index]?.endLocation
?.outsideUsa || formData?.endLocation?.outsideUsa
),
'ui:options': {
hideIf: (formData, index) =>
// See above comment
formData?.endLocation?.outsideUsa ||
formData?.spouseMarriageHistory?.[index]?.endLocation?.outsideUsa,
formData?.spouseMarriageHistory?.[index]?.endLocation
?.outsideUsa || formData?.endLocation?.outsideUsa,
},
},
country: {
'ui:title': 'Country',
'ui:webComponentField': VaSelectField,
'ui:errorMessages': {
required: 'Select a state',
required: 'Select a country',
},
'ui:required': (formData, index) =>
formData?.spouseMarriageHistory?.[index]?.endLocation?.outsideUsa ||
formData?.endLocation?.outsideUsa,
'ui:options': {
hideIf: (formData, index) =>
!(
formData?.spouseMarriageHistory?.[index]?.endLocation
?.outsideUsa || formData?.endLocation?.outsideUsa
),
},
},
},
Expand Down
84 changes: 53 additions & 31 deletions ...ications/686c-674/config/chapters/report-add-a-spouse/veteranMarriageHistoryArrayPages.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@ export const veteranMarriageHistoryOptions = {
!item?.endLocation?.location?.city ||
(item?.startLocation?.outsideUsa === false &&
!item?.startLocation?.location?.state) ||
(item?.startLocation?.outsideUsa === true &&
!item?.startLocation?.location?.country) ||
(item?.endLocation?.outsideUsa === false &&
!item?.endLocation?.location?.state),
!item?.endLocation?.location?.state) ||
(item?.endLocation?.outsideUsa === true &&
!item?.endLocation?.location?.country),
maxItems: 20,
text: {
getItemName: item =>
Expand Down Expand Up @@ -194,9 +198,7 @@ export const vetFormerMarriageEndDatePage = {

export const vetFormerMarriageStartLocationPage = {
uiSchema: {
...arrayBuilderItemSubsequentPageTitleUI(() => {
return 'Your former marriage';
}),
...arrayBuilderItemSubsequentPageTitleUI(() => 'Your former marriage'),
startLocation: {
'ui:title': 'Where did they get married?',
'ui:options': {
Expand All @@ -219,24 +221,35 @@ export const vetFormerMarriageStartLocationPage = {
state: {
'ui:title': 'State',
'ui:webComponentField': VaSelectField,
'ui:required': (formData, index) => {
// See above comment
const isEditMode = formData?.startLocation?.outsideUsa;
const isAddMode =
formData?.veteranMarriageHistory?.[index]?.startLocation
?.outsideUsa;

return !isAddMode && !isEditMode;
'ui:errorMessages': {
required: 'Select a state',
},
'ui:required': (formData, index) =>
!(
formData?.veteranMarriageHistory?.[index]?.startLocation
?.outsideUsa || formData?.startLocation?.outsideUsa
),
'ui:options': {
hideIf: (formData, index) =>
// See above comment
formData?.startLocation?.outsideUsa ||
formData?.veteranMarriageHistory?.[index]?.startLocation
?.outsideUsa,
?.outsideUsa || formData?.startLocation?.outsideUsa,
},
},
country: {
'ui:title': 'Country',
'ui:webComponentField': VaSelectField,
'ui:errorMessages': {
required: 'Select a state',
required: 'Select a country',
},
'ui:required': (formData, index) =>
formData?.veteranMarriageHistory?.[index]?.startLocation
?.outsideUsa || formData?.startLocation?.outsideUsa,
'ui:options': {
hideIf: (formData, index) =>
!(
formData?.veteranMarriageHistory?.[index]?.startLocation
?.outsideUsa || formData?.startLocation?.outsideUsa
),
},
},
},
Expand All @@ -252,9 +265,7 @@ export const vetFormerMarriageStartLocationPage = {

export const vetFormerMarriageEndLocationPage = {
uiSchema: {
...arrayBuilderItemSubsequentPageTitleUI(() => {
return 'Your former marriage';
}),
...arrayBuilderItemSubsequentPageTitleUI(() => 'Your former marriage'),
endLocation: {
'ui:title': 'Where did the marriage end?',
'ui:options': {
Expand All @@ -280,24 +291,35 @@ export const vetFormerMarriageEndLocationPage = {
state: {
'ui:title': 'State',
'ui:webComponentField': VaSelectField,
'ui:required': (formData, index) => {
// See above comment
const isEditMode = formData?.endLocation?.outsideUsa;
const isAddMode =
formData?.veteranMarriageHistory?.[index]?.endLocation
?.outsideUsa;

return !isAddMode && !isEditMode;
'ui:errorMessages': {
required: 'Select a state',
},
'ui:required': (formData, index) =>
!(
formData?.veteranMarriageHistory?.[index]?.endLocation
?.outsideUsa || formData?.endLocation?.outsideUsa
),
'ui:options': {
hideIf: (formData, index) =>
// See above comment
formData?.endLocation?.outsideUsa ||
formData?.veteranMarriageHistory?.[index]?.endLocation
?.outsideUsa,
?.outsideUsa || formData?.endLocation?.outsideUsa,
},
},
country: {
'ui:title': 'Country',
'ui:webComponentField': VaSelectField,
'ui:errorMessages': {
required: 'Select a state',
required: 'Select a country',
},
'ui:required': (formData, index) =>
formData?.veteranMarriageHistory?.[index]?.endLocation
?.outsideUsa || formData?.endLocation?.outsideUsa,
'ui:options': {
hideIf: (formData, index) =>
!(
formData?.veteranMarriageHistory?.[index]?.endLocation
?.outsideUsa || formData?.endLocation?.outsideUsa
),
},
},
},
Expand Down
Loading

0 comments on commit 98f9fa5

Please sign in to comment.