Merge branch 'main' into VACMS-16418-homepage-manager-block-permissions

department-of-veterans-affairs · Jan 3, 2024 · 5144830 · 5144830
2 parents 91f8a16 + 8f2576b
commit 5144830
Show file tree

Hide file tree

Showing 31 changed files with 457 additions and 629 deletions.
diff --git a/.github/ISSUE_TEMPLATE/ap-task.md b/.github/ISSUE_TEMPLATE/ap-task.md
@@ -18,7 +18,3 @@ labels: Needs refining, Accelerated Publishing
 <!-- any suppporting information, links etc. -->
 <!-- solution-specific discussion is great here. -->
 
-```[tasklist]
-### Implementation tasks
-- [ ] Use this if it helps you or feel free to delete.
-```
diff --git a/.github/ISSUE_TEMPLATE/cms-team-and-sitewide-crew-member-onboarding.md b/.github/ISSUE_TEMPLATE/cms-team-and-sitewide-crew-member-onboarding.md
@@ -121,7 +121,6 @@ You can view team sprint boards using either the Github view with Zenhub browser
 
 ### Context & History
 - [ ] How does the team fit into the larger OCTO ecosystem? [View this Mural diagram](https://app.mural.co/t/departmentofveteransaffairs9999/m/departmentofveteransaffairs9999/1686789362540/fb8f73b8d536f088e56bd3e38f0e37141560f62a?sender=u0b235d03cbd64f7f93673243)
-- [ ] Why is VA.gov using a Drupal CMS and how is our success measured? Read the [objectives and key results](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/96698383/Product+CMS).
 - [ ] [Watch the Drupal GovCon presentation about the project](https://www.youtube.com/watch?v=WN4bGjEuQdM).
 - [ ] Why are VA Medical Centers changing their websites? Watch the [2-minute YouTube video](https://youtu.be/Xrv5wCv6cKY).
 - [ ] Why are Vet Centers important to Veterans? Watch the [2-minute YouTube video](https://www.youtube.com/watch?v=VMzkZNbKk1I).
@@ -183,7 +182,7 @@ Drupal is the VA's content management system of choice. For anyone on our team,
   - [ ] **Drupal production access**: (SOCKS or VA network required) - in DSVA #cms-support channel, use the Slack workflow to file a helpdesk support request. Ask the helpdesk to create a Drupal user for you in [prod.cms.va.gov](prod.cms.va.gov).
      * DevOps team members require an administrator account. (SOCKS or VA access with PIV card required)
      * Standard practice for other roles is to have minimal access in prod (content editor or even a blocked account) and full admin access in lower environments.
-  - [ ] [View short presentations on specific topics](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/1714094110/CMS+Topic+Dives). Topics include site alerts, release and deploy, Facility API, etc.
+  - [ ] [View Topic Dives](https://github.com/department-of-veterans-affairs/va.gov-team/tree/master/teams/sitewide/topic-dives) (short presentations on specific topics). Topics include site alerts, release and deploy, Facility API, etc.
   - [ ] [Browse the VA Drupal CMS Knowledge Base articles](https://prod.cms.va.gov/help/).
   - [ ] What is Drupal? [Link list for Drupal context and community](https://docs.google.com/spreadsheets/d/11ppWiIggKJh-YAWia28utZXW48tJZGCEg-sFJ6eIl9c)
   - [ ] If you have a Drupal.org account, add your Agency & VA. Drupal.org > Login > My Account > Edit profile > Work tab > Add your agency, and "Department of Veterans Affairs" & save. This will help our team track Drupal open source contributions.
@@ -325,7 +324,7 @@ Each repository includes READMEs to help with setup.
  - [ ] [Platform Collab Cycle calendar](https://calendar.google.com/calendar/u/0/[email protected]&ctz=America/New_York)
 
 **CMS Collab Cycle**
-- [ ] [CMS Collab Cycle documentation](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/1791459333/CMS+Collaboration+Flow#like-section)
+- [ ] [CMS Collab Cycle documentation](LINK TBD on CMS provision of Plat Confluence access or migration of docs to DEPO website)
 - [ ] [CMS Collab Cycle kanban board](https://github.com/department-of-veterans-affairs/va.gov-cms#workspaces/cms-collaboration-cycle-reviews-62f50368ef32b60022d76d64/board?repos=154174777)
 
 **Tracking features**

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@10ca150f51dbbb963467c37a03c873ba1fa75f91 # v1.20.0
+        uses: reviewdog/action-eslint@279acb08336462ec76183a2d9ef1dd43e4c6b391 # v1.21.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
@@ -37,7 +37,7 @@ jobs:
           ref: ${{ inputs.commit_sha }}
 
       - name: Setup the Node environment
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
           node-version: '18.13'
 

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@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       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@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       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@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       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.yml → ...kflows/tugboat-refresh-cache-dispatch.yml b/.github/workflows/tugboat-refresh-cache.yml → ...kflows/tugboat-refresh-cache-dispatch.yml
@@ -5,16 +5,14 @@ on:
     - cron: '0 */6 * * *'
 jobs:
   # Collects the cache keys that need to be refreshed
-  collect_cache_keys:
-    name: Collect Tugboat Preview ID cache keys that need to be refreshed
-    outputs:
-      matrix: ${{ steps.cache-keys.outputs.result }}
+  dispatch_cache_keys:
+    name: Dispatch Tugboat Preview ID cache keys that need to be refreshed
     runs-on: ubuntu-latest
     steps:
       - name: Cross reference open PRs against cache keys in repo
-        id: cache-keys
         uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
+          github-token: ${{ secrets.LABEL_API_TOKEN }}
           script: |
             const prs = await github.paginate(
               github.rest.pulls.list,
@@ -43,32 +41,14 @@ jobs:
               console.log(`Key: ${key}`)
             }
 
-            const toRefresh = []
             for (const pr of prs) {
               if (cacheKeys.includes(`${{ runner.os }}-tugboat-preview-id-pr-${pr}`)) {
                 console.log(`Need to refresh: ${pr}`)
-                toRefresh.push(pr)
+                await github.rest.issues.addLabels({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: `${pr}`,
+                  labels: ['refresh-tugboat-cache'],
+                });
               }
             }
-
-            const result = JSON.stringify(toRefresh)
-            console.log(`Refresh Keys: ${result}`)
-            return result
-          result-encoding: string
-
-  # Refresh cache for given keys
-  refresh_cache:
-    name: Refresh cache for given keys
-    needs: [ collect_cache_keys ]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        value: ${{fromJSON(needs.collect_cache_keys.outputs.matrix)}}
-    steps:
-      - name: Refresh Preview ID
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: .tugboat_preview.txt
-          key: ${{ runner.os }}-tugboat-preview-id-pr-${{ matrix.value }}
-      - name: Cleanup temporary file
-        run: rm .tugboat_preview.txt
diff --git a/.github/workflows/tugboat-refresh-cache-responder.yml b/.github/workflows/tugboat-refresh-cache-responder.yml
@@ -0,0 +1,29 @@
+
+
+name: Refresh Tugboat Preview ID Cache
+on:
+  pull_request:
+    types: [ labeled ]
+jobs:
+  refresh_cache:
+    name: Refresh Tugboat Preview ID Cache
+    runs-on: ubuntu-latest
+    if: ${{ github.event.label.name == 'refresh-tugboat-cache' }}
+    steps:
+      - name: Refresh Preview ID
+        uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        with:
+          path: .tugboat_preview.txt
+          key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
+      - name: Cleanup temporary file
+        run: rm .tugboat_preview.txt
+      - name: Remove refresh label
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        with:
+          script: |
+            await github.rest.issues.removeLabel({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: ${{ github.event.pull_request.number }},
+              name: 'refresh-tugboat-cache',
+            });
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
@@ -156,6 +156,10 @@ services:
         # Install GitHub Status Updater, which updates the status of GitHub check runs.
         - ./scripts/install_github_status_updater.sh
 
+        # Install & build vets-website early for next-build preview
+        # Build vets-website so assets are available (various widgets, fonts, etc)
+        - ./scripts/vets-web-setup.sh
+
       # Commands that import files, databases,  or other assets. When an
       # existing preview is refreshed, the build workflow starts here,
       # skipping the init step, because the results of that step will
@@ -203,6 +207,12 @@ services:
         - bash -lc 'composer va:theme:compile'
         - bash -lc 'composer va:web:install'
         - bash -lc 'composer va:next:install'
+
+        # 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"
+        - ln -snf "${TUGBOAT_ROOT}/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
+
+
         # https://www.drush.org/latest/deploycommand/ (updatedb, cache:rebuild, config:import, deploy:hook)
         - drush deploy
 
@@ -250,7 +260,7 @@ services:
         # Build storybook and the frontends (web, next) in parallel
         - bash -lc 'time task --taskfile=tugboat.yml'
 
-        # Start the next build server
+        # Start the next build preview server
         - bash -lc 'composer va:next:start'
 
   memcache:

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "drupal/devel": "^5.0",
         "drupal/html_tag_usage": "^1.0@beta",
         "drupal/media_entity_generic": "^1.0",
-        "palantirnet/drupal-rector": "^0.15.0"
+        "palantirnet/drupal-rector": "^0.18.6"
     },
     "require": {
         "bower-asset/cropper": "^4.1",
@@ -157,7 +157,7 @@
         "drupal/pfm": "^2.0",
         "drupal/post_api": "^2.0.3",
         "drupal/prometheus_exporter": "^2.0@beta",
-        "drupal/raven": "^4.0",
+        "drupal/raven": "^5.0",
         "drupal/rdf": "^2.1",
         "drupal/redirect": "^1.3",
         "drupal/redirect_options": "^2.1",
@@ -221,7 +221,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3409",
+        "va-gov/content-build": "^0.0.3412",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",