Merge branch 'main' into VACMS-19825-operating-status-update

department-of-veterans-affairs · Nov 27, 2024 · 936ae31 · 936ae31
2 parents d5fb78a + 7d62eb6
commit 936ae31
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 79 deletions.
diff --git a/src/applications/registry.json b/src/applications/registry.json
@@ -411,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,
@@ -429,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"
         }
       ]
     }
@@ -1739,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,

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/layouts/campaign_landing_page.drupal.liquid b/src/site/layouts/campaign_landing_page.drupal.liquid
@@ -529,26 +529,26 @@
     <!--/  FAQs -->
 
     <!-- Connect with us -->
-    {% if fieldRelatedOffice.entity.fieldExternalLink.title %}
-      {% assign socialLinksObject = fieldRelatedOffice.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
+    {% if fieldConnectWithUs.entity.fieldExternalLink.title %}
+      {% assign socialLinksObject = fieldConnectWithUs.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
       <div class="vads-l-grid-container vads-u-padding-y--3 vads-u-padding-x--4 desktop-lg:vads-u-padding-x--0">
         <div class="vads-l-row">
           <!-- CONTENT -->
           <div class="vads-l-col--12 medium-screen:vads-l-col--9">
             <!-- Title -->
             <p class="va-u-text-transform--uppercase vads-u-color--gray-medium vads-u-font-size--sm vads-u-margin-bottom--0">Connect with us</p>
-            <h2 class="vads-u-margin-top--0">Get updates from {{ fieldRelatedOffice.entity.fieldExternalLink.title }}</h2>
+            <h2 class="vads-u-margin-top--0">Get updates from {{ fieldConnectWithUs.entity.fieldExternalLink.title }}</h2>
           </div>
         </div>
 
         <div class="vads-l-row medium-screen:vads-u-margin-x--neg1">
-          {% if fieldRelatedOffice.entity.fieldEmailUpdatesLink.url.path and fieldRelatedOffice.entity.fieldEmailUpdatesLink.title %}
+          {% if fieldConnectWithUs.entity.fieldEmailUpdatesLink.url.path and fieldConnectWithUs.entity.fieldEmailUpdatesLink.title %}
             <div class="vads-l-col--12 medium-screen:vads-l-col--4">
               <div class="vads-u-margin-y--1 medium-screen:vads-u-margin-x--1">
                 <va-icon icon="mail" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
                 <va-link
-                  href="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.url.path }}"
-                  text="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.title }}"
+                  href="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.url.path }}"
+                  text="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.title }}"
                 />
               </div>
             </div>
@@ -560,7 +560,7 @@
                 <va-icon icon="x" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
                 <va-link
                   href="https://twitter.com/{{ socialLinksObject.twitter.value }}"
-                  text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} X (formerly Twitter)"
+                  text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} X (formerly Twitter)"
                 />
               </div>
             </div>
@@ -572,7 +572,7 @@
                 <va-icon icon="facebook" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
                 <va-link
                   href="https://facebook.com/{{ socialLinksObject.facebook.value }}"
-                  text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} Facebook"
+                  text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} Facebook"
                 />
               </div>
             </div>
@@ -584,7 +584,7 @@
                 <va-icon icon="youtube" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
                 <va-link
                   href="https://youtube.com/{{ socialLinksObject.youtube.value }}"
-                  text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} YouTube"
+                  text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} YouTube"
                 />
               </div>
             </div>
@@ -596,7 +596,7 @@
                 <va-icon icon="linkedin" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
                 <va-link
                   href="https://linkedin.com/{{ socialLinksObject.linkedin.value }}"
-                  text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} LinkedIn"
+                  text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} LinkedIn"
                 />
               </div>
             </div>
@@ -608,7 +608,7 @@
                 <va-icon icon="instagram" size="3" class="vads-u-color--link-default vads-u-padding-right--1"></va-icon>
                 <va-link
                   href="https://instagram.com/{{ socialLinksObject.instagram.value }}"
-                  text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} Instagram"
+                  text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} Instagram"
                 />
               </div>
             </div>

diff --git a/src/site/layouts/landing_page.drupal.liquid b/src/site/layouts/landing_page.drupal.liquid
@@ -140,20 +140,20 @@
           {% endif %}
 
         <!-- Connect with us -->
