Merge branch 'main' into VACMS-10159-unique-links-vamc-nonclinical

.ddev/config.yaml

@@ -43,7 +43,7 @@ web_environment:
     - CMS_MARIADB_USERNAME=db
     - CMS_MARIADB_PASSWORD=db
     - CMS_MARIADB_HOST=db
-    - CYPRESS_TAGS=\"not @ignore and not @piv\"
+    - CYPRESS_TAGS=\"not @piv\"
     - DDEV_APPROOT=/var/www/html
     - DRUPAL_ADDRESS=https://va-gov-cms.ddev.site
 nodejs_version: "16"

.github/CODEOWNERS

@@ -34,6 +34,7 @@
 /config/sync/*full_width_banner_alert*                              @department-of-veterans-affairs/facilities-cms
 # To catch VAMC stuff with older naming convention
 /config/sync/*health_care*                                          @department-of-veterans-affairs/facilities-cms
+/config/sync/*connect_with_us*                                      @department-of-veterans-affairs/public-websites-cms
 /config/sync/*jsonapi*                                              @department-of-veterans-affairs/accelerated-publishing
 # aka VAMC System Locations List
 /config/sync/*locations_listing*                                    @department-of-veterans-affairs/facilities-cms

.github/ISSUE_TEMPLATE/ap-migration.md

@@ -0,0 +1,42 @@
+---
+name: "(AP) Next-build migration"
+about: Templates to be migrated to next-build
+title: "Next Build Template: "
+labels: Accelerated Publishing, Migration
+assignees: ''
+
+---
+
+## Template or Content Type
+_Name of template or content type_
+
+## Example
+_URL to show an example of the template or content type in both Drupal CMS and VA.gov_
+
+## Description
+_Overview of template or content type, including relevant details to the migration lift._
+
+## Product Owner 
+_The team that owns the product in production_
+
+## Definition of Done
+**Data:**
+- [ ] Conditional logic matches content-build / production 
+- [ ] SEO Metadata matches production
+- [ ] Analytics match production
+
+**Interaction / Behavior:**
+- [ ] Interactions / behavior match production (e.g. accordion expansion by default on page load if they do, data IDs on elements / their usage, link behavior, form / input field behaviors, etc) 
+
+**Accessibility:**
+- [ ] Accessibility experience matches production (voiceover/screen reader behavior, appearance at 400% zoom, params on elements, etc) 
+- [ ] axe devTools output matches production
+
+**Visual presentation:**
+- [ ] Design system components, prop usage and component versions match production
+- [ ] Design (font size, spacing, Anything else?) matches production
+- [ ] Review all breakpoints
+
+**Signoff / Launch**
+- [ ] Owning team has reviewed the build and provided feedback / approval
+- [ ] CMS Team has confirmed launch readiness 

.github/ISSUE_TEMPLATE/runbook---ux-research.md

@@ -18,14 +18,14 @@ assignees: ''
 **How to set up a new UX research epic**
 - [ ] Create a Research [Epic](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?assignees=&labels=Epic%2C+Needs+refining&template=cms-epic.md&title=%3CInsert+summary+of+epic%3E) for your product/initiative
 - [ ] Create a Research Folder following [Platform's Research guidance](https://depo-platform-documentation.scrollhelp.site/research-design/research-checklist#ResearchChecklist-1.Planningforresearch)
-- [ ] Create a [Research Discovery](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-discovery.md) issue
-- [ ] Create a [Research Plan](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-plan.md) issue
-- [ ] Create a [Research Conversation Guide](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-conversation-guide.md) issue
-- [ ] Create a [Research Collab Cycle](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-collab-cycle.md) issue
-- [ ] Create a [Research Prep](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-prep.md) issue
-- [ ] Create a [Research Sessions](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-sessions.md) issue
-- [ ] Create a [Research Synthesis and Reporting](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-synthesis-and-reporting.md) issue
-- [ ] Create a [Research Readout and Post-tasks](https://github.com/department-of-veterans-affairs/va.gov-cms/blob/main/.github/ISSUE_TEMPLATE/research-readout-and-post-tasks.md) issue
+- [ ] Create a [Research Discovery](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-discovery.md) issue
+- [ ] Create a [Research Plan](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-plan.md) issue
+- [ ] Create a [Research Conversation Guide](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-conversation-guide.md) issue
+- [ ] Create a [Research Collab Cycle](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-collab-cycle.md) issue
+- [ ] Create a [Research Prep](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-prep.md) issue
+- [ ] Create a [Research Sessions](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-sessions.md) issue
+- [ ] Create a [Research Synthesis and Reporting](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-synthesis-and-reporting.md) issue
+- [ ] Create a [Research Readout and Post-tasks](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?template=research-readout-and-post-tasks.md) issue
 - [ ] Add all the above issues to the Research Epic and add dependencies
 
 ## Acceptance Criteria

.github/ISSUE_TEMPLATE/runbook-new-vamc-system.md

@@ -116,12 +116,12 @@ assignees: ''
 ### Menu configuration and clean up [CMS helpdesk or Sitewide team]
 - [ ] Go to [Content / Menus](https://prod.cms.va.gov/admin/structure/menu)
 - [ ] Find the relevant menu and select edit menu
-- [ ] Ensure all menu links are nested in the proper place
-- [ ] Set some menu links to disabled 
-- [ ] Consult [VAMC sitemap in sharepoint](https://dvagov.sharepoint.com/:x:/s/SitewideContract/EblgAS21OUtHloKK3a8ZvNIBHzV1S6uO2l4hj4dqYG0avQ?e=J8UVZh) for menu settings (Here's a [backup static copy](https://github.com/department-of-veterans-affairs/va.gov-team/blob/1b010e72b992dbefa7305764b0058841131733bc/products/facilities/medical-centers/VAMC-Sitemap.xlsx) in case of access issues in the future)  
+- [ ] Ensure all menu links are nested in the proper place by opening each menu item individually and ensuring it has the correct parent link, and saving
+- [ ] Set some menu links to disabled, according to the [VAMC sitemap in sharepoint](https://dvagov.sharepoint.com/:x:/s/SitewideContract/EblgAS21OUtHloKK3a8ZvNIBHzV1S6uO2l4hj4dqYG0avQ?e=J8UVZh) 
+- [ ] Consult [VAMC sitemap in sharepoint](https://dvagov.sharepoint.com/:x:/s/SitewideContract/EblgAS21OUtHloKK3a8ZvNIBHzV1S6uO2l4hj4dqYG0avQ?e=J8UVZh) for menu settings (Here's a [backup static copy](https://github.com/department-of-veterans-affairs/va.gov-team/blob/1b010e72b992dbefa7305764b0058841131733bc/products/facilities/medical-centers/VAMC-Sitemap.xlsx) in case of access issues in the future)
 
 ### URL alias configuration [CMS helpdesk or Sitewide team]
-- [ ] Check that each page has the correct URL alias matching the [VAMC sitemap in sharepoint](https://dvagov.sharepoint.com/:x:/s/SitewideContract/EblgAS21OUtHloKK3a8ZvNIBHzV1S6uO2l4hj4dqYG0avQ?e=J8UVZh)
+- [ ] Check that each page has the correct URL alias matching the [VAMC sitemap in sharepoint](https://dvagov.sharepoint.com/:x:/s/SitewideContract/EblgAS21OUtHloKK3a8ZvNIBHzV1S6uO2l4hj4dqYG0avQ?e=J8UVZh), and breadcrumb
 - [ ] If pages dont have the correct URL Alias, change them from Auto to Manual and input the correct URL alias
 
 ### User set up [CMS helpdesk]
@@ -132,9 +132,11 @@ assignees: ''
 ### VAMC editor tasks
 - [ ] Complete training if they haven't already
 - [ ] Follow the instructions in [VAMC editor guide](https://prod.cms.va.gov/help/vamc)
-- [ ] Confirm when ready to publish
+- [ ] Advise the Editor not to publish content until all drafts, including Top Task pages, are ready to Publish.
+- [ ] Ask the Editor to confirm when they are ready for Helpdesk / Sitewide to publish the site
 
-### Launch tasks
-- [ ] Lighthouse coordination for service push?
-- [ ] Redirects? 
-- [ ] Comms, change management?
+### Launch tasks [CMS helpdesk or Sitewide team]
+- [ ] Bulk publish content in a Tugboat and re-verify URLs, menu items / parents / structure, and breadcrumbs
+- [ ] Coordinate timing with Editor for a bulk publish of all ready content in production, including Top Task pages
+- [ ] If there is a legacy site for the system, or if existing facilities move into the new system, create a ticket for the appropriate redirects
+- [ ] Notify the Editor that the site is published

.github/ISSUE_TEMPLATE/runbook-vba-facility-launch.md

@@ -24,7 +24,7 @@ Facility CMS link: <insert_facility_link>
 
 ### Publishing
 - [ ] Set the VBA Facility to Published, and note approvals in the revision log
-- [ ] Create a [URL change ticket](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?assignees=&labels=Facilities%2C+Drupal+engineering%2C+Flagged+Facilities%2C+Redirect+request%2C+URL+Change%2C+User+support&projects=&template=runbook-facility-url-change.md&title=URL+Change+for%3A+%3Cinsert+facility+name%3E) for the URL update from facility locator detail page URL (using API ID) to the modernized URL. If you're unsure about the original URL, request help from Facilities team in #facilities-support.
+- [ ] Ask Michelle Middaugh to update the facility URL in Sandy's Database to the modernized URL. This eliminates the need for a URL change request ([LH confirmed](https://dsva.slack.com/archives/C02BTJTDFTN/p1730395863667449?thread_ts=1730395217.135779&cid=C02BTJTDFTN)).
 - [ ] Create a [redirect request](https://github.com/department-of-veterans-affairs/va.gov-team/issues/new?assignees=kristinoletmuskat%2C+strelich%2C+Agile6MSkinner&labels=sitewide+CAIA%2C+Sitewide+IA%2C+Facilities%2C+Regional+Office%2C+sitewide%2C+VA.gov+frontend%2C+Redirect+request&projects=&template=redirect-request.md&title=Redirect+Request) to redirect the previous TeamSite page to the modernized page.
   - [ ] **Indicate in ticket** that this is a [page level redirect for a Teamsite using the injected header](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/engineering/redirect-implementation-strategy.md#3-subdomain--vagov-page-level-cross-domain-redirect-for-a-subdomain-that-loads-proxy-rewrite-js) -- it can be done within proxy rewrite as a client-side redirect
 

.github/workflows/actions-metrics.yml

@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Send GitHub Actions metrics to DataDog
-        uses: int128/datadog-actions-metrics@1211003b807510c6a05df26ab9fbc381276a2c1f # v1.100.0
+        uses: int128/datadog-actions-metrics@0b8cde3b96b3e1f8cfdedcf5aba234cd3d56f57e # v1.102.0
         with:
           datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
           collect-job-metrics: true

.github/workflows/contextual-advice.yml

@@ -17,7 +17,7 @@ jobs:
       # branch or its commits, regardless of provenance.
       #
       # Do not execute any code located within the repository!
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/continuous_integration.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Check Corresponding Entity Reference Fields
         # See also `composer va:test:check-cer` in composer.json
         run: ./tests/scripts/check-cer.sh
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Composer Validate
         run: composer validate
 
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Post-Checkout Actions
         uses: ./.github/actions/post-checkout
       - name: ReviewDog
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Post-Checkout Actions
         uses: ./.github/actions/post-checkout
       - name: Run PHP_CodeSniffer and ReviewDog
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Post-Checkout Actions
         uses: ./.github/actions/post-checkout
       - name: Run PHPLint
@@ -92,7 +92,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Post-Checkout Actions
         uses: ./.github/actions/post-checkout
       - name: Run PHPStan and ReviewDog
@@ -119,7 +119,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Post-Checkout Actions
         uses: ./.github/actions/post-checkout
       - name: Run PHPUnit (Unit Tests only)
@@ -136,7 +136,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Stylelint modules
         # See also `composer va:test:stylelint-modules` in composer.json
         uses: reviewdog/action-stylelint@c1da6e75d890eba79f82a4294e867cbd720b52d9 # v1.29.0
@@ -164,11 +164,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
       - name: Delete any existing comment.
-        uses: thollander/actions-comment-pull-request@e2c37e53a7d2227b61585343765f73a9ca57eda9 # v3.0.0
+        uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1
         continue-on-error: true
         with:
           comment_tag: check-composer-lock-changes
@@ -184,7 +184,7 @@ jobs:
           echo "LINES_CHANGED=$LINES_CHANGED" >> $GITHUB_ENV
           echo "THRESHOLD=$THRESHOLD" >> $GITHUB_ENV
       - name: Comment if composer.lock changes exceed threshold.
-        uses: thollander/actions-comment-pull-request@e2c37e53a7d2227b61585343765f73a9ca57eda9 # v3.0.0
+        uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1
         if: env.LINES_CHANGED > env.THRESHOLD
         continue-on-error: true
         with:

.github/workflows/cypress.yml

@@ -30,14 +30,14 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           # When Sorry-Cypress support is enabled on `main`, this should be
           # removed so that the `main` version of the workflow is used
           ref: ${{ inputs.commit_sha }}
 
       - name: Setup the Node environment
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: '18.13'
 

.github/workflows/default-branch-datadog-metrics.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/post-checkout
       - name: Find occurrences of "Implements hook" in *.module files.
         id: hook_implementations
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/post-checkout
       - name: Run PHPUnit (Unit Tests only)
         run: bin/phpunit \
@@ -197,7 +197,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/post-checkout
       - name: Run PHPLOC and parse output for metrics.
         id: phploc_code_quality

.github/workflows/dependabot-auto-merge.yml

@@ -21,7 +21,7 @@ jobs:
 
       # Checkout repo to make package allow list available
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # Use a YAML formatted config file to list which dependencies can be auto-merged
       - name: Read list of Allowed Auto-merge Dependencies

.github/workflows/pull-request-labels.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Autolabel

.github/workflows/set-tugboat-tests-pending.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set status for Tugboat tasks.
         run: |
           test_names=(

.tugboat/.env.j2

@@ -28,7 +28,7 @@ GITHUB_REF={{ TUGBOAT_PREVIEW_SHA }}
 
 # pass tags for testing PIV based on environment
 {% if (TUGBOAT_GITHUB_PR | default('')) == '' %}
-  CYPRESS_TAGS="not @ignore and not @piv"
+  CYPRESS_TAGS="not @piv"
 {% else %}
-  CYPRESS_TAGS="not @ignore and not @piv_off"
+  CYPRESS_TAGS="not @piv_off"
 {% endif %}