Merge branch 'main' into swirtSJW-patch-4

department-of-veterans-affairs · Jan 25, 2024 · 861ca9d · 861ca9d
2 parents 0c5bc2d + 376659b
commit 861ca9d
Show file tree

Hide file tree

Showing 91 changed files with 2,598 additions and 1,199 deletions.
diff --git a/.github/ISSUE_TEMPLATE/pw-clp-request.md b/.github/ISSUE_TEMPLATE/pw-clp-request.md
@@ -25,6 +25,15 @@ Help desk ticket: <insert_help_desk_link>
 - [ ] Name of submitter (if applicable)
 Submitter: <insert_name>
 
+- Campaign title: 
+- Who the editor(s) will be for the Campaign Landing Page and any appropriate stakeholders for awareness: 
+- The goals/outcomes you are looking to achieve with the campaign: 
+- Outcome success measurement & how it will be measured (note: "Page views" is not a generally accepted success measurement): 
+- Target Audience(s): 
+-  Campaign start/end dates: 
+- Is this a seasonal campaign? 
+- If not: when campaign ends, should campaign page be archived or redirected? 
+- If redirected, where should it redirect?
 
 ## Acceptance criteria
 

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@6c6a657047c0452b33ec3c254009c331e47c1370 # v1.64.0
+        uses: int128/datadog-actions-metrics@12d225bf2f764e5103a994157c1316df39dc3fae # v1.68.0
         with:
           datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
           collect-job-metrics: true

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@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       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@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache/save@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       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@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       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@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
         with:
           path: .tugboat_preview.txt
           key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}

diff --git a/READMES/devops/tugboat.md b/READMES/devops/tugboat.md
@@ -33,3 +33,23 @@ Can only update CPU and memory at a project level, not repository level.
 1. `tugboat ls 5fd3b8ee7b465711575722d5 -j | grep memory` # Get current limit
 1. `tugboat update 5fd3b8ee7b465711575722d5 memory=16384` # Set limit to 16GB
 1. `tugboat ls 5fd3b8ee7b465711575722d5 -j | grep memory` # Verify new limit
