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; }