Merge branch 'main' into 98086-draft-forms

Author: derekhouck

.github/workflows/continuous-integration.yml

@@ -450,21 +450,21 @@ jobs:
           report_paths: 'test-results/e2e-test-output-*.xml'
 
       - name: Archive Cypress test videos
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         if: ${{ failure() }}
         with:
           name: cypress-video-artifacts
           path: cypress/videos
 
       - name: Archive Cypress test screenshots
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         if: ${{ failure() }}
         with:
           name: cypress-screenshot-artifacts
           path: cypress/screenshots
 
       - name: Archive Mochawesome test results
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         if: ${{ always() }}
         with:
           name: cypress-mochawesome-test-results
@@ -534,7 +534,7 @@ jobs:
         working-directory: testing-tools-team-dashboard-data
 
       - name: Download Mochawesome test results
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: cypress-mochawesome-test-results
           path: testing-tools-team-dashboard-data/src/testing-reports/data
@@ -573,7 +573,7 @@ jobs:
 
       - name: Download video artifacts
         if: ${{ needs.cypress-tests.result == 'failure' }}
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: cypress-video-artifacts
           path: testing-tools-team-dashboard-data/testing-reports/videos/${{ env.UUID }}

src/applications/registry.json

@@ -836,13 +836,13 @@
     }
   },
   {
-    "appName": "Ask VA Integration Project",
-    "entryName": "ask-va-too",
-    "rootUrl": "/contact-us/ask-va-too",
+    "appName": "Ask VA",
+    "entryName": "ask-va",
+    "rootUrl": "/contact-us/ask-va",
     "template": {
       "vagovprod": false,
       "layout": "page-react.html",
-      "title": "Ask VA Integration Project",
+      "title": "Ask VA",
       "description": "Ask VA (AVA) is an online portal that allows veterans, caregivers, and supporting personnel in education, debt, loans, etc. to submit questions to VA and receive a secure message response."
     }
   },
@@ -950,7 +950,7 @@
   {
     "appName": "My Education Benefits",
     "entryName": "1990ez-edu-benefits",
-    "rootUrl": "/education/apply-for-benefits-form-22-1990",
+    "rootUrl": "/education/apply-for-gi-bill-form-22-1990",
     "template": {
       "vagovprod": true,
       "layout": "page-react.html"
@@ -1059,7 +1059,7 @@
   {
     "appName": "Apply to use transferred education benefits",
     "entryName": "toe",
-    "rootUrl": "/education/survivor-dependent-benefits/apply-for-transferred-benefits-form-22-1990e",
+    "rootUrl": "/family-and-caregiver-benefits/education-and-careers/transferred-gi-bill-benefits/apply-form-22-1990e",
     "productId": "1d535d31-c2d8-46c1-8994-a42e0860204c",
     "template": {
       "vagovprod": true,
@@ -1179,7 +1179,7 @@
   {
     "appName": "Form Upload Flow",
     "entryName": "form-upload-flow",
-    "rootUrl": "/form-upload",
+    "rootUrl": "/find-forms/upload",
     "productId": "88558f52-5c6c-447f-ab78-e006b01a32db",
     "template": {
       "vagovprod": false,
@@ -1655,7 +1655,7 @@
   {
     "appName": "22-10282 IBM Skillsbuild Training Program Intake Application",
     "entryName": "10282-edu-benefits",
-    "rootUrl": "/education/apply-for-education-benefits/10282",
+    "rootUrl": "/education/other-va-education-benefits/ibm-skillsbuild-program/apply-form-22-10282",
     "productId": "4172a63c-b93a-499e-946c-048da7a5cb6d",
     "template": {
       "vagovprod": false,
@@ -1694,7 +1694,8 @@
         "title": "Explore pattern demonstrations in our sample form",
         "subtitle": "Mock Form Minimal Header",
         "excludePaths": ["/introduction", "/confirmation"]
-      }
+      },
+      "minimalFooter": true
     }
   },
   {

src/site/stages/build/drupal/process-manila-pages.js

@@ -1,4 +1,6 @@
 /* eslint-disable no-param-reassign */
+const { ENTITY_BUNDLES } = require('../../../constants/content-modeling');
+
 const MANILA_VA_CLINIC_ENTITY_ID = '1187';
 
 function getManilaClinicUrl(path) {
@@ -13,14 +15,21 @@ function isManilaVAClinicPage(page) {
   );
 }
 
+function isManillaVaRegionHomepage(page) {
+  return (
+    isManilaVAClinicPage(page) &&
+    page?.entityBundle === ENTITY_BUNDLES.HEALTH_CARE_REGION_PAGE
+  );
+}
+
 function updateManilaSystemLinks(page) {
   // Update main URL path
-  if (page.entityUrl?.path) {
+  if (page?.entityUrl?.path) {
     page.entityUrl.path = getManilaClinicUrl(page.entityUrl.path);
   }
 
   // Update breadcrumb links
-  if (page.entityUrl?.breadcrumb) {
+  if (page?.entityUrl?.breadcrumb) {
     page.entityUrl.breadcrumb = page.entityUrl.breadcrumb.map(crumb => ({
       ...crumb,
       url: crumb.url ? getManilaClinicUrl(crumb.url) : crumb.url,
@@ -53,6 +62,10 @@ function processManilaPages(drupalData) {
       if (isManilaVAClinicPage(page)) {
         acc.manilaVAClinicPages.push(page);
       } else {
+        // Federal Region Homepage should not be created for Manila VA Clinic
+        if (isManillaVaRegionHomepage(page)) {
+          return acc;
+        }
         acc.otherPages.push(page);
       }