From e5c82ea7766b994177d58bf9af34acb95d71adbc Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Tue, 10 Oct 2023 09:13:26 -0500 Subject: [PATCH 01/26] VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description --- ...lay.paragraph.service_location.default.yml | 41 +++++++++++++++++-- ...lay.paragraph.service_location.default.yml | 36 ++++++++++++++-- ...ocation.field_service_delivery_options.yml | 39 ++++++++++++++++++ ...ation.field_service_location_descripti.yml | 24 +++++++++++ ...ce_location.field_task_oriented_header.yml | 24 +++++++++++ ...ragraph.field_service_delivery_options.yml | 20 +++++++++ ...graph.field_service_location_descripti.yml | 21 ++++++++++ ...e.paragraph.field_task_oriented_header.yml | 21 ++++++++++ 8 files changed, 219 insertions(+), 7 deletions(-) create mode 100644 config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml create mode 100644 config/sync/field.storage.paragraph.field_service_delivery_options.yml create mode 100644 config/sync/field.storage.paragraph.field_service_location_descripti.yml create mode 100644 config/sync/field.storage.paragraph.field_task_oriented_header.yml diff --git a/config/sync/core.entity_form_display.paragraph.service_location.default.yml b/config/sync/core.entity_form_display.paragraph.service_location.default.yml index f9926f097e..b71703c24f 100644 --- a/config/sync/core.entity_form_display.paragraph.service_location.default.yml +++ b/config/sync/core.entity_form_display.paragraph.service_location.default.yml @@ -8,10 +8,14 @@ dependencies: - field.field.paragraph.service_location.field_hours - field.field.paragraph.service_location.field_office_hours - field.field.paragraph.service_location.field_phone + - field.field.paragraph.service_location.field_service_delivery_options - field.field.paragraph.service_location.field_service_location_address + - field.field.paragraph.service_location.field_service_location_descripti + - field.field.paragraph.service_location.field_task_oriented_header - field.field.paragraph.service_location.field_use_main_facility_phone - paragraphs.paragraphs_type.service_location module: + - change_labels - entity_browser_entity_form - field_group - ief_table_view_mode @@ -28,7 +32,7 @@ third_party_settings: label: Hours region: content parent_name: '' - weight: 1 + weight: 4 format_type: details format_settings: classes: '' @@ -42,7 +46,7 @@ third_party_settings: label: Address region: content parent_name: '' - weight: 0 + weight: 3 format_type: details format_settings: classes: '' @@ -57,7 +61,7 @@ third_party_settings: label: 'Contact info' region: content parent_name: '' - weight: 2 + weight: 5 format_type: details format_settings: classes: '' @@ -123,6 +127,7 @@ content: collapsible: false collapsed: false revision: false + removed_reference: optional allow_system_delete: false third_party_settings: entity_browser_entity_form: @@ -137,7 +142,8 @@ content: type: office_hours_default weight: 1 region: content - settings: { } + settings: + collapsed: false third_party_settings: limited_field_widgets: limit_values: '0' @@ -157,10 +163,21 @@ content: collapsible: false collapsed: false revision: false + removed_reference: optional allow_system_delete: false third_party_settings: entity_browser_entity_form: entity_browser_id: _none + field_service_delivery_options: + type: options_buttons + weight: 2 + region: content + settings: { } + third_party_settings: + limited_field_widgets: + limit_values: '0' + change_labels: + add_another: '' field_service_location_address: type: paragraphs weight: 25 @@ -180,6 +197,22 @@ content: collapse_edit_all: '0' duplicate: '0' third_party_settings: { } + field_service_location_descripti: + type: string_textfield + weight: 1 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_task_oriented_header: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } field_use_main_facility_phone: type: boolean_checkbox weight: 4 diff --git a/config/sync/core.entity_view_display.paragraph.service_location.default.yml b/config/sync/core.entity_view_display.paragraph.service_location.default.yml index a159441c0a..277609a34b 100644 --- a/config/sync/core.entity_view_display.paragraph.service_location.default.yml +++ b/config/sync/core.entity_view_display.paragraph.service_location.default.yml @@ -8,7 +8,10 @@ dependencies: - field.field.paragraph.service_location.field_hours - field.field.paragraph.service_location.field_office_hours - field.field.paragraph.service_location.field_phone + - field.field.paragraph.service_location.field_service_delivery_options - field.field.paragraph.service_location.field_service_location_address + - field.field.paragraph.service_location.field_service_location_descripti + - field.field.paragraph.service_location.field_task_oriented_header - field.field.paragraph.service_location.field_use_main_facility_phone - paragraphs.paragraphs_type.service_location module: @@ -26,7 +29,7 @@ third_party_settings: label: Hours parent_name: group_service_location region: content - weight: 2 + weight: 8 format_type: fieldset format_settings: classes: '' @@ -41,7 +44,7 @@ third_party_settings: label: 'Contact info' parent_name: group_service_location region: content - weight: 3 + weight: 9 format_type: fieldset format_settings: classes: '' @@ -54,7 +57,7 @@ third_party_settings: label: Address parent_name: group_service_location region: content - weight: 1 + weight: 7 format_type: fieldset format_settings: classes: '' @@ -63,6 +66,9 @@ third_party_settings: open: true group_service_location: children: + - field_task_oriented_header + - field_service_location_descripti + - field_service_delivery_options - group_address - group_hours - group_contact_info @@ -148,6 +154,14 @@ content: third_party_settings: { } weight: 4 region: content + field_service_delivery_options: + type: entity_reference_label + label: above + settings: + link: false + third_party_settings: { } + weight: 6 + region: content field_service_location_address: type: entity_reference_revisions_entity_view label: visually_hidden @@ -157,6 +171,22 @@ content: third_party_settings: { } weight: 7 region: content + field_service_location_descripti: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 5 + region: content + field_task_oriented_header: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 4 + region: content field_use_main_facility_phone: type: boolean label: above diff --git a/config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml b/config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml new file mode 100644 index 0000000000..f3079c46b6 --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml @@ -0,0 +1,39 @@ +uuid: e8753699-64d0-4ece-b01d-53d60acb26cc +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_service_delivery_options + - paragraphs.paragraphs_type.service_location + - taxonomy.vocabulary.service_delivery_options + module: + - entity_reference_validators + - tmgmt_content +third_party_settings: + entity_reference_validators: + circular_reference: false + circular_reference_deep: false + duplicate_reference: false + tmgmt_content: + excluded: false +id: paragraph.service_location.field_service_delivery_options +field_name: field_service_delivery_options +entity_type: paragraph +bundle: service_location +label: 'Service delivery options' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + service_delivery_options: service_delivery_options + sort: + field: name + direction: asc + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml b/config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml new file mode 100644 index 0000000000..c5b470ce1c --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml @@ -0,0 +1,24 @@ +uuid: b1137b98-b583-41ec-ae1c-d9055e027fa8 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_service_location_descripti + - paragraphs.paragraphs_type.service_location + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_service_location_descripti +field_name: field_service_location_descripti +entity_type: paragraph +bundle: service_location +label: 'Service location description' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml b/config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml new file mode 100644 index 0000000000..16302145b7 --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml @@ -0,0 +1,24 @@ +uuid: 0c22f499-e717-4540-94d5-b4344cdecf7b +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_task_oriented_header + - paragraphs.paragraphs_type.service_location + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_task_oriented_header +field_name: field_task_oriented_header +entity_type: paragraph +bundle: service_location +label: 'Task-oriented descriptive header' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.storage.paragraph.field_service_delivery_options.yml b/config/sync/field.storage.paragraph.field_service_delivery_options.yml new file mode 100644 index 0000000000..6ab18274cc --- /dev/null +++ b/config/sync/field.storage.paragraph.field_service_delivery_options.yml @@ -0,0 +1,20 @@ +uuid: 88e99263-1551-4f7b-97a6-e92e48525c5b +langcode: en +status: true +dependencies: + module: + - paragraphs + - taxonomy +id: paragraph.field_service_delivery_options +field_name: field_service_delivery_options +entity_type: paragraph +type: entity_reference +settings: + target_type: taxonomy_term +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_service_location_descripti.yml b/config/sync/field.storage.paragraph.field_service_location_descripti.yml new file mode 100644 index 0000000000..cb730aef8f --- /dev/null +++ b/config/sync/field.storage.paragraph.field_service_location_descripti.yml @@ -0,0 +1,21 @@ +uuid: 08189d44-be34-4f4e-b42e-2d77e69acf84 +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_service_location_descripti +field_name: field_service_location_descripti +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_task_oriented_header.yml b/config/sync/field.storage.paragraph.field_task_oriented_header.yml new file mode 100644 index 0000000000..db90f926dd --- /dev/null +++ b/config/sync/field.storage.paragraph.field_task_oriented_header.yml @@ -0,0 +1,21 @@ +uuid: a2c511a4-0798-49e7-9b84-aeb45378e45a +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_task_oriented_header +field_name: field_task_oriented_header +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false From c0a72789843c5db594b38b09c364cd2fb8c37cea Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Fri, 13 Oct 2023 14:34:30 -0500 Subject: [PATCH 02/26] VACMS-15649: Removes free text fields from service location (#15676) --- ...lay.paragraph.service_location.default.yml | 18 -------------- ...lay.paragraph.service_location.default.yml | 18 -------------- ...ation.field_service_location_descripti.yml | 24 ------------------- ...ce_location.field_task_oriented_header.yml | 24 ------------------- ...graph.field_service_location_descripti.yml | 21 ---------------- ...e.paragraph.field_task_oriented_header.yml | 21 ---------------- 6 files changed, 126 deletions(-) delete mode 100644 config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml delete mode 100644 config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml delete mode 100644 config/sync/field.storage.paragraph.field_service_location_descripti.yml delete mode 100644 config/sync/field.storage.paragraph.field_task_oriented_header.yml diff --git a/config/sync/core.entity_form_display.paragraph.service_location.default.yml b/config/sync/core.entity_form_display.paragraph.service_location.default.yml index b71703c24f..23a73ffa0c 100644 --- a/config/sync/core.entity_form_display.paragraph.service_location.default.yml +++ b/config/sync/core.entity_form_display.paragraph.service_location.default.yml @@ -10,8 +10,6 @@ dependencies: - field.field.paragraph.service_location.field_phone - field.field.paragraph.service_location.field_service_delivery_options - field.field.paragraph.service_location.field_service_location_address - - field.field.paragraph.service_location.field_service_location_descripti - - field.field.paragraph.service_location.field_task_oriented_header - field.field.paragraph.service_location.field_use_main_facility_phone - paragraphs.paragraphs_type.service_location module: @@ -197,22 +195,6 @@ content: collapse_edit_all: '0' duplicate: '0' third_party_settings: { } - field_service_location_descripti: - type: string_textfield - weight: 1 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } - field_task_oriented_header: - type: string_textfield - weight: 0 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } field_use_main_facility_phone: type: boolean_checkbox weight: 4 diff --git a/config/sync/core.entity_view_display.paragraph.service_location.default.yml b/config/sync/core.entity_view_display.paragraph.service_location.default.yml index 277609a34b..1d2e21b769 100644 --- a/config/sync/core.entity_view_display.paragraph.service_location.default.yml +++ b/config/sync/core.entity_view_display.paragraph.service_location.default.yml @@ -10,8 +10,6 @@ dependencies: - field.field.paragraph.service_location.field_phone - field.field.paragraph.service_location.field_service_delivery_options - field.field.paragraph.service_location.field_service_location_address - - field.field.paragraph.service_location.field_service_location_descripti - - field.field.paragraph.service_location.field_task_oriented_header - field.field.paragraph.service_location.field_use_main_facility_phone - paragraphs.paragraphs_type.service_location module: @@ -171,22 +169,6 @@ content: third_party_settings: { } weight: 7 region: content - field_service_location_descripti: - type: string - label: above - settings: - link_to_entity: false - third_party_settings: { } - weight: 5 - region: content - field_task_oriented_header: - type: string - label: above - settings: - link_to_entity: false - third_party_settings: { } - weight: 4 - region: content field_use_main_facility_phone: type: boolean label: above diff --git a/config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml b/config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml deleted file mode 100644 index c5b470ce1c..0000000000 --- a/config/sync/field.field.paragraph.service_location.field_service_location_descripti.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: b1137b98-b583-41ec-ae1c-d9055e027fa8 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_service_location_descripti - - paragraphs.paragraphs_type.service_location - module: - - tmgmt_content -third_party_settings: - tmgmt_content: - excluded: false -id: paragraph.service_location.field_service_location_descripti -field_name: field_service_location_descripti -entity_type: paragraph -bundle: service_location -label: 'Service location description' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml b/config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml deleted file mode 100644 index 16302145b7..0000000000 --- a/config/sync/field.field.paragraph.service_location.field_task_oriented_header.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 0c22f499-e717-4540-94d5-b4344cdecf7b -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_task_oriented_header - - paragraphs.paragraphs_type.service_location - module: - - tmgmt_content -third_party_settings: - tmgmt_content: - excluded: false -id: paragraph.service_location.field_task_oriented_header -field_name: field_task_oriented_header -entity_type: paragraph -bundle: service_location -label: 'Task-oriented descriptive header' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/config/sync/field.storage.paragraph.field_service_location_descripti.yml b/config/sync/field.storage.paragraph.field_service_location_descripti.yml deleted file mode 100644 index cb730aef8f..0000000000 --- a/config/sync/field.storage.paragraph.field_service_location_descripti.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 08189d44-be34-4f4e-b42e-2d77e69acf84 -langcode: en -status: true -dependencies: - module: - - paragraphs -id: paragraph.field_service_location_descripti -field_name: field_service_location_descripti -entity_type: paragraph -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_task_oriented_header.yml b/config/sync/field.storage.paragraph.field_task_oriented_header.yml deleted file mode 100644 index db90f926dd..0000000000 --- a/config/sync/field.storage.paragraph.field_task_oriented_header.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: a2c511a4-0798-49e7-9b84-aeb45378e45a -langcode: en -status: true -dependencies: - module: - - paragraphs -id: paragraph.field_task_oriented_header -field_name: field_task_oriented_header -entity_type: paragraph -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false From bbd2c8903bdedb3d58390fd25f01e4ae9c82b2ae Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Thu, 25 Jan 2024 15:28:30 -0600 Subject: [PATCH 03/26] VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits --- ...lay.paragraph.service_location.default.yml | 146 +++++++++++++-- ...lay.paragraph.service_location.default.yml | 70 +++++++- ..._location.field_appt_intro_text_custom.yml | 24 +++ ...ce_location.field_appt_intro_text_type.yml | 27 +++ ...h.service_location.field_office_visits.yml | 25 +++ ...location.field_online_scheduling_avail.yml | 25 +++ ...ice_location.field_other_phone_numbers.yml | 167 ++++++++++++++++++ ...ocation.field_service_delivery_options.yml | 39 ---- ...cation.field_use_facility_phone_number.yml | 28 +++ ...service_location.field_virtual_support.yml | 25 +++ ...paragraph.field_appt_intro_text_custom.yml | 19 ++ ...e.paragraph.field_appt_intro_text_type.yml | 30 ++++ ....storage.paragraph.field_office_visits.yml | 33 ++++ ...aragraph.field_online_scheduling_avail.yml | 27 +++ ...ge.paragraph.field_other_phone_numbers.yml | 20 +++ ...ragraph.field_service_delivery_options.yml | 20 --- ...agraph.field_use_facility_phone_number.yml | 18 ++ ...torage.paragraph.field_virtual_support.yml | 33 ++++ 18 files changed, 692 insertions(+), 84 deletions(-) create mode 100644 config/sync/field.field.paragraph.service_location.field_appt_intro_text_custom.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_appt_intro_text_type.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_office_visits.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_online_scheduling_avail.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_other_phone_numbers.yml delete mode 100644 config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_use_facility_phone_number.yml create mode 100644 config/sync/field.field.paragraph.service_location.field_virtual_support.yml create mode 100644 config/sync/field.storage.paragraph.field_appt_intro_text_custom.yml create mode 100644 config/sync/field.storage.paragraph.field_appt_intro_text_type.yml create mode 100644 config/sync/field.storage.paragraph.field_office_visits.yml create mode 100644 config/sync/field.storage.paragraph.field_online_scheduling_avail.yml create mode 100644 config/sync/field.storage.paragraph.field_other_phone_numbers.yml delete mode 100644 config/sync/field.storage.paragraph.field_service_delivery_options.yml create mode 100644 config/sync/field.storage.paragraph.field_use_facility_phone_number.yml create mode 100644 config/sync/field.storage.paragraph.field_virtual_support.yml diff --git a/config/sync/core.entity_form_display.paragraph.service_location.default.yml b/config/sync/core.entity_form_display.paragraph.service_location.default.yml index 23a73ffa0c..6dfa1a9775 100644 --- a/config/sync/core.entity_form_display.paragraph.service_location.default.yml +++ b/config/sync/core.entity_form_display.paragraph.service_location.default.yml @@ -4,22 +4,28 @@ status: true dependencies: config: - field.field.paragraph.service_location.field_additional_hours_info + - field.field.paragraph.service_location.field_appt_intro_text_custom + - field.field.paragraph.service_location.field_appt_intro_text_type - field.field.paragraph.service_location.field_email_contacts - field.field.paragraph.service_location.field_hours - field.field.paragraph.service_location.field_office_hours + - field.field.paragraph.service_location.field_office_visits + - field.field.paragraph.service_location.field_online_scheduling_avail + - field.field.paragraph.service_location.field_other_phone_numbers - field.field.paragraph.service_location.field_phone - - field.field.paragraph.service_location.field_service_delivery_options - field.field.paragraph.service_location.field_service_location_address + - field.field.paragraph.service_location.field_use_facility_phone_number - field.field.paragraph.service_location.field_use_main_facility_phone + - field.field.paragraph.service_location.field_virtual_support - paragraphs.paragraphs_type.service_location module: - - change_labels - entity_browser_entity_form - field_group - ief_table_view_mode - limited_field_widgets - office_hours - paragraphs + - textfield_counter third_party_settings: field_group: group_service_hours: @@ -30,7 +36,7 @@ third_party_settings: label: Hours region: content parent_name: '' - weight: 4 + weight: 3 format_type: details format_settings: classes: '' @@ -44,7 +50,7 @@ third_party_settings: label: Address region: content parent_name: '' - weight: 3 + weight: 2 format_type: details format_settings: classes: '' @@ -59,7 +65,7 @@ third_party_settings: label: 'Contact info' region: content parent_name: '' - weight: 5 + weight: 4 format_type: details format_settings: classes: '' @@ -96,6 +102,56 @@ third_party_settings: open: true description: '' required_fields: false + group_service_options: + children: + - field_office_visits + - field_virtual_support + label: 'Service options' + region: content + parent_name: '' + weight: 0 + format_type: details + format_settings: + classes: '' + show_empty_fields: false + id: '' + open: false + description: '' + required_fields: true + group_appointments: + children: + - field_appt_intro_text_type + - field_appt_intro_text_custom + - group_phone_number_for_appt + - field_online_scheduling_avail + label: Appointments + region: content + parent_name: '' + weight: 1 + format_type: details + format_settings: + classes: '' + show_empty_fields: false + id: '' + open: false + description: 'Provide information that helps site visitors make an appointment for this service.' + required_fields: true + group_phone_number_for_appt: + children: + - field_use_facility_phone_number + - field_other_phone_numbers + label: 'Phone number for appointments' + region: content + parent_name: group_appointments + weight: 7 + format_type: details + format_settings: + classes: '' + show_empty_fields: false + id: '' + open: true + description: '' + required_fields: true id: paragraph.service_location.default targetEntityType: paragraph bundle: service_location @@ -109,6 +165,26 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_appt_intro_text_custom: + type: string_textarea_with_counter + weight: 6 + region: content + settings: + rows: 5 + placeholder: '' + maxlength: 200 + counter_position: after + js_prevent_submit: true + count_only_mode: false + count_html_characters: true + textcount_status_message: '@remaining_count characters remaining' + third_party_settings: { } + field_appt_intro_text_type: + type: options_buttons + weight: 5 + region: content + settings: { } + third_party_settings: { } field_email_contacts: type: inline_entity_form_complex_table_view_mode weight: 3 @@ -145,6 +221,41 @@ content: third_party_settings: limited_field_widgets: limit_values: '0' + field_office_visits: + type: options_buttons + weight: 4 + region: content + settings: { } + third_party_settings: { } + field_online_scheduling_avail: + type: options_select + weight: 8 + region: content + settings: { } + third_party_settings: { } + field_other_phone_numbers: + type: inline_entity_form_complex_table_view_mode + weight: 30 + region: content + settings: + form_mode: default + override_labels: true + label_singular: 'phone number' + label_plural: 'phone numbers' + allow_new: true + allow_existing: false + match_operator: CONTAINS + allow_duplicate: false + collapsible: false + collapsed: false + revision: false + removed_reference: optional + allow_system_delete: 0 + third_party_settings: + entity_browser_entity_form: + entity_browser_id: _none + change_labels: + add_another: '' field_phone: type: inline_entity_form_complex_table_view_mode weight: 5 @@ -166,19 +277,9 @@ content: third_party_settings: entity_browser_entity_form: entity_browser_id: _none - field_service_delivery_options: - type: options_buttons - weight: 2 - region: content - settings: { } - third_party_settings: - limited_field_widgets: - limit_values: '0' - change_labels: - add_another: '' field_service_location_address: type: paragraphs - weight: 25 + weight: 21 region: content settings: title: Address @@ -195,6 +296,13 @@ content: collapse_edit_all: '0' duplicate: '0' third_party_settings: { } + field_use_facility_phone_number: + type: boolean_checkbox + weight: 29 + region: content + settings: + display_label: true + third_party_settings: { } field_use_main_facility_phone: type: boolean_checkbox weight: 4 @@ -202,6 +310,12 @@ content: settings: display_label: true third_party_settings: { } + field_virtual_support: + type: options_buttons + weight: 5 + region: content + settings: { } + third_party_settings: { } hidden: created: true status: true diff --git a/config/sync/core.entity_view_display.paragraph.service_location.default.yml b/config/sync/core.entity_view_display.paragraph.service_location.default.yml index 1d2e21b769..a5797da3b6 100644 --- a/config/sync/core.entity_view_display.paragraph.service_location.default.yml +++ b/config/sync/core.entity_view_display.paragraph.service_location.default.yml @@ -4,13 +4,19 @@ status: true dependencies: config: - field.field.paragraph.service_location.field_additional_hours_info + - field.field.paragraph.service_location.field_appt_intro_text_custom + - field.field.paragraph.service_location.field_appt_intro_text_type - field.field.paragraph.service_location.field_email_contacts - field.field.paragraph.service_location.field_hours - field.field.paragraph.service_location.field_office_hours + - field.field.paragraph.service_location.field_office_visits + - field.field.paragraph.service_location.field_online_scheduling_avail + - field.field.paragraph.service_location.field_other_phone_numbers - field.field.paragraph.service_location.field_phone - - field.field.paragraph.service_location.field_service_delivery_options - field.field.paragraph.service_location.field_service_location_address + - field.field.paragraph.service_location.field_use_facility_phone_number - field.field.paragraph.service_location.field_use_main_facility_phone + - field.field.paragraph.service_location.field_virtual_support - paragraphs.paragraphs_type.service_location module: - entity_reference_revisions @@ -92,6 +98,20 @@ content: third_party_settings: { } weight: 5 region: content + field_appt_intro_text_custom: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 15 + region: content + field_appt_intro_text_type: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 12 + region: content field_email_contacts: type: entity_reference_revisions_entity_view label: visually_hidden @@ -143,22 +163,37 @@ content: third_party_settings: { } weight: 3 region: content - field_phone: + field_office_visits: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 10 + region: content + field_online_scheduling_avail: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 16 + region: content + field_other_phone_numbers: type: entity_reference_revisions_entity_view - label: visually_hidden + label: above settings: view_mode: default link: '' third_party_settings: { } - weight: 4 + weight: 14 region: content - field_service_delivery_options: - type: entity_reference_label - label: above + field_phone: + type: entity_reference_revisions_entity_view + label: visually_hidden settings: - link: false + view_mode: default + link: '' third_party_settings: { } - weight: 6 + weight: 4 region: content field_service_location_address: type: entity_reference_revisions_entity_view @@ -169,6 +204,16 @@ content: third_party_settings: { } weight: 7 region: content + field_use_facility_phone_number: + type: boolean + label: above + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 13 + region: content field_use_main_facility_phone: type: boolean label: above @@ -179,5 +224,12 @@ content: third_party_settings: { } weight: 3 region: content + field_virtual_support: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 11 + region: content hidden: search_api_excerpt: true diff --git a/config/sync/field.field.paragraph.service_location.field_appt_intro_text_custom.yml b/config/sync/field.field.paragraph.service_location.field_appt_intro_text_custom.yml new file mode 100644 index 0000000000..e7162a6fd4 --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_appt_intro_text_custom.yml @@ -0,0 +1,24 @@ +uuid: 96e55910-7eba-493f-be2d-6908196adceb +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_appt_intro_text_custom + - paragraphs.paragraphs_type.service_location + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_appt_intro_text_custom +field_name: field_appt_intro_text_custom +entity_type: paragraph +bundle: service_location +label: 'Custom text' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string_long diff --git a/config/sync/field.field.paragraph.service_location.field_appt_intro_text_type.yml b/config/sync/field.field.paragraph.service_location.field_appt_intro_text_type.yml new file mode 100644 index 0000000000..18484b9c16 --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_appt_intro_text_type.yml @@ -0,0 +1,27 @@ +uuid: 16342b68-830c-4d90-956e-20f5a52d2a10 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_appt_intro_text_type + - paragraphs.paragraphs_type.service_location + module: + - options + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_appt_intro_text_type +field_name: field_appt_intro_text_type +entity_type: paragraph +bundle: service_location +label: 'Appointment introduction text' +description: 'Add additional details about how to make appointments at this location.' +required: true +translatable: false +default_value: + - + value: use_default_text +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/sync/field.field.paragraph.service_location.field_office_visits.yml b/config/sync/field.field.paragraph.service_location.field_office_visits.yml new file mode 100644 index 0000000000..cde92b5444 --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_office_visits.yml @@ -0,0 +1,25 @@ +uuid: 7ca5d939-6e73-4797-8f19-f622ecce3414 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_office_visits + - paragraphs.paragraphs_type.service_location + module: + - options + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_office_visits +field_name: field_office_visits +entity_type: paragraph +bundle: service_location +label: 'Office visits' +description: 'Select whether Veterans can travel to a physical location to receive services.' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/sync/field.field.paragraph.service_location.field_online_scheduling_avail.yml b/config/sync/field.field.paragraph.service_location.field_online_scheduling_avail.yml new file mode 100644 index 0000000000..6331f1ac0d --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_online_scheduling_avail.yml @@ -0,0 +1,25 @@ +uuid: 2e7310b9-e834-4060-a2b3-8f141cc6c612 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_online_scheduling_avail + - paragraphs.paragraphs_type.service_location + module: + - options + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_online_scheduling_avail +field_name: field_online_scheduling_avail +entity_type: paragraph +bundle: service_location +label: 'Is online scheduling available for this service?' +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/sync/field.field.paragraph.service_location.field_other_phone_numbers.yml b/config/sync/field.field.paragraph.service_location.field_other_phone_numbers.yml new file mode 100644 index 0000000000..d1b719058f --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_other_phone_numbers.yml @@ -0,0 +1,167 @@ +uuid: d6e438b0-0393-43b1-bf9d-dc61b874680c +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_other_phone_numbers + - paragraphs.paragraphs_type.phone_number + - paragraphs.paragraphs_type.service_location + module: + - entity_reference_revisions + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_other_phone_numbers +field_name: field_other_phone_numbers +entity_type: paragraph +bundle: service_location +label: 'Other phone numbers' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:paragraph' + handler_settings: + target_bundles: + phone_number: phone_number + negate: 0 + target_bundles_drag_drop: + address: + weight: 46 + enabled: false + alert: + weight: 47 + enabled: false + alert_single: + weight: 48 + enabled: false + audience_topics: + weight: 49 + enabled: false + basic_accordion: + weight: 50 + enabled: false + button: + weight: 51 + enabled: false + centralized_content_descriptor: + weight: 52 + enabled: false + checklist: + weight: 53 + enabled: false + checklist_item: + weight: 54 + enabled: false + collapsible_panel: + weight: 55 + enabled: false + collapsible_panel_item: + weight: 56 + enabled: false + contact_information: + weight: 57 + enabled: false + downloadable_file: + weight: 58 + enabled: false + email_contact: + weight: 59 + enabled: false + embedded_video: + weight: 60 + enabled: false + expandable_text: + weight: 61 + enabled: false + featured_content: + weight: 62 + enabled: false + health_care_local_facility_servi: + weight: 63 + enabled: false + link_teaser: + weight: 64 + enabled: false + link_teaser_with_image: + weight: 65 + enabled: false + list_of_link_teasers: + weight: 68 + enabled: false + list_of_links: + weight: 67 + enabled: false + lists_of_links: + weight: 66 + enabled: false + magichead_group: + weight: 69 + enabled: false + media: + weight: 70 + enabled: false + media_list_images: + weight: 71 + enabled: false + media_list_videos: + weight: 72 + enabled: false + non_reusable_alert: + weight: 73 + enabled: false + number_callout: + weight: 74 + enabled: false + phone_number: + weight: 75 + enabled: true + process: + weight: 76 + enabled: false + q_a: + weight: 77 + enabled: false + q_a_group: + weight: 78 + enabled: false + q_a_section: + weight: 79 + enabled: false + react_widget: + weight: 80 + enabled: false + rich_text_char_limit_1000: + weight: 81 + enabled: false + service_location: + weight: 82 + enabled: false + service_location_address: + weight: 83 + enabled: false + situation_update: + weight: 84 + enabled: false + spanish_translation_summary: + weight: 85 + enabled: false + staff_profile: + weight: 86 + enabled: false + step: + weight: 87 + enabled: false + step_by_step: + weight: 88 + enabled: false + table: + weight: 89 + enabled: false + wysiwyg: + weight: 90 + enabled: false +field_type: entity_reference_revisions diff --git a/config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml b/config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml deleted file mode 100644 index f3079c46b6..0000000000 --- a/config/sync/field.field.paragraph.service_location.field_service_delivery_options.yml +++ /dev/null @@ -1,39 +0,0 @@ -uuid: e8753699-64d0-4ece-b01d-53d60acb26cc -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_service_delivery_options - - paragraphs.paragraphs_type.service_location - - taxonomy.vocabulary.service_delivery_options - module: - - entity_reference_validators - - tmgmt_content -third_party_settings: - entity_reference_validators: - circular_reference: false - circular_reference_deep: false - duplicate_reference: false - tmgmt_content: - excluded: false -id: paragraph.service_location.field_service_delivery_options -field_name: field_service_delivery_options -entity_type: paragraph -bundle: service_location -label: 'Service delivery options' -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:taxonomy_term' - handler_settings: - target_bundles: - service_delivery_options: service_delivery_options - sort: - field: name - direction: asc - auto_create: false - auto_create_bundle: '' -field_type: entity_reference diff --git a/config/sync/field.field.paragraph.service_location.field_use_facility_phone_number.yml b/config/sync/field.field.paragraph.service_location.field_use_facility_phone_number.yml new file mode 100644 index 0000000000..b093df23d8 --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_use_facility_phone_number.yml @@ -0,0 +1,28 @@ +uuid: 98e2d610-9d03-4475-80e8-483570ed84ac +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_use_facility_phone_number + - paragraphs.paragraphs_type.service_location + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_use_facility_phone_number +field_name: field_use_facility_phone_number +entity_type: paragraph +bundle: service_location +label: 'Use the facility phone number' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/config/sync/field.field.paragraph.service_location.field_virtual_support.yml b/config/sync/field.field.paragraph.service_location.field_virtual_support.yml new file mode 100644 index 0000000000..e524d1df32 --- /dev/null +++ b/config/sync/field.field.paragraph.service_location.field_virtual_support.yml @@ -0,0 +1,25 @@ +uuid: 397e5cab-f363-4eb3-926b-010efbabfde6 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_virtual_support + - paragraphs.paragraphs_type.service_location + module: + - options + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: paragraph.service_location.field_virtual_support +field_name: field_virtual_support +entity_type: paragraph +bundle: service_location +label: 'Virtual support' +description: 'Select whether Veterans can receive services by phone or video call. ' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/sync/field.storage.paragraph.field_appt_intro_text_custom.yml b/config/sync/field.storage.paragraph.field_appt_intro_text_custom.yml new file mode 100644 index 0000000000..e13ffa6734 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_appt_intro_text_custom.yml @@ -0,0 +1,19 @@ +uuid: aa95ab71-2c33-47cd-af64-b7a83b669b85 +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_appt_intro_text_custom +field_name: field_appt_intro_text_custom +entity_type: paragraph +type: string_long +settings: + case_sensitive: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_appt_intro_text_type.yml b/config/sync/field.storage.paragraph.field_appt_intro_text_type.yml new file mode 100644 index 0000000000..925439f7dc --- /dev/null +++ b/config/sync/field.storage.paragraph.field_appt_intro_text_type.yml @@ -0,0 +1,30 @@ +uuid: 6c7b3a37-c14d-4993-9c41-264a3add5058 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_appt_intro_text_type +field_name: field_appt_intro_text_type +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: use_default_text + label: 'Use default text' + - + value: customize_text + label: 'Customize text' + - + value: remove_text + label: 'Remove text' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_office_visits.yml b/config/sync/field.storage.paragraph.field_office_visits.yml new file mode 100644 index 0000000000..28c9646201 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_office_visits.yml @@ -0,0 +1,33 @@ +uuid: be4da6fb-7785-484c-b130-c2127c2a47aa +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_office_visits +field_name: field_office_visits +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: 'no' + label: 'No' + - + value: yes_appointment_only + label: 'Yes, by appointment only' + - + value: yes_first_come_first_served_basis + label: 'Yes, on a first-come, first-served basis' + - + value: yes_with_or_without_appointment + label: 'Yes, with or without an appointment' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_online_scheduling_avail.yml b/config/sync/field.storage.paragraph.field_online_scheduling_avail.yml new file mode 100644 index 0000000000..d637a27f5d --- /dev/null +++ b/config/sync/field.storage.paragraph.field_online_scheduling_avail.yml @@ -0,0 +1,27 @@ +uuid: dd260bd2-d9d6-4c88-a904-17a475191269 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_online_scheduling_avail +field_name: field_online_scheduling_avail +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: 'no' + label: 'No' + - + value: 'yes' + label: 'Yes' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_other_phone_numbers.yml b/config/sync/field.storage.paragraph.field_other_phone_numbers.yml new file mode 100644 index 0000000000..c9148ae8e4 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_other_phone_numbers.yml @@ -0,0 +1,20 @@ +uuid: 476b0bff-b268-4af8-a67f-8bcd4c7af62e +langcode: en +status: true +dependencies: + module: + - entity_reference_revisions + - paragraphs +id: paragraph.field_other_phone_numbers +field_name: field_other_phone_numbers +entity_type: paragraph +type: entity_reference_revisions +settings: + target_type: paragraph +module: entity_reference_revisions +locked: false +cardinality: 5 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_service_delivery_options.yml b/config/sync/field.storage.paragraph.field_service_delivery_options.yml deleted file mode 100644 index 6ab18274cc..0000000000 --- a/config/sync/field.storage.paragraph.field_service_delivery_options.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: 88e99263-1551-4f7b-97a6-e92e48525c5b -langcode: en -status: true -dependencies: - module: - - paragraphs - - taxonomy -id: paragraph.field_service_delivery_options -field_name: field_service_delivery_options -entity_type: paragraph -type: entity_reference -settings: - target_type: taxonomy_term -module: core -locked: false -cardinality: -1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_use_facility_phone_number.yml b/config/sync/field.storage.paragraph.field_use_facility_phone_number.yml new file mode 100644 index 0000000000..267d43fb52 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_use_facility_phone_number.yml @@ -0,0 +1,18 @@ +uuid: 9c969af6-a594-4339-9a8e-2d2bc98fd6c9 +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_use_facility_phone_number +field_name: field_use_facility_phone_number +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.paragraph.field_virtual_support.yml b/config/sync/field.storage.paragraph.field_virtual_support.yml new file mode 100644 index 0000000000..bc694e0ff3 --- /dev/null +++ b/config/sync/field.storage.paragraph.field_virtual_support.yml @@ -0,0 +1,33 @@ +uuid: 1a3585fe-48dd-44b5-9dee-186b1a7478a2 +langcode: en +status: true +dependencies: + module: + - options + - paragraphs +id: paragraph.field_virtual_support +field_name: field_virtual_support +entity_type: paragraph +type: list_string +settings: + allowed_values: + - + value: 'no' + label: 'No' + - + value: yes_appointment_only + label: 'Yes, by appointment only' + - + value: yes_first_come_first_served_basis + label: 'Yes, on a first-come, first-served basis' + - + value: yes_with_or_without_appointment + label: 'Yes, with or without an appointment' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false From 8d8b80cd93fc4e7f3ea6e89646333149e3c0a6a0 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Mon, 29 Jan 2024 13:24:35 -0600 Subject: [PATCH 04/26] VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt --- .../views.view.service_locations_audit.yml | 2998 +++++++++++++++++ 1 file changed, 2998 insertions(+) create mode 100644 config/sync/views.view.service_locations_audit.yml diff --git a/config/sync/views.view.service_locations_audit.yml b/config/sync/views.view.service_locations_audit.yml new file mode 100644 index 0000000000..5d570d9b8f --- /dev/null +++ b/config/sync/views.view.service_locations_audit.yml @@ -0,0 +1,2998 @@ +uuid: 06b32350-4dd3-4b03-95b0-879bbdf03851 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_administration + - field.storage.node.field_hservice_appt_intro_select + - field.storage.node.field_hservice_appt_leadin + - field.storage.node.field_online_scheduling_availabl + - field.storage.node.field_phone_numbers_paragraph + - field.storage.node.field_walk_ins_accepted + - field.storage.paragraph.field_appt_intro_text_custom + - field.storage.paragraph.field_appt_intro_text_type + - field.storage.paragraph.field_office_visits + - field.storage.paragraph.field_online_scheduling_avail + - field.storage.paragraph.field_other_phone_numbers + - field.storage.paragraph.field_use_facility_phone_number + - node.type.health_care_local_health_service + - node.type.service_region + - node.type.vba_facility_service + - node.type.vha_facility_nonclinical_service + - taxonomy.vocabulary.administration + - user.role.administrator + - user.role.content_admin + module: + - content_moderation + - csv_serialization + - entity_reference_revisions + - node + - options + - paragraphs + - rest + - serialization + - taxonomy + - user + - views_data_export +id: service_locations_audit +label: 'Service locations audit' +module: views +description: '' +tag: '' +base_table: node_field_data +base_field: nid +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: 'Service locations audit' + fields: + title: + id: title + table: node_field_data + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: field + label: Title + exclude: false + alter: + alter_text: false + make_link: false + absolute: false + word_boundary: false + ellipsis: false + strip_tags: false + trim: false + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: type + plugin_id: field + label: 'Content type' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + moderation_state_1: + id: moderation_state_1 + table: node_field_data + field: moderation_state + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: moderation_state_field + label: 'Moderation state' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: content_moderation_state + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + changed: + id: changed + table: node_field_data + field: changed + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field + label: Updated + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: medium + custom_date_format: '' + timezone: '' + tooltip: + date_format: long + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + description: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_administration: + id: field_administration + table: node__field_administration + field: field_administration + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: Section + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + revision_log: + id: revision_log + table: node_revision + field: revision_log + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: revision_log + plugin_id: field + label: 'Revision log message' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_hservice_appt_intro_select: + id: field_hservice_appt_intro_select + table: node__field_hservice_appt_intro_select + field: field_hservice_appt_intro_select + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Appointment intro text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_appt_intro_text_type: + id: field_appt_intro_text_type + table: paragraph__field_appt_intro_text_type + field: field_appt_intro_text_type + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Appointment introduction text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_hservice_appt_leadin: + id: field_hservice_appt_leadin + table: node__field_hservice_appt_leadin + field: field_hservice_appt_leadin + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Appointment lead-in text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_appt_intro_text_custom: + id: field_appt_intro_text_custom + table: paragraph__field_appt_intro_text_custom + field: field_appt_intro_text_custom + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Appt Custom text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_walk_ins_accepted: + id: field_walk_ins_accepted + table: node__field_walk_ins_accepted + field: field_walk_ins_accepted + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Are walkins accepted?' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_office_visits: + id: field_office_visits + table: paragraph__field_office_visits + field: field_office_visits + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Office visits' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_online_scheduling_availabl: + id: field_online_scheduling_availabl + table: node__field_online_scheduling_availabl + field: field_online_scheduling_availabl + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Is online scheduling available for this service?' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_online_scheduling_avail: + id: field_online_scheduling_avail + table: paragraph__field_online_scheduling_avail + field: field_online_scheduling_avail + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Is online scheduling available for this service?' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_phone_numbers_paragraph: + id: field_phone_numbers_paragraph + table: node__field_phone_numbers_paragraph + field: field_phone_numbers_paragraph + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Phone number for appointments' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_revisions_entity_view + settings: + view_mode: default + group_column: '' + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_other_phone_numbers: + id: field_other_phone_numbers + table: paragraph__field_other_phone_numbers + field: field_other_phone_numbers + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Appt: Other phone numbers' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_revisions_entity_view + settings: + view_mode: default + group_column: '' + group_columns: { } + group_rows: true + delta_limit: 5 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_use_facility_phone_number: + id: field_use_facility_phone_number + table: paragraph__field_use_facility_phone_number + field: field_use_facility_phone_number + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Use the facility phone number' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: boolean + settings: + format: default + format_custom_false: '' + format_custom_true: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field + label: ID + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: role + options: + role: + content_admin: content_admin + administrator: administrator + cache: + type: tag + options: { } + empty: { } + sorts: + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + field_identifier: '' + exposed: false + granularity: second + arguments: { } + filters: + title: + id: title + table: node_field_revision + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: title_op + label: 'Facility service name contains' + description: '' + use_operator: false + operator: title_op + operator_limit_selection: false + operator_list: { } + identifier: title + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vba: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' + administrator: '0' + homepage_manager: '0' + next_js: '0' + translation_manager: '0' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle + operator: in + value: + service_region: service_region + health_care_local_health_service: health_care_local_health_service + vha_facility_nonclinical_service: vha_facility_nonclinical_service + vba_facility_service: vba_facility_service + group: 1 + exposed: true + expose: + operator_id: type_op + label: 'Content type' + description: '' + use_operator: true + operator: type_op + operator_limit_selection: true + operator_list: + in: in + 'not in': 'not in' + identifier: type + required: false + remember: true + multiple: true + remember_roles: + authenticated: authenticated + anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vba: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' + administrator: '0' + homepage_manager: '0' + next_js: '0' + translation_manager: '0' + reduce: true + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + moderation_state_multiple_workflow_filter: + id: moderation_state_multiple_workflow_filter + table: node + field: moderation_state_multiple_workflow_filter + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: moderation_state_multiple_workflow_filter + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: moderation_state_multiple_workflow_filter_op + label: 'Moderation state' + description: '' + use_operator: false + operator: moderation_state_multiple_workflow_filter_op + operator_limit_selection: false + operator_list: { } + identifier: moderation_state_multiple_workflow_filter + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vba: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' + administrator: '0' + homepage_manager: '0' + next_js: '0' + translation_manager: '0' + reduce: 0 + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: 0 + field_administration_target_id: + id: field_administration_target_id + table: node__field_administration + field: field_administration_target_id + relationship: none + group_type: group + admin_label: '' + plugin_id: taxonomy_index_tid + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_administration_target_id_op + label: Section + description: '' + use_operator: false + operator: field_administration_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: field_administration_target_id + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + content_api_consumer: '0' + content_creator_benefits_hubs: '0' + content_creator_resources_and_support: '0' + office_content_creator: '0' + vamc_content_creator: '0' + content_creator_vba: '0' + content_creator_vet_center: '0' + content_editor: '0' + content_reviewer: '0' + content_publisher: '0' + content_admin: '0' + redirect_administrator: '0' + admnistrator_users: '0' + administrator: '0' + homepage_manager: '0' + next_js: '0' + translation_manager: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + vid: administration + type: select + hierarchy: false + limit: true + error_message: true + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + title: title + type: type + moderation_state_1: moderation_state_1 + changed: changed + field_administration: field_administration + revision_log: changed + field_hservice_appt_intro_select: field_hservice_appt_intro_select + field_appt_intro_text_type: field_appt_intro_text_type + field_hservice_appt_leadin: field_hservice_appt_leadin + field_appt_intro_text_custom: field_appt_intro_text_custom + field_walk_ins_accepted: field_walk_ins_accepted + field_office_visits: field_office_visits + field_online_scheduling_availabl: field_online_scheduling_availabl + field_online_scheduling_avail: field_online_scheduling_avail + field_phone_numbers_paragraph: field_phone_numbers_paragraph + field_other_phone_numbers: field_other_phone_numbers + field_use_facility_phone_number: field_use_facility_phone_number + nid: nid + default: '-1' + info: + title: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + type: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + moderation_state_1: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + field_administration: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + revision_log: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_hservice_appt_intro_select: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_appt_intro_text_type: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_hservice_appt_leadin: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_appt_intro_text_custom: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_walk_ins_accepted: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_office_visits: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_online_scheduling_availabl: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_online_scheduling_avail: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_phone_numbers_paragraph: + align: '' + separator: '' + empty_column: false + responsive: '' + field_other_phone_numbers: + align: '' + separator: '' + empty_column: false + responsive: '' + field_use_facility_phone_number: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + nid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: false + caption: 'Service location results' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: + field_service_location: + id: field_service_location + table: node__field_service_location + field: field_service_location + relationship: none + group_type: group + admin_label: 'field_service_location: Paragraph' + plugin_id: standard + required: true + header: + result: + id: result + table: views + field: result + relationship: none + group_type: group + admin_label: '' + plugin_id: result + empty: false + content: 'Displaying @start - @end of @total' + footer: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.roles + tags: + - 'config:field.storage.node.field_administration' + - 'config:field.storage.node.field_hservice_appt_intro_select' + - 'config:field.storage.node.field_hservice_appt_leadin' + - 'config:field.storage.node.field_online_scheduling_availabl' + - 'config:field.storage.node.field_phone_numbers_paragraph' + - 'config:field.storage.node.field_walk_ins_accepted' + - 'config:field.storage.paragraph.field_appt_intro_text_custom' + - 'config:field.storage.paragraph.field_appt_intro_text_type' + - 'config:field.storage.paragraph.field_office_visits' + - 'config:field.storage.paragraph.field_online_scheduling_avail' + - 'config:field.storage.paragraph.field_other_phone_numbers' + - 'config:field.storage.paragraph.field_use_facility_phone_number' + audit_service_locations: + id: audit_service_locations + display_title: 'Service locations audit' + display_plugin: page + position: 1 + display_options: + display_description: '' + display_extenders: + jsonapi_views: + enabled: true + path: admin/content/audit/service-locations-detailed + menu: + type: tab + title: 'Service locations audit' + description: '' + weight: 0 + expanded: false + menu_name: admin + parent: system.admin_content + context: '0' + as_local_task: true + local_task_link_title: 'Service locations audit' + local_task_parent: 'views_view:view.content.content_audit_page' + local_task_weight: 1005 + local_task_custom_parent_route: '' + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - 'user.node_grants:view' + - user.roles + tags: + - 'config:field.storage.node.field_administration' + - 'config:field.storage.node.field_hservice_appt_intro_select' + - 'config:field.storage.node.field_hservice_appt_leadin' + - 'config:field.storage.node.field_online_scheduling_availabl' + - 'config:field.storage.node.field_phone_numbers_paragraph' + - 'config:field.storage.node.field_walk_ins_accepted' + - 'config:field.storage.paragraph.field_appt_intro_text_custom' + - 'config:field.storage.paragraph.field_appt_intro_text_type' + - 'config:field.storage.paragraph.field_office_visits' + - 'config:field.storage.paragraph.field_online_scheduling_avail' + - 'config:field.storage.paragraph.field_other_phone_numbers' + - 'config:field.storage.paragraph.field_use_facility_phone_number' + service_location_audit_export: + id: service_location_audit_export + display_title: 'Service location audit export' + display_plugin: data_export + position: 1 + display_options: + fields: + title: + id: title + table: node_field_data + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: field + label: Title + exclude: false + alter: + alter_text: false + make_link: false + absolute: false + word_boundary: false + ellipsis: false + strip_tags: false + trim: false + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: type + plugin_id: field + label: 'Content type' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + moderation_state_1: + id: moderation_state_1 + table: node_field_data + field: moderation_state + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: moderation_state_field + label: 'Moderation state' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: content_moderation_state + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + changed: + id: changed + table: node_field_data + field: changed + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field + label: Updated + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: medium + custom_date_format: '' + timezone: '' + tooltip: + date_format: long + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + description: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_administration: + id: field_administration + table: node__field_administration + field: field_administration + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: Section + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + revision_log: + id: revision_log + table: node_revision + field: revision_log + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: revision_log + plugin_id: field + label: 'Revision log message' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_hservice_appt_intro_select: + id: field_hservice_appt_intro_select + table: node__field_hservice_appt_intro_select + field: field_hservice_appt_intro_select + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Appointment intro text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_appt_intro_text_type: + id: field_appt_intro_text_type + table: paragraph__field_appt_intro_text_type + field: field_appt_intro_text_type + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Appointment introduction text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_hservice_appt_leadin: + id: field_hservice_appt_leadin + table: node__field_hservice_appt_leadin + field: field_hservice_appt_leadin + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Appointment lead-in text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_appt_intro_text_custom: + id: field_appt_intro_text_custom + table: paragraph__field_appt_intro_text_custom + field: field_appt_intro_text_custom + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Appt Custom text' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_walk_ins_accepted: + id: field_walk_ins_accepted + table: node__field_walk_ins_accepted + field: field_walk_ins_accepted + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Are walkins accepted?' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_office_visits: + id: field_office_visits + table: paragraph__field_office_visits + field: field_office_visits + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Office visits' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_online_scheduling_availabl: + id: field_online_scheduling_availabl + table: node__field_online_scheduling_availabl + field: field_online_scheduling_availabl + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Is online scheduling available for this service?' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_online_scheduling_avail: + id: field_online_scheduling_avail + table: paragraph__field_online_scheduling_avail + field: field_online_scheduling_avail + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Is online scheduling available for this service?' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: list_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_phone_numbers_paragraph: + id: field_phone_numbers_paragraph + table: node__field_phone_numbers_paragraph + field: field_phone_numbers_paragraph + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'OLD: Phone number for appointments' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_revisions_entity_view + settings: + view_mode: default + group_column: '' + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_other_phone_numbers: + id: field_other_phone_numbers + table: paragraph__field_other_phone_numbers + field: field_other_phone_numbers + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Appt: Other phone numbers' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_revisions_entity_view + settings: + view_mode: default + group_column: '' + group_columns: { } + group_rows: true + delta_limit: 5 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_use_facility_phone_number: + id: field_use_facility_phone_number + table: paragraph__field_use_facility_phone_number + field: field_use_facility_phone_number + relationship: field_service_location + group_type: group + admin_label: '' + plugin_id: field + label: 'NEW: Use the facility phone number' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: boolean + settings: + format: default + format_custom_false: '' + format_custom_true: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + nid: + id: nid + table: node_field_data + field: nid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: nid + plugin_id: field + label: ID + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: number_integer + settings: + thousand_separator: '' + prefix_suffix: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + nothing: + id: nothing + table: views + field: nothing + relationship: none + group_type: group + admin_label: '' + plugin_id: custom + label: URL + exclude: false + alter: + alter_text: true + text: 'https://prod.cms.va.gov/node/{{ nid }}' + make_link: false + path: 'https://prod.cms.va.gov/node/{{ nid }}' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: false + pager: + type: some + options: + offset: 0 + items_per_page: 0 + style: + type: data_export + options: + formats: + csv: csv + csv_settings: + delimiter: ',' + enclosure: '"' + escape_char: \ + strip_tags: true + trim: true + encoding: utf8 + utf8_bom: '0' + use_serializer_encode_only: false + defaults: + access: true + fields: false + display_description: '' + display_extenders: + jsonapi_views: + enabled: true + path: admin/content/audit/service-locations-detailed-exports + displays: + audit_service_locations: audit_service_locations + default: '0' + filename: va-gov-cms-service-locations.csv + automatic_download: false + redirect_path: /admin/content/audit/service-locations-detailed + export_method: batch + export_batch_size: 500 + export_limit: 0 + store_in_public_file_directory: null + custom_redirect_path: true + redirect_to_display: none + include_query_params: true + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - request_format + - url + - 'user.node_grants:view' + - user.roles + tags: + - 'config:field.storage.node.field_administration' + - 'config:field.storage.node.field_hservice_appt_intro_select' + - 'config:field.storage.node.field_hservice_appt_leadin' + - 'config:field.storage.node.field_online_scheduling_availabl' + - 'config:field.storage.node.field_phone_numbers_paragraph' + - 'config:field.storage.node.field_walk_ins_accepted' + - 'config:field.storage.paragraph.field_appt_intro_text_custom' + - 'config:field.storage.paragraph.field_appt_intro_text_type' + - 'config:field.storage.paragraph.field_office_visits' + - 'config:field.storage.paragraph.field_online_scheduling_avail' + - 'config:field.storage.paragraph.field_other_phone_numbers' + - 'config:field.storage.paragraph.field_use_facility_phone_number' From 78508492ba3f1b10c6bc5934268f75887e5cb993 Mon Sep 17 00:00:00 2001 From: Steve Wirt Date: Fri, 2 Feb 2024 19:39:48 -0500 Subject: [PATCH 05/26] VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. --- ...ews.view.right_sidebar_latest_revision.yml | 15 +- .../views.view.service_locations_audit.yml | 130 ++++++++-- .../src/ServiceLocationMigration.php | 226 ++++++++++++++++++ .../custom/va_gov_vamc/va_gov_vamc.deploy.php | 6 +- .../custom/va_gov_vamc/va_gov_vamc.install | 73 +----- ...ervice-location-from-node-to-paragraph.php | 52 ++++ 6 files changed, 406 insertions(+), 96 deletions(-) create mode 100644 docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php create mode 100644 scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php diff --git a/config/sync/views.view.right_sidebar_latest_revision.yml b/config/sync/views.view.right_sidebar_latest_revision.yml index 21afc6ccde..1709c3ce4e 100644 --- a/config/sync/views.view.right_sidebar_latest_revision.yml +++ b/config/sync/views.view.right_sidebar_latest_revision.yml @@ -312,22 +312,21 @@ display: options: { } empty: { } sorts: - revision_timestamp: - id: revision_timestamp - table: node_revision - field: revision_timestamp + vid: + id: vid + table: node_field_revision + field: vid relationship: none group_type: group admin_label: '' entity_type: node - entity_field: revision_timestamp - plugin_id: date + entity_field: vid + plugin_id: standard order: DESC expose: label: '' - field_identifier: revision_timestamp + field_identifier: '' exposed: false - granularity: second arguments: nid: id: nid diff --git a/config/sync/views.view.service_locations_audit.yml b/config/sync/views.view.service_locations_audit.yml index 5d570d9b8f..d9479393c6 100644 --- a/config/sync/views.view.service_locations_audit.yml +++ b/config/sync/views.view.service_locations_audit.yml @@ -6,6 +6,7 @@ dependencies: - field.storage.node.field_administration - field.storage.node.field_hservice_appt_intro_select - field.storage.node.field_hservice_appt_leadin + - field.storage.node.field_last_saved_by_an_editor - field.storage.node.field_online_scheduling_availabl - field.storage.node.field_phone_numbers_paragraph - field.storage.node.field_walk_ins_accepted @@ -1182,16 +1183,93 @@ display: multi_type: separator separator: ', ' field_api_classes: false + field_last_saved_by_an_editor: + id: field_last_saved_by_an_editor + table: node__field_last_saved_by_an_editor + field: field_last_saved_by_an_editor + relationship: none + group_type: group + admin_label: '' + plugin_id: field + label: 'Last Saved by an Editor' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: medium + custom_date_format: '' + timezone: '' + tooltip: + date_format: long + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + description: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false pager: - type: mini + type: full options: offset: 0 - items_per_page: 10 + items_per_page: 100 total_pages: null id: 0 tags: next: ›› previous: ‹‹ + first: '« First' + last: 'Last »' expose: items_per_page: false items_per_page_label: 'Items per page' @@ -1200,6 +1278,8 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: @@ -1221,15 +1301,15 @@ display: options: { } empty: { } sorts: - created: - id: created + changed: + id: changed table: node_field_data - field: created + field: changed relationship: none group_type: group admin_label: '' entity_type: node - entity_field: created + entity_field: changed plugin_id: date order: DESC expose: @@ -1514,6 +1594,7 @@ display: field_other_phone_numbers: field_other_phone_numbers field_use_facility_phone_number: field_use_facility_phone_number nid: nid + field_last_saved_by_an_editor: field_last_saved_by_an_editor default: '-1' info: title: @@ -1524,14 +1605,14 @@ display: empty_column: false responsive: '' type: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' moderation_state_1: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' @@ -1545,7 +1626,7 @@ display: empty_column: false responsive: '' field_administration: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' @@ -1559,56 +1640,56 @@ display: empty_column: false responsive: '' field_hservice_appt_intro_select: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_appt_intro_text_type: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_hservice_appt_leadin: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_appt_intro_text_custom: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_walk_ins_accepted: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_office_visits: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_online_scheduling_availabl: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' field_online_scheduling_avail: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' @@ -1625,21 +1706,28 @@ display: empty_column: false responsive: '' field_use_facility_phone_number: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' nid: - sortable: false + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + field_last_saved_by_an_editor: + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' override: true - sticky: false + sticky: true summary: '' empty_table: false caption: 'Service location results' @@ -1690,6 +1778,7 @@ display: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_hservice_appt_intro_select' - 'config:field.storage.node.field_hservice_appt_leadin' + - 'config:field.storage.node.field_last_saved_by_an_editor' - 'config:field.storage.node.field_online_scheduling_availabl' - 'config:field.storage.node.field_phone_numbers_paragraph' - 'config:field.storage.node.field_walk_ins_accepted' @@ -1737,6 +1826,7 @@ display: - 'config:field.storage.node.field_administration' - 'config:field.storage.node.field_hservice_appt_intro_select' - 'config:field.storage.node.field_hservice_appt_leadin' + - 'config:field.storage.node.field_last_saved_by_an_editor' - 'config:field.storage.node.field_online_scheduling_availabl' - 'config:field.storage.node.field_phone_numbers_paragraph' - 'config:field.storage.node.field_walk_ins_accepted' diff --git a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php new file mode 100644 index 0000000000..e459199cc8 --- /dev/null +++ b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php @@ -0,0 +1,226 @@ +loadMultiple(array_values($nids)); + foreach ($facility_services as $nid => $facility_service_node) { + /** @var \Drupal\node\NodeInterface $facility_service_node */ + $this->facilityService = $facility_service_node; + // Gather existing service locations. + $service_locations = $facility_service_node->get('field_service_location')->referencedEntities(); + if (empty($service_locations)) { + // There are no service locations, but we still need to put the old node + // data some place, so we need a new service location. + $new_service_location = Paragraph::create(['type' => 'field_service_location']); + $facility_service_node->field_service_location->appendItem($new_service_location); + $service_locations = [$new_service_location]; + $this->facilityService->field_service_location[] = $new_service_location; + $sandbox['service_locations_created_count'] = (isset($sandbox['service_locations_created_count'])) ? ++$sandbox['service_locations_created_count'] : 1; + } + else { + $sandbox['service_locations_updated_count'] = (isset($sandbox['service_locations_updated_count'])) ? ++$sandbox['service_locations_updated_count'] : 1; + } + + $this->migrateServicesLocationsFromFacility($service_locations); + $message = 'Automated move of Facility Health Service data into Service Locations.'; + // Must grab this before save, because after save it will always be true. + $is_latest_revision = $this->facilityService->isLatestRevision(); + if (!$is_latest_revision) { + // The Facility service we have is the default revision, but if it is + // not the latest, there is a forward draft revision we need to update + // too. Grab it now before saving, or we'll grab the one we just saved. + $forward_revision = get_node_at_latest_revision($nid); + } + save_node_revision($this->facilityService, $message, TRUE); + + if (!$is_latest_revision) { + $this->facilityService = $forward_revision; + $this->migrateServicesLocationsFromFacility($service_locations); + // Append new log message to previous log message. + $original_message = $this->facilityService->getRevisionLogMessage(); + $message .= "- Draft revision carried forward."; + $message = "$original_message - $message"; + save_node_revision($this->facilityService, $message, TRUE); + $sandbox['forward_revisions_count'] = (isset($sandbox['forward_revisions_count'])) ? ++$sandbox['forward_revisions_count'] : 1; + } + + unset($sandbox['items_to_process'][_va_gov_stringifynid($nid)]); + $processed_nids .= $nid . ', '; + $sandbox['current']++; + } + // Log the processed nodes. + \Drupal::logger('va_gov_vamc') + ->log(LogLevel::INFO, 'Facility Health Service nodes %current nodes saved to migrate some data into paragraphs. %forward_revisions were also updated. Nodes processed: %nids', [ + '%current' => $sandbox['current'], + '%nids' => $processed_nids, + '%forward_revisions' => $sandbox['forward_revisions_count'] ?? 0, + ]); + } + + /** + * Migrate into each of the service location fields. + * + * @param array $service_locations + * An array of service locations to migrate into. + */ + protected function migrateServicesLocationsFromFacility(array $service_locations): void { + foreach ($service_locations as $service_location) { + /** @var \Drupal\paragraphs\ParagraphInterface $service_location */ + $this->serviceLocation = $service_location; + $this->migrateAppointmentIntroType(); + $this->migrateAppointmentIntroText(); + $this->migrateAppointmentUseFacilityPhone(); + $this->migrateAppointmentPhoneNumbers(); + $this->migrateScheduleOnline(); + $this->migrateWalkinsAccepted(); + $this->serviceLocation->setNewRevision(TRUE); + } + } + + /** + * Move appointment type from the service node to the service location. + */ + protected function migrateAppointmentIntroType(): void { + // Moving from: field_hservice_appt_intro_select. + // Moving to: paragraph.service_location.field_appt_intro_text_type. + $intro_type = $this->facilityService->get('field_hservice_appt_intro_select')->value; + $type_map = [ + 'default_intro_text' => 'use_default_text', + 'custom_intro_text' => 'customize_text', + 'no_intro_text' => 'remove_text', + 'default' => 'use_default_text', + ]; + $new_value = script_libary_map_to_value($intro_type, $type_map); + $this->serviceLocation->set('field_appt_intro_text_type', $new_value); + } + + /** + * Move the appointment text from the service node to the service location. + */ + protected function migrateAppointmentIntroText(): void { + // Moving from: field_hservice_appt_leadin. + // Moving to: paragraph.service_location.field_appointment_intro_text. + $intro_text = $this->facilityService->get('field_hservice_appt_leadin')->value; + $this->serviceLocation->set('field_appt_intro_text_custom', $intro_text); + } + + /** + * Populates the service location based on the presence of apt phone. + */ + protected function migrateAppointmentUseFacilityPhone(): void { + // Based on the presence of data in field_phone_numbers_paragraph. + // To field_use_facility_phone_number. + $has_no_apt_phone = $this->facilityService->get('field_phone_numbers_paragraph')->isEmpty(); + // The assumption is that if there is no existing phone, then it should + // be the main number by default. There is a risk in that they wanted + // the main number and to provide a second, but there is nothing to + // base that decision on to make it cleaner. + $use_main_facility_phone = ($has_no_apt_phone) ? 1 : 0; + $this->serviceLocation->set('field_use_facility_phone_number', $use_main_facility_phone); + } + + /** + * Move the apt phone numbers properties. + */ + protected function migrateAppointmentPhoneNumbers(): void { + // Moving from: field_phone_numbers_paragraph. + // Moving to: field_other_phone_numbers (paragraphs). + $phone_paragraphs = $this->facilityService->get('field_phone_numbers_paragraph')->referencedEntities(); + + foreach ($phone_paragraphs as $phone) { + // Add each one to the service location. + // Need to move Type, Phone number, Extension number, and Label. + $data = [ + 'type' => 'phone_number', + 'field_phone_number_type' => $phone->get('field_phone_number_type')->value, + 'field_phone_number' => $phone->get('field_phone_number')->value, + 'field_phone_extension' => $phone->get('field_phone_extension')->value, + 'field_phone_label' => $phone->get('field_phone_label')->value, + ]; + $new_phone = Paragraph::create($data); + $this->serviceLocation->field_other_phone_numbers[] = $new_phone; + } + } + + /** + * Moves the online scheduling from Service to Service location. + */ + protected function migrateScheduleOnline(): void { + // Moving from: field_online_scheduling_availabl. + // Moving to: field_online_scheduling_avail. + $schedule_online_map = [ + // Schedule online => service location schedule online. + // 'Yes' => 'Yes'. + '1' => 'yes', + // 'No' => 'No'. + '0' => 'no', + // This is the do no harm, option defaulting to most restrictive. + // 'unspecified' => 'No'. + 'not_applicable' => 'no', + 'default' => 'no', + ]; + $lookup = $this->facilityService->get('field_online_scheduling_availabl')->value; + $new_value = script_libary_map_to_value($lookup, $schedule_online_map); + $this->serviceLocation->set('field_online_scheduling_avail', $new_value); + } + + /** + * Move and map the walkins accepted to office visits. + */ + protected function migrateWalkinsAccepted(): void { + // Moving from: node field_walk_ins_accepted. + // Moving to: field_office_visits. + $walkins_accepted_map = [ + // Walkins accepted => office visits. + // 'No' => 'yes by appointment only'. + '0' => 'yes_appointment_only', + // 'Yes' => 'Yes, with or without an appointment'. + '1' => 'yes_with_or_without_appointment', + // This is the do no harm, option defaulting to most restrictive. + // 'unspecified' => 'yes by appointment only'. + 'not_applicable' => 'yes_appointment_only', + 'default' => 'yes_appointment_only', + ]; + $lookup = $this->facilityService->get('field_walk_ins_accepted')->value; + $new_value = script_libary_map_to_value($lookup, $walkins_accepted_map); + $this->serviceLocation->set('field_office_visits', $new_value); + } + +} diff --git a/docroot/modules/custom/va_gov_vamc/va_gov_vamc.deploy.php b/docroot/modules/custom/va_gov_vamc/va_gov_vamc.deploy.php index 817c241fa7..8136f3747a 100644 --- a/docroot/modules/custom/va_gov_vamc/va_gov_vamc.deploy.php +++ b/docroot/modules/custom/va_gov_vamc/va_gov_vamc.deploy.php @@ -5,13 +5,15 @@ * Post deploy file VA Gov VAMC. */ +require_once __DIR__ . '/../../../../scripts/content/script-library.php'; + /** * Build top VA Police page and menu items for each system. */ function va_gov_vamc_deploy_build_va_police_9001(&$sandbox) { \Drupal::moduleHandler()->loadInclude('va_gov_vamc', 'install'); $build_bundle = 'vamc_system_va_police'; - _va_gov_vamc_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); + script_library_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); _va_gov_vamc_create_system_content_pages($sandbox, $build_bundle, 'draft'); - return _va_gov_vamc_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); + return script_library_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); } diff --git a/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install b/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install index e95d881a0e..ccac7cc239 100644 --- a/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install +++ b/docroot/modules/custom/va_gov_vamc/va_gov_vamc.install @@ -6,71 +6,12 @@ */ use Drupal\codit_menu_tools\MenuInsert; -use Drupal\Component\Render\FormattableMarkup; -use Drupal\Core\Utility\UpdateException; use Drupal\field\Entity\FieldConfig; use Drupal\node\Entity\Node; use Drupal\va_gov_lovell\LovellOps; use Psr\Log\LogLevel; -/** - * Initializes the basic sandbox values. - * - * @param array $sandbox - * Standard drupal $sandbox var to keep state in hook_update_N. - * @param string $counter_callback - * A function name to call to get the items to process. Must return an array. - * @param array $callback_args - * A flat array of arguments to pass to the counter_callback. - * - * @throws Drupal\Core\Utility\UpdateException - * If the counter callback can not be found. - */ -function _va_gov_vamc_sandbox_init(array &$sandbox, $counter_callback, array $callback_args = []) { - if (empty($sandbox['total'])) { - // Sandbox has not been initiated. - if (is_callable($counter_callback)) { - $sandbox['items_to_process'] = call_user_func_array($counter_callback, $callback_args); - $sandbox['total'] = count($sandbox['items_to_process']); - $sandbox['current'] = 0; - } - else { - // Something went wrong could not use callback. Throw exception. - throw new UpdateException( - "Counter callback {$counter_callback} provided in _va_gov_vamc_sandbox_init() is not callable. Can not proceed." - ); - } - } -} - -/** - * Updates the counts and log if complete. - * - * @param array $sandbox - * Hook_update_n sandbox for keeping state. - * @param string $completed_message - * Message to log when completed. Can use '@completed' and '@total' as tokens. - * - * @return string - * String to be used as update hook messages. - */ -function _va_gov_vamc_sandbox_complete(array &$sandbox, $completed_message) { - // Determine when to stop batching. - $sandbox['current'] = ($sandbox['total'] - count($sandbox['items_to_process'])); - $sandbox['#finished'] = (empty($sandbox['total'])) ? 1 : ($sandbox['current'] / $sandbox['total']); - $vars = [ - '@completed' => $sandbox['current'], - '@total' => $sandbox['total'], - ]; - $message = t('Processing... @completed/@total.', $vars) . PHP_EOL; - // Log the all finished notice. - if ($sandbox['#finished'] === 1) { - Drupal::logger('va_gov_vamc')->log(LogLevel::INFO, $completed_message, $vars); - $logged_message = new FormattableMarkup($completed_message, $vars); - $message = t('Process completed:') . " {$logged_message}" . PHP_EOL; - } - return $message; -} +require_once __DIR__ . '/../../../../scripts/content/script-library.php'; /** * Calculates an array of system nids that need to have a top task page created. @@ -257,9 +198,9 @@ function va_gov_vamc_update_9003() { */ function va_gov_vamc_update_9004(&$sandbox) { $build_bundle = 'vamc_system_billing_insurance'; - _va_gov_vamc_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); + script_library_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); _va_gov_vamc_create_system_content_pages($sandbox, $build_bundle); - return _va_gov_vamc_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); + return script_library_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); } /** @@ -267,9 +208,9 @@ function va_gov_vamc_update_9004(&$sandbox) { */ function va_gov_vamc_update_9005(&$sandbox) { $build_bundle = 'vamc_system_medical_records_offi'; - _va_gov_vamc_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); + script_library_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); _va_gov_vamc_create_system_content_pages($sandbox, $build_bundle); - return _va_gov_vamc_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); + return script_library_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); } /** @@ -277,9 +218,9 @@ function va_gov_vamc_update_9005(&$sandbox) { */ function va_gov_vamc_update_9006(&$sandbox) { $build_bundle = 'vamc_system_register_for_care'; - _va_gov_vamc_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); + script_library_sandbox_init($sandbox, '_va_gov_vamc_get_systems_to_process', [$build_bundle]); _va_gov_vamc_create_system_content_pages($sandbox, $build_bundle); - return _va_gov_vamc_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); + return script_library_sandbox_complete($sandbox, "Created @total {$build_bundle} nodes."); } /** diff --git a/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php b/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php new file mode 100644 index 0000000000..945ca7581a --- /dev/null +++ b/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php @@ -0,0 +1,52 @@ + 0]; + do { + print(va_gov_vamc_deploy_migrate_service_data_to_service_location($sandbox)); + } while ($sandbox['#finished'] < 1); + // Migration is done. + script_library_skip_post_api_data_check(FALSE); + return "Script run complete."; +} + +/** + * Migrate some facility service data to service location paragraphs. + */ +function va_gov_vamc_deploy_migrate_service_data_to_service_location(&$sandbox) { + $source_bundle = 'health_care_local_health_service'; + script_library_sandbox_init($sandbox, 'get_nids_of_type', [$source_bundle, FALSE]); + new ServiceLocationMigration($sandbox); + $new_service_locations = $sandbox['service_locations_created_count'] ?? 0; + $updated_service_locations = $sandbox['service_locations_updated_count'] ?? 0; + $forward_revisions = $sandbox['forward_revisions_count'] ?? 0; + return script_library_sandbox_complete($sandbox, "migrated @total {$source_bundle} nodes into {$new_service_locations} new service_location paragraphs, and {$updated_service_locations} updated. Also updated {$forward_revisions} forward revisions."); +} From 2e9c325b16e27e35400052488d0302f9d5bb09af Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Fri, 2 Feb 2024 20:49:36 -0600 Subject: [PATCH 06/26] VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code --- ...rm_display.node.service_region.default.yml | 3 +- ...play.node.vba_facility_service.default.yml | 12 +-- ...ba_facility_service.inline_entity_form.yml | 2 + ...a_facility_nonclinical_service.default.yml | 4 +- ...ew_display.node.service_region.default.yml | 9 ++ ..._view_display.node.service_region.full.yml | 2 + ...iew_display.node.service_region.teaser.yml | 2 + ...play.node.vba_facility_service.default.yml | 9 ++ ...node.vba_facility_service.search_index.yml | 2 + ...splay.node.vba_facility_service.teaser.yml | 2 + ...a_facility_nonclinical_service.default.yml | 11 ++- ...ility_nonclinical_service.search_index.yml | 2 + ...ha_facility_nonclinical_service.teaser.yml | 2 + ...region.field_vba_serv_reg_appt_default.yml | 28 +++++++ ...ervice.field_vba_fac_serv_appt_default.yml | 28 +++++++ ...ervice.field_vamc_nonclin_appt_default.yml | 28 +++++++ ...e.node.field_vamc_nonclin_appt_default.yml | 19 +++++ ...e.node.field_vba_fac_serv_appt_default.yml | 19 +++++ ...e.node.field_vba_serv_reg_appt_default.yml | 19 +++++ .../va_gov_backend/va_gov_backend.module | 82 ------------------- .../EventSubscriber/FacilitiesSubscriber.php | 48 +++++++++++ .../va_gov_facilities.info.yml | 2 + .../va_gov_facilities.module | 71 ++++++++++++++++ .../VAMCEntityEventSubscriber.php | 3 - 24 files changed, 316 insertions(+), 93 deletions(-) create mode 100644 config/sync/field.field.node.service_region.field_vba_serv_reg_appt_default.yml create mode 100644 config/sync/field.field.node.vba_facility_service.field_vba_fac_serv_appt_default.yml create mode 100644 config/sync/field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default.yml create mode 100644 config/sync/field.storage.node.field_vamc_nonclin_appt_default.yml create mode 100644 config/sync/field.storage.node.field_vba_fac_serv_appt_default.yml create mode 100644 config/sync/field.storage.node.field_vba_serv_reg_appt_default.yml diff --git a/config/sync/core.entity_form_display.node.service_region.default.yml b/config/sync/core.entity_form_display.node.service_region.default.yml index e8304cad85..dac66a5dd7 100644 --- a/config/sync/core.entity_form_display.node.service_region.default.yml +++ b/config/sync/core.entity_form_display.node.service_region.default.yml @@ -10,6 +10,7 @@ dependencies: - field.field.node.service_region.field_service_location - field.field.node.service_region.field_service_name_and_descripti - field.field.node.service_region.field_vba_region_facility_list + - field.field.node.service_region.field_vba_serv_reg_appt_default - node.type.service_region - workflows.workflow.restricted_archive module: @@ -39,7 +40,6 @@ third_party_settings: description_display: after group_primary_facility: children: - - field_office - field_facility_location - field_service_location label: 'Primary facility' @@ -169,6 +169,7 @@ hidden: body: true created: true field_last_saved_by_an_editor: true + field_vba_serv_reg_appt_default: true langcode: true path: true promote: true diff --git a/config/sync/core.entity_form_display.node.vba_facility_service.default.yml b/config/sync/core.entity_form_display.node.vba_facility_service.default.yml index cd7c258364..e2b45e3535 100644 --- a/config/sync/core.entity_form_display.node.vba_facility_service.default.yml +++ b/config/sync/core.entity_form_display.node.vba_facility_service.default.yml @@ -9,6 +9,7 @@ dependencies: - field.field.node.vba_facility_service.field_office - field.field.node.vba_facility_service.field_service_location - field.field.node.vba_facility_service.field_service_name_and_descripti + - field.field.node.vba_facility_service.field_vba_fac_serv_appt_default - node.type.vba_facility_service - workflows.workflow.editorial module: @@ -27,7 +28,7 @@ third_party_settings: label: 'Section settings' region: content parent_name: '' - weight: 6 + weight: 5 format_type: details_sidebar format_settings: classes: '' @@ -44,7 +45,7 @@ third_party_settings: label: 'Editorial workflow' region: content parent_name: '' - weight: 7 + weight: 6 format_type: fieldset format_settings: classes: '' @@ -98,7 +99,7 @@ content: third_party_settings: { } field_last_saved_by_an_editor: type: datetime_timestamp - weight: 10 + weight: 9 region: content settings: { } third_party_settings: { } @@ -150,7 +151,7 @@ content: third_party_settings: { } status: type: boolean_checkbox - weight: 8 + weight: 7 region: content settings: display_label: true @@ -164,12 +165,13 @@ content: placeholder: '' third_party_settings: { } url_redirects: - weight: 9 + weight: 8 region: content settings: { } third_party_settings: { } hidden: created: true + field_vba_fac_serv_appt_default: true langcode: true path: true promote: true diff --git a/config/sync/core.entity_form_display.node.vba_facility_service.inline_entity_form.yml b/config/sync/core.entity_form_display.node.vba_facility_service.inline_entity_form.yml index e8230ae056..81f67e6628 100644 --- a/config/sync/core.entity_form_display.node.vba_facility_service.inline_entity_form.yml +++ b/config/sync/core.entity_form_display.node.vba_facility_service.inline_entity_form.yml @@ -10,6 +10,7 @@ dependencies: - field.field.node.vba_facility_service.field_office - field.field.node.vba_facility_service.field_service_location - field.field.node.vba_facility_service.field_service_name_and_descripti + - field.field.node.vba_facility_service.field_vba_fac_serv_appt_default - node.type.vba_facility_service module: - field_group @@ -91,6 +92,7 @@ hidden: field_enforce_unique_combo: true field_last_saved_by_an_editor: true field_service_location: true + field_vba_fac_serv_appt_default: true langcode: true moderation_state: true path: true diff --git a/config/sync/core.entity_form_display.node.vha_facility_nonclinical_service.default.yml b/config/sync/core.entity_form_display.node.vha_facility_nonclinical_service.default.yml index aa6fc220ee..c839a23a3d 100644 --- a/config/sync/core.entity_form_display.node.vha_facility_nonclinical_service.default.yml +++ b/config/sync/core.entity_form_display.node.vha_facility_nonclinical_service.default.yml @@ -9,6 +9,7 @@ dependencies: - field.field.node.vha_facility_nonclinical_service.field_last_saved_by_an_editor - field.field.node.vha_facility_nonclinical_service.field_service_location - field.field.node.vha_facility_nonclinical_service.field_service_name_and_descripti + - field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default - node.type.vha_facility_nonclinical_service - workflows.workflow.editorial module: @@ -77,7 +78,7 @@ content: third_party_settings: { } field_last_saved_by_an_editor: type: datetime_timestamp - weight: 26 + weight: 8 region: content settings: { } third_party_settings: { } @@ -130,6 +131,7 @@ content: third_party_settings: { } hidden: created: true + field_vamc_nonclin_appt_default: true langcode: true promote: true status: true diff --git a/config/sync/core.entity_view_display.node.service_region.default.yml b/config/sync/core.entity_view_display.node.service_region.default.yml index a488c8f01b..6c92ff9c48 100644 --- a/config/sync/core.entity_view_display.node.service_region.default.yml +++ b/config/sync/core.entity_view_display.node.service_region.default.yml @@ -10,10 +10,12 @@ dependencies: - field.field.node.service_region.field_service_location - field.field.node.service_region.field_service_name_and_descripti - field.field.node.service_region.field_vba_region_facility_list + - field.field.node.service_region.field_vba_serv_reg_appt_default - node.type.service_region module: - entity_reference_revisions - field_group + - markup - user third_party_settings: field_group: @@ -92,6 +94,13 @@ content: third_party_settings: { } weight: 2 region: content + field_vba_serv_reg_appt_default: + type: markup + label: above + settings: { } + third_party_settings: { } + weight: 6 + region: content hidden: body: true breadcrumbs: true diff --git a/config/sync/core.entity_view_display.node.service_region.full.yml b/config/sync/core.entity_view_display.node.service_region.full.yml index cd7879a105..82e79ca765 100644 --- a/config/sync/core.entity_view_display.node.service_region.full.yml +++ b/config/sync/core.entity_view_display.node.service_region.full.yml @@ -11,6 +11,7 @@ dependencies: - field.field.node.service_region.field_service_location - field.field.node.service_region.field_service_name_and_descripti - field.field.node.service_region.field_vba_region_facility_list + - field.field.node.service_region.field_vba_serv_reg_appt_default - node.type.service_region module: - entity_reference_revisions @@ -120,6 +121,7 @@ hidden: body: true breadcrumbs: true content_moderation_control: true + field_vba_serv_reg_appt_default: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.service_region.teaser.yml b/config/sync/core.entity_view_display.node.service_region.teaser.yml index 812f580b10..ea7cb771a7 100644 --- a/config/sync/core.entity_view_display.node.service_region.teaser.yml +++ b/config/sync/core.entity_view_display.node.service_region.teaser.yml @@ -11,6 +11,7 @@ dependencies: - field.field.node.service_region.field_service_location - field.field.node.service_region.field_service_name_and_descripti - field.field.node.service_region.field_vba_region_facility_list + - field.field.node.service_region.field_vba_serv_reg_appt_default - node.type.service_region module: - text @@ -46,5 +47,6 @@ hidden: field_service_location: true field_service_name_and_descripti: true field_vba_region_facility_list: true + field_vba_serv_reg_appt_default: true langcode: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.vba_facility_service.default.yml b/config/sync/core.entity_view_display.node.vba_facility_service.default.yml index 26841c30a1..af293fe96c 100644 --- a/config/sync/core.entity_view_display.node.vba_facility_service.default.yml +++ b/config/sync/core.entity_view_display.node.vba_facility_service.default.yml @@ -9,10 +9,12 @@ dependencies: - field.field.node.vba_facility_service.field_office - field.field.node.vba_facility_service.field_service_location - field.field.node.vba_facility_service.field_service_name_and_descripti + - field.field.node.vba_facility_service.field_vba_fac_serv_appt_default - node.type.vba_facility_service module: - allow_only_one - entity_reference_revisions + - markup - user id: node.vba_facility_service.default targetEntityType: node @@ -51,6 +53,13 @@ content: third_party_settings: { } weight: 1 region: content + field_vba_fac_serv_appt_default: + type: markup + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content hidden: breadcrumbs: true content_moderation_control: true diff --git a/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml b/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml index 546d4ed7f4..6c4b30ea44 100644 --- a/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml +++ b/config/sync/core.entity_view_display.node.vba_facility_service.search_index.yml @@ -10,6 +10,7 @@ dependencies: - field.field.node.vba_facility_service.field_office - field.field.node.vba_facility_service.field_service_location - field.field.node.vba_facility_service.field_service_name_and_descripti + - field.field.node.vba_facility_service.field_vba_fac_serv_appt_default - node.type.vba_facility_service module: - allow_only_one @@ -53,6 +54,7 @@ hidden: field_administration: true field_last_saved_by_an_editor: true field_service_location: true + field_vba_fac_serv_appt_default: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml b/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml index a54411a0d5..006c9abd80 100644 --- a/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml +++ b/config/sync/core.entity_view_display.node.vba_facility_service.teaser.yml @@ -10,6 +10,7 @@ dependencies: - field.field.node.vba_facility_service.field_office - field.field.node.vba_facility_service.field_service_location - field.field.node.vba_facility_service.field_service_name_and_descripti + - field.field.node.vba_facility_service.field_vba_fac_serv_appt_default - node.type.vba_facility_service module: - user @@ -32,5 +33,6 @@ hidden: field_office: true field_service_location: true field_service_name_and_descripti: true + field_vba_fac_serv_appt_default: true langcode: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml index af936ae78f..a4d4048abf 100644 --- a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml +++ b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml @@ -9,14 +9,23 @@ dependencies: - field.field.node.vha_facility_nonclinical_service.field_last_saved_by_an_editor - field.field.node.vha_facility_nonclinical_service.field_service_location - field.field.node.vha_facility_nonclinical_service.field_service_name_and_descripti + - field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default - node.type.vha_facility_nonclinical_service module: + - markup - user id: node.vha_facility_nonclinical_service.default targetEntityType: node bundle: vha_facility_nonclinical_service mode: default -content: { } +content: + field_vamc_nonclin_appt_default: + type: markup + label: above + settings: { } + third_party_settings: { } + weight: 1 + region: content hidden: breadcrumbs: true content_moderation_control: true diff --git a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.search_index.yml b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.search_index.yml index 01b1f75d19..7f00d08c8a 100644 --- a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.search_index.yml +++ b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.search_index.yml @@ -10,6 +10,7 @@ dependencies: - field.field.node.vha_facility_nonclinical_service.field_last_saved_by_an_editor - field.field.node.vha_facility_nonclinical_service.field_service_location - field.field.node.vha_facility_nonclinical_service.field_service_name_and_descripti + - field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default - node.type.vha_facility_nonclinical_service module: - allow_only_one @@ -48,6 +49,7 @@ hidden: field_facility_location: true field_last_saved_by_an_editor: true field_service_name_and_descripti: true + field_vamc_nonclin_appt_default: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.teaser.yml b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.teaser.yml index d52e9b5a64..6943cc5b2a 100644 --- a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.teaser.yml +++ b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.teaser.yml @@ -10,6 +10,7 @@ dependencies: - field.field.node.vha_facility_nonclinical_service.field_last_saved_by_an_editor - field.field.node.vha_facility_nonclinical_service.field_service_location - field.field.node.vha_facility_nonclinical_service.field_service_name_and_descripti + - field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default - node.type.vha_facility_nonclinical_service module: - user @@ -36,5 +37,6 @@ hidden: field_last_saved_by_an_editor: true field_service_location: true field_service_name_and_descripti: true + field_vamc_nonclin_appt_default: true langcode: true search_api_excerpt: true diff --git a/config/sync/field.field.node.service_region.field_vba_serv_reg_appt_default.yml b/config/sync/field.field.node.service_region.field_vba_serv_reg_appt_default.yml new file mode 100644 index 0000000000..e2d5acef11 --- /dev/null +++ b/config/sync/field.field.node.service_region.field_vba_serv_reg_appt_default.yml @@ -0,0 +1,28 @@ +uuid: 58ae6795-1dcb-4ff9-9dee-389f59676ba4 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_vba_serv_reg_appt_default + - node.type.service_region + module: + - markup + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.service_region.field_vba_serv_reg_appt_default +field_name: field_vba_serv_reg_appt_default +entity_type: node +bundle: service_region +label: 'Appointment lead-in default' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + markup: + value: '

Contact us to schedule, reschedule, or cancel your appointment at our service region.

' + format: rich_text +field_type: markup diff --git a/config/sync/field.field.node.vba_facility_service.field_vba_fac_serv_appt_default.yml b/config/sync/field.field.node.vba_facility_service.field_vba_fac_serv_appt_default.yml new file mode 100644 index 0000000000..f9f05424d2 --- /dev/null +++ b/config/sync/field.field.node.vba_facility_service.field_vba_fac_serv_appt_default.yml @@ -0,0 +1,28 @@ +uuid: 6a047608-0392-4784-987f-ebe107cddf8a +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_vba_fac_serv_appt_default + - node.type.vba_facility_service + module: + - markup + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vba_facility_service.field_vba_fac_serv_appt_default +field_name: field_vba_fac_serv_appt_default +entity_type: node +bundle: vba_facility_service +label: 'Appointment lead-in default' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + markup: + value: '

Contact us to schedule, reschedule, or cancel your appointment.

' + format: rich_text +field_type: markup diff --git a/config/sync/field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default.yml b/config/sync/field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default.yml new file mode 100644 index 0000000000..d637a40567 --- /dev/null +++ b/config/sync/field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default.yml @@ -0,0 +1,28 @@ +uuid: 84e6b6e5-56e6-4f90-8402-e549c0cd9030 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_vamc_nonclin_appt_default + - node.type.vha_facility_nonclinical_service + module: + - markup + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default +field_name: field_vamc_nonclin_appt_default +entity_type: node +bundle: vha_facility_nonclinical_service +label: 'Appointment lead-in default' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + markup: + value: '

Contact us to schedule, reschedule, or cancel your appointment.

' + format: rich_text +field_type: markup diff --git a/config/sync/field.storage.node.field_vamc_nonclin_appt_default.yml b/config/sync/field.storage.node.field_vamc_nonclin_appt_default.yml new file mode 100644 index 0000000000..11ffb81775 --- /dev/null +++ b/config/sync/field.storage.node.field_vamc_nonclin_appt_default.yml @@ -0,0 +1,19 @@ +uuid: f892fada-be3e-4019-9bb7-eb23cc7735be +langcode: en +status: true +dependencies: + module: + - markup + - node +id: node.field_vamc_nonclin_appt_default +field_name: field_vamc_nonclin_appt_default +entity_type: node +type: markup +settings: { } +module: markup +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_vba_fac_serv_appt_default.yml b/config/sync/field.storage.node.field_vba_fac_serv_appt_default.yml new file mode 100644 index 0000000000..43546b83ca --- /dev/null +++ b/config/sync/field.storage.node.field_vba_fac_serv_appt_default.yml @@ -0,0 +1,19 @@ +uuid: 40df6edc-0ab0-4d7c-9646-25a05172fff9 +langcode: en +status: true +dependencies: + module: + - markup + - node +id: node.field_vba_fac_serv_appt_default +field_name: field_vba_fac_serv_appt_default +entity_type: node +type: markup +settings: { } +module: markup +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_vba_serv_reg_appt_default.yml b/config/sync/field.storage.node.field_vba_serv_reg_appt_default.yml new file mode 100644 index 0000000000..4608ca20db --- /dev/null +++ b/config/sync/field.storage.node.field_vba_serv_reg_appt_default.yml @@ -0,0 +1,19 @@ +uuid: 535ddded-64f2-491e-bb21-dd21d13f686f +langcode: en +status: true +dependencies: + module: + - markup + - node +id: node.field_vba_serv_reg_appt_default +field_name: field_vba_serv_reg_appt_default +entity_type: node +type: markup +settings: { } +module: markup +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/docroot/modules/custom/va_gov_backend/va_gov_backend.module b/docroot/modules/custom/va_gov_backend/va_gov_backend.module index 166de635c3..b11d1749b5 100644 --- a/docroot/modules/custom/va_gov_backend/va_gov_backend.module +++ b/docroot/modules/custom/va_gov_backend/va_gov_backend.module @@ -380,12 +380,6 @@ function va_gov_backend_form_alter(&$form, FormStateInterface $form_state, $form $form['description']['widget']['#after_build'][] = '_va_gov_backend_allowed_formats_remove_textarea_help'; } - if (isset($form['field_hservice_appt_intro_select'])) { - $form['field_hservice_appt_leadin']['widget'][0]['value']['#title_display'] = 'invisible'; - _va_gov_backend_modify_appt_intro_text_states($form, $form_state); - $form['#validate'][] = '_va_gov_backend_appt_intro_text_validation'; - } - // Disable path alias modification after lc node is published. _va_gov_backend_disable_alias_widget($form, $form_state); @@ -609,39 +603,6 @@ function va_gov_backend_entity_view_alter(array &$build, EntityInterface $entity } } - // Check if correct content bundle and unset fields. - if ($entity instanceof FieldableEntityInterface && $entity->getEntityTypeId() === 'node' && $entity->bundle() === 'health_care_local_health_service') { - foreach (_va_gov_backend_unset_fields($entity) as $appt_intro_field) { - unset($build[$appt_intro_field]); - } - }; - -} - -/** - * Returns the fields that need to be unset. - * - * @return array - * Fields that should be unset. - */ -function _va_gov_backend_unset_fields(FieldableEntityInterface $entity) { - $appt_intro_select = $entity->get('field_hservice_appt_intro_select')->value; - if ($appt_intro_select === 'default_intro_text') { - return [ - 'field_hservice_appt_leadin', - ]; - } - elseif ($appt_intro_select === 'custom_intro_text') { - return [ - 'field_hservices_lead_in_default', - ]; - } - else { - return [ - 'field_hservices_lead_in_default', - 'field_hservice_appt_leadin', - ]; - } } /** @@ -656,49 +617,6 @@ function _va_gov_backend_get_unlocked_alias_bundles() { return ['documentation_page']; } -/** - * Visibility of Appointment Lead-in Text field. - * - * @param array $form - * The node form array. - * @param Drupal\Core\Form\FormStateInterface $form_state - * Instance of FormStateInterface. - */ -function _va_gov_backend_modify_appt_intro_text_states(array &$form, FormStateInterface $form_state) { - if (isset($form['field_hservice_appt_intro_select'])) { - $form['field_hservice_appt_leadin']['#states'] = [ - 'visible' => [ - ':input[name="field_hservice_appt_intro_select"]' => ['value' => 'custom_intro_text'], - ], - ]; - $form['field_hservices_lead_in_default']['#states'] = [ - 'visible' => [ - ':input[name="field_hservice_appt_intro_select"]' => ['value' => 'default_intro_text'], - ], - ]; - } -} - -/** - * Adds Validation to check for an empty Appointment lead-in field. - * - * @param array $form - * The exposed widget form array. - * @param \Drupal\Core\Form\FormStateInterface $form_state - * The form state. - */ -function _va_gov_backend_appt_intro_text_validation(array $form, FormStateInterface $form_state) { - if (!empty($form_state->getValue('field_hservice_appt_leadin')) && !empty($form_state->getValue('field_hservice_appt_intro_select'))) { - $intro_type = $form_state->getValue('field_hservice_appt_intro_select'); - $intro_text_value = $form_state->getValue('field_hservice_appt_leadin'); - if ($intro_type[0]['value'] === 'custom_intro_text') { - if (($intro_text_value[0]['value'] === "")) { - $form_state->setErrorByName("field_hservice_appt_leadin", t('Appointment lead-in text required')); - } - } - } -} - /** * Disable url alias widget after publish. * diff --git a/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php b/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php index 6702be4f74..b25f382c27 100644 --- a/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php +++ b/docroot/modules/custom/va_gov_facilities/src/EventSubscriber/FacilitiesSubscriber.php @@ -24,6 +24,7 @@ use Drupal\field_event_dispatcher\Event\Field\WidgetCompleteFormAlterEvent; use Drupal\field_event_dispatcher\FieldHookEvents; use Drupal\node\NodeInterface; +use Drupal\paragraphs\ParagraphInterface; use Drupal\va_gov_user\Service\UserPermsService; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -220,7 +221,9 @@ public static function createRenderArrayFromFieldOnRefdEntity(NodeInterface $nod */ public function entityPresave(EntityPresaveEvent $event): void { $entity = $event->getEntity(); + $this->clearCustomAppointmentIntroText($entity); $this->clearNormalStatusDetails($entity); + $this->clearUnusedServiceLocationHours($entity); } /** @@ -356,6 +359,51 @@ private function getFacilityHours(array &$widget_complete_form, FormStateInterfa } } + /** + * Clear custom appointment intro text when unused. + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * Entity. + */ + protected function clearCustomAppointmentIntroText(EntityInterface $entity): void { + if ($entity instanceof ParagraphInterface) { + $type = $entity->getType(); + /** @var \Drupal\paragraphs\ParagraphInterface $entity */ + if (($type === 'service_location') + && ($entity->hasField('field_appt_intro_text_type')) + && ($entity->hasField('field_appt_intro_text_custom'))) { + $appt_select = $entity->get('field_appt_intro_text_type')->value; + $appt_leadin = $entity->get('field_appt_intro_text_custom')->value; + if ($appt_select !== 'customize_text' && !empty($appt_leadin)) { + $entity->set('field_appt_intro_text_custom', ''); + } + } + } + } + + /** + * Clear service location hours when unused. + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * Entity. + */ + protected function clearUnusedServiceLocationHours(EntityInterface $entity): void { + if ($entity instanceof ParagraphInterface) { + $type = $entity->getType(); + /** @var \Drupal\paragraphs\ParagraphInterface $entity */ + if (($type === 'service_location') + && ($entity->hasField('field_hours')) + && ($entity->hasField('field_office_hours'))) { + $hours = $entity->get('field_hours')->value; + $office_hours = $entity->get('field_office_hours')->getValue(); + // 2 = Provide specific hours for this service. + if ($hours !== '2' && count($office_hours) > 0) { + $entity->set('field_office_hours', []); + } + } + } + } + /** * Clear status details when operating status is normal. * diff --git a/docroot/modules/custom/va_gov_facilities/va_gov_facilities.info.yml b/docroot/modules/custom/va_gov_facilities/va_gov_facilities.info.yml index 1034cbc4ed..0f1edb4b7b 100644 --- a/docroot/modules/custom/va_gov_facilities/va_gov_facilities.info.yml +++ b/docroot/modules/custom/va_gov_facilities/va_gov_facilities.info.yml @@ -3,3 +3,5 @@ type: module description: 'Tools to improve user experience for VA Facilities.' core_version_requirement: ^9 || ^10 package: 'Custom' +dependencies: + - va_gov_backend \ No newline at end of file diff --git a/docroot/modules/custom/va_gov_facilities/va_gov_facilities.module b/docroot/modules/custom/va_gov_facilities/va_gov_facilities.module index 60104d5049..12079ee8f2 100644 --- a/docroot/modules/custom/va_gov_facilities/va_gov_facilities.module +++ b/docroot/modules/custom/va_gov_facilities/va_gov_facilities.module @@ -5,6 +5,9 @@ * Contains va_gov_facilities.module. */ +use Drupal\Component\Render\FormattableMarkup; + +use Drupal\Core\Form\FormStateInterface; use Drupal\va_gov_facilities\EventSubscriber\FacilitiesSubscriber; /** @@ -38,3 +41,71 @@ function va_gov_facilities_preprocess_field__paragraph__field_hours(&$variables) } } } + +/** + * Populates Service Location form with default appointment text from service. + * + * @param Drupal\Core\Form\FormStateInterface $form_state + * The form state. + * + * @return string + * The default appointment text from the service node type. + */ +function _va_gov_facilities_populate_service_default_appt_text(FormStateInterface $form_state): string { + $default_text = ''; + /** @var \Drupal\Core\Entity\EntityFormInterface $form_object */ + $form_object = $form_state->getFormObject(); + $bundle = $form_object->getEntity()->bundle(); + $entity = $form_object->getEntity(); + $service_types = [ + 'health_care_local_health_service' => 'field_hservices_lead_in_default', + 'service_region' => 'field_vba_serv_reg_appt_default', + 'vba_facility_service' => 'field_vba_fac_serv_appt_default', + 'vha_facility_nonclinical_service' => 'field_vamc_nonclin_appt_default', + ]; + foreach ($service_types as $service_type => $default_field) { + if ($bundle === $service_type) { + if ($entity->$default_field && !$entity->$default_field->isEmpty()) { + $default_text = trim(strip_tags($entity->$default_field->getFieldDefinition()->getSetting('markup')['value'])); + } + } + } + + return $default_text; +} + +/** + * Implements hook_field_widget_single_element_WIDGET_TYPE_form_alter(). + */ +function va_gov_facilities_field_widget_single_element_paragraphs_form_alter(&$element, FormStateInterface $form_state, $context) { + $paragraph_type = $element['#paragraph_type'] ?? ''; + if ($paragraph_type === 'service_location') { + // Set the default text for appointments. + $default_text = _va_gov_facilities_populate_service_default_appt_text($form_state) ?? ''; + $description = new FormattableMarkup($default_text, []); + // Create the form element for the default text for appointments. + // Nest it under the select list about the type of text. + $element['subform']['field_appt_intro_text_type']['temp_default_text'] = [ + '#type' => 'textarea', + '#title' => t('Default text'), + '#value' => $description, + '#weight' => 1, + '#disabled' => TRUE, + ]; + // Hide appointments custom text unless explicitly selected. + $selector = sprintf(':input[name="field_service_location[%d][subform][field_appt_intro_text_type]"]', $element['#delta']); + // The default appointment text shows as a disabled form element. + $element['subform']['field_appt_intro_text_type']['temp_default_text']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'use_default_text'], + ], + ]; + $element['subform']['field_appt_intro_text_custom']['#states'] = [ + 'visible' => [ + $selector => ['value' => 'customize_text'], + ], + ]; + + } + +} diff --git a/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php b/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php index d1b51c31a9..5225332876 100644 --- a/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php +++ b/docroot/modules/custom/va_gov_vamc/src/EventSubscriber/VAMCEntityEventSubscriber.php @@ -14,7 +14,6 @@ use Drupal\core_event_dispatcher\Event\Entity\EntityViewAlterEvent; use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; use Drupal\node\NodeInterface; -use Drupal\paragraphs\ParagraphInterface; use Drupal\va_gov_notifications\Service\NotificationsManager; use Drupal\va_gov_user\Service\UserPermsService; use Drupal\va_gov_vamc\Service\ContentHardeningDeduper; @@ -200,8 +199,6 @@ public function alterAppendedSystemHealthServices(EntityViewAlterEvent $event):v public function entityPresave(EntityPresaveEvent $event): void { $entity = $event->getEntity(); $this->contentHardeningDeduper->removeDuplicate($entity); - $this->clearCustomAppointmentIntroText($entity); - $this->clearUnusedServiceLocationHours($entity); } /** From 52a01330600e58976d6191eb7e43ff1e27faea68 Mon Sep 17 00:00:00 2001 From: Michael Kinnunen Date: Thu, 15 Feb 2024 08:58:45 -0500 Subject: [PATCH 07/26] VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. --- ...alth_care_local_health_service.default.yml | 86 +++---------------- ...alth_care_local_health_service.default.yml | 67 +++------------ ...play.node.vba_facility_service.default.yml | 13 +-- ...a_facility_nonclinical_service.default.yml | 37 ++++++-- ...lay.paragraph.service_location.default.yml | 50 +++++++++-- .../health_care_local_health_service.feature | 5 +- 6 files changed, 99 insertions(+), 159 deletions(-) diff --git a/config/sync/core.entity_form_display.node.health_care_local_health_service.default.yml b/config/sync/core.entity_form_display.node.health_care_local_health_service.default.yml index d9471da318..87700b0608 100644 --- a/config/sync/core.entity_form_display.node.health_care_local_health_service.default.yml +++ b/config/sync/core.entity_form_display.node.health_care_local_health_service.default.yml @@ -23,13 +23,10 @@ dependencies: module: - allow_only_one - content_moderation - - entity_browser_entity_form - field_group - - ief_table_view_mode - limited_field_widgets - markup - paragraphs - - textfield_counter third_party_settings: field_group: group_governance: @@ -50,7 +47,6 @@ third_party_settings: group_appointments: children: - field_referral_required - - field_walk_ins_accepted label: Requirements region: content parent_name: group_a @@ -64,12 +60,7 @@ third_party_settings: open: true group_a: children: - - field_appointments_help_text - - field_hservice_appt_intro_select - - field_hservice_appt_leadin - - field_hservices_lead_in_default - group_appointments - - group_scheduling label: Appointments region: content parent_name: '' @@ -91,9 +82,9 @@ third_party_settings: - field_online_scheduling_availabl - field_phone_numbers_paragraph label: Scheduling - region: content - parent_name: group_a - weight: 9 + region: hidden + parent_name: '' + weight: 12 format_type: fieldset format_settings: classes: '' @@ -174,12 +165,6 @@ content: region: content settings: { } third_party_settings: { } - field_appointments_help_text: - type: markup - weight: 4 - region: content - settings: { } - third_party_settings: { } field_enforce_unique_combo: type: allow_only_one_widget weight: 29 @@ -199,62 +184,12 @@ content: region: content settings: { } third_party_settings: { } - field_hservice_appt_intro_select: - type: options_buttons - weight: 5 - region: content - settings: { } - third_party_settings: { } - field_hservice_appt_leadin: - type: string_textarea_with_counter - weight: 6 - region: content - settings: - rows: 3 - placeholder: '' - maxlength: 200 - counter_position: after - js_prevent_submit: true - count_html_characters: false - textcount_status_message: '@remaining_count characters remaining.' - third_party_settings: { } - field_hservices_lead_in_default: - type: markup - weight: 7 - region: content - settings: { } - third_party_settings: { } field_last_saved_by_an_editor: type: datetime_timestamp - weight: 32 - region: content - settings: { } - third_party_settings: { } - field_online_scheduling_availabl: - type: options_select - weight: 0 + weight: 6 region: content settings: { } third_party_settings: { } - field_phone_numbers_paragraph: - type: inline_entity_form_complex_table_view_mode - weight: 1 - region: content - settings: - form_mode: default - override_labels: true - label_singular: 'phone number' - label_plural: 'phone numbers' - allow_new: true - allow_existing: false - match_operator: CONTAINS - allow_duplicate: false - collapsible: false - collapsed: false - revision: false - third_party_settings: - entity_browser_entity_form: - entity_browser_id: _none field_referral_required: type: options_select weight: 27 @@ -287,12 +222,6 @@ content: third_party_settings: limited_field_widgets: limit_values: '3' - field_walk_ins_accepted: - type: options_select - weight: 28 - region: content - settings: { } - third_party_settings: { } moderation_state: type: moderation_state_default weight: 12 @@ -301,6 +230,13 @@ content: third_party_settings: { } hidden: created: true + field_appointments_help_text: true + field_hservice_appt_intro_select: true + field_hservice_appt_leadin: true + field_hservices_lead_in_default: true + field_online_scheduling_availabl: true + field_phone_numbers_paragraph: true + field_walk_ins_accepted: true langcode: true path: true promote: true diff --git a/config/sync/core.entity_view_display.node.health_care_local_health_service.default.yml b/config/sync/core.entity_view_display.node.health_care_local_health_service.default.yml index 5f0c5a72ed..cc2a7399da 100644 --- a/config/sync/core.entity_view_display.node.health_care_local_health_service.default.yml +++ b/config/sync/core.entity_view_display.node.health_care_local_health_service.default.yml @@ -23,7 +23,6 @@ dependencies: - allow_only_one - entity_reference_revisions - field_group - - markup - options - user third_party_settings: @@ -33,7 +32,7 @@ third_party_settings: label: 'VHA and VAMC health service description' parent_name: '' region: hidden - weight: 13 + weight: 21 format_type: fieldset format_settings: classes: '' @@ -44,7 +43,7 @@ third_party_settings: label: 'Facility description of service (this field will be no longer be used in 2021)' parent_name: '' region: hidden - weight: 12 + weight: 20 format_type: fieldset format_settings: classes: '' @@ -52,17 +51,11 @@ third_party_settings: description: '' group_appointments: children: - - field_hservice_appt_intro_select - - field_hservice_appt_leadin - - field_hservices_lead_in_default - field_referral_required - - field_walk_ins_accepted - - field_online_scheduling_availabl - - field_phone_numbers_paragraph label: Appointments parent_name: '' region: content - weight: 1 + weight: 2 format_type: fieldset format_settings: classes: '' @@ -78,44 +71,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 3 - region: content - field_hservice_appt_intro_select: - type: list_default - label: above - settings: { } - third_party_settings: { } - weight: 4 - region: content - field_hservice_appt_leadin: - type: basic_string - label: above - settings: { } - third_party_settings: { } - weight: 5 - region: content - field_hservices_lead_in_default: - type: markup - label: above - settings: { } - third_party_settings: { } - weight: 6 - region: content - field_online_scheduling_availabl: - type: list_default - label: above - settings: { } - third_party_settings: { } - weight: 9 - region: content - field_phone_numbers_paragraph: - type: entity_reference_revisions_entity_view - label: above - settings: - view_mode: default - link: '' - third_party_settings: { } - weight: 10 + weight: 1 region: content field_referral_required: type: list_default @@ -140,14 +96,7 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 2 - region: content - field_walk_ins_accepted: - type: list_default - label: above - settings: { } - third_party_settings: { } - weight: 8 + weight: 3 region: content hidden: breadcrumbs: true @@ -156,7 +105,13 @@ hidden: field_appointments_help_text: true field_facility_location: true field_facility_service_loc_help: true + field_hservice_appt_intro_select: true + field_hservice_appt_leadin: true + field_hservices_lead_in_default: true field_last_saved_by_an_editor: true + field_online_scheduling_availabl: true + field_phone_numbers_paragraph: true + field_walk_ins_accepted: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.vba_facility_service.default.yml b/config/sync/core.entity_view_display.node.vba_facility_service.default.yml index af293fe96c..6650e85328 100644 --- a/config/sync/core.entity_view_display.node.vba_facility_service.default.yml +++ b/config/sync/core.entity_view_display.node.vba_facility_service.default.yml @@ -14,7 +14,6 @@ dependencies: module: - allow_only_one - entity_reference_revisions - - markup - user id: node.vba_facility_service.default targetEntityType: node @@ -34,7 +33,7 @@ content: settings: link: true third_party_settings: { } - weight: 2 + weight: 1 region: content field_service_location: type: entity_reference_revisions_entity_view @@ -51,20 +50,14 @@ content: settings: link: true third_party_settings: { } - weight: 1 - region: content - field_vba_fac_serv_appt_default: - type: markup - label: above - settings: { } - third_party_settings: { } - weight: 4 + weight: 2 region: content hidden: breadcrumbs: true content_moderation_control: true field_administration: true field_last_saved_by_an_editor: true + field_vba_fac_serv_appt_default: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml index a4d4048abf..632b1c6ac0 100644 --- a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml +++ b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml @@ -12,29 +12,52 @@ dependencies: - field.field.node.vha_facility_nonclinical_service.field_vamc_nonclin_appt_default - node.type.vha_facility_nonclinical_service module: - - markup + - allow_only_one + - entity_reference_revisions - user id: node.vha_facility_nonclinical_service.default targetEntityType: node bundle: vha_facility_nonclinical_service mode: default content: - field_vamc_nonclin_appt_default: - type: markup + field_enforce_unique_combo_offic: + type: allow_only_one label: above settings: { } third_party_settings: { } + weight: 0 + region: content + field_facility_location: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + field_service_location: + type: entity_reference_revisions_entity_view + label: above + settings: + view_mode: default + link: '' + third_party_settings: { } + weight: 3 + region: content + field_service_name_and_descripti: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } weight: 1 region: content hidden: breadcrumbs: true content_moderation_control: true field_administration: true - field_enforce_unique_combo_offic: true - field_facility_location: true field_last_saved_by_an_editor: true - field_service_location: true - field_service_name_and_descripti: true + field_vamc_nonclin_appt_default: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/core.entity_view_display.paragraph.service_location.default.yml b/config/sync/core.entity_view_display.paragraph.service_location.default.yml index a5797da3b6..f512bf9ee8 100644 --- a/config/sync/core.entity_view_display.paragraph.service_location.default.yml +++ b/config/sync/core.entity_view_display.paragraph.service_location.default.yml @@ -33,7 +33,7 @@ third_party_settings: label: Hours parent_name: group_service_location region: content - weight: 8 + weight: 23 format_type: fieldset format_settings: classes: '' @@ -48,7 +48,7 @@ third_party_settings: label: 'Contact info' parent_name: group_service_location region: content - weight: 9 + weight: 24 format_type: fieldset format_settings: classes: '' @@ -61,7 +61,7 @@ third_party_settings: label: Address parent_name: group_service_location region: content - weight: 7 + weight: 22 format_type: fieldset format_settings: classes: '' @@ -70,9 +70,8 @@ third_party_settings: open: true group_service_location: children: - - field_task_oriented_header - - field_service_location_descripti - - field_service_delivery_options + - group_service_options + - group_appointments - group_address - group_hours - group_contact_info @@ -85,6 +84,39 @@ third_party_settings: classes: '' id: '' description: '' + group_appointments: + children: + - field_appt_intro_text_type + - field_appt_intro_text_custom + - field_use_facility_phone_number + - field_other_phone_numbers + - field_online_scheduling_avail + label: Appointments + parent_name: group_service_location + region: content + weight: 21 + format_type: fieldset + format_settings: + classes: '' + show_empty_fields: false + id: '' + description: '' + description_display: after + group_service_options: + children: + - field_office_visits + - field_virtual_support + label: 'Service Options' + parent_name: group_service_location + region: content + weight: 20 + format_type: fieldset + format_settings: + classes: '' + show_empty_fields: false + id: '' + description: '' + description_display: after id: paragraph.service_location.default targetEntityType: paragraph bundle: service_location @@ -103,7 +135,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 15 + weight: 13 region: content field_appt_intro_text_type: type: list_default @@ -184,7 +216,7 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 14 + weight: 15 region: content field_phone: type: entity_reference_revisions_entity_view @@ -212,7 +244,7 @@ content: format_custom_false: '' format_custom_true: '' third_party_settings: { } - weight: 13 + weight: 14 region: content field_use_main_facility_phone: type: boolean diff --git a/tests/cypress/integration/features/content_type/facilities/vamc/health_care_local_health_service.feature b/tests/cypress/integration/features/content_type/facilities/vamc/health_care_local_health_service.feature index d74139c8a6..9492a37fc6 100644 --- a/tests/cypress/integration/features/content_type/facilities/vamc/health_care_local_health_service.feature +++ b/tests/cypress/integration/features/content_type/facilities/vamc/health_care_local_health_service.feature @@ -22,9 +22,10 @@ Scenario: Log in and create VAMC Facility Health Service as a Lovell editor Then I select option "Cardiology at Lovell Federal health care - TRICARE" from dropdown with selector "#edit-field-regional-health-service" # Phone number AJAX test - Then I click the "Add new phone number" button + Then I click to expand "Appointments" + And I click the "Add new phone number" button And I wait "20" seconds - Then I should see an element with the selector "[data-drupal-selector*='edit-field-phone-numbers-paragraph-form-']" + Then I should see an element with the selector "[data-drupal-selector*='edit-field-service-location-0-subform-field-other-phone-numbers-wrapper']" # Lovell Federal umbrella test Then I scroll to position "bottom" From 52826f99736c312eef092c440b96c8c03ad106d3 Mon Sep 17 00:00:00 2001 From: Steve Wirt Date: Thu, 15 Feb 2024 18:51:01 -0500 Subject: [PATCH 08/26] VACMS-17241 Update service location migration script to keep state. (#17249) --- .../src/ServiceLocationMigration.php | 108 +++++++++--------- ...ervice-location-from-node-to-paragraph.php | 6 +- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php index e459199cc8..7456783943 100644 --- a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php +++ b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php @@ -3,7 +3,6 @@ namespace Drupal\va_gov_vamc; use Drupal\paragraphs\Entity\Paragraph; -use Psr\Log\LogLevel; /** * Single use class to migrate from facility service node to service location. @@ -29,69 +28,68 @@ class ServiceLocationMigration { /** * Constructor for ServiceLocationMigration. + */ + public function __construct() { + require_once __DIR__ . '/../../../../../scripts/content/script-library.php'; + } + + /** + * Runs a single iteration of the migration. * * @param array $sandbox * Sandbox variable for keeping state during batches. */ - public function __construct(array &$sandbox) { - require_once __DIR__ . '/../../../../../scripts/content/script-library.php'; - $processed_nids = ''; - $batch_size = 25; + public function run(array &$sandbox) { $node_storage = get_node_storage(); - $nids = array_slice($sandbox['items_to_process'], 0, $batch_size, TRUE); - $facility_services = (empty($nids)) ? [] : $node_storage->loadMultiple(array_values($nids)); - foreach ($facility_services as $nid => $facility_service_node) { - /** @var \Drupal\node\NodeInterface $facility_service_node */ - $this->facilityService = $facility_service_node; - // Gather existing service locations. - $service_locations = $facility_service_node->get('field_service_location')->referencedEntities(); - if (empty($service_locations)) { - // There are no service locations, but we still need to put the old node - // data some place, so we need a new service location. - $new_service_location = Paragraph::create(['type' => 'field_service_location']); - $facility_service_node->field_service_location->appendItem($new_service_location); - $service_locations = [$new_service_location]; - $this->facilityService->field_service_location[] = $new_service_location; - $sandbox['service_locations_created_count'] = (isset($sandbox['service_locations_created_count'])) ? ++$sandbox['service_locations_created_count'] : 1; - } - else { - $sandbox['service_locations_updated_count'] = (isset($sandbox['service_locations_updated_count'])) ? ++$sandbox['service_locations_updated_count'] : 1; - } + $nid_to_load = reset($sandbox['items_to_process']); + $facility_service = (empty($nid_to_load)) ? [] : $node_storage->loadMultiple([$nid_to_load]); + $nid = array_key_first($facility_service); + /** @var \Drupal\node\NodeInterface $facility_service_node */ + $facility_service_node = reset($facility_service); + $this->facilityService = $facility_service_node; + // Gather existing service locations. + $service_locations = $this->facilityService->get('field_service_location')->referencedEntities(); + if (empty($service_locations)) { + // There are no service locations, but we still need to put the old node + // data some place, so we need a new service location. + $new_service_location = Paragraph::create(['type' => 'field_service_location']); + $this->facilityService->field_service_location->appendItem($new_service_location); + $service_locations = [$new_service_location]; + $this->facilityService->field_service_location[] = $new_service_location; + $sandbox['service_locations_created_count'] = (isset($sandbox['service_locations_created_count'])) ? ++$sandbox['service_locations_created_count'] : 1; + } + else { + $sandbox['service_locations_updated_count'] = (isset($sandbox['service_locations_updated_count'])) ? ++$sandbox['service_locations_updated_count'] : 1; + } + + $this->migrateServicesLocationsFromFacility($service_locations); + $message = 'Automated move of Facility Health Service data into Service Locations.'; + // Must grab this before save, because after save it will always be true. + $is_latest_revision = $this->facilityService->isLatestRevision(); + if (!$is_latest_revision) { + // The Facility service we have is the default revision, but if it is + // not the latest, there is a forward draft revision we need to update + // too. Grab it now before saving, or we'll grab the one we just saved. + $forward_revision = get_node_at_latest_revision($nid); + } + save_node_revision($this->facilityService, $message, TRUE); + $status_msg = "Updated {$facility_service_node->getTitle()}. "; + if (!$is_latest_revision) { + $this->facilityService = $forward_revision; $this->migrateServicesLocationsFromFacility($service_locations); - $message = 'Automated move of Facility Health Service data into Service Locations.'; - // Must grab this before save, because after save it will always be true. - $is_latest_revision = $this->facilityService->isLatestRevision(); - if (!$is_latest_revision) { - // The Facility service we have is the default revision, but if it is - // not the latest, there is a forward draft revision we need to update - // too. Grab it now before saving, or we'll grab the one we just saved. - $forward_revision = get_node_at_latest_revision($nid); - } + // Append new log message to previous log message. + $original_message = $this->facilityService->getRevisionLogMessage(); + $message .= "- Draft revision carried forward."; + $message = "$original_message - $message"; save_node_revision($this->facilityService, $message, TRUE); - - if (!$is_latest_revision) { - $this->facilityService = $forward_revision; - $this->migrateServicesLocationsFromFacility($service_locations); - // Append new log message to previous log message. - $original_message = $this->facilityService->getRevisionLogMessage(); - $message .= "- Draft revision carried forward."; - $message = "$original_message - $message"; - save_node_revision($this->facilityService, $message, TRUE); - $sandbox['forward_revisions_count'] = (isset($sandbox['forward_revisions_count'])) ? ++$sandbox['forward_revisions_count'] : 1; - } - - unset($sandbox['items_to_process'][_va_gov_stringifynid($nid)]); - $processed_nids .= $nid . ', '; - $sandbox['current']++; + $sandbox['forward_revisions_count'] = (isset($sandbox['forward_revisions_count'])) ? ++$sandbox['forward_revisions_count'] : 1; + $status_msg .= "And a forward revision. "; } - // Log the processed nodes. - \Drupal::logger('va_gov_vamc') - ->log(LogLevel::INFO, 'Facility Health Service nodes %current nodes saved to migrate some data into paragraphs. %forward_revisions were also updated. Nodes processed: %nids', [ - '%current' => $sandbox['current'], - '%nids' => $processed_nids, - '%forward_revisions' => $sandbox['forward_revisions_count'] ?? 0, - ]); + + unset($sandbox['items_to_process'][_va_gov_stringifynid($nid)]); + + return $status_msg; } /** diff --git a/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php b/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php index 945ca7581a..a6a9e49e99 100644 --- a/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php +++ b/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php @@ -10,6 +10,7 @@ * It should only be run 1 time or it will duplicate phone data. * * If for some reason the run crashes before it is complete: + * - It is safe to re-run the script as it should pick up where it left off. * - Go to /admin/config/va-gov-post-api/config * - Uncheck the box for 'Bypass data comparison' * - Click the 'Save' button. @@ -44,9 +45,10 @@ function run(): string { function va_gov_vamc_deploy_migrate_service_data_to_service_location(&$sandbox) { $source_bundle = 'health_care_local_health_service'; script_library_sandbox_init($sandbox, 'get_nids_of_type', [$source_bundle, FALSE]); - new ServiceLocationMigration($sandbox); + $migrator = new ServiceLocationMigration(); + $msg = $migrator->run($sandbox); $new_service_locations = $sandbox['service_locations_created_count'] ?? 0; $updated_service_locations = $sandbox['service_locations_updated_count'] ?? 0; $forward_revisions = $sandbox['forward_revisions_count'] ?? 0; - return script_library_sandbox_complete($sandbox, "migrated @total {$source_bundle} nodes into {$new_service_locations} new service_location paragraphs, and {$updated_service_locations} updated. Also updated {$forward_revisions} forward revisions."); + return $msg . script_library_sandbox_complete($sandbox, "migrated @total {$source_bundle} nodes into {$new_service_locations} new service_location paragraphs, and {$updated_service_locations} updated. Also updated {$forward_revisions} forward revisions."); } From 49f84d8f07204569a04990fe5c5ca09229b262e8 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 28 Feb 2024 13:05:18 -0800 Subject: [PATCH 09/26] VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment --- .../src/Service/PostFacilityServiceVamc.php | 243 ++++++++++++++---- 1 file changed, 191 insertions(+), 52 deletions(-) diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php index 7da37bf3dc..1728d204e4 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php +++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php @@ -10,6 +10,55 @@ */ class PostFacilityServiceVamc extends PostFacilityServiceBase { + /** + * The whether and how to make an office visit. + * + * Options: no, yes_appointment_only, yes_first_come_first_served_basis, + * yes_with_or_without_appointment. + * + * @var string + */ + protected $officeVisits = ""; + + /** + * The type of appointment help text. + * + * Options: use_default_text, customize_text, or remove_text. + * + * @var string + */ + protected $apptIntroType = ""; + + /** + * The visitor help text for making appointments. + * + * @var string + */ + protected $apptIntroText = ""; + + /** + * If the "Use facility phone" was ever selected for appts. + * + * Options: Yes, No (which we convert to bools below). + * + * @var bool + */ + protected $facilityPhoneWasSelectedAppt = FALSE; + + /** + * The phone data for appointments. + * + * @var array + */ + protected $apptPhones = []; + + /** + * Whether online scheduling is available. + * + * @var string + */ + protected $isOnlineSchedulingAvail = ""; + /** * Adds facility service data to Post API queue. * @@ -173,21 +222,19 @@ protected function getPayload(bool $forcePush = FALSE) { if (empty($this->errors) && $this->shouldPush($this->facilityService, $forcePush)) { $service = new \stdClass(); + $service->service_locations = $this->getServiceLocations(); $service->name = $this->serviceTerm->getName(); $service->active = ($this->facilityService->isPublished()) ? TRUE : FALSE; $service->description_national = $this->serviceTerm->getDescription(); $service->description_system = $this->getProcessedHtmlFromField('systemService', 'field_body'); $service->service_api_id = $this->serviceTerm->get('field_health_service_api_id')->value; $service->appointment_leadin = $this->getAppointmentLeadin(); - $field_phone_numbers_paragraphs = $this->facilityService->get('field_phone_numbers_paragraph')->referencedEntities(); - $service->appointment_phones = $this->getPhones(FALSE, $field_phone_numbers_paragraphs); + $service->appointment_phones = $this->apptPhones; // These three fields are repeated here to support Facilty API V0 // for Covid-19 Vaccines. $service->referral_required = $this->getReferralRequired(); - $service->walk_ins_accepted = $this->getWalkInsAccepted(); - $service->online_scheduling_available = $this->getOnlineSchedulingAvailable(); - - $service->service_locations = $this->getServiceLocations(); + $service->walk_ins_accepted = $this->officeVisits; + $service->online_scheduling_available = $this->isOnlineSchedulingAvail; $payload = [ 'detailed_services' => [$service], @@ -234,25 +281,64 @@ protected function getPhones($from_facility = FALSE, array $phone_paragraphs = [ return $assembled_phones; } + /** + * Get the type of lead-in text, favoring the most specific. + * + * @param string $lead_in_type + * The lead-in text type selected. + * + * @return string + * The most specific lead-in text. + */ + protected function getAppointmentLeadInType(string $lead_in_type) { + + switch ($lead_in_type) { + + case 'customize_text': + $text = $lead_in_type; + break; + + case 'use_default_text': + $text = ($this->apptIntroType === 'customize_text') + ? $this->apptIntroType + : $lead_in_type; + break; + + case 'remove_text': + $text = ($this->apptIntroType === 'customize_text' + || $this->apptIntroType === 'use_default_text') + ? $this->apptIntroType + : $lead_in_type; + break; + + default: + $text = $lead_in_type; + + break; + } + + return $this->stringNullify($text); + } + /** * Gets the appropriate appointment intro text. * * @return string - * The mapped values of the field. True, False, not applicable, NULL. + * The mapped values of the field. */ protected function getAppointmentLeadin() { - $selection = $this->facilityService->get('field_hservice_appt_intro_select')->value; + $selection = $this->apptIntroType; switch ($selection) { - case 'custom_intro_text': - $text = $this->facilityService->get('field_hservice_appt_leadin')->value; + case 'customize_text': + $text = $this->apptIntroText; break; - case 'no_intro_text': + case 'remove_text': $text = NULL; break; - case 'default_intro_text': + case 'use_default_text': default: $markupField = $this->facilityService->get('field_hservices_lead_in_default'); $text = $markupField->getSetting('markup')['value'] ?? NULL; @@ -263,6 +349,95 @@ protected function getAppointmentLeadin() { return $this->stringNullify($text); } + /** + * Gets the online scheduling value. + * + * @param string $online_scheduling_avail + * The value set by the user about online scheduling availability. + * Options: yes, no. + */ + protected function getOnlineScheduling(string $online_scheduling_avail) { + $map = [ + // Value => Return. + // Lighthouse decided to receive these as strings since non-bool options. + 'no' => 'false', + 'yes' => 'true', + ]; + + return $map[$online_scheduling_avail]; + } + + /** + * Finds the best way to visit, among options chosen. + * + * @param string $office_visits + * The machine value of the Office visits option. + */ + protected function chooseBestOfficeVisitOption(string $office_visits) { + switch ($office_visits) { + + case 'yes_with_or_without_appointment': + $text = $office_visits; + break; + + case 'yes_first_come_first_served_basis': + case 'yes_appointment_only': + $text = ($this->officeVisits === 'yes_with_or_without_appointment') + ? $this->officeVisits + : $office_visits; + break; + + case 'no': + $text = ($this->officeVisits === 'yes_with_or_without_appointment' + || $this->officeVisits === 'yes_first_come_first_served_basis' + || $this->officeVisits === 'yes_appointment_only') + ? $this->officeVisits + : $office_visits; + break; + + default: + $text = $office_visits; + } + return $this->stringNullify($text); + } + + /** + * Sets all the service-level class properties. + * + * The purpose of setting the class properties from the Service + * location is to ensure that the non-default, most specific or most + * Veteran-friendly value of any of these fields is set at the Service + * level for the payload. + * + * @param \Drupal\paragraphs\Entity\Paragraph $service_location + * The service location. + */ + protected function setServiceLevelProperties(Paragraph $service_location) { + // Set the office visits policy to non-default for the service. + $field_office_visits = $service_location->get('field_office_visits')->value; + $this->officeVisits = $this->chooseBestOfficeVisitOption($field_office_visits); + + // Set the appointment text values to the non-default for the service. + $field_appt_intro_text_type = $service_location->get('field_appt_intro_text_type')->value; + $this->apptIntroType = $this->getAppointmentLeadInType($field_appt_intro_text_type); + $this->apptIntroText = (!empty($this->apptIntroText)) + ? $this->apptIntroText + : $this->stringNullify($service_location->get('field_appt_intro_text_custom')->value); + + // Get the phones from the first service location for appointments. + $field_appt_phone_type = $service_location->get('field_use_facility_phone_number')->value; + $this->apptPhones = (!empty($this->apptPhones)) + ? $this->apptPhones + : $this->getPhones((bool) $field_appt_phone_type, $service_location->get('field_other_phone_numbers')->referencedEntities()); + + // Set the online scheduling value to yes for the service if so chosen. + $this->isOnlineSchedulingAvail = ($this->isOnlineSchedulingAvail !== 'false' + && !empty($this->isOnlineSchedulingAvail)) + ? $this->isOnlineSchedulingAvail + : $this->getOnlineScheduling($service_location->get('field_online_scheduling_avail')->value); + + } + /** * Builds the array of service locations. * @@ -287,6 +462,8 @@ protected function getServiceLocations(): array { // We have some locations. foreach ($field_service_locations as $location) { $service_location = new \stdClass(); + $this->setServiceLevelProperties($location); + $field_service_location_address = $location->get('field_service_location_address')->referencedEntities(); $address_paragraph = reset($field_service_location_address); $service_location->office_name = $this->stringNullify($address_paragraph->get('field_clinic_name')->value); @@ -314,8 +491,8 @@ protected function getServiceLocations(): array { // They will eventually be part of the CMS service location, but are // currently sourced from the facility service node. $service_location->referral_required = $this->getReferralRequired(); - $service_location->walk_ins_accepted = $this->getWalkInsAccepted(); - $service_location->online_scheduling_available = $this->getOnlineSchedulingAvailable(); + $service_location->walk_ins_accepted = $location->get('field_office_visits')->value; + $service_location->online_scheduling_available = $this->getOnlineScheduling($location->get('field_online_scheduling_avail')->value); $service_locations[] = $service_location; } @@ -400,44 +577,6 @@ protected function getReferralRequired() { return $map[$raw] ?? NULL; } - /** - * Maps and returns the value of walk ins accepted. - * - * @return string - * The mapped values of the field. True, False, not applicable, NULL. - */ - protected function getWalkInsAccepted() { - $raw = $this->facilityService->get('field_walk_ins_accepted')->value; - $map = [ - // Value => Return. - // Lighthouse decided to receive these as strings since non-bool options. - '0' => 'false', - '1' => 'true', - 'not_applicable' => 'not applicable', - ]; - - return $map[$raw] ?? NULL; - } - - /** - * Maps and returns the value of online scheduling. - * - * @return string - * The mapped values of the field. True, False, not applicable, NULL. - */ - protected function getOnlineSchedulingAvailable() { - $raw = $this->facilityService->get('field_online_scheduling_availabl')->value; - $map = [ - // Value => Return. - // Lighthouse decided to receive these as strings since non-bool options. - '0' => 'false', - '1' => 'true', - 'not_applicable' => 'not applicable', - ]; - - return $map[$raw] ?? NULL; - } - /** * Load and set the facility node that this service belongs to. */ From 8364114be2bcb64f9012619f80540c7c0928f65f Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 13 Mar 2024 07:29:10 -0500 Subject: [PATCH 10/26] VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen --- ..._view_display.node.vba_facility_service.default.yml | 8 ++++++++ ...y.node.vha_facility_nonclinical_service.default.yml | 1 + .../src/Service/PostFacilityServiceVamc.php | 10 +++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config/sync/core.entity_view_display.node.vba_facility_service.default.yml b/config/sync/core.entity_view_display.node.vba_facility_service.default.yml index 6650e85328..ee960107c7 100644 --- a/config/sync/core.entity_view_display.node.vba_facility_service.default.yml +++ b/config/sync/core.entity_view_display.node.vba_facility_service.default.yml @@ -14,6 +14,7 @@ dependencies: module: - allow_only_one - entity_reference_revisions + - markup - user id: node.vba_facility_service.default targetEntityType: node @@ -52,6 +53,13 @@ content: third_party_settings: { } weight: 2 region: content + field_vba_fac_serv_appt_default: + type: markup + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content hidden: breadcrumbs: true content_moderation_control: true diff --git a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml index 632b1c6ac0..19bc1c8290 100644 --- a/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml +++ b/config/sync/core.entity_view_display.node.vha_facility_nonclinical_service.default.yml @@ -14,6 +14,7 @@ dependencies: module: - allow_only_one - entity_reference_revisions + - markup - user id: node.vha_facility_nonclinical_service.default targetEntityType: node diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php index 1728d204e4..82134b9fad 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php +++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php @@ -414,18 +414,18 @@ protected function chooseBestOfficeVisitOption(string $office_visits) { */ protected function setServiceLevelProperties(Paragraph $service_location) { // Set the office visits policy to non-default for the service. - $field_office_visits = $service_location->get('field_office_visits')->value; + $field_office_visits = $service_location->get('field_office_visits')->value ?? ''; $this->officeVisits = $this->chooseBestOfficeVisitOption($field_office_visits); // Set the appointment text values to the non-default for the service. - $field_appt_intro_text_type = $service_location->get('field_appt_intro_text_type')->value; + $field_appt_intro_text_type = $service_location->get('field_appt_intro_text_type')->value ?? ''; $this->apptIntroType = $this->getAppointmentLeadInType($field_appt_intro_text_type); $this->apptIntroText = (!empty($this->apptIntroText)) ? $this->apptIntroText : $this->stringNullify($service_location->get('field_appt_intro_text_custom')->value); // Get the phones from the first service location for appointments. - $field_appt_phone_type = $service_location->get('field_use_facility_phone_number')->value; + $field_appt_phone_type = $service_location->get('field_use_facility_phone_number')->value ?? ''; $this->apptPhones = (!empty($this->apptPhones)) ? $this->apptPhones : $this->getPhones((bool) $field_appt_phone_type, $service_location->get('field_other_phone_numbers')->referencedEntities()); @@ -434,7 +434,7 @@ protected function setServiceLevelProperties(Paragraph $service_location) { $this->isOnlineSchedulingAvail = ($this->isOnlineSchedulingAvail !== 'false' && !empty($this->isOnlineSchedulingAvail)) ? $this->isOnlineSchedulingAvail - : $this->getOnlineScheduling($service_location->get('field_online_scheduling_avail')->value); + : $this->getOnlineScheduling($service_location->get('field_online_scheduling_avail')->value ?? ''); } @@ -492,7 +492,7 @@ protected function getServiceLocations(): array { // currently sourced from the facility service node. $service_location->referral_required = $this->getReferralRequired(); $service_location->walk_ins_accepted = $location->get('field_office_visits')->value; - $service_location->online_scheduling_available = $this->getOnlineScheduling($location->get('field_online_scheduling_avail')->value); + $service_location->online_scheduling_available = $this->getOnlineScheduling($location->get('field_online_scheduling_avail')->value ?? ''); $service_locations[] = $service_location; } From a773336d4a95a5501b2986b701a4b5cffdba7317 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 06:12:45 -0700 Subject: [PATCH 11/26] Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> --- composer.json | 3 --- composer.lock | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index def8d33bdd..8c7b644885 100644 --- a/composer.json +++ b/composer.json @@ -444,9 +444,6 @@ "drupal/html_tag_usage": { "3270450 - Add csv generator and filters": "https://www.drupal.org/files/issues/2022-06-30/add-filters-and-csv-20.patch" }, - "drupal/hook_event_dispatcher": { - "3341726 - fix for deprecated getImplemenations()": "https://www.drupal.org/files/issues/2023-02-14/3341726-remove-getImplementations.patch" - }, "drupal/inline_entity_form": { "3226473 - Opt-in system delete.": "https://www.drupal.org/files/issues/2023-03-28/3226473-opt-in-system-delete-2.patch", "3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch" diff --git a/composer.lock b/composer.lock index 82a3814bd3..05759e8658 100644 --- a/composer.lock +++ b/composer.lock @@ -7536,17 +7536,17 @@ }, { "name": "drupal/hook_event_dispatcher", - "version": "4.0.0-rc1", + "version": "4.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hook_event_dispatcher.git", - "reference": "4.0.0-rc1" + "reference": "4.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-4.0.0-rc1.zip", - "reference": "4.0.0-rc1", - "shasum": "4e643c27f4c083eb30a1e2325163e65be47d7b81" + "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-4.0.0.zip", + "reference": "4.0.0", + "shasum": "9b11a07269ccf87e2c9b5e487aea3bcb425fcf5f" }, "require": { "drupal/core": "^10", @@ -7555,6 +7555,7 @@ "require-dev": { "drupal/core_event_dispatcher": "*", "drupal/paragraphs": "^1.10", + "drupal/tracer": "^1.0", "drupal/webform": "*", "mglaman/phpstan-drupal": "^1.1", "mockery/mockery": "^1.3", @@ -7568,11 +7569,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.0-rc1", - "datestamp": "1691676068", + "version": "4.0.0", + "datestamp": "1709272506", "security-coverage": { - "status": "not-covered", - "message": "RC releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, From 405997eed80fe25e446741e532f7c584399119c7 Mon Sep 17 00:00:00 2001 From: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:37:49 -0700 Subject: [PATCH 12/26] Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files --- composer.json | 3 +++ composer.lock | 19 +++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 8c7b644885..def8d33bdd 100644 --- a/composer.json +++ b/composer.json @@ -444,6 +444,9 @@ "drupal/html_tag_usage": { "3270450 - Add csv generator and filters": "https://www.drupal.org/files/issues/2022-06-30/add-filters-and-csv-20.patch" }, + "drupal/hook_event_dispatcher": { + "3341726 - fix for deprecated getImplemenations()": "https://www.drupal.org/files/issues/2023-02-14/3341726-remove-getImplementations.patch" + }, "drupal/inline_entity_form": { "3226473 - Opt-in system delete.": "https://www.drupal.org/files/issues/2023-03-28/3226473-opt-in-system-delete-2.patch", "3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch" diff --git a/composer.lock b/composer.lock index 05759e8658..82a3814bd3 100644 --- a/composer.lock +++ b/composer.lock @@ -7536,17 +7536,17 @@ }, { "name": "drupal/hook_event_dispatcher", - "version": "4.0.0", + "version": "4.0.0-rc1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hook_event_dispatcher.git", - "reference": "4.0.0" + "reference": "4.0.0-rc1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-4.0.0.zip", - "reference": "4.0.0", - "shasum": "9b11a07269ccf87e2c9b5e487aea3bcb425fcf5f" + "url": "https://ftp.drupal.org/files/projects/hook_event_dispatcher-4.0.0-rc1.zip", + "reference": "4.0.0-rc1", + "shasum": "4e643c27f4c083eb30a1e2325163e65be47d7b81" }, "require": { "drupal/core": "^10", @@ -7555,7 +7555,6 @@ "require-dev": { "drupal/core_event_dispatcher": "*", "drupal/paragraphs": "^1.10", - "drupal/tracer": "^1.0", "drupal/webform": "*", "mglaman/phpstan-drupal": "^1.1", "mockery/mockery": "^1.3", @@ -7569,11 +7568,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.0", - "datestamp": "1709272506", + "version": "4.0.0-rc1", + "datestamp": "1691676068", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "RC releases are not covered by Drupal security advisories." } } }, From 81a0f241c5c85da57c906bf8673161d78c487f08 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 3 Apr 2024 15:31:25 -0500 Subject: [PATCH 13/26] VACMS-17516 and 17518: Migrating certain Service location values to null (#17703) * Bump drupal/raven from 5.0.8 to 5.0.9 (#17615) Bumps drupal/raven from 5.0.8 to 5.0.9. --- updated-dependencies: - dependency-name: drupal/raven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump knplabs/github-api from 3.14.0 to 3.14.1 (#17628) Bumps [knplabs/github-api](https://github.com/KnpLabs/php-github-api) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/KnpLabs/php-github-api/releases) - [Changelog](https://github.com/KnpLabs/php-github-api/blob/master/CHANGELOG-3.X.md) - [Commits](https://github.com/KnpLabs/php-github-api/compare/v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: knplabs/github-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (#17690) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3469 to 0.0.3470. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3469...v0.0.3470) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5 (#17670) Bumps drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5. --- updated-dependencies: - dependency-name: drupal/entity_clone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.65 to 1.10.66 (#17678) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.65 to 1.10.66. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.65...1.10.66) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (#17617) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/c9c4182bf1b97f5224aee3906fd373f6b61b4526...0fb21704c18a42ce5aa8d720ea4b912f5e6babef) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (#17577) Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 2.1.3 to 2.2.1. - [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases) - [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v2.2.1/docs/simplesamlphp-changelog.md) - [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v2.1.3...v2.2.1) --- updated-dependencies: - dependency-name: simplesamlphp/simplesamlphp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17559: Adds final steps to prevent Cypress failures (#17692) * Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (#17698) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3470 to 0.0.3471. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3470...v0.0.3471) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * VACMS-17518: Adds mapping to NULL * VACMS-17518: Adds mapping to NULL for walk-ins * VACMS-17518: Updates to prevent a warning and to fix the '0' options --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> --- composer.lock | 1 - .../src/Service/PostFacilityServiceVamc.php | 2 +- .../src/ServiceLocationMigration.php | 18 ++++++++++-------- scripts/content/script-library.php | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 82a3814bd3..613a819ab2 100644 --- a/composer.lock +++ b/composer.lock @@ -26924,7 +26924,6 @@ "drupal/no_table_drag": 15, "drupal/openapi": 5, "drupal/openapi_ui": 5, - "drupal/paragraphs_features": 10, "drupal/password_strength": 20, "drupal/pathologic": 15, "drupal/prometheus_exporter": 10, diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php index 82134b9fad..3034c72cdd 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php +++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php @@ -364,7 +364,7 @@ protected function getOnlineScheduling(string $online_scheduling_avail) { 'yes' => 'true', ]; - return $map[$online_scheduling_avail]; + return $map[$online_scheduling_avail] ?? NULL; } /** diff --git a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php index 7456783943..cc0e300bf3 100644 --- a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php +++ b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php @@ -189,10 +189,11 @@ protected function migrateScheduleOnline(): void { '1' => 'yes', // 'No' => 'No'. '0' => 'no', - // This is the do no harm, option defaulting to most restrictive. - // 'unspecified' => 'No'. - 'not_applicable' => 'no', - 'default' => 'no', + // This is the do no harm, option defaulting to no choice. + // 'unspecified' => NULL. + '2' => NULL, + 'not_applicable' => NULL, + 'default' => NULL, ]; $lookup = $this->facilityService->get('field_online_scheduling_availabl')->value; $new_value = script_libary_map_to_value($lookup, $schedule_online_map); @@ -211,10 +212,11 @@ protected function migrateWalkinsAccepted(): void { '0' => 'yes_appointment_only', // 'Yes' => 'Yes, with or without an appointment'. '1' => 'yes_with_or_without_appointment', - // This is the do no harm, option defaulting to most restrictive. - // 'unspecified' => 'yes by appointment only'. - 'not_applicable' => 'yes_appointment_only', - 'default' => 'yes_appointment_only', + // This is the do no harm, option defaulting to no choice. + // 'unspecified' => NULL. + '2' => NULL, + 'not_applicable' => NULL, + 'default' => NULL, ]; $lookup = $this->facilityService->get('field_walk_ins_accepted')->value; $new_value = script_libary_map_to_value($lookup, $walkins_accepted_map); diff --git a/scripts/content/script-library.php b/scripts/content/script-library.php index ac00016965..e7d55cca42 100644 --- a/scripts/content/script-library.php +++ b/scripts/content/script-library.php @@ -388,7 +388,7 @@ function script_library_sandbox_complete(array &$sandbox, $completed_message) { * Whatever the value associated with the key. */ function script_libary_map_to_value(string|null $lookup, array $map, bool $strict = TRUE) : mixed { - if (empty($lookup)) { + if (empty($lookup) && strlen($lookup) === 0) { if (isset($map['default'])) { // There is a default set, so use it. return $map['default']; From d8186dd1c8fd3e6c7b9267fbd36101c15077763c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 10:44:01 -0700 Subject: [PATCH 14/26] Bump symfony/console from 6.4.4 to 6.4.6 (#17728) Bumps [symfony/console](https://github.com/symfony/console) from 6.4.4 to 6.4.6. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v6.4.4...v6.4.6) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> From d993653fd58a2fac0c89f86c4fd7bda48cb0c209 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:28:45 -0700 Subject: [PATCH 15/26] Bump symfony/routing from 6.4.5 to 6.4.6 (#17726) Bumps [symfony/routing](https://github.com/symfony/routing) from 6.4.5 to 6.4.6. - [Release notes](https://github.com/symfony/routing/releases) - [Changelog](https://github.com/symfony/routing/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/routing/compare/v6.4.5...v6.4.6) --- updated-dependencies: - dependency-name: symfony/routing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> From 15e8aed13f233d3f8bcb949842af1d2bf8cac7a3 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Fri, 19 Apr 2024 09:58:31 -0500 Subject: [PATCH 16/26] VACMS-17516: main rebase of integration-service-location (#17901) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * VACMS-17516 and 17518: Migrating certain Service location values to null (#17703) * Bump drupal/raven from 5.0.8 to 5.0.9 (#17615) Bumps drupal/raven from 5.0.8 to 5.0.9. --- updated-dependencies: - dependency-name: drupal/raven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump knplabs/github-api from 3.14.0 to 3.14.1 (#17628) Bumps [knplabs/github-api](https://github.com/KnpLabs/php-github-api) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/KnpLabs/php-github-api/releases) - [Changelog](https://github.com/KnpLabs/php-github-api/blob/master/CHANGELOG-3.X.md) - [Commits](https://github.com/KnpLabs/php-github-api/compare/v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: knplabs/github-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (#17690) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3469 to 0.0.3470. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3469...v0.0.3470) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5 (#17670) Bumps drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5. --- updated-dependencies: - dependency-name: drupal/entity_clone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.65 to 1.10.66 (#17678) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.65 to 1.10.66. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.65...1.10.66) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (#17617) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/c9c4182bf1b97f5224aee3906fd373f6b61b4526...0fb21704c18a42ce5aa8d720ea4b912f5e6babef) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (#17577) Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 2.1.3 to 2.2.1. - [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases) - [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v2.2.1/docs/simplesamlphp-changelog.md) - [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v2.1.3...v2.2.1) --- updated-dependencies: - dependency-name: simplesamlphp/simplesamlphp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17559: Adds final steps to prevent Cypress failures (#17692) * Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (#17698) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3470 to 0.0.3471. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3470...v0.0.3471) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * VACMS-17518: Adds mapping to NULL * VACMS-17518: Adds mapping to NULL for walk-ins * VACMS-17518: Updates to prevent a warning and to fix the '0' options --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-17516: Restores composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin From c27c4a1371c0bdc64d197a8d43ce918e5a5318bb Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Fri, 26 Apr 2024 11:33:50 -0500 Subject: [PATCH 17/26] VACMS-17843: change visit options virtual support (#17905) * VACMS-17516 and 17518: Migrating certain Service location values to null (#17703) * Bump drupal/raven from 5.0.8 to 5.0.9 (#17615) Bumps drupal/raven from 5.0.8 to 5.0.9. --- updated-dependencies: - dependency-name: drupal/raven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump knplabs/github-api from 3.14.0 to 3.14.1 (#17628) Bumps [knplabs/github-api](https://github.com/KnpLabs/php-github-api) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/KnpLabs/php-github-api/releases) - [Changelog](https://github.com/KnpLabs/php-github-api/blob/master/CHANGELOG-3.X.md) - [Commits](https://github.com/KnpLabs/php-github-api/compare/v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: knplabs/github-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (#17690) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3469 to 0.0.3470. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3469...v0.0.3470) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5 (#17670) Bumps drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5. --- updated-dependencies: - dependency-name: drupal/entity_clone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.65 to 1.10.66 (#17678) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.65 to 1.10.66. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.65...1.10.66) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (#17617) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/c9c4182bf1b97f5224aee3906fd373f6b61b4526...0fb21704c18a42ce5aa8d720ea4b912f5e6babef) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (#17577) Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 2.1.3 to 2.2.1. - [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases) - [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v2.2.1/docs/simplesamlphp-changelog.md) - [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v2.1.3...v2.2.1) --- updated-dependencies: - dependency-name: simplesamlphp/simplesamlphp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17559: Adds final steps to prevent Cypress failures (#17692) * Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (#17698) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3470 to 0.0.3471. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3470...v0.0.3471) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * VACMS-17518: Adds mapping to NULL * VACMS-17518: Adds mapping to NULL for walk-ins * VACMS-17518: Updates to prevent a warning and to fix the '0' options --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * Bump symfony/console from 6.4.4 to 6.4.6 (#17728) Bumps [symfony/console](https://github.com/symfony/console) from 6.4.4 to 6.4.6. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v6.4.4...v6.4.6) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump symfony/routing from 6.4.5 to 6.4.6 (#17726) Bumps [symfony/routing](https://github.com/symfony/routing) from 6.4.5 to 6.4.6. - [Release notes](https://github.com/symfony/routing/releases) - [Changelog](https://github.com/symfony/routing/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/routing/compare/v6.4.5...v6.4.6) --- updated-dependencies: - dependency-name: symfony/routing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17843: Updates visit and virtual support choices * Update composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> --- .../sync/field.storage.paragraph.field_office_visits.yml | 6 +++--- .../field.storage.paragraph.field_virtual_support.yml | 8 ++++---- .../src/Service/PostFacilityServiceVamc.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/sync/field.storage.paragraph.field_office_visits.yml b/config/sync/field.storage.paragraph.field_office_visits.yml index 28c9646201..eef6c7f6a7 100644 --- a/config/sync/field.storage.paragraph.field_office_visits.yml +++ b/config/sync/field.storage.paragraph.field_office_visits.yml @@ -18,8 +18,8 @@ settings: value: yes_appointment_only label: 'Yes, by appointment only' - - value: yes_first_come_first_served_basis - label: 'Yes, on a first-come, first-served basis' + value: yes_walk_in_visits_only + label: 'Yes, walk-in visits only' - value: yes_with_or_without_appointment label: 'Yes, with or without an appointment' @@ -30,4 +30,4 @@ cardinality: 1 translatable: true indexes: { } persist_with_no_fields: false -custom_storage: false +custom_storage: false \ No newline at end of file diff --git a/config/sync/field.storage.paragraph.field_virtual_support.yml b/config/sync/field.storage.paragraph.field_virtual_support.yml index bc694e0ff3..6b4f24874b 100644 --- a/config/sync/field.storage.paragraph.field_virtual_support.yml +++ b/config/sync/field.storage.paragraph.field_virtual_support.yml @@ -18,11 +18,11 @@ settings: value: yes_appointment_only label: 'Yes, by appointment only' - - value: yes_first_come_first_served_basis - label: 'Yes, on a first-come, first-served basis' + value: yes_veterans_can_call + label: 'Yes, Veterans can call at their convenience' - - value: yes_with_or_without_appointment - label: 'Yes, with or without an appointment' + value: virtual_visits_may_be_available + label: 'Virtual visits may be available' allowed_values_function: '' module: options locked: false diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php index 3034c72cdd..402deecbe6 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php +++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php @@ -380,7 +380,7 @@ protected function chooseBestOfficeVisitOption(string $office_visits) { $text = $office_visits; break; - case 'yes_first_come_first_served_basis': + case 'yes_walk_in_visits_only': case 'yes_appointment_only': $text = ($this->officeVisits === 'yes_with_or_without_appointment') ? $this->officeVisits @@ -389,7 +389,7 @@ protected function chooseBestOfficeVisitOption(string $office_visits) { case 'no': $text = ($this->officeVisits === 'yes_with_or_without_appointment' - || $this->officeVisits === 'yes_first_come_first_served_basis' + || $this->officeVisits === 'yes_walk_in_visits_only' || $this->officeVisits === 'yes_appointment_only') ? $this->officeVisits : $office_visits; From 9d4f695a078402cc5243abb71253bcdd0ce98019 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 1 May 2024 13:44:07 -0500 Subject: [PATCH 18/26] VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978) * Bump drupal/upgrade_status from 4.1.0 to 4.2.0 (#17900) Bumps drupal/upgrade_status from 4.1.0 to 4.2.0. --- updated-dependencies: - dependency-name: drupal/upgrade_status dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Update sitewide-crew-member-onboarding.md * Bump drupal/override_node_options from 2.7.0 to 2.8.0 (#17899) Bumps drupal/override_node_options from 2.7.0 to 2.8.0. --- updated-dependencies: - dependency-name: drupal/override_node_options dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Update sitewide-crew-member-onboarding.md * Bump va-gov/content-build from 0.0.3486 to 0.0.3487 (#17907) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3486 to 0.0.3487. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3486...v0.0.3487) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-17903: ddev updates (#17910) * Bump drupal/better_exposed_filters from 6.0.3 to 6.0.5 (#17906) Bumps drupal/better_exposed_filters from 6.0.3 to 6.0.5. --- updated-dependencies: - dependency-name: drupal/better_exposed_filters dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump actions/checkout from 4.1.2 to 4.1.3 (#17908) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/9bb56186c3b09b4f86b1c65136769dd318469633...1d96c772d19495a3b5c517cd2bc0cb401ea0529f) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3487 to 0.0.3488 (#17922) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3487 to 0.0.3488. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3487...v0.0.3488) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/govdelivery_bulletins from 1.9.0 to 1.10.0 (#17923) Bumps drupal/govdelivery_bulletins from 1.9.0 to 1.10.0. --- updated-dependencies: - dependency-name: drupal/govdelivery_bulletins dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * VACMS-7325: Adds number of services column and filter (#17924) * VACMS-7325: Adds number of services column and filter * VACMS-7325: Adds Vet Center services * VACMS-7325: Updates the columns for sorting * Bump va-gov/content-build from 0.0.3488 to 0.0.3489 (#17934) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3488 to 0.0.3489. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3488...v0.0.3489) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump squizlabs/php_codesniffer from 3.9.1 to 3.9.2 (#17935) Bumps [squizlabs/php_codesniffer](https://github.com/PHPCSStandards/PHP_CodeSniffer) from 3.9.1 to 3.9.2. - [Release notes](https://github.com/PHPCSStandards/PHP_CodeSniffer/releases) - [Changelog](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.9.1...3.9.2) --- updated-dependencies: - dependency-name: squizlabs/php_codesniffer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * VACMS-17949: fix for composer.lock and drupal-test-traits (#17950) * Bump va-gov/content-build from 0.0.3489 to 0.0.3490 (#17953) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3489 to 0.0.3490. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3489...v0.0.3490) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/paragraphs_features from 2.0.0-beta4 to 2.0.0 (#17952) Bumps drupal/paragraphs_features from 2.0.0-beta4 to 2.0.0. --- updated-dependencies: - dependency-name: drupal/paragraphs_features dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump drupal/tzfield from 1.9.0 to 1.10.0 (#17951) Bumps drupal/tzfield from 1.9.0 to 1.10.0. --- updated-dependencies: - dependency-name: drupal/tzfield dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump int128/datadog-actions-metrics from 1.80.0 to 1.81.0 (#17398) Bumps [int128/datadog-actions-metrics](https://github.com/int128/datadog-actions-metrics) from 1.80.0 to 1.81.0. - [Release notes](https://github.com/int128/datadog-actions-metrics/releases) - [Commits](https://github.com/int128/datadog-actions-metrics/compare/2ca3c09b18e2185806a071ed29fd5a02b75f8599...8a70221aaf8d488c817ae230ac6354ee59279080) --- updated-dependencies: - dependency-name: int128/datadog-actions-metrics dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Update sitewide-crew-member-onboarding.md * Bump va-gov/content-build from 0.0.3490 to 0.0.3491 (#17971) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3490 to 0.0.3491. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3490...v0.0.3491) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-17516 and 17518: Migrating certain Service location values to null (#17703) * Bump drupal/raven from 5.0.8 to 5.0.9 (#17615) Bumps drupal/raven from 5.0.8 to 5.0.9. --- updated-dependencies: - dependency-name: drupal/raven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump knplabs/github-api from 3.14.0 to 3.14.1 (#17628) Bumps [knplabs/github-api](https://github.com/KnpLabs/php-github-api) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/KnpLabs/php-github-api/releases) - [Changelog](https://github.com/KnpLabs/php-github-api/blob/master/CHANGELOG-3.X.md) - [Commits](https://github.com/KnpLabs/php-github-api/compare/v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: knplabs/github-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (#17690) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3469 to 0.0.3470. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3469...v0.0.3470) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5 (#17670) Bumps drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5. --- updated-dependencies: - dependency-name: drupal/entity_clone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.65 to 1.10.66 (#17678) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.65 to 1.10.66. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.65...1.10.66) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (#17617) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/c9c4182bf1b97f5224aee3906fd373f6b61b4526...0fb21704c18a42ce5aa8d720ea4b912f5e6babef) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (#17577) Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 2.1.3 to 2.2.1. - [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases) - [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v2.2.1/docs/simplesamlphp-changelog.md) - [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v2.1.3...v2.2.1) --- updated-dependencies: - dependency-name: simplesamlphp/simplesamlphp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17559: Adds final steps to prevent Cypress failures (#17692) * Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (#17698) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3470 to 0.0.3471. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3470...v0.0.3471) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * VACMS-17518: Adds mapping to NULL * VACMS-17518: Adds mapping to NULL for walk-ins * VACMS-17518: Updates to prevent a warning and to fix the '0' options --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * Bump symfony/console from 6.4.4 to 6.4.6 (#17728) Bumps [symfony/console](https://github.com/symfony/console) from 6.4.4 to 6.4.6. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v6.4.4...v6.4.6) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump symfony/routing from 6.4.5 to 6.4.6 (#17726) Bumps [symfony/routing](https://github.com/symfony/routing) from 6.4.5 to 6.4.6. - [Release notes](https://github.com/symfony/routing/releases) - [Changelog](https://github.com/symfony/routing/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/routing/compare/v6.4.5...v6.4.6) --- updated-dependencies: - dependency-name: symfony/routing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17516: main rebase of integration-service-location (#17901) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * VACMS-17516 and 17518: Migrating certain Service location values to null (#17703) * Bump drupal/raven from 5.0.8 to 5.0.9 (#17615) Bumps drupal/raven from 5.0.8 to 5.0.9. --- updated-dependencies: - dependency-name: drupal/raven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump knplabs/github-api from 3.14.0 to 3.14.1 (#17628) Bumps [knplabs/github-api](https://github.com/KnpLabs/php-github-api) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/KnpLabs/php-github-api/releases) - [Changelog](https://github.com/KnpLabs/php-github-api/blob/master/CHANGELOG-3.X.md) - [Commits](https://github.com/KnpLabs/php-github-api/compare/v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: knplabs/github-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (#17690) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3469 to 0.0.3470. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3469...v0.0.3470) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5 (#17670) Bumps drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5. --- updated-dependencies: - dependency-name: drupal/entity_clone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.65 to 1.10.66 (#17678) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.65 to 1.10.66. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.65...1.10.66) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (#17617) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/c9c4182bf1b97f5224aee3906fd373f6b61b4526...0fb21704c18a42ce5aa8d720ea4b912f5e6babef) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (#17577) Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 2.1.3 to 2.2.1. - [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases) - [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v2.2.1/docs/simplesamlphp-changelog.md) - [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v2.1.3...v2.2.1) --- updated-dependencies: - dependency-name: simplesamlphp/simplesamlphp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17559: Adds final steps to prevent Cypress failures (#17692) * Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (#17698) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3470 to 0.0.3471. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3470...v0.0.3471) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * VACMS-17518: Adds mapping to NULL * VACMS-17518: Adds mapping to NULL for walk-ins * VACMS-17518: Updates to prevent a warning and to fix the '0' options --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-17516: Restores composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Update composer.lock * Bump symfony/console from 6.4.4 to 6.4.6 (#17728) Bumps [symfony/console](https://github.com/symfony/console) from 6.4.4 to 6.4.6. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v6.4.4...v6.4.6) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump symfony/routing from 6.4.5 to 6.4.6 (#17726) Bumps [symfony/routing](https://github.com/symfony/routing) from 6.4.5 to 6.4.6. - [Release notes](https://github.com/symfony/routing/releases) - [Changelog](https://github.com/symfony/routing/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/routing/compare/v6.4.5...v6.4.6) --- updated-dependencies: - dependency-name: symfony/routing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17516: main rebase of integration-service-location (#17901) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * VACMS-17516 and 17518: Migrating certain Service location values to null (#17703) * Bump drupal/raven from 5.0.8 to 5.0.9 (#17615) Bumps drupal/raven from 5.0.8 to 5.0.9. --- updated-dependencies: - dependency-name: drupal/raven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump knplabs/github-api from 3.14.0 to 3.14.1 (#17628) Bumps [knplabs/github-api](https://github.com/KnpLabs/php-github-api) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/KnpLabs/php-github-api/releases) - [Changelog](https://github.com/KnpLabs/php-github-api/blob/master/CHANGELOG-3.X.md) - [Commits](https://github.com/KnpLabs/php-github-api/compare/v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: knplabs/github-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (#17690) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3469 to 0.0.3470. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3469...v0.0.3470) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5 (#17670) Bumps drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5. --- updated-dependencies: - dependency-name: drupal/entity_clone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.65 to 1.10.66 (#17678) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.65 to 1.10.66. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.65...1.10.66) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (#17617) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/c9c4182bf1b97f5224aee3906fd373f6b61b4526...0fb21704c18a42ce5aa8d720ea4b912f5e6babef) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (#17577) Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 2.1.3 to 2.2.1. - [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases) - [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v2.2.1/docs/simplesamlphp-changelog.md) - [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v2.1.3...v2.2.1) --- updated-dependencies: - dependency-name: simplesamlphp/simplesamlphp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17559: Adds final steps to prevent Cypress failures (#17692) * Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (#17698) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3470 to 0.0.3471. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3470...v0.0.3471) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * VACMS-17518: Adds mapping to NULL * VACMS-17518: Adds mapping to NULL for walk-ins * VACMS-17518: Updates to prevent a warning and to fix the '0' options --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-17516: Restores composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * VACMS-17956: Adds virtual support to LH services push --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Jill Adams <85581471+jilladams@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> --- .github/workflows/actions-metrics.yml | 4 +++ .github/workflows/contextual-advice.yml | 4 +++ .github/workflows/continuous_integration.yml | 36 +++++++++++++++++++ .github/workflows/cypress.yml | 4 +++ .../default-branch-datadog-metrics.yml | 12 +++++++ .github/workflows/dependabot-auto-merge.yml | 4 +++ .github/workflows/pull-request-labels.yml | 4 +++ .../workflows/set-tugboat-tests-pending.yml | 4 +++ composer.json | 4 +++ composer.lock | 18 +++++++--- .../src/Service/PostFacilityServiceVamc.php | 1 + 11 files changed, 90 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions-metrics.yml b/.github/workflows/actions-metrics.yml index 4c97ea063d..768e3f5896 100644 --- a/.github/workflows/actions-metrics.yml +++ b/.github/workflows/actions-metrics.yml @@ -11,7 +11,11 @@ jobs: timeout-minutes: 10 steps: - name: Send GitHub Actions metrics to DataDog +<<<<<<< HEAD uses: int128/datadog-actions-metrics@519686d5aeec89083d24b723724656e65fc0b7e4 # v1.87.0 +======= + uses: int128/datadog-actions-metrics@8a70221aaf8d488c817ae230ac6354ee59279080 # v1.81.0 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) with: datadog-api-key: ${{ secrets.DATADOG_API_KEY }} collect-job-metrics: true diff --git a/.github/workflows/contextual-advice.yml b/.github/workflows/contextual-advice.yml index a06bb430a8..ead8de7233 100644 --- a/.github/workflows/contextual-advice.yml +++ b/.github/workflows/contextual-advice.yml @@ -17,7 +17,11 @@ jobs: # branch or its commits, regardless of provenance. # # Do not execute any code located within the repository! +<<<<<<< HEAD - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 21ee52455a..808f1b8bfa 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -11,7 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Check Corresponding Entity Reference Fields # See also `composer va:test:check-cer` in composer.json run: ./tests/scripts/check-cer.sh @@ -28,7 +32,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Composer Validate run: composer validate @@ -38,7 +46,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Post-Checkout Actions uses: ./.github/actions/post-checkout - name: ReviewDog @@ -55,7 +67,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Post-Checkout Actions uses: ./.github/actions/post-checkout - name: Run PHP_CodeSniffer and ReviewDog @@ -79,7 +95,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Post-Checkout Actions uses: ./.github/actions/post-checkout - name: Run PHPLint @@ -92,7 +112,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Post-Checkout Actions uses: ./.github/actions/post-checkout - name: Run PHPStan and ReviewDog @@ -119,7 +143,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Post-Checkout Actions uses: ./.github/actions/post-checkout - name: Run PHPUnit (Unit Tests only) @@ -136,7 +164,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Stylelint modules # See also `composer va:test:stylelint-modules` in composer.json uses: reviewdog/action-stylelint@24fcb957ec2ca41649b8e060a6630feb0d8e4201 # v1.23.0 @@ -164,7 +196,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) with: fetch-depth: 0 - name: Delete any existing comment. diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index ccb75fa551..814cddb816 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -30,7 +30,11 @@ jobs: steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) with: # When Sorry-Cypress support is enabled on `main`, this should be # removed so that the `main` version of the workflow is used diff --git a/.github/workflows/default-branch-datadog-metrics.yml b/.github/workflows/default-branch-datadog-metrics.yml index 0a428f5541..fd26301766 100644 --- a/.github/workflows/default-branch-datadog-metrics.yml +++ b/.github/workflows/default-branch-datadog-metrics.yml @@ -11,7 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - uses: ./.github/actions/post-checkout - name: Find occurrences of "Implements hook" in *.module files. id: hook_implementations @@ -75,7 +79,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - uses: ./.github/actions/post-checkout - name: Run PHPUnit (Unit Tests only) run: bin/phpunit \ @@ -197,7 +205,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - uses: ./.github/actions/post-checkout - name: Run PHPLOC and parse output for metrics. id: phploc_code_quality diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 60967f48e7..ca12a90e80 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -21,7 +21,11 @@ jobs: # Checkout repo to make package allow list available - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) # Use a YAML formatted config file to list which dependencies can be auto-merged - name: Read list of Allowed Auto-merge Dependencies diff --git a/.github/workflows/pull-request-labels.yml b/.github/workflows/pull-request-labels.yml index ad060d09a6..ebb72ad555 100644 --- a/.github/workflows/pull-request-labels.yml +++ b/.github/workflows/pull-request-labels.yml @@ -13,7 +13,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) with: token: "${{ secrets.GITHUB_TOKEN }}" - name: Autolabel diff --git a/.github/workflows/set-tugboat-tests-pending.yml b/.github/workflows/set-tugboat-tests-pending.yml index ee3255c046..9cd6c57c2e 100644 --- a/.github/workflows/set-tugboat-tests-pending.yml +++ b/.github/workflows/set-tugboat-tests-pending.yml @@ -21,7 +21,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout +<<<<<<< HEAD uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 +======= + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) - name: Set status for Tugboat tasks. run: | test_names=( diff --git a/composer.json b/composer.json index def8d33bdd..96e004d37d 100644 --- a/composer.json +++ b/composer.json @@ -223,7 +223,11 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^6.3", "symfony/routing": "^6.3", +<<<<<<< HEAD "va-gov/content-build": "^0.0.3494", +======= + "va-gov/content-build": "^0.0.3491", +>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) "vlucas/phpdotenv": "^5.3", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index 613a819ab2..96e881384c 100644 --- a/composer.lock +++ b/composer.lock @@ -4745,10 +4745,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "drupalspoons", - "homepage": "https://www.drupal.org/user/3647684" - }, { "name": "moshe weitzman", "homepage": "https://www.drupal.org/user/23" @@ -4882,6 +4878,10 @@ "homepage": "https://www.drupal.org/u/realityloop", "role": "Maintainer" }, + { + "name": "Junyor", + "homepage": "https://www.drupal.org/user/7006" + }, { "name": "lhangea", "homepage": "https://www.drupal.org/user/2743803" @@ -11033,6 +11033,14 @@ "name": "Deciphered", "homepage": "https://www.drupal.org/user/103796" }, + { + "name": "greggles", + "homepage": "https://www.drupal.org/user/36762" + }, + { + "name": "kgatzby", + "homepage": "https://www.drupal.org/user/3601554" + }, { "name": "michaellander", "homepage": "https://www.drupal.org/user/636494" @@ -11397,7 +11405,7 @@ "extra": { "drupal": { "version": "8.x-1.12", - "datestamp": "1696776683", + "datestamp": "1712319355", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php index 402deecbe6..7effd2a571 100644 --- a/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php +++ b/docroot/modules/custom/va_gov_post_api/src/Service/PostFacilityServiceVamc.php @@ -493,6 +493,7 @@ protected function getServiceLocations(): array { $service_location->referral_required = $this->getReferralRequired(); $service_location->walk_ins_accepted = $location->get('field_office_visits')->value; $service_location->online_scheduling_available = $this->getOnlineScheduling($location->get('field_online_scheduling_avail')->value ?? ''); + $service_location->virtual_support = $location->get('field_virtual_support')->value ?? ''; $service_locations[] = $service_location; } From ce978dec23999e5b0ea40ef47848cb5df3f2bc96 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 3 Apr 2024 15:31:25 -0500 Subject: [PATCH 19/26] VACMS-17516 and 17518: Migrating certain Service location values to null (#17703) * Bump drupal/raven from 5.0.8 to 5.0.9 (#17615) Bumps drupal/raven from 5.0.8 to 5.0.9. --- updated-dependencies: - dependency-name: drupal/raven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump knplabs/github-api from 3.14.0 to 3.14.1 (#17628) Bumps [knplabs/github-api](https://github.com/KnpLabs/php-github-api) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/KnpLabs/php-github-api/releases) - [Changelog](https://github.com/KnpLabs/php-github-api/blob/master/CHANGELOG-3.X.md) - [Commits](https://github.com/KnpLabs/php-github-api/compare/v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: knplabs/github-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (#17690) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3469 to 0.0.3470. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3469...v0.0.3470) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5 (#17670) Bumps drupal/entity_clone from 2.0.0-beta4 to 2.0.0-beta5. --- updated-dependencies: - dependency-name: drupal/entity_clone dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.65 to 1.10.66 (#17678) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.65 to 1.10.66. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.65...1.10.66) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin * Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (#17617) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/c9c4182bf1b97f5224aee3906fd373f6b61b4526...0fb21704c18a42ce5aa8d720ea4b912f5e6babef) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (#17577) Bumps [simplesamlphp/simplesamlphp](https://github.com/simplesamlphp/simplesamlphp) from 2.1.3 to 2.2.1. - [Release notes](https://github.com/simplesamlphp/simplesamlphp/releases) - [Changelog](https://github.com/simplesamlphp/simplesamlphp/blob/v2.2.1/docs/simplesamlphp-changelog.md) - [Commits](https://github.com/simplesamlphp/simplesamlphp/compare/v2.1.3...v2.2.1) --- updated-dependencies: - dependency-name: simplesamlphp/simplesamlphp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17559: Adds final steps to prevent Cypress failures (#17692) * Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (#17698) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3470 to 0.0.3471. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3470...v0.0.3471) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-15649: Removes free text fields from service location (#15676) * VACMS-16348: Add fields to service location (#17017) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Adds service options, office hours and virtual support * VACMS-16348: Adds appointment fields * VACMS-16348: Adds online scheduling field * VACMS-16348: Adds a necessary question mark * VACMS-16348: Updates description for office visits * VACMS-16451: Audit view service location (#17054) * VACMS-16451: Adds service location audit * VACMS-16451: Fixes export and adds filters * VACMS-16451: Reapplied content moderation state filter, removed published * VACMS-16451: Adds online scheduling fields * VACMS-16451: Changes the weight of the view in the menu * VACMS-16451: Adds table caption and link in download * Update config/sync/views.view.service_locations_audit.yml Co-authored-by: Steve Wirt --------- Co-authored-by: Steve Wirt * VACMS-15559 Migration of service location data to paragraphs (#16911) * Add post_update hook to move facility service location data * Add placeholder methods and mapping * Adding more notes * VACMS-15559 FIXUP refactor into class. * VACMS-15559 Refactory functions to scipt library. * Add new map to value function to script-library. * VACMS-15559 Remove conflation of new revision and new node. * VACMS-15559 Add all migrated fields to migration. * VACMS-15559 Programatically shut off queue checks and processing. * VACMS-15559 Move deploy function to script. * VACMS-15559 Update audit, make sortable, add editor updated. * VACMS-15559 Cleaned up function names and some comments. * VACMS-15559 Fix incorrect office_visits parameter. * VACMS-15559 Make service location audit headers sticky. * VACMS-15559 Fix forward revision. * VACMS-15559 Fix the timing on grabing the lastes revision. * VACMS-15559 Fix recent changes View to sort by revision id, not time. * VACMS-15559 Carry forward draft revision log message. * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17142: Update service content types post-Service Location migration (#17225) * VACMS-17142: Update cypress test to use phone number in service locations * VACMS-17142: Hide VAMC Facility Health Service fields that are no longer in use. * VACMS-17142: Have the view_display mirror the form_display. * VACMS-17142: Add revision_log back. * VACMS-17142: Update service location paragraph view display to mirror form display. * VACMS-17241 Update service location migration script to keep state. (#17249) * VACMS-17114: Service location fields lighthouse push (#17213) * VACMS-17114: Adds appointment text * VACMS-17114: Adds walk-ins and online scheduling refactored * VACMS-17114: Unfinished work on phones * VACMS-17114: Adds online scheduling available (untested) * VACMS-17114: Tested one row successfully * VACMS-17144: Refactor to remove unnecessary methods, tested row 2 successfully * VACMS-17114: Updates how Office Visits are captued * VACMS-17114: Refactors office visits logic to be more ... logical * VACMS-17114: Accounts for false then true then false for online scheduling * VACMS-17114: Changes online scheduling to string * VACMS-17114: Changes online scheduling to check for empty * VACMS-17114: Getting logic of phone type to work * VACMS-17114: Fixes the logic of the appointment lead in text * VACMS-17114: Test of using method * VACMS-17114: Adds logic for getting ALL the phone numbers * VACMS-17114: Getting all numbers. Not passing main more than once. But empty array. * VACMS-17114: Main phones won't duplicate. Others are shwowing. * VACMS-17114: Moves service-level work to own function * VACMS-17114: Changes the way phones are added to stop queue processing from throwing WSOD * VACMS-17114: Refactors getting phones for service appointment * VACMS-17114: adding null coalesce and main rebase (#17496) * Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (#17471) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3450 to 0.0.3451. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3450...v0.0.3451) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump aws-actions/configure-aws-credentials from 4.0.1 to 4.0.2 (#17273) Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases) - [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/010d0da01d0b5a38af31e9c3470dbfdabdecca3a...e3dd6a429d7300a6a4c196c26e071d42e0343502) --- updated-dependencies: - dependency-name: aws-actions/configure-aws-credentials dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Bump phpstan/phpstan from 1.10.59 to 1.10.60 (#17472) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.59 to 1.10.60. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.59...1.10.60) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/setup-node from 4.0.1 to 4.0.2 (#17205) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8...60edb5dd545a775178f52524783378180af0d1f8) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * VACMS-17323: Updates module with fixes for button (#17451) * VACMS-17323: Updates module with fixes for button * VACMS-17325: Updates the default displays of content types and paragraphs * VACMS-17325: Adds other displays settings * Adding in VAMC Top Task pages (#17470) * Billing and Insurance * Update views.view.non_clinical_services.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.search_index.yml * Update core.entity_view_display.node.vamc_system_billing_insurance.default.yml * VACMS-17325: Updates service location hours display --------- Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> * VACMS-14083: Upgrades address module to version 2.0 (#17393) * VACMS-14083: Upgrade address module with dependencies via composer (#17297) * VACMS-14083: Upgrade address module with dependencies via composer * VACMS-14083: Updates composer.lock * VACMS-17191: Back end changes for address module upgrade (#17392) * VACMS-17191: Hide address line 3 for all address fields. * VACMS-17191: Hide address line 3 for second NCA address field. * VACMS-14083: Update composer.lock * VACMS-14083: Update composer.lock --------- Co-authored-by: Christian Burk * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (#17492) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3451 to 0.0.3452. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3451...v0.0.3452) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VACMS-16348: Service location ux enhancements (#17048) * VACMS-14704: Adding service location fields (#15599) * VACMS:14704: Adding service modalities * VACMS-14704: Adds vocabulary * VACMS-14704: Adds free-text fields. * VACMS-14704: Update langage around service delivery * VACMS-14704: Updates taxonomy label and description * VACMS-16348: Removes unnecessary and undesired fields * VACMS-16348: Shows Custom text when Customize text is selected * VACMS-16348: Trying to get the default text * VACMS-16348: Adds default text to Service Locations for VAMC facility health and Service region * VACMS-16348: Removes VAMC Facility Health Service-level appointment code * VACMS-16348: Adds VBA Facility service appt lead-in default text * VACMS-16348: Adds VBA FAcility service appt default text UX * VACMS-16348: DRYing off this code for the different content types and fields * VACMS-16348: Adds nonclinical service default text field * VACMS-16348: Restores the errant revision_log and adds right field for vba_facility_service * VACMS-16348: Moves work out of backend and vamc and into facilities * VACMS-16348: Trying to get paragraph validation to work * VACMS-16348: Adds required state to custom text * VACMS-16348: Removes text validation, as not working, for now * VACMS-16348: Removing commented out code * VACMS-17114: Adds empty string to prevent nulls --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Co-authored-by: Michael Kinnunen * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428) * Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 Bumps drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0. --- updated-dependencies: - dependency-name: drupal/hook_event_dispatcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * removed unnecessary patch * updated composer.lock * updated composer.lock * updated composer.lock --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> * Revert hook event dispatcher update (#17484) * Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)" This reverts commit 4d1cb3a8965c064bc30d53282728ab6edec5e945. * updated composer.lock * updated composer files * VACMS-17518: Adds mapping to NULL * VACMS-17518: Adds mapping to NULL for walk-ins * VACMS-17518: Updates to prevent a warning and to fix the '0' options --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Co-authored-by: Amanda Nantais-Austin Co-authored-by: Steve Wirt Co-authored-by: Michael Kinnunen Co-authored-by: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> --- composer.lock | 135 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 122 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index 96e881384c..5ceb9617f0 100644 --- a/composer.lock +++ b/composer.lock @@ -5597,17 +5597,17 @@ }, { "name": "drupal/entity_clone", - "version": "2.0.0-beta6", + "version": "2.0.0-beta4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_clone.git", - "reference": "2.0.0-beta6" + "reference": "2.0.0-beta4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta6.zip", - "reference": "2.0.0-beta6", - "shasum": "afd98c1aeffc1d28b8a0b29c8cfb09de95debc9b" + "url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta4.zip", + "reference": "2.0.0-beta4", + "shasum": "21b6636cea194e1f71753a54b28d4a56b42a4b00" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -5621,8 +5621,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-beta6", - "datestamp": "1712549899", + "version": "2.0.0-beta4", + "datestamp": "1687250852", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -18903,16 +18903,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.28.0", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -18944,9 +18944,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, - "time": "2024-04-03T18:51:33+00:00" + "time": "2024-02-23T16:05:55+00:00" }, { "name": "phpstan/phpstan", @@ -25378,6 +25378,115 @@ ], "time": "2024-02-15T11:26:02+00:00" }, + { + "name": "symfony/twig-bridge", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/twig-bridge.git", + "reference": "256f330026d1c97187b61aa5c29e529499877f13" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/256f330026d1c97187b61aa5c29e529499877f13", + "reference": "256f330026d1c97187b61aa5c29e529499877f13", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/translation-contracts": "^2.5|^3", + "twig/twig": "^2.13|^3.0.4" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/console": "<5.4", + "symfony/form": "<6.3", + "symfony/http-foundation": "<5.4", + "symfony/http-kernel": "<6.4", + "symfony/mime": "<6.2", + "symfony/serializer": "<6.4", + "symfony/translation": "<5.4", + "symfony/workflow": "<5.4" + }, + "require-dev": { + "egulias/email-validator": "^2.1.10|^3|^4", + "league/html-to-markdown": "^5.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/asset-mapper": "^6.3|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/form": "^6.4|^7.0", + "symfony/html-sanitizer": "^6.1|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", + "symfony/polyfill-intl-icu": "~1.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/security-acl": "^2.8|^3.0", + "symfony/security-core": "^5.4|^6.0|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/security-http": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4.3|^7.0.3", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^6.1|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/workflow": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "twig/cssinliner-extra": "^2.12|^3", + "twig/inky-extra": "^2.12|^3", + "twig/markdown-extra": "^2.12|^3" + }, + "type": "symfony-bridge", + "autoload": { + "psr-4": { + "Symfony\\Bridge\\Twig\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides integration for Twig with various Symfony components", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-15T11:26:02+00:00" + }, { "name": "symfony/validator", "version": "v6.4.7", From 16d263001962d405ac9dfa70192e45535caf3d38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 10:44:01 -0700 Subject: [PATCH 20/26] Bump symfony/console from 6.4.4 to 6.4.6 (#17728) Bumps [symfony/console](https://github.com/symfony/console) from 6.4.4 to 6.4.6. - [Release notes](https://github.com/symfony/console/releases) - [Changelog](https://github.com/symfony/console/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/console/compare/v6.4.4...v6.4.6) --- updated-dependencies: - dependency-name: symfony/console dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> From 140b214f2106e3d315432ed01758679a566d54d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:28:45 -0700 Subject: [PATCH 21/26] Bump symfony/routing from 6.4.5 to 6.4.6 (#17726) Bumps [symfony/routing](https://github.com/symfony/routing) from 6.4.5 to 6.4.6. - [Release notes](https://github.com/symfony/routing/releases) - [Changelog](https://github.com/symfony/routing/blob/7.0/CHANGELOG.md) - [Commits](https://github.com/symfony/routing/compare/v6.4.5...v6.4.6) --- updated-dependencies: - dependency-name: symfony/routing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> From 10c967ccd9c8612f5b1b64fbc5644c5c4f312695 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 1 May 2024 14:27:45 -0500 Subject: [PATCH 22/26] VACMS-14683: Updates composer.json --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 96e004d37d..def8d33bdd 100644 --- a/composer.json +++ b/composer.json @@ -223,11 +223,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^6.3", "symfony/routing": "^6.3", -<<<<<<< HEAD "va-gov/content-build": "^0.0.3494", -======= - "va-gov/content-build": "^0.0.3491", ->>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978)) "vlucas/phpdotenv": "^5.3", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", From e4e77a826f87cc56134d35233f45ca8b05edcb11 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 1 May 2024 15:03:51 -0500 Subject: [PATCH 23/26] VACMS-14683: Updates composer.lock, removing extra twig-bridge --- composer.lock | 109 -------------------------------------------------- 1 file changed, 109 deletions(-) diff --git a/composer.lock b/composer.lock index 5ceb9617f0..675ba03255 100644 --- a/composer.lock +++ b/composer.lock @@ -25378,115 +25378,6 @@ ], "time": "2024-02-15T11:26:02+00:00" }, - { - "name": "symfony/twig-bridge", - "version": "v6.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/twig-bridge.git", - "reference": "256f330026d1c97187b61aa5c29e529499877f13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/256f330026d1c97187b61aa5c29e529499877f13", - "reference": "256f330026d1c97187b61aa5c29e529499877f13", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/translation-contracts": "^2.5|^3", - "twig/twig": "^2.13|^3.0.4" - }, - "conflict": { - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/console": "<5.4", - "symfony/form": "<6.3", - "symfony/http-foundation": "<5.4", - "symfony/http-kernel": "<6.4", - "symfony/mime": "<6.2", - "symfony/serializer": "<6.4", - "symfony/translation": "<5.4", - "symfony/workflow": "<5.4" - }, - "require-dev": { - "egulias/email-validator": "^2.1.10|^3|^4", - "league/html-to-markdown": "^5.0", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/asset": "^5.4|^6.0|^7.0", - "symfony/asset-mapper": "^6.3|^7.0", - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/expression-language": "^5.4|^6.0|^7.0", - "symfony/finder": "^5.4|^6.0|^7.0", - "symfony/form": "^6.4|^7.0", - "symfony/html-sanitizer": "^6.1|^7.0", - "symfony/http-foundation": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/intl": "^5.4|^6.0|^7.0", - "symfony/mime": "^6.2|^7.0", - "symfony/polyfill-intl-icu": "~1.0", - "symfony/property-info": "^5.4|^6.0|^7.0", - "symfony/routing": "^5.4|^6.0|^7.0", - "symfony/security-acl": "^2.8|^3.0", - "symfony/security-core": "^5.4|^6.0|^7.0", - "symfony/security-csrf": "^5.4|^6.0|^7.0", - "symfony/security-http": "^5.4|^6.0|^7.0", - "symfony/serializer": "^6.4.3|^7.0.3", - "symfony/stopwatch": "^5.4|^6.0|^7.0", - "symfony/translation": "^6.1|^7.0", - "symfony/web-link": "^5.4|^6.0|^7.0", - "symfony/workflow": "^5.4|^6.0|^7.0", - "symfony/yaml": "^5.4|^6.0|^7.0", - "twig/cssinliner-extra": "^2.12|^3", - "twig/inky-extra": "^2.12|^3", - "twig/markdown-extra": "^2.12|^3" - }, - "type": "symfony-bridge", - "autoload": { - "psr-4": { - "Symfony\\Bridge\\Twig\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides integration for Twig with various Symfony components", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.4" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-02-15T11:26:02+00:00" - }, { "name": "symfony/validator", "version": "v6.4.7", From c06b99f412ea1b7692aea88737ea7aab3dc5f94b Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Thu, 2 May 2024 09:17:12 -0500 Subject: [PATCH 24/26] VACMS-14683: Adds sleep after 1000 --- .../va_gov_vamc/src/ServiceLocationMigration.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php index cc0e300bf3..546c7ca082 100644 --- a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php +++ b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php @@ -26,6 +26,13 @@ class ServiceLocationMigration { */ protected $serviceLocation; + /** + * Counter of runs. + * + * @var int + */ + protected $runCount = 0; + /** * Constructor for ServiceLocationMigration. */ @@ -40,6 +47,9 @@ public function __construct() { * Sandbox variable for keeping state during batches. */ public function run(array &$sandbox) { + if ($this->runCount % 1000 === 0) { + sleep(120); + } $node_storage = get_node_storage(); $nid_to_load = reset($sandbox['items_to_process']); $facility_service = (empty($nid_to_load)) ? [] : $node_storage->loadMultiple([$nid_to_load]); @@ -89,6 +99,8 @@ public function run(array &$sandbox) { unset($sandbox['items_to_process'][_va_gov_stringifynid($nid)]); + $this->runCount++; + return $status_msg; } From 5616f3cc96920eafc060cddd25b84987c83fa292 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Thu, 2 May 2024 09:24:59 -0500 Subject: [PATCH 25/26] VACMS-14683: Adds check for 1st run --- .../modules/custom/va_gov_vamc/src/ServiceLocationMigration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php index 546c7ca082..db2140d5ec 100644 --- a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php +++ b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php @@ -47,7 +47,7 @@ public function __construct() { * Sandbox variable for keeping state during batches. */ public function run(array &$sandbox) { - if ($this->runCount % 1000 === 0) { + if (($this->runCount > 1) && ($this->runCount % 1000 === 0)) { sleep(120); } $node_storage = get_node_storage(); From 5914634fbb1268a131773e88064639d892122394 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Thu, 2 May 2024 09:53:21 -0500 Subject: [PATCH 26/26] VACMS-14683: Moves sleep function to make it function. --- .../va_gov_vamc/src/ServiceLocationMigration.php | 12 ------------ ...grate-service-location-from-node-to-paragraph.php | 3 +++ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php index db2140d5ec..cc0e300bf3 100644 --- a/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php +++ b/docroot/modules/custom/va_gov_vamc/src/ServiceLocationMigration.php @@ -26,13 +26,6 @@ class ServiceLocationMigration { */ protected $serviceLocation; - /** - * Counter of runs. - * - * @var int - */ - protected $runCount = 0; - /** * Constructor for ServiceLocationMigration. */ @@ -47,9 +40,6 @@ public function __construct() { * Sandbox variable for keeping state during batches. */ public function run(array &$sandbox) { - if (($this->runCount > 1) && ($this->runCount % 1000 === 0)) { - sleep(120); - } $node_storage = get_node_storage(); $nid_to_load = reset($sandbox['items_to_process']); $facility_service = (empty($nid_to_load)) ? [] : $node_storage->loadMultiple([$nid_to_load]); @@ -99,8 +89,6 @@ public function run(array &$sandbox) { unset($sandbox['items_to_process'][_va_gov_stringifynid($nid)]); - $this->runCount++; - return $status_msg; } diff --git a/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php b/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php index a6a9e49e99..41fa32a879 100644 --- a/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php +++ b/scripts/content/VACMS-15559-migrate-service-location-from-node-to-paragraph.php @@ -47,6 +47,9 @@ function va_gov_vamc_deploy_migrate_service_data_to_service_location(&$sandbox) script_library_sandbox_init($sandbox, 'get_nids_of_type', [$source_bundle, FALSE]); $migrator = new ServiceLocationMigration(); $msg = $migrator->run($sandbox); + if ($sandbox['current'] > 1 && $sandbox['current'] % 1000 === 0) { + sleep(150); + } $new_service_locations = $sandbox['service_locations_created_count'] ?? 0; $updated_service_locations = $sandbox['service_locations_updated_count'] ?? 0; $forward_revisions = $sandbox['forward_revisions_count'] ?? 0;