Merge branch 'main' into VACMS-16853-next-build-branches

department-of-veterans-affairs · Feb 1, 2024 · 4eca737 · 4eca737
2 parents 83590d0 + 43c3814
commit 4eca737
Show file tree

Hide file tree

Showing 27 changed files with 964 additions and 561 deletions.
diff --git a/.github/ISSUE_TEMPLATE/content_model_spec.md b/.github/ISSUE_TEMPLATE/content_model_spec.md
@@ -0,0 +1,34 @@
+---
+name: Content Model Specification
+about: Use this template when you are specifying proposed changes to the CMS Content Model
+title: "Content model specification for [PRODUCT/FEATURE]"
+labels: Content Model
+assignees: ''
+
+---
+
+## User Story or Problem Statement
+
+AS A Drupal Engineer
+I NEED detailed guidance on the proposed content model for [PRODUCT/FEATURE]
+SO THAT I can implement it in Drupal
+
+## Description or Additional Context 
+
+
+## Steps for Implementation
+
+
+## Acceptance Criteria
+- [ ] Proposed entities, fields, and field properties are documented using the [content model spec template](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/content-model/drupal_content_model_spec_template.xlsx)
+- [ ] Reviewed with engineering & product
+- [ ] Send to CMS Collab Cycle
+
+
+## Team
+Please check the team(s) that will do this work.
+
+- [ ] CMS Team
+- [ ] Public Websites
+- [ ] Facilities
+- [ ] Accelerated Publishing
diff --git a/.github/ISSUE_TEMPLATE/taxonomy-update-term.yml b/.github/ISSUE_TEMPLATE/taxonomy-update-term.yml
@@ -75,5 +75,10 @@ body:
       - [ ] Content is reviewed by relevant stakeholders
       - [ ] (List any necessary review and approval steps here)
       - [ ] Term is published
+      If term is part of VA Service Taxonomy & the term name changes:
+      - [ ] Bulk resave system services to pick up name change (filtered for the old name)
+      - [ ] Bulk Update alias for all system services (filtered for new name)
+      - [ ] Bulk update facility services (filtered for the old name)
+      - [ ] Bulk update alias for all facility services (filtered for new name)
   validations:
     required: true
diff --git a/.github/ISSUE_TEMPLATE/ux-writing.md b/.github/ISSUE_TEMPLATE/ux-writing.md
@@ -37,7 +37,7 @@ E.g. *As a user who may be making changes to content, I'd like a message that wa
 - [ ] Validate draft with those responsible for the work
 - [ ] Peer review by a member of the design pod
 - [ ] Finalize edits to text, and mark as ready to implement in the original issue
-- [ ] Document strategy behind language choices that are relevant to [the back end style guide](https://docs.google.com/document/d/1o3euR0eMoXRyp8G6sx1OCpmRtBShYGAm-Rb8MSXXir0/edit#)
+- [ ] Document strategy behind language choices that are relevant to [the CMS content style guide](https://github.com/department-of-veterans-affairs/va.gov-team/tree/master/platform/cms/content-style-guide)
 
 ### Team
 Please check the team(s) that will do this work.

diff --git a/.github/workflows/actions-metrics.yml b/.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@12d225bf2f764e5103a994157c1316df39dc3fae # v1.68.0
+        uses: int128/datadog-actions-metrics@56be1c4bf92adece9d10f7fef4ba48bccf8e8c81 # v1.77.0
         with:
           datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
           collect-job-metrics: true

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -46,7 +46,7 @@ jobs:
         uses: ./.github/actions/post-checkout
       - name: ReviewDog
         # See also `composer va:test:eslint` in composer.json
-        uses: reviewdog/action-eslint@279acb08336462ec76183a2d9ef1dd43e4c6b391 # v1.21.0
+        uses: reviewdog/action-eslint@5deb8e2c1d8a9bbefff4d80d6702c41c5b3729cb # v1.22.0
         with:
           reporter: github-pr-review
           eslint_flags: '--max-warnings 0 -c .eslintrc.json --no-eslintrc docroot/modules/custom/**/*.es6.js docroot/themes/custom/**/*.es6.js tests/cypress/**/*.js'

diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -47,7 +47,7 @@ jobs:
           NODE_TLS_REJECT_UNAUTHORIZED: 0
 
       - name: Cypress run
-        uses: cypress-io/github-action@ebe8b24c4428922d0f793a5c4c96853a633180e3 # v6.6.0
+        uses: cypress-io/github-action@1b70233146622b69e789ccdd4f9452adc638d25a # v6.6.1
         with:
           wait-on: "${{ inputs.preview_url }}"
           command: 'npm run test:cypress:parallel'

diff --git a/.github/workflows/tugboat-pr-closed.yml b/.github/workflows/tugboat-pr-closed.yml
@@ -14,7 +14,7 @@ jobs:
     name: Delete Tugboat Preview
     steps:
     - name: Restore Preview ID
-      uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: .tugboat_preview.txt
         key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}

diff --git a/.github/workflows/tugboat-pr-opened.yml b/.github/workflows/tugboat-pr-opened.yml
@@ -39,7 +39,7 @@ jobs:
             key: `${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}`,
           });
     - name: Save Preview ID