+
+## Tugboat Crisis Intervention
+
+### Overload
+
+**Symptoms**: Tugboat is slow, requests to Tugboat dashboard return 502/504 status codes, previews disappear and reappear, etc.
+
+**Diagnosis**: Tugboat might be overloaded; too many previews might be running simultaneously.
+
+**Verification**: 
+
+1. Log into the Tugboat server (`ssm-session utility tugboat auto`).
+2. Check system load and free memory (e.g. `top`).
+3. If load is incredibly high, and available memory is very low, then the Tugboat server might be dealing with too many open previews.
+
+**Remediation**:
+
+1. Close unused previews in the CMS/Pull Requests project. Target older previews and those corresponding to closed/merged PRs; these should be closed automatically, but there may be issues somewhere in the system that impair communication and cause these to remain open.
+2. Suspend older previews. This normally happens automatically (for Pull Request-based previews that haven't been touched in some period of time), but a flurry of previews might have been created inadvertently.
+3. Consider upscaling the Tugboat server or migrating to an alternative architecture.
diff --git a/READMES/user_management.md b/READMES/user_management.md
@@ -18,7 +18,7 @@ To resolve this issue:
 
 To import users:
 
-1. go to [the import page](https://prod.cms.va.gov/migrate_source_ui)
+1. go to [the import page](https://prod.cms.va.gov/admin/content/migrate_source_ui))
 1. Select "User Import (supports csv)" from the **Migrations** dropdown
 1. Upload a CSV file in the following format:
 ```

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "composer/installers": "^2.2",
         "consolidation/site-process": "^5.2",
         "cweagans/composer-patches": "^1.7",
-        "datadog/dd-trace": "^0.96.0",
+        "datadog/dd-trace": "^0.97.0",
         "dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
         "drupal/address": "^1.4",
         "drupal/admin_feedback": "^2.2",
@@ -34,6 +34,7 @@
         "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",
         "drupal/ckeditor_abbreviation": "^4.0@alpha",
         "drupal/coder": "^8.3",
         "drupal/codit_menu_tools": "^1.0@alpha",
@@ -48,9 +49,8 @@
         "drupal/consumers": "^1.17.0",
         "drupal/content_lock": "^2.3",
         "drupal/content_model_documentation": "^1.0.19",
-        "drupal/core": "10.1.7 as 9.5",
-        "drupal/core-composer-scaffold": "10.1.7 as 9.5",
-        "drupal/core-recommended": "10.1.7 as 9.5",
+        "drupal/core-composer-scaffold": "^10.2.0",
+        "drupal/core-recommended": "^10.2.0",
         "drupal/crop": "^2.0",
         "drupal/csv_serialization": "^4.0",
         "drupal/ctools_block": "^4.0",
@@ -98,7 +98,7 @@
         "drupal/hierarchy_manager": "^3.0",
         "drupal/hms_field": "^2.0",
         "drupal/hook_event_dispatcher": "^4.0@beta",
-        "drupal/ief_table_view_mode": "^2.1",
+        "drupal/ief_table_view_mode": "^3.0",
         "drupal/image_style_warmer": "^1.2@RC",
         "drupal/image_widget_crop": "^2.2",
         "drupal/jsonapi_extras": "^3.19",
@@ -193,7 +193,7 @@
         "drupal/views_local_tasks": "^1.0",
         "drupal/workbench_access": "^2.0",
         "drupal/workbench_menu_access": "^2.0",
-        "drush/drush": "^11",
+        "drush/drush": "^12",
         "easyrdf/easyrdf": "1.1.1 as 0.9.1",
         "geocoder-php/mapbox-provider": "^1.3",
         "gitonomy/gitlib": "^1.2",
@@ -204,6 +204,7 @@
         "mikey179/vfsstream": "^1.6",
         "mnsami/composer-custom-directory-installer": "^2.0",
         "npm-asset/dropzone": "^5.5",
+        "npm-asset/jquery-validation": "^1.17",
         "npm-asset/yarn": "1.19.1",
         "oomphinc/composer-installers-extender": "^2.0",
         "orakili/composer-drupal-info-file-patch-helper": "*",
@@ -221,7 +222,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3417",
+        "va-gov/content-build": "^0.0.3427",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -366,6 +367,9 @@
                 "3200122 - Remove delete hook": "https://www.drupal.org/files/issues/2021-02-24/delete-hook-added-in-dev-causes-test-failures.patch",
                 "3254663 - Notice: Undefined index: target_bundles on Drupal\\cer\\Entity\\CorrespondingReference->synchronizeCorrespondingField()": "https://www.drupal.org/files/issues/2022-02-14/prevent-undefined-index-3254663-6.patch"
             },
+            "drupal/clientside_validation": {
+                "2949540 - Allow specific form ids for clientside validation": "https://www.drupal.org/files/issues/2023-10-27/2949540-31.patch"
+            },
             "drupal/consumer_image_styles": {
                 "3301224 - Follow-up: Very slow JSON:API responses when images are stored on AWS bucket": "https://www.drupal.org/files/issues/2023-02-07/3301224-9.patch"
             },
@@ -385,10 +389,10 @@
                 "2767243 - Create a theme suggestion for taxonomy terms by view mode": "https://www.drupal.org/files/issues/core-theme-suggestion-for-taxonomy-view-modes-2767243-14.patch",
                 "2775665 - MenuLinkContent updateLink function generates a PHP Warning for override-able keys that are not present in the loaded entity": "https://www.drupal.org/files/issues/2021-09-17/updateLink-2775665-14.patch",
                 "Claro claro_preprocess_input()": "patches/drupal-core-claro_preprocess_input.patch",
-                "1156338 - Fixed maximum number of field values, but use «add more» similar to when cardinality «unlimited» is used": "https://www.drupal.org/files/issues/2022-01-27/drupal-fix-limited-cardinality-fields-1156338-23.patch",
+                "1156338 - Fixed maximum number of field values, but use «add more» similar to when cardinality «unlimited» is used": "https://www.drupal.org/files/issues/2023-12-20/1156338-31.patch",
                 "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/2023-05-24/3106205-length-menu-tree-too-short.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",
                 "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",
@@ -443,8 +447,7 @@
             },
             "drupal/inline_entity_form": {
                 "3226473 - Opt-in system delete.": "https://www.drupal.org/files/issues/2023-03-28/3226473-opt-in-system-delete-2.patch",
-                "3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch",
-                "3311501 - Add label to weight select field for accessibility": "https://www.drupal.org/files/issues/2022-09-23/Adding_labels_to_weight_selects_for_accessibility.patch"
+                "3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch"
             },
             "drupal/jsonapi_menu_items": {
                 "3276561 - Add support for the Menu Item Extras module": "https://www.drupal.org/files/issues/2022-08-01/3276561-05-menu_item_extras_support.patch"
@@ -503,7 +506,8 @@
             },
             "drupal/smart_date": {
                 "3260965 - Undefined index: #value": "https://www.drupal.org/files/issues/2022-01-27/smart_date_undefined_value_in_validation.patch",
-                "3385720 - Implement errorElement() in Widgets": "https://www.drupal.org/files/issues/2023-09-08/smart_date-implement-errorelement-3385720-3.patch"
+                "3385720 - Implement errorElement() in Widgets": "https://www.drupal.org/files/issues/2023-09-08/smart_date-implement-errorelement-3385720-3.patch",
+                "3413612 - The repeat end date should not be allowed to come before the start time": "https://www.drupal.org/files/issues/2024-01-11/smart_date-repeat-end-date-3413612-0.patch"
             },
             "drupal/tablefield": {
                 "3100109 - 0 string value in cell throws empty error": "https://www.drupal.org/files/issues/2019-12-10/0-value-throwing-empty-error.patch",