Skip to content

Commit

Permalink
Merge branch 'main' into va-14940-vba-facility-content-skeleton
Browse files Browse the repository at this point in the history
  • Loading branch information
eselkin committed Nov 13, 2023
2 parents 3b22e57 + 098eb9b commit c00627d
Show file tree
Hide file tree
Showing 30 changed files with 620 additions and 383 deletions.
24 changes: 12 additions & 12 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
script @department-of-veterans-affairs/cms-infrastructure @department-of-veterans-affairs/va-platform-cop-frontend

# Shared templates
src/site/includes @department-of-veterans-affairs/vsa-public-websites-frontend @department-of-veterans-affairs/vsa-facilities-frontend @department-of-veterans-affairs/1010-health-apps-frontend
src/site/components @department-of-veterans-affairs/vsa-public-websites-frontend @department-of-veterans-affairs/vsa-facilities-frontend @department-of-veterans-affairs/1010-health-apps-frontend
src/site/layouts @department-of-veterans-affairs/vsa-public-websites-frontend @department-of-veterans-affairs/vsa-facilities-frontend
src/site/teasers @department-of-veterans-affairs/vsa-public-websites-frontend @department-of-veterans-affairs/vsa-facilities-frontend
src/site/filters @department-of-veterans-affairs/vsa-public-websites-frontend @department-of-veterans-affairs/vsa-facilities-frontend
src/site/includes @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/vfs-facilities-frontend @department-of-veterans-affairs/1010-health-apps-frontend
src/site/components @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/vfs-facilities-frontend @department-of-veterans-affairs/1010-health-apps-frontend
src/site/layouts @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/vfs-facilities-frontend
src/site/teasers @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/vfs-facilities-frontend
src/site/filters @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/vfs-facilities-frontend

# Facility Locator and VAMC pages
src/site/facilities @department-of-veterans-affairs/vsa-facilities-frontend
src/site/layouts/health*.drupal.liquid @department-of-veterans-affairs/vsa-facilities-frontend
src/site/navigation/facility_no_drupal_page_sidebar_nav.drupal.liquid @department-of-veterans-affairs/vsa-facilities-frontend
src/site/navigation/facility_sidebar_nav.drupal.liquid @department-of-veterans-affairs/vsa-facilities-frontend
src/site/paragraphs/facilities @department-of-veterans-affairs/vsa-facilities-frontend
src/site/facilities @department-of-veterans-affairs/vfs-facilities-frontend
src/site/layouts/health*.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
src/site/navigation/facility_no_drupal_page_sidebar_nav.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
src/site/navigation/facility_sidebar_nav.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
src/site/paragraphs/facilities @department-of-veterans-affairs/vfs-facilities-frontend

# GraphQL Queries
src/site/stages/build/drupal @department-of-veterans-affairs/vsa-public-websites-frontend @department-of-veterans-affairs/vsa-facilities-frontend @department-of-veterans-affairs/cms-infrastructure
src/site/stages/build/drupal @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/vfs-facilities-frontend @department-of-veterans-affairs/cms-infrastructure

# Site Assets
src/site/assets/robots.txt @department-of-veterans-affairs/vsa-public-websites-frontend
src/site/assets/robots.txt @department-of-veterans-affairs/vfs-public-websites-frontend
75 changes: 57 additions & 18 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,70 @@
## Description
**Note**: Delete the description statements, complete each step. **None are optional**, but can be justified as to why they cannot be completed as written. Provide known gaps to testing that may raise the risk of merging to production.

closes __
relates to __
## Summary

## Testing done & Screenshots
- _(Summarize the changes that have been made to the platform)_
- _(If bug, how to reproduce)_
- _(What is the solution, why is this the solution)_
- _(Which team do you work for, does your team own the maintenance of this component?)_
- _(If using a flipper, what is the end date of the flipper being required/success criteria being targeted)_

## Related issue(s)

