Skip to content

Commit cf4a012

Browse files
authored
Merge branch 'main' into mkerns-84964-update-breadcrumb
2 parents ccd347c + df5a7fd commit cf4a012

38 files changed

+857
-504
lines changed

.github/CODEOWNERS

+10-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ src/site/layouts/leadership_listing*.drupal.liquid @department-of-veterans-affai
4242
src/site/layouts/news_story.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
4343
src/site/layouts/person_profile.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
4444
src/site/layouts/press_release.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
45-
src/site/layouts/story.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
45+
src/site/layouts/press_releases_listing.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
46+
src/site/layouts/regional_health_care_service_des.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
47+
src/site/layouts/story_listing.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
4648
src/site/layouts/tests/vamc* @department-of-veterans-affairs/vfs-facilities-frontend
4749
src/site/layouts/vamc*.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
4850
src/site/stages/build/drupal/static-data-files/vaPoliceData @department-of-veterans-affairs/vfs-facilities-frontend
@@ -59,19 +61,26 @@ src/site/layouts/vet_center*.drupal.liquid @department-of-veterans-affairs/vfs-f
5961
src/site/layouts/tests/vet_center* @department-of-veterans-affairs/vfs-facilities-frontend
6062

6163
# Public Websites
64+
src/site/blocks @department-of-veterans-affairs/vfs-public-websites-frontend
65+
src/site/layouts/basic_landing_page.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
6266
src/site/layouts/campaign_landing_page.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
6367
src/site/layouts/checklist.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
6468
src/site/layouts/event* @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/ap-admins
6569
src/site/layouts/faq*.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
6670
src/site/layouts/full_width_banner_alert.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
6771
src/site/layouts/home* @department-of-veterans-affairs/vfs-public-websites-frontend
72+
src/site/layouts/landing_page.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
6873
src/site/layouts/media_list*.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
74+
src/site/layouts/office.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
6975
src/site/layouts/outreach_asset.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
7076
src/site/layouts/page* @department-of-veterans-affairs/vfs-public-websites-frontend
7177
src/site/layouts/publication_listing.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
7278
src/site/layouts/q_a.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
79+
src/site/layouts/step_by_step.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
7380
src/site/layouts/support*.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
7481
src/site/layouts/va_form.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
82+
src/site/navigation/sidebar_nav.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
83+
src/site/paragraphs @department-of-veterans-affairs/vfs-public-websites-frontend
7584
src/site/tests/home @department-of-veterans-affairs/vfs-public-websites-frontend
7685

7786

.github/workflows/content-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ jobs:
392392
- build
393393
outputs:
394394
DEPLOY_END_TIME: ${{ steps.export-deploy-end-time.outputs.DEPLOY_END_TIME }}
395-
timeout-minutes: 15
395+
timeout-minutes: 25
396396

397397
steps:
398398

.github/workflows/daily-release-warning.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Daily Release Warning
22

33
on:
44
schedule:
5-
- cron: 0 17 * * 1-5
5+
- cron: 0 14 * * 1-5
66

