Skip to content

Commit

Permalink
Merge branch 'main' of github.com:department-of-veterans-affairs/cont…
Browse files Browse the repository at this point in the history
…ent-build into 18521-ga-analytics
  • Loading branch information
chriskim2311 committed Dec 2, 2024
2 parents e8dbab0 + 25e1e72 commit 6204e8a
Show file tree
Hide file tree
Showing 58 changed files with 652 additions and 507 deletions.
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 15 * * 1-5
- cron: 0 16 * * 1-5

concurrency:
group: daily-prod-release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily-release-warning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Daily Release Warning

on:
schedule:
- cron: 0 14 * * 1-5
- cron: 0 15 * * 1-5

concurrency:
group: daily-release-warning
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview-environment-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
uses: EndBug/add-and-commit@1bad3abcf0d6ec49a5857d124b0bfb52dc7bb081 # 9.1.3
with:
author_name: va-vsp-bot
author_email: devops@va.gov
author_email: 70344339+va-vsp-bot@users.noreply.github.com
branch: main
cwd: manifests/apps/preview-environment/dev/
add: 'pe-envs'
Expand All @@ -66,7 +66,7 @@ jobs:
uses: EndBug/add-and-commit@1bad3abcf0d6ec49a5857d124b0bfb52dc7bb081 # 9.1.3
with:
author_name: va-vsp-bot
author_email: devops@va.gov
author_email: 70344339+va-vsp-bot@users.noreply.github.com
branch: main
cwd: manifests/apps/preview-environment/dev/
add: 'argocd-apps'
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"test:watch": "node script/watch-tests.js",
"update:schema": "./script/update-json-schema.sh",
"validate:registry": "node ./script/validate-registry.js --registry-file=src/applications/registry.json",
"watch": "concurrently \"node --max-old-space-size=8000 --expose-gc script/build-content.js --watch\" \"http-server build/localhost -s -c-1 -p 3002\"",
"watch": "concurrently \"node --max-old-space-size=12288 --expose-gc script/build-content.js --watch\" \"http-server build/localhost -s -c-1 -p 3002\"",
"watch:codespaces": "concurrently \"yarn build:codespaces --watch\" \"http-server build/localhost -s -c-1 -p 3002\"",
"watch:css-sourcemaps": "node --max-old-space-size=6000 --expose-gc script/build-content.js --watch --local-css-sourcemaps",
"watch:css-sourcemaps": "node --max-old-space-size=12288 --expose-gc script/build-content.js --watch --local-css-sourcemaps",
"watch:review": "node ./script/run-review-instance-api.js",
"list-heading-order-violations": "node script/heading-order-violations.js --dir ./build/vagovdev",
"prepare": "husky install",
Expand Down Expand Up @@ -98,7 +98,7 @@
"@babel/preset-react": "^7.23.3",
"@babel/register": "^7.23.7",
"@department-of-veterans-affairs/eslint-plugin": "^1.1.0",
"@department-of-veterans-affairs/web-components": "^15.1.0",
"@department-of-veterans-affairs/web-components": "^16.0.1",
"@octokit/rest": "^18.10.0",
"@sentry/browser": "^6.13.1",
"@testing-library/cypress": "^8.0.3",
Expand Down
1 change: 0 additions & 1 deletion script/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ app.get('/preview', async (req, res, next) => {
}

const [drupalData, fileManifest] = await fetchAllPageData(req.query.nodeId);

const smith = await createPipeline({
...options,
drupalData,
Expand Down
3 changes: 3 additions & 0 deletions src/applications/registry-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
"rootUrl": {
"type": "string"
},
"useLocalStylesAndComponents": {
"type": "boolean"
},
"template": {
"type": "object",
"properties": {
Expand Down
117 changes: 56 additions & 61 deletions src/applications/registry.json
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@
"title": "Track Claims",
"layout": "page-react.html",
"description": "Track the status of your VA claims and appeals."
}
},
"useLocalStylesAndComponents": true
},
{
"appName": "Letters",
Expand Down Expand Up @@ -410,12 +411,12 @@
{
"appName": "Post 9/11 GI Bill Status",
"entryName": "post-911-gib-status",
"rootUrl": "/education/gi-bill/post-9-11/ch-33-benefit/status",
"rootUrl": "/education/check-remaining-post-9-11-gi-bill-benefits/status",
"template": {
"layout": "page-react.html",
"title": "Check Your Post-9/11 GI Bill Benefits Status",
"heading": "Check your Post-9/11 GI Bill benefits status",
"display_title": "Check Post-9/11 GI Bill benefits",
"title": "Check your remaining Post-9/11 GI Bill benefits",
"heading": "Check your remaining Post-9/11 GI Bill benefits",
"display_title": "Check your remaining Post-9/11 GI Bill benefits",
"collection": "education",
"spoke": "Manage benefits",
"order": 2,
Expand All @@ -428,20 +429,8 @@
"name": "Education and training"
},
{
"path": "education/about-gi-bill-benefits/",
"name": "GI Bill"
},
{
"path": "education/about-gi-bill-benefits/post-9-11/",
"name": "Post-9/11 GI Bill"
},
{
"path": "education/gi-bill/post-9-11/ch-33-benefit/",
"name": "Check Post-9/11 GI Bill benefits"
},
{
"path": "education/gi-bill/post-9-11/ch-33-benefit/status",
"name": "Post-9/11 GI Bill Statement of Benefits"
"path": "education/check-remaining-post-9-11-gi-bill-benefits/status",
"name": "Check your remaining Post-9/11 GI Bill benefits"
}
]
}
Expand Down Expand Up @@ -506,32 +495,6 @@
]
}
},
{
"appName": "Opt Out of Sharing VA Education Benefits Information",
"entryName": "0993-edu-benefits",
"rootUrl": "/education/opt-out-information-sharing/opt-out-form-0993",
"template": {
"title": "Opt Out Of Sharing VA Education Benefits Information",
"heading": "Opt out of sharing VA education benefits information",
"layout": "page-react.html",
"description": "Use your VA education benefits to pay for college or training programs. Find out which documents you’ll need to apply for benefits, and start your online application today.",
"includeBreadcrumbs": true,
"breadcrumbs_override": [
{
"path": "education/",
"name": "Education and training"
},
{
"path": "education/opt-out-information-sharing/",
"name": "Opt out of information sharing"
},
{
"path": "education/opt-out-information-sharing/opt-out-form-0993",
"name": "Opt out of sharing your information with schools"
}
]
}
},
{
"appName": "GI Bill School Feedback Tool",
"entryName": "feedback-tool",
Expand Down Expand Up @@ -1055,7 +1018,7 @@
}
},
{
"appName": "Mock Form AE Design Patterns",
"appName": "Authenticated Experience Design Patterns",
"entryFile": "./app-entry.jsx",
"entryName": "mock-form-ae-design-patterns",
"rootUrl": "/mock-form-ae-design-patterns",
Expand Down Expand Up @@ -1644,7 +1607,9 @@
"minimalHeader": {
"title": "Submit a statement to support a claim",
"subtitle": "Statement in support of a claim (VA Form 21-4138)",
"excludePaths": ["/introduction"]
"excludePaths": [
"/introduction"
]
}
}
},
Expand Down Expand Up @@ -1702,16 +1667,6 @@
"layout": "page-react.html"
}
},
{
"appName": "Form Renderer",
"entryName": "form-renderer",
"rootUrl": "/digital-form",
"productId": "8e41524c-d835-476c-ba0f-040037380911",
"template": {
"vagovprod": false,
"layout": "page-react.html"
}
},
{
"appName": "22-10215 Statement of Assurance of Compliance with 85 Percent Enrollment Ratios",
"entryName": "10215-edu-benefits",
Expand Down Expand Up @@ -1743,7 +1698,10 @@
"minimalHeader": {
"title": "Explore pattern demonstrations in our sample form",
"subtitle": "Mock Form Minimal Header",
"excludePaths": ["/introduction", "/confirmation"]
"excludePaths": [
"/introduction",
"/confirmation"
]
}
}
},
Expand All @@ -1768,9 +1726,9 @@
}
},
{
"appName": "Benefit Eligibility Questionnaire",
"entryName": "benefit-eligibility-questionnaire",
"rootUrl": "/benefit-eligibility-questionnaire",
"appName": "Discover Your Benefits",
"entryName": "discover-your-benefits",
"rootUrl": "/discover-your-benefits",
"productId": "87f2c91f-46c3-4461-8890-3636130af4ab",
"template": {
"vagovprod": false,
Expand All @@ -1792,9 +1750,46 @@
"entryName": "welcome-va-setup-review-information",
"rootUrl": "/my-va/welcome-va-setup/review-information",
"productId": "c1a00d88-ead0-46d4-94ab-e72baba100c6",
"template": {
"vagovprod": false,
"layout": "page-react.html",
"includeBreadcrumbs": true,
"breadcrumbs_override": [
{
"path": "",
"name": "Va.gov home"
},
{
"path": "my-va",
"name": "My VA"
},
{
"path": "welcome-va-setup/review-information/contact-information",
"name": "Add your contact information"
}
]
}
},
{
"appName": "Employment Questionnaire",
"entryName": "21-4140-eq",
"rootUrl": "/employment-questionnaire-form-21-4140",
"productId": "2e00cd49-14e2-4eb0-a3c6-5bc92c9e4618",
"template": {
"vagovprod": false,
"layout": "page-react.html"
}
},
{
"appName": "Demo: File for disability compensation - New conditions",
"entryName": "new-conditions",
"rootUrl": "/user-testing/new-conditions",
"productId": "0db1a222-9d73-4c26-9966-75283e6510a1",
"template": {
"vagovprod": false,
"title": "Demo: File for disability compensation - New conditions",
"layout": "page-react.html",
"includeBreadcrumbs": true
}
}
]
2 changes: 1 addition & 1 deletion src/site/assets/img/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/site/assets/img/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/site/assets/img/info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/site/assets/img/success.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/site/assets/img/warning.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6204e8a

Please sign in to comment.