Skip to content

Commit

Permalink
VACMS-17516 and 17518: Migrating certain Service location values to n…
Browse files Browse the repository at this point in the history
…ull (department-of-veterans-affairs#17703)

* Bump drupal/raven from 5.0.8 to 5.0.9 (department-of-veterans-affairs#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>

* Bump knplabs/github-api from 3.14.0 to 3.14.1 (department-of-veterans-affairs#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](KnpLabs/php-github-api@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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>

* Bump va-gov/content-build from 0.0.3469 to 0.0.3470 (department-of-veterans-affairs#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](department-of-veterans-affairs/content-build@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] <[email protected]>
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 (department-of-veterans-affairs#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] <[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.65 to 1.10.66 (department-of-veterans-affairs#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](phpstan/phpstan@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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Amanda Nantais-Austin <[email protected]>

* Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (department-of-veterans-affairs#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](dependabot/fetch-metadata@c9c4182...0fb2170)

---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump simplesamlphp/simplesamlphp from 2.1.3 to 2.2.1 (department-of-veterans-affairs#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](simplesamlphp/simplesamlphp@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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>

* VACMS-17559: Adds final steps to prevent Cypress failures (department-of-veterans-affairs#17692)

* Bump va-gov/content-build from 0.0.3470 to 0.0.3471 (department-of-veterans-affairs#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](department-of-veterans-affairs/content-build@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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* VACMS-14704: Adding service location fields (department-of-veterans-affairs#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 (department-of-veterans-affairs#15676)

* VACMS-16348: Add fields to service location (department-of-veterans-affairs#17017)

* VACMS-14704: Adding service location fields (department-of-veterans-affairs#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 (department-of-veterans-affairs#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 <[email protected]>

---------

Co-authored-by: Steve Wirt <[email protected]>

* VACMS-15559 Migration of service location data to paragraphs (department-of-veterans-affairs#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 (department-of-veterans-affairs#17048)

* VACMS-14704: Adding service location fields (department-of-veterans-affairs#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 (department-of-veterans-affairs#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. (department-of-veterans-affairs#17249)

* VACMS-17114: Service location fields lighthouse push (department-of-veterans-affairs#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 (department-of-veterans-affairs#17496)

* Bump va-gov/content-build from 0.0.3450 to 0.0.3451 (department-of-veterans-affairs#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 (department-of-veterans-affairs#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 (department-of-veterans-affairs#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 (department-of-veterans-affairs#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 (department-of-veterans-affairs#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 (department-of-veterans-affairs#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 (department-of-veterans-affairs#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 (department-of-veterans-affairs#17393)

* VACMS-14083: Upgrade address module with dependencies via composer (department-of-veterans-affairs#17297)

* VACMS-14083: Upgrade address module with dependencies via composer

* VACMS-14083: Updates composer.lock

* VACMS-17191: Back end changes for address module upgrade (department-of-veterans-affairs#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 (department-of-veterans-affairs#17484)

* Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (department-of-veterans-affairs#17428)"

This reverts commit 4d1cb3a.

* updated composer.lock

* updated composer files

* Bump va-gov/content-build from 0.0.3451 to 0.0.3452 (department-of-veterans-affairs#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 (department-of-veterans-affairs#17048)

* VACMS-14704: Adding service location fields (department-of-veterans-affairs#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]>

* Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (department-of-veterans-affairs#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]>

* Revert hook event dispatcher update (department-of-veterans-affairs#17484)

* Revert "Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (department-of-veterans-affairs#17428)"

This reverts commit 4d1cb3a.

* 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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Edmund Dunn <[email protected]>
Co-authored-by: Amanda Nantais-Austin <[email protected]>
Co-authored-by: Steve Wirt <[email protected]>
Co-authored-by: Michael Kinnunen <[email protected]>
Co-authored-by: Dave Pickett <[email protected]>
  • Loading branch information
7 people authored and jilladams committed May 6, 2024
1 parent 7f2b2b9 commit 719b6cf
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
1 change: 0 additions & 1 deletion composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26974,7 +26974,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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ protected function getOnlineScheduling(string $online_scheduling_avail) {
'yes' => 'true',
];

return $map[$online_scheduling_avail];
return $map[$online_scheduling_avail] ?? NULL;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion scripts/content/script-library.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down

0 comments on commit 719b6cf

Please sign in to comment.