From 9a691cea1af61c186975eca112d0b579d35f95c8 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 28 Feb 2024 13:04:50 -0800 Subject: [PATCH] VACMS-15686: Swaps mental health phone fields (#17161) * VACMS-15686: Removes the temp field from everywhere * VACMS-15868: Move old mental health phone field in form display * VACMS-15686: Updates the migration to not overwrite mental health phone number * VACMS-15686: Revision looooog! -- In the voice of Kirk yelling "Kahn!" --------- Co-authored-by: Jill Adams <85581471+jilladams@users.noreply.github.com> --- ...ode.health_care_local_facility.default.yml | 20 +++--------- ...care_local_facility.inline_entity_form.yml | 2 -- ...ode.health_care_local_facility.default.yml | 10 ------ ...h_care_local_facility.external_content.yml | 32 ++++++++----------- ...e.health_care_local_facility.ief_table.yml | 2 -- ...node.health_care_local_facility.teaser.yml | 2 -- ...ility.field_mental_health_contact_phon.yml | 25 --------------- ...cal_facility.field_mental_health_phone.yml | 2 +- ....node.field_mental_health_contact_phon.yml | 19 ----------- ...ion.va_node_health_care_local_facility.yml | 28 ---------------- ...ion.va_node_health_care_local_facility.yml | 11 ------- .../src/Service/PostFacilityStatus.php | 6 +--- 12 files changed, 21 insertions(+), 138 deletions(-) delete mode 100644 config/sync/field.field.node.health_care_local_facility.field_mental_health_contact_phon.yml delete mode 100644 config/sync/field.storage.node.field_mental_health_contact_phon.yml diff --git a/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml b/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml index 55a7e6fcc4..2f83e9ccc9 100644 --- a/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml +++ b/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml @@ -15,7 +15,6 @@ dependencies: - field.field.node.health_care_local_facility.field_location_services - field.field.node.health_care_local_facility.field_main_location - field.field.node.health_care_local_facility.field_media - - field.field.node.health_care_local_facility.field_mental_health_contact_phon - field.field.node.health_care_local_facility.field_mental_health_phone - field.field.node.health_care_local_facility.field_meta_tags - field.field.node.health_care_local_facility.field_mobile @@ -93,7 +92,7 @@ third_party_settings: label: 'VAMC system' region: content parent_name: '' - weight: 2 + weight: 3 format_type: fieldset format_settings: classes: '' @@ -107,7 +106,7 @@ third_party_settings: label: 'Title and summary' region: content parent_name: '' - weight: 3 + weight: 4 format_type: fieldset format_settings: classes: '' @@ -133,7 +132,7 @@ third_party_settings: label: 'Operating status' region: content parent_name: '' - weight: 1 + weight: 2 format_type: fieldset format_settings: classes: '' @@ -148,7 +147,7 @@ third_party_settings: label: 'Meta Tags' region: content parent_name: '' - weight: 4 + weight: 5 format_type: fieldset format_settings: classes: '' @@ -158,7 +157,6 @@ third_party_settings: group_locations_and_contact_info: children: - group_facility_data_from_vast - - field_mental_health_contact_phon label: 'Locations and contact information' region: content parent_name: '' @@ -179,7 +177,6 @@ third_party_settings: - field_geolocation - field_mobile - field_phone_number - - field_mental_health_phone - field_office_hours - field_timezone label: 'Facility data' @@ -318,16 +315,9 @@ content: settings: media_types: { } third_party_settings: { } - field_mental_health_contact_phon: - type: telephone_default - weight: 21 - region: content - settings: - placeholder: '' - third_party_settings: { } field_mental_health_phone: type: telephone_default - weight: 28 + weight: 1 region: content settings: placeholder: '' diff --git a/config/sync/core.entity_form_display.node.health_care_local_facility.inline_entity_form.yml b/config/sync/core.entity_form_display.node.health_care_local_facility.inline_entity_form.yml index bb8face28e..e8f2e84b49 100644 --- a/config/sync/core.entity_form_display.node.health_care_local_facility.inline_entity_form.yml +++ b/config/sync/core.entity_form_display.node.health_care_local_facility.inline_entity_form.yml @@ -16,7 +16,6 @@ dependencies: - field.field.node.health_care_local_facility.field_location_services - field.field.node.health_care_local_facility.field_main_location - field.field.node.health_care_local_facility.field_media - - field.field.node.health_care_local_facility.field_mental_health_contact_phon - field.field.node.health_care_local_facility.field_mental_health_phone - field.field.node.health_care_local_facility.field_meta_tags - field.field.node.health_care_local_facility.field_mobile @@ -151,7 +150,6 @@ hidden: field_location_services: true field_main_location: true field_media: true - field_mental_health_contact_phon: true field_mental_health_phone: true field_meta_tags: true field_mobile: true diff --git a/config/sync/core.entity_view_display.node.health_care_local_facility.default.yml b/config/sync/core.entity_view_display.node.health_care_local_facility.default.yml index 8a2ea63ceb..6a3cafd15c 100644 --- a/config/sync/core.entity_view_display.node.health_care_local_facility.default.yml +++ b/config/sync/core.entity_view_display.node.health_care_local_facility.default.yml @@ -15,7 +15,6 @@ dependencies: - field.field.node.health_care_local_facility.field_location_services - field.field.node.health_care_local_facility.field_main_location - field.field.node.health_care_local_facility.field_media - - field.field.node.health_care_local_facility.field_mental_health_contact_phon - field.field.node.health_care_local_facility.field_mental_health_phone - field.field.node.health_care_local_facility.field_meta_tags - field.field.node.health_care_local_facility.field_mobile @@ -95,7 +94,6 @@ third_party_settings: group_locations_and_contact_info: children: - group_facility_data_from_vast - - field_mental_health_contact_phon label: 'Locations and contact information' parent_name: '' region: content @@ -202,14 +200,6 @@ content: third_party_settings: { } weight: 0 region: content - field_mental_health_contact_phon: - type: telephone_link - label: inline - settings: - title: '' - third_party_settings: { } - weight: 20 - region: content field_mental_health_phone: type: telephone_link label: inline diff --git a/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml b/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml index c148f6326c..7140d844db 100644 --- a/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml +++ b/config/sync/core.entity_view_display.node.health_care_local_facility.external_content.yml @@ -16,7 +16,6 @@ dependencies: - field.field.node.health_care_local_facility.field_location_services - field.field.node.health_care_local_facility.field_main_location - field.field.node.health_care_local_facility.field_media - - field.field.node.health_care_local_facility.field_mental_health_contact_phon - field.field.node.health_care_local_facility.field_mental_health_phone - field.field.node.health_care_local_facility.field_meta_tags - field.field.node.health_care_local_facility.field_mobile @@ -43,7 +42,7 @@ third_party_settings: label: Meta parent_name: '' region: hidden - weight: 13 + weight: 22 format_type: fieldset format_settings: classes: '' @@ -56,7 +55,7 @@ third_party_settings: label: 'Operating status' parent_name: '' region: hidden - weight: 11 + weight: 20 format_type: fieldset format_settings: classes: '' @@ -67,7 +66,7 @@ third_party_settings: label: 'Social media' parent_name: '' region: hidden - weight: 17 + weight: 26 format_type: details format_settings: classes: '' @@ -81,7 +80,7 @@ third_party_settings: label: 'Prepare for your visit' parent_name: '' region: hidden - weight: 14 + weight: 23 format_type: details format_settings: classes: '' @@ -94,7 +93,6 @@ third_party_settings: - field_address - field_mobile - field_phone_number - - field_mental_health_phone - field_office_hours label: 'Location Information' parent_name: '' @@ -133,7 +131,7 @@ third_party_settings: label: 'Title and summary' parent_name: '' region: hidden - weight: 12 + weight: 21 format_type: fieldset format_settings: classes: '' @@ -146,7 +144,7 @@ third_party_settings: label: 'Section settings' parent_name: '' region: hidden - weight: 15 + weight: 24 format_type: details_sidebar format_settings: classes: '' @@ -162,7 +160,7 @@ third_party_settings: label: 'Editorial workflow' parent_name: '' region: hidden - weight: 16 + weight: 25 format_type: fieldset format_settings: classes: '' @@ -192,14 +190,6 @@ content: third_party_settings: { } weight: 17 region: content - field_mental_health_phone: - type: string - label: above - settings: - link_to_entity: false - third_party_settings: { } - weight: 21 - region: content field_mobile: type: boolean label: above @@ -220,6 +210,7 @@ content: grouped: false show_closed: all closed_format: Closed + all_day_format: 'All day open' separator: days: '
' grouped_days: ' - ' @@ -230,6 +221,11 @@ content: position: '' open_text: 'Currently open!' closed_text: 'Currently closed' + exceptions: + title: 'Exception hours' + restrict_exceptions_to_num_days: 7 + date_format: long + all_day_format: 'All day open' timezone_field: '' office_hours_first_day: '' schema: @@ -268,7 +264,7 @@ hidden: field_location_services: true field_main_location: true field_media: true - field_mental_health_contact_phon: true + field_mental_health_phone: true field_meta_tags: true field_meta_title: true field_operating_status_facility: true diff --git a/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml b/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml index 54d54c1bd5..d978097d78 100644 --- a/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml +++ b/config/sync/core.entity_view_display.node.health_care_local_facility.ief_table.yml @@ -16,7 +16,6 @@ dependencies: - field.field.node.health_care_local_facility.field_location_services - field.field.node.health_care_local_facility.field_main_location - field.field.node.health_care_local_facility.field_media - - field.field.node.health_care_local_facility.field_mental_health_contact_phon - field.field.node.health_care_local_facility.field_mental_health_phone - field.field.node.health_care_local_facility.field_meta_tags - field.field.node.health_care_local_facility.field_mobile @@ -120,7 +119,6 @@ hidden: field_local_health_care_service_: true field_location_services: true field_main_location: true - field_mental_health_contact_phon: true field_mental_health_phone: true field_meta_tags: true field_mobile: true diff --git a/config/sync/core.entity_view_display.node.health_care_local_facility.teaser.yml b/config/sync/core.entity_view_display.node.health_care_local_facility.teaser.yml index 45398d6261..23950b24f1 100644 --- a/config/sync/core.entity_view_display.node.health_care_local_facility.teaser.yml +++ b/config/sync/core.entity_view_display.node.health_care_local_facility.teaser.yml @@ -16,7 +16,6 @@ dependencies: - field.field.node.health_care_local_facility.field_location_services - field.field.node.health_care_local_facility.field_main_location - field.field.node.health_care_local_facility.field_media - - field.field.node.health_care_local_facility.field_mental_health_contact_phon - field.field.node.health_care_local_facility.field_mental_health_phone - field.field.node.health_care_local_facility.field_meta_tags - field.field.node.health_care_local_facility.field_mobile @@ -96,7 +95,6 @@ hidden: field_location_services: true field_main_location: true field_media: true - field_mental_health_contact_phon: true field_mental_health_phone: true field_meta_tags: true field_mobile: true diff --git a/config/sync/field.field.node.health_care_local_facility.field_mental_health_contact_phon.yml b/config/sync/field.field.node.health_care_local_facility.field_mental_health_contact_phon.yml deleted file mode 100644 index f62a8a60d6..0000000000 --- a/config/sync/field.field.node.health_care_local_facility.field_mental_health_contact_phon.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: 85b46732-b695-42f5-be09-413287698196 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_mental_health_contact_phon - - node.type.health_care_local_facility - module: - - telephone - - tmgmt_content -third_party_settings: - tmgmt_content: - excluded: false -id: node.health_care_local_facility.field_mental_health_contact_phon -field_name: field_mental_health_contact_phon -entity_type: node -bundle: health_care_local_facility -label: 'Mental health contact phone number' -description: 'Enter the number Veterans should call to access mental health services at your facility, for example 202-555-1234, ext. 23. If your facility doesn''t offer these services, enter the most appropriate system number. This number will be displayed everywhere your facility appears across VA.gov. View guidelines for editing VAMC facilities (opens in a new tab)' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: telephone diff --git a/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml b/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml index ff107baf8e..4643e7ea8e 100644 --- a/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml +++ b/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml @@ -16,7 +16,7 @@ field_name: field_mental_health_phone entity_type: node bundle: health_care_local_facility label: 'Mental health phone number' -description: '' +description: 'Enter the number Veterans should call to access mental health services at your facility, for example 202-555-1234, ext. 23. If your facility doesn''t offer these services, enter the most appropriate system number. This number will be displayed everywhere your facility appears across VA.gov. View guidelines for editing VAMC facilities (opens in a new tab)' required: false translatable: false default_value: { } diff --git a/config/sync/field.storage.node.field_mental_health_contact_phon.yml b/config/sync/field.storage.node.field_mental_health_contact_phon.yml deleted file mode 100644 index a32d2da389..0000000000 --- a/config/sync/field.storage.node.field_mental_health_contact_phon.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 0b19fe89-c843-4663-a729-1244f4931208 -langcode: en -status: true -dependencies: - module: - - node - - telephone -id: node.field_mental_health_contact_phon -field_name: field_mental_health_contact_phon -entity_type: node -type: telephone -settings: { } -module: telephone -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml b/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml index 37047c74c8..f664592b7a 100644 --- a/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml +++ b/config/sync/migrate_plus.migration.va_node_health_care_local_facility.yml @@ -80,10 +80,6 @@ source: name: phone-main label: phone-main selector: properties/phone/main - - - name: phone-mental-health - label: phone-mental-health - selector: properties/phone/mental_health_clinic - name: state label: state @@ -179,29 +175,6 @@ process: 'Other Outpatient Services (OOS)': 6 'Extended Care Site (Community Living Center) (Stand-Alone)': 7 'Residential Care Site (MH RRTP/DRRTP) (Stand-Alone)': 8 - field_mental_health_phone: - plugin: str_replace - search: - - ( - - ) - - X - - ' ' - - ext - - Ext - - . - - ',' - - x - replace: - - '' - - '-' - - x - - '' - - x - - x - - '' - - '' - - ', ext. ' - source: phone-mental-health field_phone_number: plugin: str_replace search: @@ -284,7 +257,6 @@ destination: - field_timezone - changed - field_facility_classification - - field_mental_health_phone - field_phone_number - field_mobile - new_revision diff --git a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml index 084789f101..639250ef95 100644 --- a/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml +++ b/docroot/modules/custom/va_gov_migrate/config/install/migrate_plus.migration.va_node_health_care_local_facility.yml @@ -86,10 +86,6 @@ source: name: phone-main label: phone-main selector: properties/phone/main - - - name: phone-mental-health - label: phone-mental-health - selector: properties/phone/mental_health_clinic - name: state label: state @@ -191,12 +187,6 @@ process: 'Other Outpatient Services (OOS)': 6 'Extended Care Site (Community Living Center) (Stand-Alone)': 7 'Residential Care Site (MH RRTP/DRRTP) (Stand-Alone)': 8 - field_mental_health_phone: - # Covert all ext variants to x and then replace it with, ', ext. ' last. - plugin: str_replace - search: ['(', ')', 'X', ' ', 'ext', 'Ext', '.', ',', 'x'] - replace: ['', '-', 'x', '', 'x', 'x', '', '', ', ext. '] - source: phone-mental-health field_phone_number: # Covert all ext variants to x and then replace it with, ', ext. ' last. plugin: str_replace @@ -266,7 +256,6 @@ destination: - field_timezone - changed - field_facility_classification - - field_mental_health_phone - field_phone_number - field_mobile - new_revision diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityStatus.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityStatus.php index 382bb18dd3..84f0cf929a 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityStatus.php +++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityStatus.php @@ -412,12 +412,8 @@ protected function shouldPushSystem(NodeInterface $entity) { * The mental health phone number. */ protected function getFacilityMentalHealthPhone(): string { - // This is the original and life-long field. $mental_health_phone = $this->getFieldSafe('field_mental_health_phone'); - // This is the temporary shuffle field that will be removed once conversion - // to fully edited is complete. - $mental_health_contact = $this->getFieldSafe('field_mental_health_contact_phon'); - return (!empty($mental_health_contact)) ? $mental_health_contact : $mental_health_phone; + return $mental_health_phone; } /**