Skip to content

Commit

Permalink
Merge branch 'main' into co-021624-Find-a-Rep-unit-test-and-component…
Browse files Browse the repository at this point in the history
…-changes
  • Loading branch information
cosu419 committed Feb 20, 2024
2 parents ba6691e + cd0ab6b commit 497c987
Show file tree
Hide file tree
Showing 192 changed files with 4,495 additions and 2,218 deletions.
27 changes: 14 additions & 13 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ src/applications/ds-v3-playground @department-of-veterans-affairs/platform-desig
src/applications/sah @department-of-veterans-affairs/platform-va-product-forms
src/applications/static-pages/wizard @department-of-veterans-affairs/platform-va-product-forms

# VSP-Identity authentication

src/applications/auth @department-of-veterans-affairs/vsp-identity
src/applications/login @department-of-veterans-affairs/vsp-identity
src/applications/terms-of-use @department-of-veterans-affairs/vsp-identity
src/applications/verify @department-of-veterans-affairs/vsp-identity
src/platform/site-wide/ebenefits/ @department-of-veterans-affairs/vsp-identity
src/platform/site-wide/user-nav/containers/AutoSSO.jsx @department-of-veterans-affairs/vsp-identity
src/platform/user/authentication @department-of-veterans-affairs/vsp-identity
src/platform/utilities/oauth @department-of-veterans-affairs/vsp-identity
src/platform/utilities/sso @department-of-veterans-affairs/vsp-identity
# octo-identity authentication

src/applications/auth @department-of-veterans-affairs/octo-identity
src/applications/login @department-of-veterans-affairs/octo-identity
src/applications/terms-of-use @department-of-veterans-affairs/octo-identity
src/applications/verify @department-of-veterans-affairs/octo-identity
src/platform/site-wide/ebenefits/ @department-of-veterans-affairs/octo-identity
src/platform/site-wide/user-nav/containers/AutoSSO.jsx @department-of-veterans-affairs/octo-identity
src/platform/user/authentication @department-of-veterans-affairs/octo-identity
src/platform/utilities/oauth @department-of-veterans-affairs/octo-identity
src/platform/utilities/sso @department-of-veterans-affairs/octo-identity

# VSP QA Standards

Expand All @@ -56,6 +56,9 @@ script/github-actions/daily-product-scan/ @department-of-veterans-affairs/va-pla
src/applications/personalization @department-of-veterans-affairs/vsa-authd-exp-frontend @department-of-veterans-affairs/va-platform-cop-frontend
src/platform/user/profile/vap-svc @department-of-veterans-affairs/vsa-authd-exp-frontend @department-of-veterans-affairs/va-platform-cop-frontend

# Disability Benefits Experience
src/applications/disability-benefits @department-of-veterans-affairs/DBEX-TREX @department-of-veterans-affairs/va-platform-cop-frontend

# Benefits Management Tools (DSVA Slack: #benefits-management-tools)
src/applications/claims-status @department-of-veterans-affairs/benefits-management-tools-fe @department-of-veterans-affairs/va-platform-cop-frontend
src/applications/disability-benefits/view-payments @department-of-veterans-affairs/benefits-management-tools-fe @department-of-veterans-affairs/va-platform-cop-frontend
Expand All @@ -82,8 +85,6 @@ src/applications/sah @department-of-veterans-affairs/benefits-non-disability @de
# Pensions
src/applications/pensions @department-of-veterans-affairs/pensions @department-of-veterans-affairs/va-platform-cop-frontend

# Disability Benefits Experience
src/applications/disability-benefits @department-of-veterans-affairs/DBEX-TREX @department-of-veterans-affairs/va-platform-cop-frontend

# Dependent Benefits Experience
src/applications/disability-benefits/686c-674 @department-of-veterans-affairs/va-platform-cop-frontend @department-of-veterans-affairs/benefits-dependents-management
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ jobs:
with:
fetch-depth: 0

- name: Get changed applications
id: get-changed-apps
uses: ./.github/workflows/get-changed-apps
with:
delimiter: ','
output-type: 'entry_name, continuous_deployment'

- name: Configure AWS credentials
if: ${{ matrix.buildtype == 'vagovprod' }}
uses: aws-actions/configure-aws-credentials@v4
Expand All @@ -48,7 +41,7 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-gov-west-1
mask-aws-account-id: true

