Merge branch 'main' into VACMS-20371-extension-clean-up

department-of-veterans-affairs · Feb 28, 2025 · f40722b · f40722b
2 parents 982d29d + 0d5ab18
commit f40722b
Show file tree

Hide file tree

Showing 45 changed files with 676 additions and 349 deletions.
diff --git a/.github/workflows/default-branch-datadog-metrics.yml b/.github/workflows/default-branch-datadog-metrics.yml
@@ -58,7 +58,7 @@ jobs:
         env:
           GITHUB_REPOSITORY: "${{ github.repository }}"
       - name: Send Metrics to DataDog.
-        uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
+        uses: masci/datadog@748e7a8235b5dd4f467cc27dc77cc0c71d78563b # v1.8.0
         with:
           api-key: ${{ secrets.DATADOG_API_KEY }}
           api-url: https://api.ddog-gov.com
@@ -150,7 +150,7 @@ jobs:
           echo "Lines Denominator: ${lines_denominator}";
 
       - name: Send Metrics to DataDog.
-        uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
+        uses: masci/datadog@748e7a8235b5dd4f467cc27dc77cc0c71d78563b # v1.8.0
         with:
           api-key: ${{ secrets.DATADOG_API_KEY }}
           api-url: https://api.ddog-gov.com
@@ -271,7 +271,7 @@ jobs:
           echo "nonpublic_class_constants=$(jq '.nonPublicClassConstants' phploc.json)" >> $GITHUB_OUTPUT
 
       - name: Send Metrics to DataDog.
-        uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
+        uses: masci/datadog@748e7a8235b5dd4f467cc27dc77cc0c71d78563b # v1.8.0
         with:
           api-key: ${{ secrets.DATADOG_API_KEY }}
           api-url: https://api.ddog-gov.com

diff --git a/composer.json b/composer.json
@@ -228,7 +228,7 @@
         "symfony/phpunit-bridge": "^7.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "0.0.3687",
+        "va-gov/content-build": "^0.0.3692",
         "vlucas/phpdotenv": "^5.6",
         "webflo/drupal-finder": "1.3.1",
         "webmozart/path-util": "^2.3",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ada32d5f69e1bd4e9ecb9d0277032bfc",
+    "content-hash": "925bf2cf10cc9ee4a3dccb0375811f80",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -26907,16 +26907,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3687",
+            "version": "v0.0.3692",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "5cb5b37f4bfadd218e32bce98e0caa6b235d518e"
+                "reference": "c068208c8015cc7fbab3e7598356b2eda483c5fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/5cb5b37f4bfadd218e32bce98e0caa6b235d518e",
-                "reference": "5cb5b37f4bfadd218e32bce98e0caa6b235d518e",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/c068208c8015cc7fbab3e7598356b2eda483c5fc",
+                "reference": "c068208c8015cc7fbab3e7598356b2eda483c5fc",
                 "shasum": ""
             },
             "type": "node-project",
@@ -26943,9 +26943,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3687"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3692"
             },
-            "time": "2025-02-19T16:18:39+00:00"
+            "time": "2025-02-26T22:06:38+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/config/sync/core.entity_form_display.node.va_form.default.yml b/config/sync/core.entity_form_display.node.va_form.default.yml
@@ -8,7 +8,6 @@ dependencies:
     - field.field.node.va_form.field_alert
     - field.field.node.va_form.field_benefit_categories
     - field.field.node.va_form.field_last_saved_by_an_editor
-    - field.field.node.va_form.field_meta_tags
     - field.field.node.va_form.field_va_form_administration
     - field.field.node.va_form.field_va_form_deleted
     - field.field.node.va_form.field_va_form_deleted_date
@@ -161,6 +160,7 @@ content:
       field_widget_display_settings:
         view_mode: default
       selection_mode: selection_append
+      show_latest_revision: false
     third_party_settings: {  }
   field_benefit_categories:
     type: options_buttons
@@ -352,7 +352,6 @@ content:
     third_party_settings: {  }
 hidden:
   created: true
-  field_meta_tags: true
   langcode: true
   promote: true
   status: true

diff --git a/config/sync/core.entity_view_display.node.va_form.default.yml b/config/sync/core.entity_view_display.node.va_form.default.yml
@@ -7,7 +7,6 @@ dependencies:
     - field.field.node.va_form.field_alert
     - field.field.node.va_form.field_benefit_categories
     - field.field.node.va_form.field_last_saved_by_an_editor
-    - field.field.node.va_form.field_meta_tags
     - field.field.node.va_form.field_va_form_administration
     - field.field.node.va_form.field_va_form_deleted
     - field.field.node.va_form.field_va_form_deleted_date
@@ -32,7 +31,6 @@ dependencies:
     - entity_reference_revisions
     - field_group
     - link
-    - metatag
     - options
     - text
     - user
@@ -107,13 +105,6 @@ content:
     third_party_settings: {  }
     weight: 18
     region: content
-  field_meta_tags:
-    type: metatag_empty_formatter
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
   field_va_form_language:
     type: list_default
     label: above