-        {% if fieldRelatedOffice != empty and fieldRelatedOffice.entity.fieldExternalLink.title != "Records benefits hub" %}
+        {% if fieldConnectWithUs != empty and fieldConnectWithUs.entity.fieldExternalLink.title != "Records benefits hub" %}
             <va-accordion-item
               class="va-accordion-item"
               level="2"
               header="Connect with us"
               bordered
               uswds
               open="true"
-              id="{{ fieldRelatedOffice.entity.fieldExternalLink.title | hashReference: 60 }}">
-              {% if fieldRelatedOffice.entity.fieldExternalLink.url.path != empty %}
+              id="{{ fieldConnectWithUs.entity.fieldExternalLink.title | hashReference: 60 }}">
+              {% if fieldConnectWithUs.entity.fieldExternalLink.url.path != empty %}
                 <h3 class="va-nav-linkslist-list vads-u-font-size--h4">
                   <va-link
-                    href="{{ fieldRelatedOffice.entity.fieldExternalLink.url.path }}"
-                    text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }}"
+                    href="{{ fieldConnectWithUs.entity.fieldExternalLink.url.path }}"
+                    text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }}"
                   />
                 </h3>
               {% endif %}
@@ -163,16 +163,16 @@
                   <p>
                     <va-icon icon="mail" size="3" class="vads-u-color--link-default vads-u-padding-right--0p5"></va-icon>
                     <va-link
-                      href="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.url.path }}"
-                      text="{{ fieldRelatedOffice.entity.fieldEmailUpdatesLink.title }}"
+                      href="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.url.path }}"
+                      text="{{ fieldConnectWithUs.entity.fieldEmailUpdatesLink.title }}"
                     />
                   </p>
               </section>
 
               <section>
                 <h3 class="vads-u-font-size--h4">Follow us</h3>
                 <ul class="va-nav-linkslist-list social">
-                  {% assign socialLinks =  fieldRelatedOffice.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
+                  {% assign socialLinks =  fieldConnectWithUs.entity.fieldSocialMediaLinks.platformValues | jsonToObj %}
                   {% assign socialPlatforms = socialLinks | keys %}
 
                   {% for socialPlatform in socialPlatforms %}
@@ -193,7 +193,7 @@
                           class="vads-u-color--link-default vads-u-padding-right--0p5"></va-icon>
                         <va-link
                           href="http://{{ socialPlatform }}.com/{{ socialLink.value }}"
-                          text="{{ fieldRelatedOffice.entity.fieldExternalLink.title }} {{ platform | formatSocialPlatform }}"
+                          text="{{ fieldConnectWithUs.entity.fieldExternalLink.title }} {{ platform | formatSocialPlatform }}"
                         >
                         </va-link>
                       </li>
@@ -219,4 +219,4 @@
 {% endif %}
 
 {% include "src/site/includes/footer.html" %}
-{% include "src/site/includes/debug.drupal.liquid" %}
+{% include "src/site/includes/debug.drupal.liquid" %}
diff --git a/src/site/stages/build/drupal/graphql/landingPage.graphql.js b/src/site/stages/build/drupal/graphql/landingPage.graphql.js
@@ -58,9 +58,9 @@ const landingPageFragment = `
       date
     }
     fieldTeaserText
-    fieldRelatedOffice {
+    fieldConnectWithUs {
       entity {
-        ... on NodeOffice {
+        ... on BlockContentConnectWithUs {
           fieldExternalLink {
             url {
               path

diff --git a/src/site/stages/build/drupal/graphql/nodeCampaignLandingPage.graphql.js b/src/site/stages/build/drupal/graphql/nodeCampaignLandingPage.graphql.js
@@ -323,9 +323,9 @@ const nodeCampaignLandingPage = `
         ... button
       }
     }
