Merge branch 'main' into VACMS-16853-next-build-branches

department-of-veterans-affairs · Jan 22, 2024 · aa141fe · aa141fe
2 parents b231592 + 2ca4409
commit aa141fe
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 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/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/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 });
+});