Merge branch 'main' into dependabot/composer/drupal/ief_table_view_mo…

…de-3.0.0
department-of-veterans-affairs · Jan 25, 2024 · c6340fa · c6340fa
2 parents f6d44f6 + 3458529
commit c6340fa
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 30 deletions.
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
@@ -222,7 +222,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3422",
+        "va-gov/content-build": "^0.0.3427",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "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": "838b43f862632bf9e22a36cfd7a147af",
+    "content-hash": "38b7f3830a1e681f80076cb379b2023e",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -6572,17 +6572,17 @@
         },
         {
             "name": "drupal/geocoder",
-            "version": "4.18.0",
+            "version": "4.20.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geocoder.git",
-                "reference": "8.x-4.18"
+                "reference": "8.x-4.20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.18.zip",
-                "reference": "8.x-4.18",
-                "shasum": "5ad95a5e6eceecdd32ebb42b3dc5b35487dfda7b"
+                "url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.20.zip",
+                "reference": "8.x-4.20",
+                "shasum": "1bf5ff7082e64f55128032b61c7333fd611c5347"
             },
             "require": {
                 "davedevelopment/stiphle": "^0.9.2",
@@ -6627,8 +6627,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-4.18",
-                    "datestamp": "1703166690",
+                    "version": "8.x-4.20",
+                    "datestamp": "1706097387",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -18312,16 +18312,16 @@
         },
         {
             "name": "php-http/promise",
-            "version": "1.2.1",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/promise.git",
-                "reference": "44a67cb59f708f826f3bec35f22030b3edb90119"
+                "reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/promise/zipball/44a67cb59f708f826f3bec35f22030b3edb90119",
-                "reference": "44a67cb59f708f826f3bec35f22030b3edb90119",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/2916a606d3b390f4e9e8e2b8dd68581508be0f07",
+                "reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07",
                 "shasum": ""
             },
             "require": {
@@ -18358,9 +18358,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/promise/issues",
-                "source": "https://github.com/php-http/promise/tree/1.2.1"
+                "source": "https://github.com/php-http/promise/tree/1.3.0"
             },
-            "time": "2023-11-08T12:57:08+00:00"
+            "time": "2024-01-04T18:49:48+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -25862,16 +25862,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3422",
+            "version": "v0.0.3427",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "6c82218da1661c090d2883b26f40cf18e173ff98"
+                "reference": "d98e082265882b311383cb6a0b83ef6cf6d72f42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/6c82218da1661c090d2883b26f40cf18e173ff98",
-                "reference": "6c82218da1661c090d2883b26f40cf18e173ff98",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/d98e082265882b311383cb6a0b83ef6cf6d72f42",
+                "reference": "d98e082265882b311383cb6a0b83ef6cf6d72f42",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25898,9 +25898,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.3422"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3427"
             },
-            "time": "2024-01-17T18:59:30+00:00"
+            "time": "2024-01-24T17:14:58+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/config/sync/next.settings.yml b/config/sync/next.settings.yml
@@ -8,5 +8,5 @@ site_previewer_configuration:
   sync_route_skip_routes: ''
 preview_url_generator: simple_oauth
 preview_url_generator_configuration:
-  secret_expiration: 300
+  secret_expiration: 86400
 debug: false
diff --git a/config/sync/views.view.user_admin_people.yml b/config/sync/views.view.user_admin_people.yml
@@ -1466,7 +1466,7 @@ display:
           type: timestamp
           settings:
             date_format: custom
-            custom_date_format: 'F j, Y, g:ia'
+            custom_date_format: 'Y-m-d H:i:s'
             timezone: ''
             tooltip:
               date_format: ''
@@ -1477,6 +1477,7 @@ display:
               past_format: '@interval ago'
               granularity: 2
               refresh: 60
+              description: ''
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -1501,7 +1502,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "{% if access__value %}\r\n    {{ access__value|format_date('custom', 'F j, Y, g:ia') }}\r\n{% else %}\r\n    Never\r\n{% endif %}"
+            text: "{% if access__value %}\r\n    {{ access__value|format_date('custom', 'Y-m-d H:i:s') }}\r\n{% else %}\r\n    Never\r\n{% endif %}"
             make_link: false
             path: ''
             absolute: false