- name: Install dependencies
uses: ./.github/workflows/install
timeout-minutes: 30
Expand All @@ -59,6 +52,13 @@ jobs:
.cache/yarn
node_modules
- name: Get changed applications
id: get-changed-apps
uses: ./.github/workflows/get-changed-apps
with:
delimiter: ','
output-type: 'entry_name, continuous_deployment'

- name: Get Mapbox Token
if: ${{ matrix.buildtype == 'vagovprod' }}
uses: department-of-veterans-affairs/action-inject-ssm-secrets@latest
Expand Down Expand Up @@ -1774,7 +1774,12 @@ jobs:
steps:
- name: Set environments for deploy matrix
id: set-environments
run: echo environments={\"include\":[${{env.DEV}},${{env.STAGING}}]} >> $GITHUB_OUTPUT
run: |
if [[ ${{ env.DEPLOY_TO_PRODUCTION }} == true && ${{ needs.build.outputs.continuous_deployment }} == true ]]; then
echo environments={\"include\":[${{env.DEV}},${{env.STAGING}},${{env.PROD}}]} >> $GITHUB_OUTPUT
else
echo environments={\"include\":[${{env.DEV}},${{env.STAGING}}]} >> $GITHUB_OUTPUT
fi
deploy:
name: Deploy
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,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#496d623816fe8248827257efd96e41422a0b835a"
"vets-json-schema": "https://github.com/department-of-veterans-affairs/vets-json-schema.git#cb05ca4f2883c6d66aca0396db524ff14fd2a734"
},
"resolutions": {
"**/lodash": "4.17.21",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ import React from 'react';
const title = 'Denial of VA health care benefits';

export const content = {
title: <h3 className="vads-u-margin-top--0">{title}</h3>,
title: <h3 className="vads-u-margin-y--0">{title}</h3>,
label: 'Are you appealing a denial of VA health care benefits?',
};
4 changes: 2 additions & 2 deletions src/applications/appeals/10182/content/extensionReason.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { MAX_LENGTH } from '../../shared/constants';
const title = 'Reason for extension';

export const content = {
title: <h3 className="vads-u-margin-top--0">{title}</h3>,
title: <h3 className="vads-u-margin-y--0">{title}</h3>,
description: (
<p className="vads-u-margin-top--0">
<p className="vads-u-margin-y--0">
Tell us why you have good cause for an extension.
</p>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const content = {
description: (
<>
<h3 className="vads-u-margin-top--0">{title}</h3>
<p className="vads-u-margin-top--0">
<p className="vads-u-margin-y--0">
If you request an extension (extra time) to file VA Form 10182 for good
cause, you’ll need to tell us why you have good cause.
</p>
Expand Down
8 changes: 2 additions & 6 deletions src/applications/appeals/10182/content/homeless.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import React from 'react';

const title = 'Are you experiencing homelessness?';

export const homelessTitle = (
<h3 className="vads-u-margin-y--0 vads-u-display--inline">{title}</h3>
);
export const homelessTitle = 'Are you experiencing homelessness?';

export const homelessReviewField = ({ children }) => (
<div className="review-row">
<dt>{title}</dt>
<dt>{homelessTitle}</dt>
<dd>{children}</dd>
</div>
);
23 changes: 14 additions & 9 deletions src/applications/appeals/10182/pages/appealingVhaDenial.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
import {
yesNoSchema,
yesNoUI,
} from 'platform/forms-system/src/js/web-component-patterns';

import { content } from '../content/appealingVhaDenial';

const appealingVhaDenial = {
uiSchema: {
'ui:title': content.title,
appealingVHADenial: {
'ui:title': content.label,
'ui:widget': 'yesNo',
'ui:options': {
enableAnalytics: true,
appealingVHADenial: yesNoUI({
title: content.label,
enableAnalytics: true,
labels: {
Y: 'Yes',
N: 'No',
},
},
uswds: true,
}),
},

schema: {
type: 'object',
properties: {
appealingVHADenial: {
type: 'boolean',
},
appealingVHADenial: yesNoSchema,
},
},
};
Expand Down
32 changes: 14 additions & 18 deletions src/applications/appeals/10182/pages/evidenceIntro.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import {
yesNoSchema,
yesNoUI,
} from 'platform/forms-system/src/js/web-component-patterns';

import {
evidenceUploadIntroTitle,
evidenceUploadIntroDescription,
Expand All @@ -13,30 +18,21 @@ const contactInfo = {
showFieldLabel: 'no-wrap', // new option
hideDuplicateDescription: true, // new option
},
'view:additionalEvidence': {
'ui:title': evidenceUploadIntroLabel,
'ui:widget': 'yesNo',
'ui:options': {
labels: {
N: 'No, I’ll submit it later.',
},
enableAnalytics: true,
classNames: 'vads-u-margin-top--0',
widgetProps: {
// ID from evidenceUploadIntroDescription
Y: { 'aria-describedby': 'additional-evidence-description' },
N: { 'aria-describedby': 'additional-evidence-description' },
},
'view:additionalEvidence': yesNoUI({
title: evidenceUploadIntroLabel,
enableAnalytics: true,
labels: {
Y: 'Yes',
N: 'No, I’ll submit it later.',
},
},
uswds: true,
}),
},

schema: {
type: 'object',
properties: {
'view:additionalEvidence': {
type: 'boolean',
},
'view:additionalEvidence': yesNoSchema,
},
},
};
Expand Down
1 change: 1 addition & 0 deletions src/applications/appeals/10182/pages/extensionReason.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const requestExtension = {
'ui:options': {
enableAnalytics: false,
hint: content.hint,
charcount: true,
},
'ui:validations': [extensionReason],
'ui:errorMessages': {
Expand Down
23 changes: 14 additions & 9 deletions src/applications/appeals/10182/pages/extensionRequest.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import {
yesNoSchema,
yesNoUI,
} from 'platform/forms-system/src/js/web-component-patterns';

import { content } from '../content/extensionRequest';
import { SHOW_PART3, SHOW_PART3_REDIRECT } from '../constants';

Expand All @@ -11,13 +16,15 @@ const requestExtension = {
forceDivWrap: true,
},
},
requestingExtension: {
'ui:title': content.label,
'ui:widget': 'yesNo',
'ui:options': {
enableAnalytics: true,
requestingExtension: yesNoUI({
title: content.label,
enableAnalytics: true,
labels: {
Y: 'Yes',
N: 'No',
},
},
uswds: true,
}),
},

schema: {
Expand All @@ -27,9 +34,7 @@ const requestExtension = {
type: 'object',
properties: {},
},
requestingExtension: {
type: 'boolean',
},
requestingExtension: yesNoSchema,
},
},

Expand Down
24 changes: 16 additions & 8 deletions src/applications/appeals/10182/pages/homeless.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import {
yesNoSchema,
yesNoUI,
} from 'platform/forms-system/src/js/web-component-patterns';

import { homelessTitle, homelessReviewField } from '../content/homeless';

export default {
Expand All @@ -7,20 +12,23 @@ export default {
forceDivWrapper: true,
},
homeless: {
'ui:title': homelessTitle,
'ui:reviewField': homelessReviewField,
'ui:widget': 'yesNo',
'ui:options': {
...yesNoUI({
title: homelessTitle,
enableAnalytics: true,
},
labelHeaderLevel: '3',
labels: {
Y: 'Yes',
N: 'No',
},
uswds: true,
}),
'ui:reviewField': homelessReviewField,
},
},
schema: {
type: 'object',
properties: {
homeless: {
type: 'boolean',
},
homeless: yesNoSchema,
},
},
};
11 changes: 11 additions & 0 deletions src/applications/appeals/10182/sass/10182-nod.scss
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,14 @@ article[data-location="review-and-submit"] {
word-break: break-all;
}
}

/* Fix va-radio v3 input overlapping finish this request later link */
.schemaform-save-container {
position: relative;
z-index: 1;
}

/* contestable issues widget - copy uswds v3 style */
.widget-checkbox-wrap label:before {
box-shadow: rgb(27, 27, 27) 0px 0px 0px 2px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('Notice of Disagreement keyboard only navigation', () => {

// Homelessness radios
cy.url().should('include', chapters.infoPages.pages.homeless.path);
cy.tabToElement('[name="root_homeless"]');
cy.tabToElement('input[name="root_homeless"]');
cy.chooseRadio('N');
cy.tabToContinueForm();

Expand Down

0 comments on commit 497c987

Please sign in to comment.