Merge remote-tracking branch 'origin/main' into VACMS-15385-event-ema…

…il-call-to-action

.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml

@@ -1,5 +1,5 @@
 
-name: CMS Collaboration Cycle Request
+name: "CMS Collaboration Cycle Request"
 description: Use this template to begin engaging with the CMS Collaboration Cycle.
 title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]"
 labels: CMS Team, Needs Analysis, CMS-Collab-Cycle, Epic
@@ -11,7 +11,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Reach out to the CMS Team in the cms-support Slack channel.
+        Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Read our [Kickoff Request documentation](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/collaboration-cycle/kickoff.md) in Github or reach out to the CMS Team in the cms-support Slack channel.
   - type: input
     id: product-outline
     attributes:
@@ -64,7 +64,7 @@ body:
   - type: dropdown
     id: research
     attributes:
-      label: Are you doing user research with CMS editors?
+      label: Will you be doing user research with CMS editors?
       multiple: false
       options:
         - "Yes"
@@ -83,6 +83,17 @@ body:
         - "Maybe (Leave notes in the Additional Information section of this form)"
     validations:
       required: true
+  - type: dropdown
+    id: DS
+    attributes:
+      label: Will your work require introducing a new CMS Design System component or changes to an existing component?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe (Leave notes in the Additional Information section of this form)"
+    validations:
+      required: true
   - type: dropdown
     id: modules
     attributes:
@@ -94,10 +105,21 @@ body:
         - "Maybe (Leave notes in the Additional Information section of this form)"
     validations:
       required: true
+  - type: dropdown
+    id: fields
+    attributes:
+      label: Will your work require introducing new input fields or making changes to existing input fields?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+        - "Maybe (Leave notes in the Additional Information section of this form)"
+    validations:
+      required: true
   - type: dropdown
     id: analytics
     attributes:
-      label: Do you need to capture any analytics or metrics?
+      label: Will this work require you to capture any analytics or metrics?
       multiple: false
       options:
         - "Yes"

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

.github/workflows/cypress.yml

@@ -56,7 +56,7 @@ jobs:
           CY_BUILD_ID: "${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt}}"
 
       - name: Update status on commit.
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             await octokit.rest.repos.createCommitStatus({

composer.json

@@ -83,7 +83,7 @@
         "drupal/geofield_map": "^3.0",
         "drupal/google_analytics": "^4.0",
         "drupal/govdelivery_bulletins": "^1.2",
-        "drupal/graphql": "3.1.0",
+        "drupal/graphql": "^3.4",
         "drupal/graphql_core": "^3.1.0",
         "drupal/graphql_menu": "^1.0@alpha",
         "drupal/graphql_metatag": "^1.0",
@@ -208,7 +208,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^4.0",
         "symfony/routing": "^4.0",
-        "va-gov/content-build": "^0.0.3385",
+        "va-gov/content-build": "^0.0.3389",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -428,10 +428,6 @@
             "drupal/flysystem_s3": {
                 "3297257 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-04-27/3297257-drupal-10-compatibility-fixes_0.patch"
             },
-            "drupal/graphql": {
-                "Fix Explorer with Layout Builder enabled - https://github.com/drupal-graphql/graphql/pull/1144": "patches/graphql_8x3x_layout_builder_incompat.patch",
-                "Remove outdated RouteQueryEnhancer controller reference - https://github.com/drupal-graphql/graphql/pull/1230": "patches/graphql_8x3x_query_route_enhancer_update.patch"
-            },
             "drupal/hms_field": {
                 "3351452 - Argument #1 ($seconds) must be of type string|int, null given": "https://www.drupal.org/files/issues/2023-03-31/hms_field-field_null_value-3351452-1.patch"
             },