From e1b46a1550c62b2429c7ba22ffdf001981e0e4fd Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 13 Mar 2024 07:29:10 -0500 Subject: [PATCH] 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; }