VACMS 19968 - remove CMS toggle usage for phone number migration and use only new fields (#2380)

eselkin · web-flow · commit 2528a3586775 · 2024-12-11T16:08:46.000-08:00
* remove CMS toggle usage and use only new fields
* checked with deleted old phone numbers
diff --git a/src/site/includes/facilityListing.drupal.liquid b/src/site/includes/facilityListing.drupal.liquid
@@ -42,7 +42,7 @@
            <strong>VA health connect:</strong> {{ fieldVaHealthConnectPhone | processPhoneToVaTelephoneOrFallback : '',  'VA health connect' }}
          </div>
       {% endif %}
-      {% if entity.fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+      {% if entity.fieldTelephone %}
         <div>
           {% 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'
           %}
         </div>
-      {% elsif entity.fieldMentalHealthPhone and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-        <div>
-          {% include "src/site/components/phone-number-no-header.drupal.liquid" with
-            phoneNumber = entity.fieldMentalHealthPhone
-            phoneLabel = 'Mental health care'
-            phoneNumberType = "tel"
-          %}
-        </div>
       {% endif %}
     </div>
   </section>
diff --git a/src/site/layouts/health_care_local_facility.drupal.liquid b/src/site/layouts/health_care_local_facility.drupal.liquid
@@ -118,7 +118,7 @@
                           </strong> {{ fieldRegionPage.entity.fieldVaHealthConnectPhone | processPhoneToVaTelephoneOrFallback :  '', 'VA health connect' }}
                         </div>
                       {% endif %}
-                      {% if fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+                      {% if fieldTelephone %}
                         <div>
                           {% 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'
                           %}
                         </div>
-                      {% elsif fieldMentalHealthPhone and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-                        <div>
-                          {% include "src/site/components/phone-number-no-header.drupal.liquid" with
-                            phoneNumber = fieldMentalHealthPhone
-                            phoneLabel = 'Mental health care'
-                            phoneNumberType = 'tel'
-                          %}
-                        </div>
                       {% endif %}
                     </div>
                     {% 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
@@ -60,7 +60,7 @@
                             vads-u-font-weight--regular">
                                 <span class="vads-u-font-weight--bold">Email:</span> <va-link type="email" href="mailto:{{ fieldEmailAddress }}" text="{{ fieldEmailAddress }}"></va-link></p>
                             {% endif %}
-                            {% if fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+                            {% if fieldTelephone %}
                                 <p class="
                                 vads-u-margin--0
                                 vads-u-margin-bottom--0p5
@@ -72,13 +72,6 @@
                                     phoneLabel = fieldTelephone.entity.fieldPhoneLabel
                                 %}
                                 </p>
-                            {% elsif fieldPhoneNumber and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-                            <p class="
-                            vads-u-font-weight--regular
-                            vads-u-margin--0
-                            vads-u-margin-bottom--0p5">
-                                <span class="vads-u-font-weight--bold">Phone:</span> {{ fieldPhoneNumber | processPhoneToVaTelephoneOrFallback :  '', '' }}
-                            </p>
                             {% endif %}
                         </div>
                     </div>
diff --git a/src/site/layouts/press_release.drupal.liquid b/src/site/layouts/press_release.drupal.liquid
@@ -48,7 +48,7 @@
                                 {% if c != empty %}
                                     <div>
                                         <p class="vads-u-margin-top--1 vads-u-margin-bottom--0">{{ c.title }}{% if c.fieldDescription != empty %}, {{ c.fieldDescription }} {% endif %}</p>
-                                        {% if c.fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+                                        {% if c.fieldTelephone %}
                                             <p class="vads-u-margin-top--1 vads-u-margin-bottom--0">
                                                 {% 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
                                                 %}
                                             </p>
-                                        {% elsif c.fieldPhoneNumber and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-                                            <p class="vads-u-margin-top--1 vads-u-margin-bottom--0">{{ c.fieldPhoneNumber }}</p>
                                         {% endif %}
                                         {% if c.fieldEmailAddress != empty %}
                                             <p class="vads-u-margin-top--1 vads-u-margin-bottom--0"><va-link
diff --git a/src/site/layouts/vamc_system_billing_insurance.drupal.liquid b/src/site/layouts/vamc_system_billing_insurance.drupal.liquid
@@ -39,7 +39,7 @@
                 immunizations.
               </p>
             {% 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 %}
-              <h3>
-                Phone
-              </h3>
-              <p>{{ fieldPhoneNumber | processPhoneToVaTelephoneOrFallback :  '', '' }}
-              </p>
             {% endif %}
             <div class="vads-u-margin-bottom--3">
               {% 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
@@ -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
@@ -47,7 +47,7 @@
           {{ bio.fieldOffice.entity.entityLabel }}
         </p>
       {% endif %}
-      {% if bio.fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+      {% if bio.fieldTelephone %}
         <p class="
         vads-u-font-weight--normal
         vads-u-margin--0
@@ -59,13 +59,6 @@
             phoneLabel = bio.fieldTelephone.entity.fieldPhoneLabel
         %}
         </p>
-      {% elsif bio.fieldPhoneNumber and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-        <p class="
-        vads-u-font-weight--normal
-        vads-u-margin--0
-        vads-u-margin-bottom--1">
-          <strong>Phone:</strong> {{ bio.fieldPhoneNumber | processPhoneToVaTelephoneOrFallback :  '', '' }}
-        </p>
       {% endif %}
       {% if bio.fieldEmailAddress %}
         <p class="
diff --git a/src/site/stages/build/drupal/graphql/facilities-fragments/healthCareLocalFacility.node.graphql.js b/src/site/stages/build/drupal/graphql/facilities-fragments/healthCareLocalFacility.node.graphql.js
@@ -57,7 +57,6 @@ const FACILITIES_RESULTS = `
       postalCode
     }
     fieldPhoneNumber
-    fieldMentalHealthPhone
     ${mhTelephonePara}
     fieldOfficeHours {
       day
diff --git a/src/site/stages/build/drupal/graphql/facilities-fragments/healthCareRegionStaffBios.node.graphql.js b/src/site/stages/build/drupal/graphql/facilities-fragments/healthCareRegionStaffBios.node.graphql.js
@@ -12,7 +12,6 @@ const PERSON_PROFILE_RESULTS = `
       fieldLastName
       fieldSuffix
       fieldEmailAddress
-      fieldPhoneNumber
       ${personTelephoneParagraphGraphql}
       fieldDescription
       fieldOffice {
diff --git a/src/site/stages/build/drupal/graphql/healthCareLocalFacilityPage.graphql.js b/src/site/stages/build/drupal/graphql/healthCareLocalFacilityPage.graphql.js
@@ -58,7 +58,6 @@ const healthCareLocalFacilityPageFragment = `
       lon
     }
     fieldPhoneNumber
-    fieldMentalHealthPhone
     ${mhTelephonePara}
     fieldOfficeHours {
       day
diff --git a/src/site/stages/build/drupal/graphql/leadershipListingPage.graphql.js b/src/site/stages/build/drupal/graphql/leadershipListingPage.graphql.js
@@ -18,7 +18,6 @@ const leadershipListingPage = `
       entity {
         ... on NodePersonProfile {
           title
-          fieldPhoneNumber
           ${personTelephoneParagraphGraphql}
           entityPublished
           fieldNameFirst
diff --git a/src/site/stages/build/drupal/graphql/paragraph-fragments/staffProfile.paragraph.graphql.js b/src/site/stages/build/drupal/graphql/paragraph-fragments/staffProfile.paragraph.graphql.js
@@ -18,7 +18,6 @@ module.exports = `
         fieldSuffix
         fieldDescription
         fieldEmailAddress
-        fieldPhoneNumber
         ${personTelephoneParagraphGraphql}
         fieldCompleteBiographyCreate
         fieldIntroText
diff --git a/src/site/stages/build/drupal/graphql/pressReleasePage.graphql.js b/src/site/stages/build/drupal/graphql/pressReleasePage.graphql.js
@@ -37,7 +37,6 @@ const pressReleaseFragment = `
         ...on NodePersonProfile {
           title
           fieldDescription
-          fieldPhoneNumber
           ${personTelephoneParagraphGraphql}
           fieldEmailAddress
         }
diff --git a/src/site/teasers/bio.drupal.liquid b/src/site/teasers/bio.drupal.liquid
@@ -86,7 +86,7 @@ Example data:
             {{ node.fieldOffice.entity.entityLabel }}
         </p>
         {% endif %}
-        {% if node.fieldTelephone and enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
+        {% if node.fieldTelephone %}
           <p class="
             vads-u-margin--0
             vads-u-margin-bottom--1
@@ -98,13 +98,6 @@ Example data:
                     phoneLabel = node.fieldTelephone.entity.fieldPhoneLabel 
                 %}
           </p>
-        {% elsif node.fieldPhoneNumber and !enabledFeatureFlags.FEATURE_TELEPHONE_MIGRATION_V1 %}
-        <p class="
-          vads-u-margin--0
-          vads-u-margin-bottom--1
-          vads-u-font-size--base">
-            <strong>Phone:</strong> {{ node.fieldPhoneNumber |  processPhoneToVaTelephoneOrFallback :  '', '' }}
-        </p>
         {% endif %}
         {% if node.fieldEmailAddress %}
             <p class="

Original file line number	Diff line number	Diff line change
@@ -57,7 +57,6 @@ const FACILITIES_RESULTS = `
`57`	`57`	`postalCode`
`58`	`58`	`}`
`59`	`59`	`fieldPhoneNumber`
`60`		`- fieldMentalHealthPhone`
`61`	`60`	`${mhTelephonePara}`
`62`	`61`	`fieldOfficeHours {`
`63`	`62`	`day`
Original file line number	Diff line number	Diff line change
@@ -58,7 +58,6 @@ const healthCareLocalFacilityPageFragment = `
`58`	`58`	`lon`
`59`	`59`	`}`
`60`	`60`	`fieldPhoneNumber`
`61`		`- fieldMentalHealthPhone`
`62`	`61`	`${mhTelephonePara}`
`63`	`62`	`fieldOfficeHours {`
`64`	`63`	`day`