-    fieldRelatedOffice {
+    fieldConnectWithUs {
       entity {
-        ... on NodeOffice {
+        ... on BlockContentConnectWithUs {
           fieldExternalLink {
             url {
               path

diff --git a/src/site/tests/cypress/vamc-lovell.cypress.spec.js b/src/site/tests/cypress/vamc-lovell.cypress.spec.js
@@ -1,89 +1,101 @@
 import { expect } from 'chai';
 
+const verifyActionLink = (expectedText, expectedHref) =>
+  cy
+    .get('va-link-action')
+    .eq(0)
+    .shadow()
+    .find('a')
+    .should('be.visible')
+    .should('have.text', expectedText)
+    .should('have.attr', 'href')
+    .and('include', expectedHref);
+
 describe('VAMC Lovell - All TRICARE pages with expected MHS Genesis Patient Portal Top Task have it', () => {
   it('TRICARE system has MHS Genesis Patient Portal link', () => {
     cy.visit('/lovell-federal-health-care-tricare/');
     cy.injectAxeThenAxeCheck();
+
     cy.findByText('MHS Genesis Patient Portal').then(el => {
       const attr = el.attr('href');
       expect(attr).to.equal('https://my.mhsgenesis.health.mil/');
     });
-    // https://www.va.gov/lovell-federal-health-care-tricare/
   });
 
   it('TRICARE Health services has MHS Genesis Patient Portal link', () => {
     cy.visit('/lovell-federal-health-care-tricare/health-services');
     cy.injectAxeThenAxeCheck();
-    cy.findByText('MHS Genesis Patient Portal').then(el => {
-      const attr = el.attr('href');
-      expect(attr).to.equal('https://my.mhsgenesis.health.mil/');
-    });
-    // https://www.va.gov/lovell-federal-health-care-tricare/health-services/
+
+    verifyActionLink(
+      'MHS Genesis Patient Portal',
+      'https://my.mhsgenesis.health.mil/',
+    );
   });
 
   it('TRICARE Locations has MHS Genesis Patient Portal link', () => {
     cy.visit('/lovell-federal-health-care-tricare/locations');
     cy.injectAxeThenAxeCheck();
+
     cy.findByText('MHS Genesis Patient Portal').then(el => {
       const attr = el.attr('href');
       expect(attr).to.equal('https://my.mhsgenesis.health.mil/');
     });
-    // https://www.va.gov/lovell-federal-health-care-tricare/locations/
   });
 
   it('TRICARE Captain James A. Lovell Location has MHS Genesis Patient Portal link', () => {
     cy.visit(
       '/lovell-federal-health-care-tricare/locations/captain-james-a-lovell-federal-health-care-center/',
     );
     cy.injectAxeThenAxeCheck();
-    cy.findByText('MHS Genesis Patient Portal').then(el => {
-      const attr = el.attr('href');
-      expect(attr).to.equal('https://my.mhsgenesis.health.mil/');
-    });
-    // https://www.va.gov/lovell-federal-health-care-tricare/locations/captain-james-a-lovell-federal-health-care-center/
+
+    verifyActionLink(
+      'MHS Genesis Patient Portal',
+      'https://my.mhsgenesis.health.mil/',
+    );
   });
 });
 
 describe('VAMC Lovell - All VA pages with expected Make an appointment Top Task have it', () => {
   it('VA system has Make an appointment link', () => {
     cy.visit('/lovell-federal-health-care-va/');
     cy.injectAxeThenAxeCheck();
+
     cy.findByText('Make an appointment').then(el => {
       const attr = el.attr('href');
       expect(attr.endsWith('make-an-appointment')).to.be.true;
     });
-    // https://www.va.gov/lovell-federal-health-care-va/
   });
 
   it('VA Health services has Make an appointment link', () => {
     cy.visit('/lovell-federal-health-care-va/health-services/');
     cy.injectAxeThenAxeCheck();
-    cy.findByText('Make an appointment').then(el => {
-      const attr = el.attr('href');
-      expect(attr.endsWith('make-an-appointment')).to.be.true;
-    });
-    // https://www.va.gov/lovell-federal-health-care-va/health-services/
+
+    verifyActionLink(
+      'Make an appointment',
+      '/lovell-federal-health-care-va/make-an-appointment',
+    );
   });
 
   it('VA Locations has Make an appointment link', () => {
     cy.visit('/lovell-federal-health-care-va/locations/');
     cy.injectAxeThenAxeCheck();
+
     cy.findByText('Make an appointment').then(el => {
       const attr = el.attr('href');
       expect(attr.endsWith('make-an-appointment')).to.be.true;
     });
-    // https://www.va.gov/lovell-federal-health-care-va/locations/
   });
+
   it('VA Captain James A. Lovell Location has Make an appointment link', () => {
     cy.visit(
       '/lovell-federal-health-care-va/locations/captain-james-a-lovell-federal-health-care-center/',
     );
     cy.injectAxeThenAxeCheck();
-    cy.findByText('Make an appointment').then(el => {
-      const attr = el.attr('href');
-      expect(attr.endsWith('make-an-appointment')).to.be.true;
-    });
-    // https://www.va.gov/lovell-federal-health-care-va/locations/captain-james-a-lovell-federal-health-care-center/
+
+    verifyActionLink(
+      'Make an appointment',
+      '/lovell-federal-health-care-va/make-an-appointment',
+    );
   });
 });