diff --git a/config/sync/core.entity_view_display.node.va_form.external_content.yml b/config/sync/core.entity_view_display.node.va_form.external_content.yml
@@ -8,7 +8,6 @@ dependencies:
     - field.field.node.va_form.field_alert
     - field.field.node.va_form.field_benefit_categories
     - field.field.node.va_form.field_last_saved_by_an_editor
-    - field.field.node.va_form.field_meta_tags
     - field.field.node.va_form.field_va_form_administration
     - field.field.node.va_form.field_va_form_deleted
     - field.field.node.va_form.field_va_form_deleted_date
@@ -165,7 +164,6 @@ hidden:
   field_alert: true
   field_benefit_categories: true
   field_last_saved_by_an_editor: true
-  field_meta_tags: true
   field_va_form_language: true
   field_va_form_link_teasers: true
   field_va_form_name: true

diff --git a/config/sync/core.entity_view_display.node.va_form.teaser.yml b/config/sync/core.entity_view_display.node.va_form.teaser.yml
@@ -8,7 +8,6 @@ dependencies:
     - field.field.node.va_form.field_alert
     - field.field.node.va_form.field_benefit_categories
     - field.field.node.va_form.field_last_saved_by_an_editor
-    - field.field.node.va_form.field_meta_tags
     - field.field.node.va_form.field_va_form_administration
     - field.field.node.va_form.field_va_form_deleted
     - field.field.node.va_form.field_va_form_deleted_date
@@ -48,7 +47,6 @@ hidden:
   field_alert: true
   field_benefit_categories: true
   field_last_saved_by_an_editor: true
-  field_meta_tags: true
   field_va_form_administration: true
   field_va_form_deleted: true
   field_va_form_deleted_date: true

diff --git a/config/sync/field.field.node.va_form.field_meta_tags.yml b/config/sync/field.field.node.va_form.field_meta_tags.yml
diff --git a/config/sync/metatag.metatag_defaults.node__campaign_landing_page.yml b/config/sync/metatag.metatag_defaults.node__campaign_landing_page.yml
@@ -5,5 +5,6 @@ dependencies: {  }
 id: node__campaign_landing_page
 label: 'Content: Campaign Landing Page'
 tags:
+  description: '[node:field_clp_why_this_matters:value]'
   og_image: '[node:field_hero_image:entity:image:3_2_medium_thumbnail:url]'
   twitter_cards_image: '[node:field_hero_image:entity:image:3_2_medium_thumbnail:url]'
diff --git a/config/sync/metatag.metatag_defaults.node__va_form.yml b/config/sync/metatag.metatag_defaults.node__va_form.yml
@@ -5,4 +5,4 @@ dependencies: {  }
 id: node__va_form
 label: 'Content: VA form'
 tags:
-  description: '[node:field_va_form_usage:value]'
+  description: '[node:field_va_form_name:value]'
diff --git a/docroot/modules/custom/va_gov_backend/src/Deploy/Plugin/MaintenanceMode.php b/docroot/modules/custom/va_gov_backend/src/Deploy/Plugin/MaintenanceMode.php
@@ -4,6 +4,7 @@
 
 use Drupal\va_gov_backend\Deploy\LoadMaintenanceFileTrait;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 /**
@@ -30,8 +31,12 @@ public function run(Request $request, string $app_root, string $site_path) {
     $html = preg_replace('/\{\{\s*update_duration\s*\}\}/', $expected_update_duration, $html);
     $headers = [
       'Content-Type' => 'text/html',
+      'Retry-After' => 120,
     ];
-    throw new ServiceUnavailableHttpException(120, $html, NULL, 503, $headers);
+    $response = new Response($html, 503, $headers);
+    $response->send();
+    // We need to throw an exception to stop the request.
+    throw new ServiceUnavailableHttpException();
   }
 
 }
diff --git a/.../va_gov_form_builder/css/form_builder.css → .../va_gov_form_builder/css/form-builder.css b/.../va_gov_form_builder/css/form_builder.css → .../va_gov_form_builder/css/form-builder.css
diff --git a/...tom/va_gov_form_builder/css/form_info.css → ...tom/va_gov_form_builder/css/form-info.css b/...tom/va_gov_form_builder/css/form_info.css → ...tom/va_gov_form_builder/css/form-info.css
diff --git a/...content__layout__non_editable_pattern.css → ...form_builder/css/non-editable-pattern.css b/...content__layout__non_editable_pattern.css → ...form_builder/css/non-editable-pattern.css
diff --git a/docroot/modules/custom/va_gov_form_builder/css/single-column-with-buttons.css b/docroot/modules/custom/va_gov_form_builder/css/single-column-with-buttons.css
@@ -0,0 +1,3 @@
+.form-builder-single-column-with-buttons__main-content > p {
+  margin-bottom: var(--units-3);
+}
diff --git a/...v_form_builder/images/phone-and-email.png → ..._gov_form_builder/images/contact-info.png b/...v_form_builder/images/phone-and-email.png → ..._gov_form_builder/images/contact-info.png