From 7ecd2ec9d657134c302feec9636ccfa03d0d3fd9 Mon Sep 17 00:00:00 2001 From: Adrian Rollett Date: Wed, 28 Jun 2023 09:30:19 -0600 Subject: [PATCH 01/71] Update registry.json (#1620) --- src/applications/registry.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/applications/registry.json b/src/applications/registry.json index 39c84b1b82..26bd6e2d0f 100644 --- a/src/applications/registry.json +++ b/src/applications/registry.json @@ -1459,5 +1459,15 @@ "vagovprod": false, "layout": "page-react.html" } + }, + { + "appName": "After Visit Summary", + "entryName": "avs", + "rootUrl": "/my-health/medical-records/care-notes/avs", + "productId": "e5bd4cff-77b1-4d56-ab8e-a66c9c2667ab", + "template": { + "vagovprod": false, + "layout": "page-react.html" + } } ] From 49d66fc7ea18651644a4ca3deeaa9f354303762c Mon Sep 17 00:00:00 2001 From: Ryan Koch <6863534+ryguyk@users.noreply.github.com> Date: Fri, 30 Jun 2023 08:59:56 -0500 Subject: [PATCH 02/71] VACMS-13705: Fixes phone number bugs on health services (#1625) * Changes phone-number.drupal.liquid: - Uses component - Simplifies API to explicitly require properties rather than an object containing them. This allows this component to be used more flexibly for cases when data is not part of an object. * Updates phone.drupal.liquid to use new API on phone-number.drupal.liquid. * Updates health_care_local_health_service.drupal.liquid: - Uses phone-number.drupal.liquid rather than calling directly. - Respects fieldPhoneLabel if it's present. * Displays facility phone number when fieldUseMainFacilityPhone is true. * Use 'Main Phone' as label when facility phone number is used. --- .../components/phone-number.drupal.liquid | 18 +++++-------- src/site/components/phone.drupal.liquid | 20 ++++++++------ ...th_care_local_health_service.drupal.liquid | 26 +++++++++---------- .../paragraphs/service_location.drupal.liquid | 15 ++++++++++- 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/src/site/components/phone-number.drupal.liquid b/src/site/components/phone-number.drupal.liquid index 3ffcb9c30b..63a294f045 100644 --- a/src/site/components/phone-number.drupal.liquid +++ b/src/site/components/phone-number.drupal.liquid @@ -1,11 +1,7 @@ -{% if number.fieldPhoneLabel != empty %} - {% assign phoneLabel = number.fieldPhoneLabel %} -{% endif %} -{% if phoneLabel == empty %} - {% assign phoneLabel = 'Phone' %} -{% endif %} -{{ phoneLabel }} - - {{ number.fieldPhoneNumber }}{% if number.fieldPhoneExtension %}x {{ number.fieldPhoneExtension }}{% endif %} - +{{ phoneLabel | default: 'Phone' }} +
+ +
diff --git a/src/site/components/phone.drupal.liquid b/src/site/components/phone.drupal.liquid index 61bfb2bee4..4f2466632b 100644 --- a/src/site/components/phone.drupal.liquid +++ b/src/site/components/phone.drupal.liquid @@ -4,8 +4,9 @@ {% if phoneNumberObj.tel %} {% for number in phoneNumberObj.tel %} {% include "src/site/components/phone-number.drupal.liquid" with - number = number - phoneLabel = 'Phone' + phoneNumber = number.fieldPhoneNumber + phoneExtension = number.fieldPhoneExtension + phoneLabel = number.fieldPhoneLabel | default: 'Phone' phoneHeaderLevel = phoneHeaderLevel %} {% endfor %} @@ -14,8 +15,9 @@ {% if phoneNumberObj.fax %} {% for number in phoneNumberObj.fax %} {% include "src/site/components/phone-number.drupal.liquid" with - number = number - phoneLabel = 'Fax' + phoneNumber = number.fieldPhoneNumber + phoneExtension = number.fieldPhoneExtension + phoneLabel = number.fieldPhoneLabel | default: 'Fax' phoneHeaderLevel = phoneHeaderLevel %} {% endfor %} @@ -24,8 +26,9 @@ {% if phoneNumberObj.sms %} {% for number in phoneNumberObj.sms %} {% include "src/site/components/phone-number.drupal.liquid" with - number = number - phoneLabel = 'SMS' + phoneNumber = number.fieldPhoneNumber + phoneExtension = number.fieldPhoneExtension + phoneLabel = number.fieldPhoneLabel | default: 'SMS' phoneHeaderLevel = phoneHeaderLevel %} {% endfor %} @@ -34,8 +37,9 @@ {% if phoneNumberObj.tty %} {% for number in phoneNumberObj.tty %} {% include "src/site/components/phone-number.drupal.liquid" with - number = number - phoneLabel = 'TTY' + phoneNumber = number.fieldPhoneNumber + phoneExtension = number.fieldPhoneExtension + phoneLabel = number.fieldPhoneLabel | default: 'TTY' phoneHeaderLevel = phoneHeaderLevel %} {% endfor %} diff --git a/src/site/facilities/health_care_local_health_service.drupal.liquid b/src/site/facilities/health_care_local_health_service.drupal.liquid index 0c87b2dcb8..27fce6f994 100644 --- a/src/site/facilities/health_care_local_health_service.drupal.liquid +++ b/src/site/facilities/health_care_local_health_service.drupal.liquid @@ -37,22 +37,22 @@ {% endcomment %} {% if locationEntity.fieldPhoneNumbersParagraph.length > 0 %}
-
Phone
- {% if locationEntity.fieldPhoneNumbersParagraph %} - {% for number in locationEntity.fieldPhoneNumbersParagraph %} - - {% endfor %} - {% endif %} + {% for number in locationEntity.fieldPhoneNumbersParagraph %} + {% include "src/site/components/phone-number.drupal.liquid" with + phoneNumber = number.entity.fieldPhoneNumber + phoneExtension = number.entity.fieldPhoneExtension + phoneLabel = number.entity.fieldPhoneLabel + phoneHeaderLevel = 5 + %} + {% endfor %}
{% else %}
-
Phone
- + {% include "src/site/components/phone-number.drupal.liquid" with + phoneNumber = fieldPhoneNumber + phoneLabel = 'Main Phone' + phoneHeaderLevel = 5 + %}
{% endif %} diff --git a/src/site/paragraphs/service_location.drupal.liquid b/src/site/paragraphs/service_location.drupal.liquid index 20ae044aa1..b83dace3b2 100644 --- a/src/site/paragraphs/service_location.drupal.liquid +++ b/src/site/paragraphs/service_location.drupal.liquid @@ -25,11 +25,24 @@ {% endif %} {% endcase %} - {% if single.fieldAdditionalHoursInfo %} {{ single.fieldAdditionalHoursInfo }} {% endif %} +{% comment %} + Conditionally display facility phone number +{% endcomment %} +{% if single.fieldUseMainFacilityPhone %} + {% include "src/site/components/phone-number.drupal.liquid" with + phoneNumber = fieldPhoneNumber + phoneLabel = 'Main Phone' + phoneHeaderLevel = serviceLocationSubHeaderLevel + %} +{% endif %} + +{% comment %} + Display each additional phone number provided +{% endcomment %} {% include "src/site/components/phone.drupal.liquid" with numbers = single.fieldPhone phoneHeaderLevel = serviceLocationSubHeaderLevel From 5148cceaa18b3c628d8ef5a7ab58ab71b59ddf42 Mon Sep 17 00:00:00 2001 From: Max Antonucci Date: Wed, 5 Jul 2023 09:54:10 -0400 Subject: [PATCH 03/71] [VA-12997] Avoid Staff Profile field office choice breaking the build (#1616) * VA-12997: avoid page menu build for non-health care pages * Revert "VA-12997: avoid page menu build for non-health care pages" This reverts commit efce8c45aa2016114c484e1d84c83f00beca6466. * VACMS-12997: Skips search for facility sidebar on person_profile pages. --------- Co-authored-by: Ryan Koch --- src/site/stages/build/drupal/page.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/site/stages/build/drupal/page.js b/src/site/stages/build/drupal/page.js index 708173a717..55148dd366 100644 --- a/src/site/stages/build/drupal/page.js +++ b/src/site/stages/build/drupal/page.js @@ -202,6 +202,18 @@ function getHubSidebar(navsArray, owner) { // used to find the correct sidebar menu if the page belongs to a health care region function getFacilitySidebar(page, contentData) { + const defaultEmptySidebar = { links: [] }; + + // skip this processing for person_profile pages: + // 1. person_profile pages can have fieldOffice values like 'VHA', + // which will never have a matching sidebar and will break the build + // 2. person_profile pages do not display a real sidebar anyway, + // so no need to do this processing + const personProfilePage = page?.entityBundle === 'person_profile'; + if (personProfilePage) { + return defaultEmptySidebar; + } + // for pages like New Releases, Stories, Events, and Detail Pages const facilityPage = page.fieldOffice && @@ -270,7 +282,7 @@ function getFacilitySidebar(page, contentData) { } // return the default and most important of the menu structure - return { links: [] }; + return defaultEmptySidebar; } function mergeTaxonomiesIntoResourcesAndSupportHomepage( From 2bfef46a1687a472a242b572f3506a4fff9fb61f Mon Sep 17 00:00:00 2001 From: Max Antonucci Date: Wed, 5 Jul 2023 09:54:26 -0400 Subject: [PATCH 04/71] VA-11848: Open facility social links in same tab (#1608) * VA-11848: Open facility social links in same tab * VACMS-11848 revert data-same-tab, keep target=_blank removed --------- Co-authored-by: Jill Adams --- .../facilities/facility_social_links.drupal.liquid | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/site/facilities/facility_social_links.drupal.liquid b/src/site/facilities/facility_social_links.drupal.liquid index fb51205f3c..86c07cce99 100644 --- a/src/site/facilities/facility_social_links.drupal.liquid +++ b/src/site/facilities/facility_social_links.drupal.liquid @@ -7,7 +7,7 @@ {% if fieldGovdeliveryIdNews != empty %}