Skip to content

Commit

Permalink
VACMS-17114: adding null coalesce and main rebase (#17496)
Browse files Browse the repository at this point in the history
* 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](department-of-veterans-affairs/content-build@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] <[email protected]>
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] <[email protected]>

* removed unnecessary patch

* updated composer.lock

* updated composer.lock

* updated composer.lock

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>

* 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](aws-actions/configure-aws-credentials@010d0da...e3dd6a4)

---
updated-dependencies:
- dependency-name: aws-actions/configure-aws-credentials
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>

* 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](phpstan/phpstan@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] <[email protected]>
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](actions/setup-node@b39b52d...60edb5d)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 4d1cb3a.

* 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](department-of-veterans-affairs/content-build@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] <[email protected]>
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>
Co-authored-by: Dave Pickett <[email protected]>
Co-authored-by: Michael Kinnunen <[email protected]>
  • Loading branch information
5 people committed Apr 26, 2024
1 parent 97ad2ee commit eb506ed
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
module:
- allow_only_one
- entity_reference_revisions
- markup
- user
id: node.vba_facility_service.default
targetEntityType: node
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dependencies:
module:
- allow_only_one
- entity_reference_revisions
- markup
- user
id: node.vha_facility_nonclinical_service.default
targetEntityType: node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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 ?? '');

}

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit eb506ed

Please sign in to comment.