Merge branch 'main' into vebt-470

src/applications/registry.json

@@ -473,35 +473,6 @@
       "vagovprod": true
     }
   },
-  {
-    "appName": "22-1990E Education benefits form",
-    "entryName": "1990e-edu-benefits",
-    "rootUrl": "/education/apply-for-education-benefits/application/1990E",
-    "template": {
-      "title": "Apply For Education Benefits",
-      "heading": "Apply for education benefits",
-      "display_title": "Apply to use transferred benefits",
-      "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.",
-      "order": 4,
-      "hideFromSidebar": true,
-      "includeBreadcrumbs": true,
-      "breadcrumbs_override": [
-        {
-          "name": "Education and training",
-          "path": "education/"
-        },
-        {
-          "name": "How to apply",
-          "path": "education/how-to-apply/"
-        },
-        {
-          "name": "Apply for education benefits",
-          "path": "education/apply-for-education-benefits/application/1990E"
-        }
-      ]
-    }
-  },
   {
     "appName": "22-10203 Education benefits form",
     "entryName": "10203-edu-benefits",
@@ -986,31 +957,6 @@
       "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."
     }
   },
-  {
-    "appName": "Veteran Rapid Retraining Assistance Program (VRRAP)",
-    "entryName": "1990s-edu-benefits",
-    "rootUrl": "/education/other-va-education-benefits/veteran-rapid-retraining-assistance/apply-for-vrrap-form-22-1990s",
-    "template": {
-      "title": "Apply for the Veteran Rapid Retraining Assistance Program (VRRAP)",
-      "heading": "Apply for the Veteran Rapid Retraining Assistance Program (VRRAP)",
-      "layout": "page-react.html",
-      "includeBreadcrumbs": true,
-      "breadcrumbs_override": [
-        {
-          "name": "Education and training",
-          "path": "education/"
-        },
-        {
-          "name": "Other VA education benefits",
-          "path": "education/other-va-education-benefits/"
-        },
-        {
-          "name": "Apply for VRRAP VA Form 22 1990s",
-          "path": "education/other-va-education-benefits/veteran-rapid-retraining-assistance/apply-for-vrrap-form-22-1990s"
-        }
-      ]
-    }
-  },
   {
     "appName": "Request a Board Appeal",
     "entryName": "10182-board-appeal",
@@ -1729,7 +1675,9 @@
     "productId": "89100c00-5b5f-46fd-bd98-d3b35f220958",
     "template": {
       "vagovprod": false,
-      "layout": "accredited-representative-portal.html"
+      "layout": "accredited-representative-portal.html",
+      "title": "Apply to become a VA accredited attorney or claims agent",
+      "description": "Apply to become a VA accredited attorney or claims agent (VA Form 21a)"
     }
   },
   {
@@ -1813,33 +1761,6 @@
       "includeBreadcrumbs": true
     }
   },
-  {
-    "appName": "Apply to become a VA accredited attorney or claims agent",
-    "entryName": "21a",
-    "rootUrl": "/accreditation/attorney-claims-agent-form-21a",
-    "productId": "55b00994-6f3c-4527-98be-5a90e37eec01",
-    "template": {
-      "vagovprod": false,
-      "title": "Apply to become a VA accredited attorney or claims agent",
-      "description": "Apply to become a VA accredited attorney or claims agent (VA Form 21a)",
-      "layout": "page-react.html",
-      "includeBreadcrumbs": true,
-      "breadcrumbs_override": [
-        {
-          "name": "Home",
-          "path": ""
-        },
-        {
-          "name": "VA accreditation representatives",
-          "path": "accreditation"
-        },
-        {
-          "name": "Apply to become a VA accredited attorney or claims agent",
-          "path": "accreditation/attorney-claims-agent-form-21a"
-        }
-      ]
-    }
-  },
   {
     "appName": "Resources for schools",
     "entryName": "sco",

src/site/filters/liquid.js

@@ -673,26 +673,20 @@ module.exports = function registerFilters() {
     return breadcrumbs;
   };
 
-  liquid.filters.deriveLcBreadcrumbs = (
-    breadcrumbs,
-    string,
-    currentPath,
-    pageTitle,
-  ) => {
+  liquid.filters.deriveLcBreadcrumbs = breadcrumbs => {
     // Remove any resources crumb - we don't want the drupal page title.
     const filteredCrumbs = breadcrumbs.filter(
       crumb => crumb.url.path !== '/resources',
     );
-    // Add the resources crumb with the correct crumb title.
-    filteredCrumbs.push({
-      url: { path: '/resources', routed: false },
-      text: 'Resources and support',
-    });
 
-    if (pageTitle) {
-      filteredCrumbs.push({
-        url: { path: currentPath, routed: true },
-        text: string,
+    const firstBreadcrumbIsHome =
+      breadcrumbs?.[0].text.toLowerCase() === 'home';
+
+    if (firstBreadcrumbIsHome) {
+      // Add the resources crumb with the correct crumb title after "home"
+      filteredCrumbs.splice(1, 0, {
+        url: { path: '/resources', routed: false },
+        text: 'Resources and support',
       });
     }
 

src/site/includes/breadcrumbs.drupal.liquid

@@ -6,7 +6,7 @@
   {% endif %}
 
   {% if constructLcBreadcrumbs == true %}
-    {% assign crumbs = entityUrl.breadcrumb | deriveLcBreadcrumbs: title, entityUrl.path, titleInclude %}
+    {% assign crumbs = entityUrl.breadcrumb | deriveLcBreadcrumbs %}
   {% endif %}
 
   {% assign crumbs = crumbs | formatForBreadcrumbs: title, entityUrl.path, hideHomeBreadcrumb, customHomeCrumbText  %}
@@ -15,6 +15,7 @@
 
   <script>
     const bcComponent = document.querySelector('va-breadcrumbs');
+
     if (bcComponent) {
       bcComponent.setAttribute('breadcrumb-list', {{ crumbs }});
     }

src/site/paragraphs/facilities/list_of_link_teasers_facility.drupal.liquid

@@ -45,8 +45,6 @@
           {% endif %}
 
           <va-link
-            disable-analytics
-            onclick="recordEvent({ event: 'nav-featured-content-link-click', 'featured-content-header': '{{ paragraph.fieldTitle }}', 'featured-content-click-label': '{{ link.title }}' });" 
             class="other-services-links vads-u-display--block{{ spacing }}"
             href="{{ link.url.path }}"
             text="{{ link.title }}"