Merge branch 'main' into 16591-updat-drupal-core-to-v102

READMES/devops/aws-assets.md

@@ -0,0 +1,18 @@
+# AWS Assets
+
+This is a list of some generic AWS assets that are not directly traceable to this team, i.e. they are not managed in Terraform or other IaC. The purpose of this document is to clarify ownership and collect relevant information so that these assets are more discoverable and their _raison d'être_ more transparent.
+
+## IAM Users (Service Accounts)
+
+The following were added in #5611 to work with certain S3 buckets; these are intended to allow transfer of files from CMS file stores to an S3 bucket designated for public access to those files. These systems are not fully in place yet, but are in progress.
+
+- `svc-dsva-vagov-cms-dev-assets` 
+- `svc-dsva-vagov-prod-cms-files`
+- `svc-dsva-vagov-prod-cms-test-files`
+- `svc-dsva-vagov-staging-cms-files`
+- `svc-dsva-vagov-staging-cms-test-files`
+
+The following account may be necessary for GitHub Actions workflows (currently under the purview of Accelerated Publishing) to interact with AWS resources.
+
+- `svc-gh-vagov-ap-user`
+

composer.json

@@ -220,7 +220,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3414",
+        "va-gov/content-build": "^0.0.3417",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",

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": "1bad95ec0dd7e9c01492ee502e4c5d42",
+    "content-hash": "dd7a8b38039836aeebdc472d433eaf95",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -5406,26 +5406,26 @@
         },
         {
             "name": "drupal/entity_field_fetch",
-            "version": "1.0.4",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/entity_field_fetch.git",
-                "reference": "1.0.4"
+                "reference": "1.0.6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity_field_fetch-1.0.4.zip",
-                "reference": "1.0.4",
-                "shasum": "a48fabc970c460d032e7ac017285d5b9e2f434d1"
+                "url": "https://ftp.drupal.org/files/projects/entity_field_fetch-1.0.6.zip",
+                "reference": "1.0.6",
+                "shasum": "615ec840043ef03e28ec727bd2809c3c0de630f8"
             },
             "require": {
                 "drupal/core": "^8 || ^9 || ^10"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "1.0.4",
-                    "datestamp": "1691158258",
+                    "version": "1.0.6",
+                    "datestamp": "1704772049",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -18834,16 +18834,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.50",
+            "version": "1.10.55",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4"
+                "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4",
-                "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9a88f9d18ddf4cf54c922fbeac16c4cb164c5949",
+                "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949",
                 "shasum": ""
             },
             "require": {
@@ -18892,7 +18892,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-13T10:59:42+00:00"
+            "time": "2024-01-08T12:32:40+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -25788,16 +25788,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3414",
+            "version": "v0.0.3417",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "a337ba03263ce90145a22194c353cbf9b3eb71a0"
+                "reference": "62ce570e4c1a240c46381ca02a635ea191aa82ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/a337ba03263ce90145a22194c353cbf9b3eb71a0",
-                "reference": "a337ba03263ce90145a22194c353cbf9b3eb71a0",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/62ce570e4c1a240c46381ca02a635ea191aa82ec",
+                "reference": "62ce570e4c1a240c46381ca02a635ea191aa82ec",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25824,9 +25824,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.3414"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3417"
             },
-            "time": "2024-01-04T16:17:01+00:00"
+            "time": "2024-01-08T21:06:54+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -26803,7 +26803,6 @@
         "drupal/entity_block": 10,
         "drupal/entity_clone": 15,
         "drupal/entity_diff_ui": 15,
-        "drupal/entity_field_fetch": 10,
         "drupal/entity_reference_hierarchy": 10,
         "drupal/entity_reference_validators": 15,
         "drupal/entity_route_context": 5,

config/sync/feature_toggle.features.yml

@@ -5,3 +5,4 @@ features:
   feature_single_value_field_link: FEATURE_SINGLE_VALUE_FIELD_LINK
   feature_health_connect_number: FEATURE_HEALTH_CONNECT_NUMBER
   feature_next_story_preview: FEATURE_NEXT_STORY_PREVIEW
+  feature_mobile_app_promo: FEATURE_MOBILE_APP_PROMO

docroot/modules/custom/va_gov_backend/va_gov_backend.module

@@ -419,12 +419,12 @@ function va_gov_backend_form_alter(&$form, FormStateInterface $form_state, $form
   // Only run when on a node.
   // Additionally, reduce the number of times called when editing a paragraph,
   // which will have a triggering_element set.
-  if (isset($form['#entity_type'])
-    && $form['#entity_type'] === 'node'
-    && (!$form_state->getTriggeringElement())) {
+  $base_form_id = $form_state->getBuildInfo()['base_form_id'] ?? '';
+  if ((!$form_state->getTriggeringElement()) && ($base_form_id === "node_form")) {
     $targets = [
       'field_office',
       'field_listing',
+      'field_facility_location',
     ];
     _va_gov_backend_dropdown_field_access($form, $targets);
   }
@@ -1045,6 +1045,13 @@ function _va_gov_backend_dropdown_field_access(array &$form, array $targets) {
             }
           }
         }
+        elseif (!empty($option_header)) {
+          // If not an array, it's just an option.
+          // If not in the allowed items array, take it out.
+          if (!in_array($header_key, $allowed_options)) {
+            unset($form[$target]['widget']['#options'][$header_key]);
+          }
+        }
       }
     }
   }

scripts/queue_runner/queue_runner.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -l
 
 cd "${TUGBOAT_ROOT}"
 ./bin/drush advancedqueue:queue:process command_runner 2>&1

tests/cypress/integration/features/content_type/vba_facility_service.feature

@@ -0,0 +1,21 @@
+@content_type__vba_facility_service
+Feature: CMS User may effectively interact with the VBA Facility service form
+  In order to confirm that cms user have access to the necessary functionality
+  As anyone involved in the project
+  I need to have certain functionality available
+
+  Scenario: Log in and try to create a VBA Facility service as a VBA editor
+    When I am logged in as a user with the roles "content_creator_vba, content_publisher"
+    And my workbench access sections are set to "1065"
+    And I am at "/node/add/vba_facility_service"
+    Then I should see an option with the text "Columbia VA Regional Benefit Office" from dropdown with selector "#edit-field-office"
+    And I should not see an option with the text "Cheyenne VA Regional Benefit Office" from dropdown with selector "#edit-field-office"
+
+Scenario: Log in and try to create a VBA Facility service as a VBA editor with 2 sections
+    When I am logged in as a user with the roles "content_creator_vba, content_publisher"
+    And my workbench access sections are set to "1065,1104"
+    And I am at "/node/add/vba_facility_service"
+    Then I should see an option with the text "Cheyenne VA Regional Benefit Office" from dropdown with selector "#edit-field-office"
+    And I should see an option with the text "Columbia VA Regional Benefit Office" from dropdown with selector "#edit-field-office"
+    And I should not see an option with the text "Denver VA Regional Benefit Office" from dropdown with selector "#edit-field-office"
+