From ab6655e04dfffd217b242b81197b4d212e4fb52f Mon Sep 17 00:00:00 2001
From: Eli Selkin <5606931+eselkin@users.noreply.github.com>
Date: Tue, 3 Dec 2024 17:32:27 -0800
Subject: [PATCH] VACMS 19825 - Updated all operating status content-build
 templates (#2355)

* updated all operating status content-build templates
* operation_status_information.liquid was not used/imported
* slim alert if no fieldOperatingStatusMoreInfo
* margin and spacing
---
 .../operatingStatusFlagsLinks.drupal.liquid   | 24 ++++++++-
 .../operating_status_expandable_alert.liquid  | 31 ++++++++++--
 .../operation_status_information.liquid       | 19 -------
 .../vba_facilities/expandable_alert.liquid    | 50 +++++++++++++++----
 .../health_care_facility_status.drupal.liquid | 24 ++++++++-
 ...er_locations_operating_status.unit.spec.js |  4 +-
 ..._operating_status_and_alerts.drupal.liquid | 17 ++++++-
 src/site/layouts/vba_facility.drupal.liquid   |  6 +--
 8 files changed, 129 insertions(+), 46 deletions(-)
 delete mode 100644 src/site/includes/operation_status_information.liquid

diff --git a/src/site/includes/operatingStatusFlagsLinks.drupal.liquid b/src/site/includes/operatingStatusFlagsLinks.drupal.liquid
index 360c978ea6..08124f1fae 100644
--- a/src/site/includes/operatingStatusFlagsLinks.drupal.liquid
+++ b/src/site/includes/operatingStatusFlagsLinks.drupal.liquid
@@ -7,15 +7,35 @@
     />
   </va-alert>
 {% elsif fieldOperatingStatusFacility == 'limited' %}
-  <va-alert status="warning" slim visible>
+  <va-alert status="info" slim visible>
     <va-link
       class="vads-u-font-weight--bold operating-status-link"
       href="{{ facilitySidebar.links.0.url.path }}/operating-status"
       text="Limited services and hours"
     />
   </va-alert>
+{% elsif fieldOperatingStatusFacility == 'temporary_closure' %}
+    <va-alert status="warning" slim visible>
+      <va-link class="vads-u-font-weight--bold operating-status-link"
+        href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Temporary facility closure" />
+    </va-alert>
+{% elsif fieldOperatingStatusFacility == 'temporary_location' %}
+    <va-alert status="warning" slim visible>
+      <va-link class="vads-u-font-weight--bold operating-status-link"
+        href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Temporary location" />
+    </va-alert>
+{% elsif fieldOperatingStatusFacility == 'virtual_care' %}
+    <va-alert status="warning" slim visible>
+      <va-link class="vads-u-font-weight--bold operating-status-link"
+        href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Virtual care only" />
+    </va-alert>
+{% elsif fieldOperatingStatusFacility == 'coming_soon' %}
+    <va-alert status="warning" slim visible>
+      <va-link class="vads-u-font-weight--bold operating-status-link"
+        href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Coming soon" />
+    </va-alert>
 {% elsif fieldOperatingStatusFacility == 'closed' %}
-  <va-alert status="error" slim visible>
+  <va-alert status="warning" slim visible>
     <va-link
       class="vads-u-font-weight--bold operating-status-link"
       href="{{ facilitySidebar.links.0.url.path }}/operating-status"
diff --git a/src/site/includes/operating_status_expandable_alert.liquid b/src/site/includes/operating_status_expandable_alert.liquid
index 51bb4451af..83deb50a3f 100644
--- a/src/site/includes/operating_status_expandable_alert.liquid
+++ b/src/site/includes/operating_status_expandable_alert.liquid
@@ -6,14 +6,26 @@
   {% endif %}
   {% case fieldOperatingStatusFacility %}
   {% when 'limited' %}
-    {% assign status = "warning" %}
+    {% assign status = "info" %}
     {% assign trigger = "Limited services and hours" %}
   {% when 'closed' %}
-    {% assign status = "error" %}
+    {% assign status = "warning" %}
     {% assign trigger = "Facility Closed" %}
   {% when 'notice' %}
     {% assign status = "info" %}
     {% assign trigger = "Facility notice" %}
+  {% when 'temporary_closure' %}
+    {% assign status = "warning" %}
+    {% assign trigger = "Temporary facility closure" %}
+  {% when 'temporary_location' %}
+    {% assign status = "warning" %}
+    {% assign trigger = "Temporary location" %}
+  {% when 'virtual_care' %}
+    {% assign status = "warning" %}
+    {% assign trigger = "Virtual care only" %}
+  {% when 'coming_soon' %}
+    {% assign status = "warning" %}
+    {% assign trigger = "Coming soon" %}
   {% endcase %}
   {% if status and fieldOperatingStatusMoreInfo and fieldOperatingStatusMoreInfo != blank %}
     <div class="vads-u-margin-bottom--1">
@@ -25,8 +37,21 @@
         class="vads-u-margin-y--0 vamc-facility-expandable-alert"
         style="max-width: 303px;"
       >
-        <p>{{ fieldOperatingStatusMoreInfo | drupalToVaPath | phoneLinks | newline_to_br }}</p>
+          <p>{{ fieldOperatingStatusMoreInfo | drupalToVaPath | phoneLinks | newline_to_br }}</p>
       </va-alert-expandable>
     </div>
+  {% elsif status %}
+    <div class="vads-u-margin-bottom--1">
+      <va-alert
+        id="operating-status-nonexp-{{ operatingStatusId }}"
+        data-testid="operating-status-nonexp-{{ operatingStatusId }}"
+        status="{{ status }}"
+        class="vads-u-margin-y--0"
+        slim        
+        style="max-width: 303px;"
+      >
+        <p class="vads-u-margin-y--0 vads-u-padding-y--0 vads-u-font-weight--bold">{{ trigger }}</p>
+      </va-alert>
+    </div>
   {% endif %}
 {% endif %}
\ No newline at end of file
diff --git a/src/site/includes/operation_status_information.liquid b/src/site/includes/operation_status_information.liquid
deleted file mode 100644
index 922aa879a7..0000000000
--- a/src/site/includes/operation_status_information.liquid
+++ /dev/null
@@ -1,19 +0,0 @@
-{% if fieldOperatingStatusFacility == 'notice' %}
-    <span class="operating-status-flag operating-status-flag-notice operating-status usa-alert usa-alert-info background-color-only vads-u-margin-top--1 vads-u-padding-y--1 vads-u-padding-x--1p5">
-      <va-icon icon="info" size="3" class="os-icon"></va-icon>
-        Facility notice
-      <va-icon icon="chevron_right" size="3" class="os-chevron-right vads-u-padding-left--0p5"></va-icon>
-    </span>
-    {% elsif fieldOperatingStatusFacility == 'limited' %}
-    <span class="operating-status-flag operating-status-flag-warning operating-status usa-alert usa-alert-warning background-color-only vads-u-margin-top--1 vads-u-padding-y--1 vads-u-padding-x--1p5">
-      <va-icon icon="warning" size="3" class="os-icon"></va-icon>
-        Limited services and hours
-      <va-icon icon="chevron_right" size="3" class="os-chevron-right vads-u-padding-left--0p5"></va-icon>
-    </span>
-    {% elsif fieldOperatingStatusFacility == 'closed' %}
-    <span class="operating-status-flag operating-status-flag-error operating-status usa-alert usa-alert-error background-color-only vads-u-margin-top--1 vads-u-padding-y--1 vads-u-padding-x--1p5">
-      <va-icon icon="error" size="3" class="os-icon"></va-icon>
-        Facility Closed
-      <va-icon icon="chevron_right" size="3" class="os-chevron-right vads-u-padding-left--0p5"></va-icon>
-    </span>
-{% endif %}
\ No newline at end of file
diff --git a/src/site/includes/vba_facilities/expandable_alert.liquid b/src/site/includes/vba_facilities/expandable_alert.liquid
index a1b08beaa8..7bd364cec8 100644
--- a/src/site/includes/vba_facilities/expandable_alert.liquid
+++ b/src/site/includes/vba_facilities/expandable_alert.liquid
@@ -7,24 +7,52 @@
 {% elsif fieldOperatingStatusFacility == 'limited' %}
   {% assign showVBAExpandableAlert = true %}
   {% assign VBAExpandableAlertTrigger = 'Limited services and hours' %}
-  {% assign VBAExpandableAlertStatus = 'warning' %}
+  {% assign VBAExpandableAlertStatus = 'info' %}
 {% elsif fieldOperatingStatusFacility == 'closed' %}
   {% assign showVBAExpandableAlert = true %}
   {% assign VBAExpandableAlertTrigger = 'Facility Closed' %}
-  {% assign VBAExpandableAlertStatus = 'error' %}
+  {% assign VBAExpandableAlertStatus = 'warning' %}
+{% elsif fieldOperatingStatusFacility == 'temporary_closure' %}
+  {% assign showVBAExpandableAlert = true %}
+  {% assign VBAExpandableAlertTrigger = 'Temporary facility closure' %}
+  {% assign VBAExpandableAlertStatus = 'warning' %}
+{% elsif fieldOperatingStatusFacility == 'temporary_location' %}
+  {% assign showVBAExpandableAlert = true %}
+  {% assign VBAExpandableAlertTrigger = 'Temporary location' %}
+  {% assign VBAExpandableAlertStatus = 'warning' %}
+{% elsif fieldOperatingStatusFacility == 'virtual_care' %}
+  {% assign showVBAExpandableAlert = true %}
+  {% assign VBAExpandableAlertTrigger = 'Virtual care only' %}
+  {% assign VBAExpandableAlertStatus = 'warning' %}
+{% elsif fieldOperatingStatusFacility == 'coming_soon' %}
+  {% assign showVBAExpandableAlert = true %}
+  {% assign VBAExpandableAlertTrigger = 'Coming soon' %}
+  {% assign VBAExpandableAlertStatus = 'warning' %}
 {% endif %}
 
 {% if showVBAExpandableAlert %}
-  <va-alert-expandable
-    data-template="components/vba_facilities/expandable-alert.drupal.liquid"
-    class="vads-u-margin-top--0 vads-u-margin-bottom--0 vamc-facility-expandable-alert"
-    status="{{ VBAExpandableAlertStatus }}"
-    trigger="{{ VBAExpandableAlertTrigger }}"
-  >
-    <div>
+  <div class="vads-u-display--inline-block vads-u-margin-bottom--2">
+  {% if fieldOperatingStatusMoreInfo and fieldOperatingStatusMoreInfo != blank %}
+    <va-alert-expandable
+      trigger="{{ VBAExpandableAlertTrigger }}"
+      data-template="components/vba_facilities/expandable-alert.drupal.liquid"
+      class="vads-u-margin-top--0 vads-u-margin-bottom--0 vamc-facility-expandable-alert"
+      status="{{ VBAExpandableAlertStatus }}"        
+      style="max-width: 303px;"
+    > 
       <p>
         {{ fieldOperatingStatusMoreInfo | newline_to_br | phoneLinks }}
       </p>
-    </div>
-  </va-alert-expandable>
+    </va-alert-expandable>
+  {% else %}
+    <va-alert
+      slim
+      status="{{ VBAExpandableAlertStatus }}"
+      class="vads-u-margin-y--0"
+      style="max-width: 303px;"
+    >
+      <p class="vads-u-margin-y--0 vads-u-padding-y--0 vads-u-font-weight--bold">{{ VBAExpandableAlertTrigger }}</p>
+    </va-alert>
+  {% endif %}
+  </div>
 {% endif %}
diff --git a/src/site/layouts/health_care_facility_status.drupal.liquid b/src/site/layouts/health_care_facility_status.drupal.liquid
index 10a9bb45fe..76c0b53360 100644
--- a/src/site/layouts/health_care_facility_status.drupal.liquid
+++ b/src/site/layouts/health_care_facility_status.drupal.liquid
@@ -21,13 +21,33 @@
                             {% if office.fieldOperatingStatusFacility == 'normal' %}
                                     Normal services and hours
                             {% elsif office.fieldOperatingStatusFacility == 'limited' %}
-                                <va-alert slim="true" status="warning">
+                                <va-alert slim="true" status="info">
                                     Limited services and hours
                                 </va-alert>
                             {% elsif office.fieldOperatingStatusFacility == 'closed' %}
-                                <va-alert slim="true" status="error">
+                                <va-alert slim="true" status="warning">
                                     Facility closed
                                 </va-alert>
+                            {% elsif office.fieldOperatingStatusFacility == 'notice' %}
+                                <va-alert slim="true" status="info">
+                                    Facility notice
+                                </va-alert>
+                            {% elsif office.fieldOperatingStatusFacility == 'temporary_closure' %}
+                                <va-alert slim="true" status="warning">
+                                    Temporary facility closure
+                                </va-alert>
+                            {% elsif office.fieldOperatingStatusFacility == 'temporary_location' %}
+                                <va-alert slim="true" status="warning">
+                                    Temporary location
+                                </va-alert>
+                            {% elsif office.fieldOperatingStatusFacility == 'virtual_care' %}
+                                <va-alert slim="true" status="warning">
+                                    Virtual care only
+                                </va-alert>
+                            {% elsif office.fieldOperatingStatusFacility == 'coming_soon' %}
+                                <va-alert slim="true" status="warning">
+                                    Coming soon
+                                </va-alert>
                             {% endif %}
                         {% endfor %}
                     </section>
diff --git a/src/site/layouts/tests/vet_center/vet_center_locations_operating_status.unit.spec.js b/src/site/layouts/tests/vet_center/vet_center_locations_operating_status.unit.spec.js
index 77fe2e322c..b722bc9f86 100644
--- a/src/site/layouts/tests/vet_center/vet_center_locations_operating_status.unit.spec.js
+++ b/src/site/layouts/tests/vet_center/vet_center_locations_operating_status.unit.spec.js
@@ -51,9 +51,9 @@ describe('Vet Center Locations Operating Status', () => {
     );
     const operatingStatus = queryAllByTestId(
       rendered,
-      'operating-status-vc_5141OS',
+      'operating-status-nonexp-vc_5141OS',
     );
-    expect(operatingStatus).to.be.empty;
+    expect(operatingStatus).to.have.lengthOf(1);
   });
 
   it('should render a limited operating status when has status and more info', async () => {
diff --git a/src/site/layouts/vamc_operating_status_and_alerts.drupal.liquid b/src/site/layouts/vamc_operating_status_and_alerts.drupal.liquid
index 77b493f56b..f440c5e0bc 100644
--- a/src/site/layouts/vamc_operating_status_and_alerts.drupal.liquid
+++ b/src/site/layouts/vamc_operating_status_and_alerts.drupal.liquid
@@ -68,12 +68,25 @@
                         </span>
 
                       {% elsif status.entity.fieldOperatingStatusFacility == 'limited' %}
-                        <va-alert slim status="warning" visible>Limited services and hours</va-alert>
+                        <va-alert slim status="info" visible>Limited services and hours</va-alert>
 
                       {% elsif status.entity.fieldOperatingStatusFacility == 'closed' %}
-                        <va-alert slim status="error" visible>Facility Closed</va-alert>
+                        <va-alert slim status="warning" visible>Facility Closed</va-alert>
+                      
+                      {% elsif status.entity.fieldOperatingStatusFacility == 'temporary_closure' %}
+                        <va-alert slim status="warning" visible>Temporary facility closure</va-alert>
+
+                      {% elsif status.entity.fieldOperatingStatusFacility == 'temporary_location' %}
+                        <va-alert slim status="warning" visible>Temporary location</va-alert>
+
+                      {% elsif status.entity.fieldOperatingStatusFacility == 'virtual_care' %}
+                        <va-alert slim status="warning" visible>Virtual care only</va-alert>
+
+                      {% elsif status.entity.fieldOperatingStatusFacility == 'coming_soon' %}
+                        <va-alert slim status="warning" visible>Coming soon</va-alert>
                       {% endif %}
 
+
                       {% if status.entity.fieldOperatingStatusMoreInfo  and status.entity.fieldOperatingStatusFacility != 'normal' %}
                         <div class="vads-u-margin-top--1p5">
                           {{ status.entity.fieldOperatingStatusMoreInfo }}
diff --git a/src/site/layouts/vba_facility.drupal.liquid b/src/site/layouts/vba_facility.drupal.liquid
index 8bf957a9ae..9b7cfebf0a 100644
--- a/src/site/layouts/vba_facility.drupal.liquid
+++ b/src/site/layouts/vba_facility.drupal.liquid
@@ -43,11 +43,7 @@
               <div>
                 <div>
 
-                  {% if fieldOperatingStatusMoreInfo and fieldOperatingStatusFacility and fieldOperatingStatusFacility != 'normal' %}
-                    <div class="vads-u-display--inline-block vads-u-margin-bottom--1">
-                      {% include "src/site/includes/vba_facilities/expandable_alert.liquid" %}
-                    </div>
-                  {% endif %}
+                {% include "src/site/includes/vba_facilities/expandable_alert.liquid" %}
 
                   <section>
                     <script type="application/ld+json">