Merge branch 'main' into update-merger-social-sco

department-of-veterans-affairs · Jul 23, 2024 · 793cadb · 793cadb
2 parents 3d2ed05 + bc2947d
commit 793cadb
Show file tree

Hide file tree

Showing 33 changed files with 514 additions and 457 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -42,7 +42,9 @@ src/site/layouts/leadership_listing*.drupal.liquid @department-of-veterans-affai
 src/site/layouts/news_story.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
 src/site/layouts/person_profile.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
 src/site/layouts/press_release.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
-src/site/layouts/story.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
+src/site/layouts/press_releases_listing.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
+src/site/layouts/regional_health_care_service_des.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
+src/site/layouts/story_listing.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
 src/site/layouts/tests/vamc* @department-of-veterans-affairs/vfs-facilities-frontend
 src/site/layouts/vamc*.drupal.liquid @department-of-veterans-affairs/vfs-facilities-frontend
 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
 src/site/layouts/tests/vet_center* @department-of-veterans-affairs/vfs-facilities-frontend
 
 # Public Websites
+src/site/blocks @department-of-veterans-affairs/vfs-public-websites-frontend
+src/site/layouts/basic_landing_page.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/campaign_landing_page.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/checklist.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/event* @department-of-veterans-affairs/vfs-public-websites-frontend @department-of-veterans-affairs/ap-admins
 src/site/layouts/faq*.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/full_width_banner_alert.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/home* @department-of-veterans-affairs/vfs-public-websites-frontend
+src/site/layouts/landing_page.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/media_list*.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
+src/site/layouts/office.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/outreach_asset.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/page* @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/publication_listing.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/q_a.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
+src/site/layouts/step_by_step.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/support*.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/layouts/va_form.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
+src/site/navigation/sidebar_nav.drupal.liquid @department-of-veterans-affairs/vfs-public-websites-frontend
+src/site/paragraphs @department-of-veterans-affairs/vfs-public-websites-frontend
 src/site/tests/home @department-of-veterans-affairs/vfs-public-websites-frontend
 
 

diff --git a/.github/workflows/content-release.yml b/.github/workflows/content-release.yml
@@ -392,7 +392,7 @@ jobs:
       - build
     outputs:
       DEPLOY_END_TIME: ${{ steps.export-deploy-end-time.outputs.DEPLOY_END_TIME }}
-    timeout-minutes: 15
+    timeout-minutes: 25
 
     steps:
 

diff --git a/package.json b/package.json
@@ -97,7 +97,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": "^10.0.2",
+    "@department-of-veterans-affairs/web-components": "^11.2.4",
     "@octokit/rest": "^18.10.0",
     "@sentry/browser": "^6.13.1",
     "@testing-library/cypress": "^8.0.3",

diff --git a/src/applications/registry.json b/src/applications/registry.json
@@ -155,29 +155,6 @@
       "keywords": "VA location by zip code, VA clinic, VA near me"
     }
   },
-  {
-    "appName": "10-10CG",
-    "entryName": "1010cg-application-caregiver-assistance",
-    "rootUrl": "/family-member-benefits/apply-for-caregiver-assistance-form-10-10cg",
-    "template": {
-      "title": "Caregiver Application for Benefits",
-      "vagovprod": true,
-      "vagovstaging": true,
-      "vagovdev": true,
-      "localhost": true,
-      "includeBreadcrumbs": true,
-      "breadcrumbs_override": [
-        {
-          "path": "family-member-benefits/comprehensive-assistance-for-family-caregivers",
-          "name": "Family member benefits"
-        },
-        {
-          "path": "family-member-benefits/apply-for-caregiver-assistance-form-10-10cg",
-          "name": "Apply for the Program of Comprehensive Assistance for Family Caregivers"
-        }
-      ]
-    }
-  },
   {
     "appName": "10-10CG",
     "entryName": "1010cg-application-caregiver-assistance",
@@ -270,6 +247,37 @@
       ]
     }
   },