-      uses: actions/cache/save@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: .tugboat_preview.txt
         key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}

diff --git a/.github/workflows/tugboat-pr-updated.yml b/.github/workflows/tugboat-pr-updated.yml
@@ -14,7 +14,7 @@ jobs:
     name: Rebuild Tugboat Preview
     steps:
     - name: Restore Preview ID
-      uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: .tugboat_preview.txt
         key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}

diff --git a/.github/workflows/tugboat-refresh-cache-responder.yml b/.github/workflows/tugboat-refresh-cache-responder.yml
@@ -11,7 +11,7 @@ jobs:
     if: ${{ github.event.label.name == 'refresh-tugboat-cache' }}
     steps:
       - name: Refresh Preview ID
-        uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+        uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: .tugboat_preview.txt
           key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}

diff --git a/.tugboat/config.yml b/.tugboat/config.yml
@@ -206,6 +206,7 @@ services:
 
         # Create symlink between vets-website assets and next-build
 #        - ln -snf "${DOCROOT}/vendor/va-gov/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
+        - mkdir -p "${TUGBOAT_ROOT}/next/public"
         - ln -snf "${TUGBOAT_ROOT}/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
 
 

diff --git a/.tugboat/vhost-next.conf b/.tugboat/vhost-next.conf
@@ -29,8 +29,8 @@
     # Ignore redirecting error doc directory
     ProxyPass /.next/ !
     # Redirect requests to the running node server from next-build
-    ProxyPass / http://localhost:3000/
-    ProxyPassReverse / http://localhost:3000/
+    ProxyPass / http://localhost:3999/
+    ProxyPassReverse / http://localhost:3999/
 
     # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
     # error, crit, alert, emerg.

diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
         "drupal/animated_gif": "^2.0",
         "drupal/auto_entitylabel": "^3.0",
         "drupal/better_exposed_filters": "^6.0",
-        "drupal/block_content_permissions": "^1.6",
         "drupal/cer": "^5.0@beta",
         "drupal/change_labels": "dev-3326097-remove-dependency-on-drupal-autoservices#7f92f90b456ac2f394dd434257e39e1d9b3086eb",
         "drupal/clientside_validation": "^4.0",
@@ -222,7 +221,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3427",
+        "va-gov/content-build": "^0.0.3432",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -393,7 +392,7 @@
                 "2942404 - Contentinfo landmark" : "https://www.drupal.org/files/issues/2023-06-30/2942404-messages-should-have-role-status.patch",
                 "3047110 - Add workflow to taxonomy" : "https://www.drupal.org/files/issues/2023-04-14/3047110-45.patch",
                 "3106205 - Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters)": "https://www.drupal.org/files/issues/2024-01-02/3106205-length-menu-tree-too-short-48.patch",
-                "3333401 - Pager h4 cause accessibility flag on many pages": "https://www.drupal.org/files/issues/2023-11-01/3333401-64.patch",
+                "3333401 - Pager h4 cause accessibility flag on many pages": "patches/3333401-configurable-pager-heading-default-h2.patch",
                 "3382759 - Add multiple workflow content moderation filter to Views.": "https://www.drupal.org/files/issues/2023-08-24/3382759-8.patch",
                 "3241295 - CKEditor 5 isn't respecting field widgets row settings": "https://www.drupal.org/files/issues/2023-11-14/3241295-d10.1.6-114.patch",
                 "3376267 - [upstream] Add style to anchor leads to unusable behavior": "https://www.drupal.org/files/issues/2023-08-09/fix_anchor_scheme_to_not_copy_on_enter-3376167-11.patch"
@@ -458,9 +457,6 @@
             "drupal/menu_item_extras": {
                 "3210468 - The 'bundle' field is not always populated with the menu name": "https://www.drupal.org/files/issues/2021-04-23/3210468.patch"
             },
-            "drupal/message_subscribe": {
-                "3279287 - PHP 8.1 Deprecated function notices": "https://www.drupal.org/files/issues/2022-11-03/php-81-deprecation-notices.patch"
-            },
             "drupal/migrate_plus": {
                 "3368310 - Fix str_replace for null values, post PHP 8.1": "patches/3368310-str-replace-throws-php-error-11.patch"
             },