@@ -2006,7 +2007,7 @@ display:
           type: timestamp
           settings:
             date_format: custom
-            custom_date_format: 'F j, Y, g:ia'
+            custom_date_format: 'Y-m-d H:i:s'
             timezone: ''
             tooltip:
               date_format: ''
@@ -2042,7 +2043,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "{% if access__value %}\r\n    {{ access__value|format_date('custom', 'F j, Y, g:ia') }}\r\n{% else %}\r\n    Never\r\n{% endif %}"
+            text: "{% if access__value %}\r\n    {{ access__value|format_date('custom', 'Y-m-d H:i:s') }}\r\n{% else %}\r\n    Never\r\n{% endif %}"
             make_link: false
             path: ''
             absolute: false

diff --git a/docroot/modules/custom/va_gov_content_types/src/Traits/EventOutreachTrait.php b/docroot/modules/custom/va_gov_content_types/src/Traits/EventOutreachTrait.php
@@ -46,10 +46,11 @@ public function addToNationalOutreachCalendar(EventInterface $node): void {
     if ($node->hasField(EventOutreachInterface::LISTING_FIELD) &&
       $node->hasField(EventOutreachInterface::PUBLISH_TO_OUTREACH_CAL_FIELD) &&
       $node->hasField(EventOutreachInterface::ADDITIONAL_LISTING_FIELD)) {
-      $addToCalValue = $node->get(EventOutreachInterface::PUBLISH_TO_OUTREACH_CAL_FIELD)->first()->getValue();
-      if (isset($addToCalValue['value'])) {
+      if ($node->get(EventOutreachInterface::PUBLISH_TO_OUTREACH_CAL_FIELD)->first()) {
+        $addToCalValue = $node->get(EventOutreachInterface::PUBLISH_TO_OUTREACH_CAL_FIELD)->first()->getValue();
         $listings = $node->get(EventOutreachInterface::LISTING_FIELD)->getValue();
         $additionalListings = $node->get(EventOutreachInterface::ADDITIONAL_LISTING_FIELD)->getValue();
+        assert(array_key_exists('value', $addToCalValue));
         if ($addToCalValue['value'] === 1 || $this->outreachHubOnlyUser()) {
           // Add to Outreach calendar selected, or user is Outreach Hub only
           // user.

diff --git a/docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php b/docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php
@@ -270,7 +270,11 @@ protected function applyVamcMenuRulesForDetailPage(array &$form) {
 
         $menu_element_type = $this->getMenuItemType($alias);
         $menu_element_type = $menu_element_type ?? $this->checkForSeparator($allowed_separators, $menu_item);
-
+        if (str_contains($subject_uuid['option'], 'Work with us')) {
+          // This is a special case where we want to allow the menu item
+          // to be enabled.
+          $menu_element_type = self::ENABLED;
+        }
         $this->addAllowedParent($allowed_parents, $enabled_count, $menu_element_type, $subject_uuid);
       }
     }

diff --git a/tests/cypress/integration/features/content_type/event.feature b/tests/cypress/integration/features/content_type/event.feature
@@ -144,3 +144,11 @@ Feature: Content Type: Event
     Given I am logged in as a user with the "content_admin" role
     When I am at "node/add/event"
     Then an element with the selector "#edit-field-datetime-range-timezone-wrapper button.tabledrag-toggle-weight" should not exist
+
+  Scenario: Confirm creating "Featured" Events is possible.
+    Given I am logged in as a user with the "content_admin" role
+    And I create a "event" node and continue
+    And I fill in field with selector "#edit-revision-log-0-value" with fake text
+    And I feature the content
+    When I save the node
+    Then I should see "has been updated."
diff --git a/tests/cypress/integration/step_definitions/common/i_feature_the_content.js b/tests/cypress/integration/step_definitions/common/i_feature_the_content.js
@@ -0,0 +1,5 @@
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
+
+Given("I feature the content", () => {
+  cy.get("#edit-field-featured-value").check({ force: true });
+});