Merge branch 'main' into cartographers/supply-reordering

department-of-veterans-affairs · Dec 3, 2024 · 78fe46c · 78fe46c
2 parents 2566570 + 25e1e72
commit 78fe46c
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 118 deletions.
diff --git a/.github/workflows/preview-environment-cleanup.yml b/.github/workflows/preview-environment-cleanup.yml
@@ -55,7 +55,7 @@ jobs:
         uses: EndBug/add-and-commit@1bad3abcf0d6ec49a5857d124b0bfb52dc7bb081 # 9.1.3
         with:
           author_name: va-vsp-bot
-          author_email: [email protected]
+          author_email: [email protected]
           branch: main
           cwd: manifests/apps/preview-environment/dev/
           add: 'pe-envs'
@@ -66,7 +66,7 @@ jobs:
         uses: EndBug/add-and-commit@1bad3abcf0d6ec49a5857d124b0bfb52dc7bb081 # 9.1.3
         with:
           author_name: va-vsp-bot
-          author_email: [email protected]
+          author_email: [email protected]
           branch: main
           cwd: manifests/apps/preview-environment/dev/
           add: 'argocd-apps'

diff --git a/src/applications/registry-schema.json b/src/applications/registry-schema.json
@@ -20,6 +20,9 @@
             "rootUrl": {
                 "type": "string"
             },
+            "useLocalStylesAndComponents": {
+                "type": "boolean"
+            },
             "template": {
                 "type": "object",
                 "properties": {

diff --git a/src/applications/registry.json b/src/applications/registry.json
@@ -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",
@@ -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,
@@ -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"
         }
       ]
     }
@@ -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",
@@ -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",
@@ -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"
+        ]
       }
     }
   },
@@ -1733,7 +1698,10 @@
       "minimalHeader": {
         "title": "Explore pattern demonstrations in our sample form",
         "subtitle": "Mock Form Minimal Header",
-        "excludePaths": ["/introduction", "/confirmation"]
+        "excludePaths": [
+          "/introduction",
+          "/confirmation"
+        ]
       }
     }
   },
@@ -1759,8 +1727,8 @@
   },
   {
     "appName": "Discover Your Benefits",
-    "entryName": "benefit-eligibility-questionnaire",
-    "rootUrl": "/benefit-eligibility-questionnaire",
+    "entryName": "discover-your-benefits",
+    "rootUrl": "/discover-your-benefits",
     "productId": "87f2c91f-46c3-4461-8890-3636130af4ab",
     "template": {
       "vagovprod": false,
@@ -1782,6 +1750,31 @@
     "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"
@@ -1796,5 +1789,17 @@
       "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
+    }
   }
 ]
diff --git a/src/site/assets/sass/style.scss b/src/site/assets/sass/style.scss
@@ -97,6 +97,77 @@
   }
 }
 
+//===== Playbook
+
+// ToDo: It appears that the page-playbook.html template that uses this class is no longer used, can we remove the template and the following classes?
+.va-nav-breadcrumbs--playbook {
+  background: none;
+  margin: 0 0 1em 0;
+  padding: 0;
+
+  h2 {
+    font-size: 1em;
+  }
+
+  li {
+    text-transform: none;
+    margin: 0.25em 0;
+    padding: 0.1em;
+    display: inline-block;
+    line-height: 1.15em;
+    vertical-align: middle;
+    font-size: 1.35em;
+
+    &:hover {
+      border-bottom: none;
+      text-decoration: none;
+    }
+  }
+
+  a {
+    border-bottom: 3px solid var(--vads-color-white);
+    text-decoration: none !important;
+    color: var(--vads-color-white);
+    &:hover {
+      text-decoration: none;
+      background: var(--color-link-default-hover);
+      border-bottom: 3px solid var(--vads-color-warning);
+    }
+  }
+}
+
+.va-nav-breadcrumbs--playbook {
+  .parent {
+    padding-top: 0.5em;
+    margin: 0 0 0.75em 0;
+
+    &:after {
+      content: " › ";
+      display: inline-block;
+      color: var(--vads-color-white);
+      padding: 0 0.5em;
+    }
+  }
+
+  .active {
+    background: var(--vads-color-warning);
+    color: var(--vads-color-black);
+    font: 400 1.35em / 1.15em var(--font-family-serif);
+    margin: 0.5em 0;
+    padding: 0.2em;
+
+    @media (min-width: 768px) {
+      font-size: 1.8em;
+    }
+
+    &:before {
+      content: "";
+      padding: 0;
+      margin: 0;
+    }
+  }
+}
+
 // START: Styles for mobile app promo banner
 .smartbanner {
   position: absolute;

diff --git a/src/site/facilities/facilities_health_services_buttons.drupal.liquid b/src/site/facilities/facilities_health_services_buttons.drupal.liquid
@@ -2,14 +2,23 @@
     This is used for Facility details pages and (A-Z) Health Services page
 {% endcomment %}
 <div data-template="facilities/facilities_health_services_buttons">
-    <div>
-        {% assign topTask = "make-an-appointment" | topTaskLovellComp: path, buildtype, fieldAdministration, fieldVamcEhrSystem, fieldRegionPage, fieldOffice %}
-        <a class="vads-c-action-link--blue" href="{{topTask.url}}">{{topTask.text}}</a>
-    </div>
-    <div class="vads-u-margin-y--2">
-        <a class="vads-c-action-link--blue" href="/{{ path }}/register-for-care">Register for care</a>
-    </div>
-    <div>
-        <a class="vads-c-action-link--blue" href="/{{ path }}/pharmacy">Pharmacy</a>
-    </div>
+  {% assign topTask = "make-an-appointment" | topTaskLovellComp: path, buildtype, fieldAdministration, fieldVamcEhrSystem, fieldRegionPage, fieldOffice %}
+  <va-link-action
+    class="vads-u-display--block"
+    href="{{topTask.url}}"
+    text="{{topTask.text}}"
+    type="secondary"
+  ></va-link-action>  
+  <va-link-action
+    class="vads-u-display--block"
+    href="/{{ path }}/register-for-care"
+    text="Register for care"
+    type="secondary"
+  ></va-link-action>   
+  <va-link-action
+    class="vads-u-display--block"
+    href="/{{ path }}/pharmacy"
+    text="Learn about pharmacy services"
+    type="secondary"
+  ></va-link-action>   
 </div>
diff --git a/src/site/includes/header.html b/src/site/includes/header.html
@@ -72,13 +72,7 @@
   <link rel="preload" href="/generated/fa-solid-900.woff2" as="font" type="font/woff2" crossorigin>
 
   <!-- CSS -->
-  {% comment %}
-    Apps that opt out of the site-wide stylesheet must include a smaller subset of styles
-    in their application bundle
-  {% endcomment %}
-  {% unless useLocalStylesAndComponents %}
-    <link rel="stylesheet" data-entry-name="style.css">
-  {% endunless %}
+  <link rel="stylesheet" data-entry-name="style.css">
   <link rel="stylesheet" data-entry-content="content-build.css">
   <link rel="stylesheet" data-entry-name="{{ entryname | default: 'static-pages' }}.css">