From 2528a3586775a7122fc66b577964eadfbbad0fd2 Mon Sep 17 00:00:00 2001
From: Eli Selkin <5606931+eselkin@users.noreply.github.com>
Date: Wed, 11 Dec 2024 16:08:46 -0800
Subject: [PATCH] VACMS 19968 - remove CMS toggle usage for phone number
migration and use only new fields (#2380)
* remove CMS toggle usage and use only new fields
* checked with deleted old phone numbers
---
src/site/includes/facilityListing.drupal.liquid | 10 +---------
.../layouts/health_care_local_facility.drupal.liquid | 10 +---------
src/site/layouts/person_profile.drupal.liquid | 9 +--------
src/site/layouts/press_release.drupal.liquid | 4 +---
.../vamc_system_billing_insurance.drupal.liquid | 8 +-------
src/site/paragraphs/service_location.drupal.liquid | 6 +-----
src/site/paragraphs/staff_profile.drupal.liquid | 9 +--------
.../healthCareLocalFacility.node.graphql.js | 1 -
.../healthCareRegionStaffBios.node.graphql.js | 1 -
.../graphql/healthCareLocalFacilityPage.graphql.js | 1 -
.../drupal/graphql/leadershipListingPage.graphql.js | 1 -
.../staffProfile.paragraph.graphql.js | 1 -
.../build/drupal/graphql/pressReleasePage.graphql.js | 1 -
src/site/teasers/bio.drupal.liquid | 9 +--------
14 files changed, 8 insertions(+), 63 deletions(-)
diff --git a/src/site/includes/facilityListing.drupal.liquid b/src/site/includes/facilityListing.drupal.liquid
index b9ece62a1f..3aac73ba4a 100644
--- a/src/site/includes/facilityListing.drupal.liquid
+++ b/src/site/includes/facilityListing.drupal.liquid
@@ -42,7 +42,7 @@
VA health connect: {{ fieldVaHealthConnectPhone | processPhoneToVaTelephoneOrFallback : '', 'VA health connect' }}
{% endif %}
- {% if entity.fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+ {% if entity.fieldTelephone %}
{% include "src/site/components/phone-number-no-header.drupal.liquid" with
phoneNumber = entity.fieldTelephone.entity.fieldPhoneNumber
@@ -51,14 +51,6 @@
phoneLabel = entity.fieldTelephone.entity.fieldPhoneLabel | default: 'Mental health care'
%}
- {% elsif entity.fieldMentalHealthPhone and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-
- {% include "src/site/components/phone-number-no-header.drupal.liquid" with
- phoneNumber = entity.fieldMentalHealthPhone
- phoneLabel = 'Mental health care'
- phoneNumberType = "tel"
- %}
-
{% endif %}
diff --git a/src/site/layouts/health_care_local_facility.drupal.liquid b/src/site/layouts/health_care_local_facility.drupal.liquid
index 5420c0b036..5b9711fe02 100644
--- a/src/site/layouts/health_care_local_facility.drupal.liquid
+++ b/src/site/layouts/health_care_local_facility.drupal.liquid
@@ -118,7 +118,7 @@
{{ fieldRegionPage.entity.fieldVaHealthConnectPhone | processPhoneToVaTelephoneOrFallback : '', 'VA health connect' }}
{% endif %}
- {% if fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+ {% if fieldTelephone %}
{% include "src/site/components/phone-number-no-header.drupal.liquid" with
phoneNumber = fieldTelephone.entity.fieldPhoneNumber
@@ -127,14 +127,6 @@
phoneLabel = fieldTelephone.entity.fieldPhoneLabel | default: 'Mental health care'
%}
- {% elsif fieldMentalHealthPhone and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-
- {% include "src/site/components/phone-number-no-header.drupal.liquid" with
- phoneNumber = fieldMentalHealthPhone
- phoneLabel = 'Mental health care'
- phoneNumberType = 'tel'
- %}
-
{% endif %}
{% include 'src/site/includes/hours.liquid' with allHours = fieldOfficeHours headerType = 'clinical' %}
diff --git a/src/site/layouts/person_profile.drupal.liquid b/src/site/layouts/person_profile.drupal.liquid
index adf33d0a34..9615ae2e3a 100644
--- a/src/site/layouts/person_profile.drupal.liquid
+++ b/src/site/layouts/person_profile.drupal.liquid
@@ -60,7 +60,7 @@
vads-u-font-weight--regular">
Email:
{% endif %}
- {% if fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+ {% if fieldTelephone %}
- Phone: {{ fieldPhoneNumber | processPhoneToVaTelephoneOrFallback : '', '' }}
-
{% endif %}
diff --git a/src/site/layouts/press_release.drupal.liquid b/src/site/layouts/press_release.drupal.liquid
index ae3771e259..3d8e6e0db4 100644
--- a/src/site/layouts/press_release.drupal.liquid
+++ b/src/site/layouts/press_release.drupal.liquid
@@ -48,7 +48,7 @@
{% if c != empty %}
{{ c.title }}{% if c.fieldDescription != empty %}, {{ c.fieldDescription }} {% endif %}
- {% if c.fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+ {% if c.fieldTelephone %}
{% include "src/site/components/phone-number-no-header.drupal.liquid" with
phoneNumber = c.fieldTelephone.entity.fieldPhoneNumber
@@ -57,8 +57,6 @@
phoneLabel = c.fieldTelephone.entity.fieldPhoneLabel
%}
- {% elsif c.fieldPhoneNumber and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-
{{ c.fieldPhoneNumber }}
{% endif %}
{% if c.fieldEmailAddress != empty %}
{% endif %}
- {% if fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+ {% if fieldTelephone %}
{% include "src/site/components/phone-number.drupal.liquid" with
phoneHeaderLevel = 3
useParagraph = true
@@ -48,12 +48,6 @@
phoneType = fieldTelephone.entity.fieldPhoneNumberType
phoneLabel = fieldTelephone.entity.fieldPhoneLabel
%}
- {% elsif fieldPhoneNumber and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-
- Phone
-
- {{ fieldPhoneNumber | processPhoneToVaTelephoneOrFallback : '', '' }}
-
{% endif %}
{% include 'src/site/includes/hours.liquid' with allHours = fieldOfficeHours headerType = 'small' %}
diff --git a/src/site/paragraphs/service_location.drupal.liquid b/src/site/paragraphs/service_location.drupal.liquid
index 0f488c6881..eec636a44f 100644
--- a/src/site/paragraphs/service_location.drupal.liquid
+++ b/src/site/paragraphs/service_location.drupal.liquid
@@ -127,14 +127,10 @@
{% endcomment %}
{% assign shouldShowIntroText = single.fieldApptIntroTextType | shouldShowIntroText: single.fieldApptIntroTextCustom %}
- {% if isMentalHealthService and fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+ {% if isMentalHealthService and fieldTelephone %}
{% assign serviceLocationMainNumber = fieldTelephone.entity.fieldPhoneNumber %}
{% assign serviceLocationMainExt = fieldTelephone.entity.fieldPhoneExtension %}
{% assign serviceLocationMainPhoneType = fieldTelephone.entity.fieldPhoneNumberType %}
- {% elsif isMentalHealthService and fieldMentalHealthPhone and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
- {% assign serviceLocationMainNumber = fieldMentalHealthPhone %}
- {% assign serviceLocationMainExt = "" %}
- {% assign serviceLocationMainPhoneType = "tel" %}
{% elsif fieldPhoneNumber %}
{% assign serviceLocationMainNumber = fieldPhoneNumber %}
{% assign serviceLocationMainExt = "" %}
diff --git a/src/site/paragraphs/staff_profile.drupal.liquid b/src/site/paragraphs/staff_profile.drupal.liquid
index b4e9010db6..02be583136 100644
--- a/src/site/paragraphs/staff_profile.drupal.liquid
+++ b/src/site/paragraphs/staff_profile.drupal.liquid
@@ -47,7 +47,7 @@
{{ bio.fieldOffice.entity.entityLabel }}
{% endif %}
- {% if bio.fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+ {% if bio.fieldTelephone %}
- Phone: {{ bio.fieldPhoneNumber | processPhoneToVaTelephoneOrFallback : '', '' }}
-
{% endif %}
{% if bio.fieldEmailAddress %}
- {% elsif node.fieldPhoneNumber and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-
- Phone: {{ node.fieldPhoneNumber | processPhoneToVaTelephoneOrFallback : '', '' }}
-
{% endif %}
{% if node.fieldEmailAddress %}