77
concurrency:
88
group: daily-release-warning
@@ -36,7 +36,7 @@ jobs:
3636
uses: department-of-veterans-affairs/platform-release-tools-actions/slack-notify@8c496a4b0c9158d18edcd9be8722ed0f79e8c5b4 # main
3737
continue-on-error: true
3838
with:
39-
payload: '{"attachments": [{"color": "#07711E","blocks": [{"type": "section","text": {"type": "mrkdwn","text": "Stand by, production release for content-build coming up in 60 minutes. Please review staging before then. View what's coming here: <https://github.com/${{ github.repository }}/compare/${{ steps.get-latest-tag.outputs.LATEST_TAG_VERSION }}...main>"}}]}]}'
39+
payload: '{"attachments": [{"color": "#07711E","blocks": [{"type": "section","text": {"type": "mrkdwn","text": "Stand by, production release for content-build coming up in 60 minutes. Please review staging before then. View what''s coming here: <https://github.com/${{ github.repository }}/compare/${{ steps.get-latest-tag.outputs.LATEST_TAG_VERSION }}...main>"}}]}]}'
4040
channel_id: ${{ env.CONTENT_BUILD_CHANNEL_ID }}
4141
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
4242
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/gha-metrics.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: 'Send GHA metrics to Datadog'
2+
on:
3+
workflow_run:
4+
workflows:
5+
- 'Content Release'
6+
types:
7+
- completed
8+
jobs:
9+
send:
10+
runs-on: ubuntu-latest
11+
timeout-minutes: 10
12+
steps:
13+
- name: Configure AWS Credentials
14+
uses: aws-actions/configure-aws-credentials@e1e17a757e536f70e52b5a12b2e8d1d1c60e04ef # v2.0.0
15+
with:
16+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
17+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
18+
aws-region: us-gov-west-1
19+
20+
- name: Get Datadog api key from Parameter Store
21+
uses: department-of-veterans-affairs/action-inject-ssm-secrets@d8e6de3bde4dd728c9d732baef58b3c854b8c4bb # latest
22+
with:
23+
ssm_parameter: /dsva-vagov/content-build/GHA_CONTENT_BUILD_DATADOG_API_KEY
24+
env_variable_name: GHA_CONTENT_BUILD_DATADOG_API_KEY
25+
26+
- name: Send GitHub Actions metrics to DataDog
27+
uses: int128/datadog-actions-metrics@432f143460957c07e730f9f082af7d5063e99f84 # v1.88.0
28+
with:
29+
datadog-api-key: ${{ env.GHA_CONTENT_BUILD_DATADOG_API_KEY }}
30+
collect-job-metrics: true
31+
collect-step-metrics: true
32+
datadog-site: ddog-gov.com

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"@babel/preset-react": "^7.23.3",
9898
"@babel/register": "^7.23.7",
9999
"@department-of-veterans-affairs/eslint-plugin": "^1.1.0",
100-
"@department-of-veterans-affairs/web-components": "^10.0.2",
100+
"@department-of-veterans-affairs/web-components": "^11.2.4",
101101
"@octokit/rest": "^18.10.0",
102102
"@sentry/browser": "^6.13.1",
103103
"@testing-library/cypress": "^8.0.3",
@@ -177,7 +177,7 @@
177177
"mocker-api": "^2.9.1",
178178
"morgan": "^1.10.0",
179179
"node-fetch": "^2.6.7",
180-
"node-sass": "^6.0.1",
180+
"node-sass": "^7.0.3",
181181
"nyc": "^15.1.0",
182182
"p-retry": "^4.6.0",
183183
"postcss": "^8.3.6",

src/applications/registry.json