- _Link to ticket created in va.gov-team repo_
department-of-veterans-affairs/va.gov-team#0000
- _Link to previous change of the code/bug (if applicable)_
department-of-veterans-affairs/vets-website#0000
- _Link to epic if not included in ticket_
department-of-veterans-affairs/va.gov-team#0000

## QA steps
## Testing done

What needs to be checked to prove this works?
What needs to be checked to prove it didn't break any related things?
What variations of circumstances (users, actions, values) need to be checked?
- _Describe what the old behavior was prior to the change_
- _Describe the steps required to verify your changes are working as expected_
- _Describe the tests completed and the results_
- _Exclusively stating 'Specs and automated tests passing' is NOT acceptable as appropriate testing
- _Optionally, provide a link to your [test plan](https://depo-platform-documentation.scrollhelp.site/developer-docs/create-a-test-plan-in-testrail) and [test execution records](https://depo-platform-documentation.scrollhelp.site/developer-docs/execute-tests-in-testrail)_

1. Do this
- [ ] Validate that
2. Then
- [ ] Validate that
3. Then validate Acceptance Criteria from issue
## Screenshots

_Note: This field is mandatory for UI changes (non-component work should NOT have screenshots)._

| | Before | After |
| ------- | ------ | ----- |
| Mobile | | |
| Desktop | | |

## What areas of the site does it impact?

*(Describe what parts of the site are impacted **if** code touched other areas)*

## Acceptance criteria

- [ ]
### Quality Assurance & Testing

## Definition of done
- [ ] Events are logged appropriately
- [ ] Documentation has been updated, if applicable
- [ ] A link has been provided to the originating GitHub issue (or connected to it via ZenHub)
- [ ] I fixed|updated|added unit tests and integration tests for each feature (if applicable).
- [ ] No sensitive information (i.e. PII/credentials/internal URLs/etc.) is captured in logging, hardcoded, or specs
- [ ] Linting warnings have been addressed
- [ ] Documentation has been updated ([link to documentation](#) \*if necessary)
- [ ] Screenshot of the developed feature is added
- [ ] [Accessibility testing](https://depo-platform-documentation.scrollhelp.site/developer-docs/wcag-2-1-success-criteria-and-foundational-testing) has been performed

### Error Handling

- [ ] Browser console contains no warnings or errors.
- [ ] Events are being sent to the appropriate logging solution
- [ ] Feature/bug has a monitor built into Datadog or Grafana (if applicable)

### Authentication

- [ ] Did you login to a local build and verify all authenticated routes work as expected with a test user

### :warning: Team Sites (only applies to modifications made to the VA.gov header) :warning:

- [ ] The header does not contain any web-components
- [ ] I used the [proxy-rewrite steps](https://github.com/department-of-veterans-affairs/vets-website/tree/main/src/applications/proxy-rewrite#local-dev) to test the injected header scenario
- [ ] I reached out in the `#sitewide-public-websites` Slack channel for questions

## Requested Feedback

(OPTIONAL) _What should the reviewers know in addition to the above. Is there anything specific you wish the reviewer to assist with. Do you have any concerns with this PR, why?_
6 changes: 3 additions & 3 deletions .github/workflows/content-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ jobs:
ARCHIVE_END_TIME: ${{ steps.export-archive-end-time.outputs.ARCHIVE_END_TIME }}
env:
CHROMEDRIVER_FILEPATH: /usr/local/share/chrome_driver/chromedriver

steps:
- name: Export build start time
id: export-build-start-time
Expand Down Expand Up @@ -209,6 +208,7 @@ jobs:
timeout-minutes: 40
env:
NODE_ENV: production
DEBUG: ${{ secrets.ACTIONS_RUNNER_DEBUG }}

- name: Export content build end time
id: export-content-build-end
Expand Down Expand Up @@ -534,7 +534,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
with:
Expand Down Expand Up @@ -594,7 +594,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ jobs:
run: yarn build --buildtype=${{ matrix.buildtype }} --asset-source=local --drupal-address=${{ env.DRUPAL_ADDRESS }} --drupal-user=${{ env.DRUPAL_USERNAME }} --drupal-password="${{ env.DRUPAL_PASSWORD }}" --pull-drupal --drupal-max-parallel-requests=15 --no-drupal-proxy --verbose
env:
NODE_ENV: production
DEBUG: ${{ secrets.ACTIONS_RUNNER_DEBUG }}

- name: Check broken links
id: get-broken-link-info
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily-production-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Daily Production Release
on:
workflow_dispatch:
schedule:
- cron: 0 19 * * 1-5
- cron: 0 20 * * 1-5

concurrency:
group: daily-prod-release
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"ajv": "^6.12.2",
"ascii-table": "^0.0.9",
"autoprefixer": "^10.3.4",
"axe-core": "^4.4.3",
"axe-core": "^4.8.2",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.1.0",
"babel-plugin-dynamic-import-node": "^2.3.3",
Expand All @@ -129,7 +129,8 @@
"cssnano": "^5.0.8",
"cy-mobile-commands": "^0.3.0",
"cypress": "^10.8.0",
"cypress-axe": "^1.0.0",
"cypress-axe": "^1.5.0",
"cypress-downloadfile": "^1.2.3",
"cypress-multi-reporters": "^1.5.0",
"cypress-plugin-tab": "^1.0.5",
"cypress-real-events": "^1.7.1",
Expand Down Expand Up @@ -210,6 +211,7 @@
"aws-sdk": "^2.1441.0",
"blob-polyfill": "^4.0.20200601",
"core-js": "^3.17.3",
"csvtojson": "^2.0.10",
"diff2html": "^3.4.11",
"dotenv": "^10.0.0",
"express": "^4.17.1",
Expand All @@ -229,6 +231,7 @@
"metalsmith-sitemap": "^1.0.0",
"moment": "^2.29.2",
"moment-timezone": "^0.5.33",
"node-libcurl": "2.3.4",
"number-to-words": "^1.2.4",
"raven": "^2.6.4",
"react": "^16.13.1",
Expand Down
54 changes: 33 additions & 21 deletions src/applications/registry.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,10 @@
"layout": "page-react.html"
}
},
{
"appName": "Rated Disabilities",
"entryName": "disability-my-rated-disabilities",
"rootUrl": "/disability/view-disability-rating/rating",
"template": {
"layout": "page-react.html",
"vagovprod": true
}
},
{
"appName": "Rated Disabilities",
"entryName": "rated-disabilities",
"rootUrl": "/disability/view-disability-rating/my-rating",
"rootUrl": "/disability/view-disability-rating/rating",
"template": {
"layout": "page-react.html",
"vagovprod": true,
Expand All @@ -81,7 +72,7 @@
"name": "View your VA disability rating"
},
{
"path": "disability/view-disability-rating/my-rating",
"path": "disability/view-disability-rating/rating",
"name": "Your VA disability rating"
}
]
Expand Down Expand Up @@ -233,7 +224,7 @@
"rootUrl": "/my-health/update-benefits-information-form-10-10ezr",
"template": {
"layout": "page-react.html",
"vagovprod": false,
"vagovprod": true,
"includeBreadcrumbs": true,
"breadcrumbs_override": [
{
Expand Down Expand Up @@ -1409,7 +1400,7 @@
}
},
{
"appName": "21-10210 Lay/Witness Statement",
"appName": "Submit a lay or witness statement to support a VA claim",
"entryName": "10210-lay-witness-statement",
"rootUrl": "/supporting-forms-for-claims/lay-witness-statement-form-21-10210",
"productId": "f8117c9f-0d57-486f-91ee-89c806b84d65",
Expand All @@ -1436,7 +1427,18 @@
"productId": "8233bd78-20c6-4498-b36f-55ec0028b1e5",
"template": {
"vagovprod": false,
"layout": "page-react.html"
"layout": "page-react.html",
"includeBreadcrumbs": true,
"breadcrumbs_override": [
{
"name": "Supporting forms for VA claims",
"path": "supporting-forms-for-claims"
},
{
"name": "Submit an intent to file",
"path": "supporting-forms-for-claims/intent-to-file-a-claim-form-21-0966"
}
]
}
},
{
Expand Down Expand Up @@ -1511,7 +1513,7 @@
"rootUrl": "/my-health/medications",
"productId": "0203ca08-b7a2-4cd6-abb5-56d38c239cd3",
"template": {
"vagovprod": false,
"vagovprod": true,
"layout": "page-react.html"
}
},
Expand Down Expand Up @@ -1582,7 +1584,7 @@
"rootUrl": "/burials-memorials/memorial-items/presidential-memorial-certificates/request-certificate-form-40-0247",
"productId": "5af7a83b-c1a0-4a0a-b0e9-88baf150e6a9",
"template": {
"vagovprod": false,
"vagovprod": true,
"layout": "page-react.html",
"includeBreadcrumbs": true,
"breadcrumbs_override": [
Expand All @@ -1608,7 +1610,7 @@
{
"appName": "PACT Act",
"entryName": "pact-act",
"rootUrl": "pact-act-wizard-test",
"rootUrl": "pact-act-eligibility",
"template": {
"title": "PACT Act",
"layout": "page-react.html",
Expand Down Expand Up @@ -1639,7 +1641,7 @@
},
{
"appName": "Request personal records",
"entryName": "10206-foia",
"entryName": "10206-pa",
"rootUrl": "/request-personal-records",
"productId": "560247e7-3a80-4fdd-ad00-8d0e14435d22",
"template": {
Expand All @@ -1648,9 +1650,9 @@
}
},
{
"appName": "Find a Local Representative",
"entryName": "representative-app",
"rootUrl": "/representative",
"appName": "Find a Representative",
"entryName": "find-a-representative",
"rootUrl": "/get-help-from-accredited-representative/find-rep",
"productId": "decb6c85-abcd-44b5-b722-550905f48dd7",
"template": {
"vagovprod": false,
Expand All @@ -1666,5 +1668,15 @@
"vagovprod": false,
"layout": "page-react.html"
}
},
{
"appName": "40-10007 Burial pre-need eligibility determination",
"entryName": "pre-need-integration",
"rootUrl": "/burials-and-memorials/pre-need-integration",
"productId": "e5593a96-1ba0-476c-9033-31ab963436c6",
"template": {
"vagovprod": false,
"layout": "page-react.html"
}
}
]
15 changes: 14 additions & 1 deletion src/platform/testing/e2e/cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const fs = require('fs-extra');
const path = require('path');
const table = require('table').table;
const { table } = require('table');
const { downloadFile } = require('cypress-downloadfile/lib/addPlugin');

const tableConfig = {
columns: {
Expand Down Expand Up @@ -76,5 +77,17 @@ module.exports = on => {

return dir;
},
downloadFile,
deleteFileOrDir(fileOrDirName) {
if (fs.existsSync(fileOrDirName)) {
fs.rmSync(fileOrDirName, {
recursive: true,
});
}
return null;
},
fileOrDirExists(fileOrDirName) {
return fs.existsSync(fileOrDirName);
},
});
};
9 changes: 9 additions & 0 deletions src/platform/testing/e2e/cypress/support/commands/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@ import './hasCount';
import './keyboard';
import 'cy-mobile-commands';
import 'cypress-wait-until';
import 'cypress-downloadfile/lib/downloadFileCommand';

Cypress.Commands.add('deleteFileOrDir', fileOrDirName => {
return cy.task('deleteFileOrDir', fileOrDirName);
});

Cypress.Commands.add('fileOrDirExists', fileOrDirName => {
return cy.task('fileOrDirExists', fileOrDirName);
});
Loading

0 comments on commit c00627d

Please sign in to comment.