+  {
+    "appName": "21P-530EZ Burials benefits form",
+    "entryName": "burials-ez",
+    "rootUrl": "/burials-memorials/veterans-burial-allowance/apply-for-burial-benefits",
+    "template": {
+      "title": "Apply for Burial Benefits (VA Form 21P-530EZ)",
+      "display_title": "Apply Now",
+      "layout": "page-react.html",
+      "description": "Use VA Form 21P-530EZ to apply for VA burial benefits online now. Get step-by-step instructions, and consider signing in to save your in-progress application if you need to come back to finish filling it out later.",
+      "order": 1,
+      "includeBreadcrumbs": true,
+      "breadcrumbs_override": [
+        {
+          "path": "/",
+          "name": "Home"
+        },
+        {
+          "path": "burials-memorials/",
+          "name": "Burials and memorials"
+        },
+        {
+          "path": "burials-memorials/veterans-burial-allowance",
+          "name": "Burial allowance"
+        },
+        {
+          "path": "burials-memorials/veterans-burial-allowance/apply-for-burial-benefits",
+          "name": "Apply for burial benefits"
+        }
+      ]
+    }
+  },
   {
     "appName": "1010ez Health Care Application form",
     "entryName": "hca",
@@ -306,9 +314,13 @@
       "includeBreadcrumbs": true,
       "private": true,
       "breadcrumbs_override": [
+        {
+          "name": "VA.gov home",
+          "path": ""
+        },
         {
           "path": "my-health/",
-          "name": "My Health"
+          "name": "My HealtheVet"
         },
         {
           "path": "my-health/update-benefits-information-form-10-10ezr",
@@ -1195,16 +1207,6 @@
       "layout": "page-react.html"
     }
   },
-  {
-    "appName": "Search Representative",
-    "entryFile": "./app-entry.jsx",
-    "entryName": "search-representative",
-    "rootUrl": "/view-change-representative/search",
-    "template": {
-      "vagovprod": false,
-      "layout": "page-react.html"
-    }
-  },
   {
     "appName": "Apply for Specially Adapted Housing Grant",
     "entryName": "sahg",
@@ -1342,7 +1344,7 @@
     "rootUrl": "/housing-assistance/disability-housing-grants/apply-for-grant-form-26-4555",
     "productId": "49929be5-0c92-42f2-b122-3cb426f691d4",
     "template": {
-      "vagovprod": false,
+      "vagovprod": true,
       "layout": "page-react.html",
       "includeBreadcrumbs": true,
       "breadcrumbs_override": [
@@ -1642,9 +1644,9 @@
     }
   },
   {
-    "appName": "Appeals Testing",
-    "entryName": "appeals-testing",
-    "rootUrl": "/decision-reviews/appeals-testing",
+    "appName": "Appeals NOD layout testing",
+    "entryName": "nod-new",
+    "rootUrl": "/decision-reviews/testing/nod-new",
     "productId": "5dd32517-00fd-4e97-afed-e6db1f1f54f9",
     "template": {
       "layout": "page-react.html",
@@ -1658,16 +1660,28 @@
     }
   },
   {
-    "appName": "Submitted Appeals view & download",
-    "entryName": "submitted-appeal",
-    "rootUrl": "/decision-reviews/submitted-appeal",
+    "appName": "Appeals download",
+    "entryName": "download",
+    "rootUrl": "/decision-reviews/testing/download",
     "productId": "8057a5e9-196a-462f-9bc3-3bd1d199892c",
     "template": {
       "layout": "page-react.html",
       "description": "Show submitted appeal data for print & download",
       "vagovprod": false
     }
   },
+  {
+    "appName": "HLR testing",
+    "entryFile": "./form-entry.jsx",
+    "entryName": "hlr-testing",
+    "rootUrl": "/decision-reviews/testing/hlr",
+    "productId": "32de6df6-8818-4fc8-b179-5d05ccb2db19",
+    "template": {
+      "layout": "page-react.html",
+      "description": "Test changes to HLR form",
+      "vagovprod": false
+    }
+  },
   {
     "appName": "Order hearing aid or CPAP supplies",
     "entryName": "health-care-supply-reordering",
@@ -1721,7 +1735,7 @@
     "rootUrl": "/education/verify-school-enrollment/mgib-enrollments",
     "productId": "90b61c25-80ce-444f-89fb-eb186b52bfe6",
     "template": {
-      "vagovprod": false,
+      "vagovprod": true,
       "layout": "page-react.html"
     }
   },
@@ -1736,7 +1750,7 @@
     }
   },
   {
-    "appName": "Beneficiary Travel",
+    "appName": "Check Your Travel Reimbursement Claim Status",
     "entryName": "travel-pay",
     "rootUrl": "/my-health/travel-claim-status",
     "productId": "1e585463-5625-4868-b5f5-58ee0490ea28",
@@ -1748,7 +1762,7 @@
   {
     "appName": "10-10d Application for CHAMPVA benefits",
     "entryName": "10-10D",
-    "rootUrl": "/health-care/champva/apply-form-10-10d",
+    "rootUrl": "/family-and-caregiver-benefits/health-and-disability/champva/apply-form-10-10d",
     "productId": "c485d6da-8094-433d-9cd3-3d31e7813650",
     "template": {
       "vagovprod": false,
@@ -1778,7 +1792,7 @@
   {
     "appName": "10-7959C CHAMPVA Other Health Insurance Certification form",
     "entryName": "10-7959C",
-    "rootUrl": "/health-care/champva/other-insurance-form-10-7959c",
+    "rootUrl": "/family-and-caregiver-benefits/health-and-disability/champva/other-insurance-form-10-7959c",
     "productId": "db17fe5b-107e-40c0-a105-b3ba913cf731",
     "template": {
       "vagovprod": false,
@@ -1798,7 +1812,7 @@
   {
     "appName": "10-7959a CHAMPVA Claim Form",
     "entryName": "10-7959a",
-    "rootUrl": "/ivc-champva/10-7959a",
+    "rootUrl": "/family-and-caregiver-benefits/health-and-disability/file-champva-claim-10-7959a",
     "productId": "e6afb103-521b-46a2-b29c-245f6c95d3af",
     "template": {
       "vagovprod": false,
@@ -1883,4 +1897,4 @@
       ]
     }
   }
-]
+]
diff --git a/src/site/assets/sass/style.scss b/src/site/assets/sass/style.scss
@@ -54,6 +54,18 @@
   word-wrap: break-word;
 }
 
+.health-online-desktop-link {
+  @media (max-width: 767px) {
+    display: none !important;
+  }
+}
+
+.health-online-mobile-link {
+  @media (min-width: 768px) {
+    display: none !important;
+  }
+}
+
 // START: Styles for mobile app promo banner
 #alert-with-additional-info {
 
@@ -251,5 +263,23 @@
     }
   }
 }
+// fix for sidenav btn
+.va-sidenav-btn-close {
+  background-size: 0.625rem 0.625rem;
+  background-color: transparent;
+  height: 1.375rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 1.375rem;
+  margin: 0;
+  width: .625rem;
+}
+
+@media (min-width: 767px) {
+  .va-sidenav-btn-close {
+    display: none;
+  }
+}
 
 // END: Styles for mobile app promo banner  
diff --git a/src/site/components/merger-crosslinks.html b/src/site/components/merger-crosslinks.html