+57-38
Original file line numberDiff line numberDiff line change
@@ -155,29 +155,6 @@
155155
"keywords": "VA location by zip code, VA clinic, VA near me"
156156
}
157157
},
158-
{
159-
"appName": "10-10CG",
160-
"entryName": "1010cg-application-caregiver-assistance",
161-
"rootUrl": "/family-member-benefits/apply-for-caregiver-assistance-form-10-10cg",
162-
"template": {
163-
"title": "Caregiver Application for Benefits",
164-
"vagovprod": true,
165-
"vagovstaging": true,
166-
"vagovdev": true,
167-
"localhost": true,
168-
"includeBreadcrumbs": true,
169-
"breadcrumbs_override": [
170-
{
171-
"path": "family-member-benefits/comprehensive-assistance-for-family-caregivers",
172-
"name": "Family member benefits"
173-
},
174-
{
175-
"path": "family-member-benefits/apply-for-caregiver-assistance-form-10-10cg",
176-
"name": "Apply for the Program of Comprehensive Assistance for Family Caregivers"
177-
}
178-
]
179-
}
180-
},
181158
{
182159
"appName": "10-10CG",
183160
"entryName": "1010cg-application-caregiver-assistance",
@@ -273,7 +250,7 @@
273250
{
274251
"appName": "21P-530EZ Burials benefits form",
275252
"entryName": "burials-ez",
276-
"rootUrl": "/burials-memorials/veterans-burial-allowance/apply-for-burial-benefits",
253+
"rootUrl": "/burials-memorials/veterans-burial-allowance/apply-for-allowance-form-21p-530ez",
277254
"template": {
278255
"title": "Apply for Burial Benefits (VA Form 21P-530EZ)",
279256
"display_title": "Apply Now",
@@ -292,11 +269,11 @@
292269
},
293270
{
294271
"path": "burials-memorials/veterans-burial-allowance",
295-
"name": "Burial allowance"
272+
"name": "Veterans burial allowance and transportation benefits"
296273
},
297274
{
298-
"path": "burials-memorials/veterans-burial-allowance/apply-for-burial-benefits",
299-
"name": "Apply for burial benefits"
275+
"path": "burials-memorials/veterans-burial-allowance/apply-for-allowance-form-21p-530ez",
276+
"name": "Apply for a Veterans burial allowance and transportation benefits"
300277
}
301278
]
302279
}
@@ -1367,7 +1344,7 @@
13671344
"rootUrl": "/housing-assistance/disability-housing-grants/apply-for-grant-form-26-4555",
13681345
"productId": "49929be5-0c92-42f2-b122-3cb426f691d4",
13691346
"template": {
1370-
"vagovprod": false,
1347+
"vagovprod": true,
13711348
"layout": "page-react.html",
13721349
"includeBreadcrumbs": true,
13731350
"breadcrumbs_override": [
@@ -1667,9 +1644,9 @@
16671644
}
16681645
},
16691646
{
1670-
"appName": "Appeals Testing",
1671-
"entryName": "appeals-testing",
1672-
"rootUrl": "/decision-reviews/appeals-testing",
1647+
"appName": "Appeals NOD layout testing",
1648+
"entryName": "nod-new",
1649+
"rootUrl": "/decision-reviews/testing/nod-new",
16731650
"productId": "5dd32517-00fd-4e97-afed-e6db1f1f54f9",
16741651
"template": {
16751652
"layout": "page-react.html",
@@ -1683,16 +1660,28 @@
16831660
}
16841661
},
16851662
{
1686-
"appName": "Submitted Appeals view & download",
1687-
"entryName": "submitted-appeal",
1688-
"rootUrl": "/decision-reviews/submitted-appeal",
1663+
"appName": "Appeals download",
1664+
"entryName": "download",
1665+
"rootUrl": "/decision-reviews/testing/download",
16891666
"productId": "8057a5e9-196a-462f-9bc3-3bd1d199892c",
16901667
"template": {
16911668
"layout": "page-react.html",
16921669
"description": "Show submitted appeal data for print & download",
16931670
"vagovprod": false
16941671
}
16951672
},
1673+
{
1674+
"appName": "HLR testing",
1675+
"entryFile": "./form-entry.jsx",
1676+
"entryName": "hlr-testing",
1677+
"rootUrl": "/decision-reviews/testing/hlr",
1678+
"productId": "32de6df6-8818-4fc8-b179-5d05ccb2db19",
1679+
"template": {
1680+
"layout": "page-react.html",
1681+
"description": "Test changes to HLR form",
1682+
"vagovprod": false
1683+
}
1684+
},
16961685
{
16971686
"appName": "Order hearing aid or CPAP supplies",
16981687
"entryName": "health-care-supply-reordering",
@@ -1746,7 +1735,7 @@
17461735
"rootUrl": "/education/verify-school-enrollment/mgib-enrollments",
17471736
"productId": "90b61c25-80ce-444f-89fb-eb186b52bfe6",
17481737
"template": {
1749-
"vagovprod": false,
1738+
"vagovprod": true,
17501739
"layout": "page-react.html"
17511740
}
17521741
},
@@ -1761,7 +1750,7 @@
17611750
}
17621751
},
17631752
{
1764-
"appName": "Beneficiary Travel",
1753+
"appName": "Check Your Travel Reimbursement Claim Status",
17651754
"entryName": "travel-pay",
17661755
"rootUrl": "/my-health/travel-claim-status",
17671756
"productId": "1e585463-5625-4868-b5f5-58ee0490ea28",
@@ -1803,7 +1792,7 @@
18031792
{
18041793
"appName": "10-7959C CHAMPVA Other Health Insurance Certification form",
18051794
"entryName": "10-7959C",
1806-
"rootUrl": "/health-care/champva/other-insurance-form-10-7959c",
1795+
"rootUrl": "/family-and-caregiver-benefits/health-and-disability/champva/other-insurance-form-10-7959c",
18071796
"productId": "db17fe5b-107e-40c0-a105-b3ba913cf731",
18081797
"template": {
18091798
"vagovprod": false,
@@ -1823,7 +1812,7 @@
18231812
{
18241813
"appName": "10-7959a CHAMPVA Claim Form",
18251814
"entryName": "10-7959a",
1826-
"rootUrl": "/ivc-champva/10-7959a",
1815+
"rootUrl": "/family-and-caregiver-benefits/health-and-disability/file-champva-claim-10-7959a",
18271816
"productId": "e6afb103-521b-46a2-b29c-245f6c95d3af",
18281817
"template": {
18291818
"vagovprod": false,
@@ -1907,5 +1896,35 @@
19071896
}
19081897
]
19091898
}
1899+
},
1900+
{
1901+
"appName": "Resources for schools",
1902+
"entryName": "sco",
1903+
"rootUrl": "/education/school-administrators",
1904+
"productId": "40938a35-1cfa-4808-917b-37e0baec6a7c",
1905+
"template": {
1906+
"vagovprod": false,
1907+
"layout": "page-react.html"
1908+
}
1909+
},
1910+
{
1911+
"appName": "22-10282 IBM Skillsbuild Training Program Intake Application",
1912+
"entryName": "10282-edu-benefits",
1913+
"rootUrl": "/education/apply-for-education-benefits/10282",
1914+
"productId": "4172a63c-b93a-499e-946c-048da7a5cb6d",
1915+
"template": {
1916+
"vagovprod": false,
1917+
"layout": "page-react.html"
1918+
}
1919+
},
1920+
{
1921+
"appName": "Form Renderer",
1922+
"entryName": "form-renderer",
1923+
"rootUrl": "/digital-form",
1924+
"productId": "8e41524c-d835-476c-ba0f-040037380911",
1925+
"template": {
1926+
"vagovprod": false,
1927+
"layout": "page-react.html"
1928+
}
19101929
}
19111930
]

src/site/assets/sass/style.scss

+30
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,18 @@
5454
word-wrap: break-word;
5555
}
5656

57+
.health-online-desktop-link {
58+
@media (max-width: 767px) {
59+
display: none !important;
60+
}
61+
}
62+
63+
.health-online-mobile-link {
64+
@media (min-width: 768px) {
65+
display: none !important;
66+
}
67+
}
68+
5769
// START: Styles for mobile app promo banner
5870
#alert-with-additional-info {
5971

@@ -251,5 +263,23 @@
251263
}
252264
}
253265
}
266+
// fix for sidenav btn
267+
.va-sidenav-btn-close {
268+
background-size: 0.625rem 0.625rem;
269+
background-color: transparent;
270+
height: 1.375rem;
271+
display: flex;
272+
align-items: center;
273+
justify-content: center;
274+
padding: 1.375rem;
275+
margin: 0;
276+
width: .625rem;
277+
}
278+
279+
@media (min-width: 767px) {
280+
.va-sidenav-btn-close {
281+
display: none;
282+
}
283+
}
254284

255285
// END: Styles for mobile app promo banner

src/site/components/merger-crosslinks.html

-55
This file was deleted.

0 commit comments

Comments
 (0)