Merge pull request #1383 from USEPA/main

Version 2024-05-24
USEPA · May 24, 2024 · c56d83c · c56d83c
2 parents 003d359 + 2a86589
commit c56d83c
Show file tree

Hide file tree

Showing 46 changed files with 5,194 additions and 2,287 deletions.
diff --git a/services/drupal/Dockerfile b/services/drupal/Dockerfile
@@ -294,11 +294,6 @@ RUN \
 COPY scripts/ecs/drush-migrate.sh /usr/local/bin/drush-migrate
 RUN chmod +x /usr/local/bin/drush-migrate
 
-# Replace the default crontab with one that runs Drush every five minutes. By
-# default, cron is not run (since there is no systemd equivalent in containers),
-# but we use this in the Drush ECS service definition.
-RUN echo '*/5 * * * * drush cron --uri="${WEBCMS_SITE_URL}" 2>&1' | crontab -
-
 # Wrap the entrypoint script with tini to allow graceful signal handling
 ENTRYPOINT ["tini", "--", "docker-php-entrypoint"]
 
@@ -308,3 +303,6 @@ ARG GIT_TAG=""
 ARG GIT_COMMIT=""
 
 ENV GIT_TAG=${GIT_TAG} GIT_COMMIT=${GIT_COMMIT}
+
+# Lower user
+USER www-data
diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
@@ -132,7 +132,8 @@
     "drupal/elasticsearch_connector": {
       "Facet OR: global aggregation does not take views filter into account": "https://www.drupal.org/files/issues/2023-03-06/elasticsearch_connector-facet_OR_global_aggregation_does_not_take_views_filter_into_account-3014805-44.patch",
       "Accurately count total number of results": "https://www.drupal.org/files/issues/2021-11-18/3250145-1-track-total-hits.patch",
-      "Implement luceneFlattenKeys": "https://www.drupal.org/files/issues/2021-09-28/elasticsearch_connector-flattenkeys-2952301-15.patch"
+      "Implement luceneFlattenKeys": "https://www.drupal.org/files/issues/2021-09-28/elasticsearch_connector-flattenkeys-2952301-15.patch",
+      "Search API + Elastic connector + VBO error performing action": "https://www.drupal.org/files/issues/2021-10-26/elasticsearch_connector-views_bulk_operation_fix-3050133-16.patch"
     },
     "drupal/redis": {
       "Enable cluster mode support": "https://www.drupal.org/files/issues/2020-02-06/2900947-17.patch"
@@ -236,7 +237,8 @@
       "Fix errors from incorrect argument 3 being passed to Symfony\\Component\\HttpKernel\\Exception\\ServiceUnavailableHttpException::__construct()": "https://www.drupal.org/files/issues/2021-01-28/fast_404_3194034-6.patch"
     },
     "drupal/cloudfront_cache_path_invalidate": {
-      "Fix naming of settings file": "https://www.drupal.org/files/issues/2022-06-06/cloudfront_cache_path_invalidate-settings_name-3284348-2.patch"
+      "Fix naming of settings file": "https://www.drupal.org/files/issues/2022-06-06/cloudfront_cache_path_invalidate-settings_name-3284348-2.patch",
+      "Caller reference invalidate": "patches/caller_reference-invalidate.patch"
     },
     "nodespark/des-connector": {
       "Make magic __wakeup method public for PHP 8 compatibility": "patches/des-connector-php-8-fixes.patch"

diff --git a/services/drupal/config/sync/block.block.footerlanguagebar.yml b/services/drupal/config/sync/block.block.footerlanguagebar.yml
@@ -0,0 +1,23 @@
+uuid: 43ef2b86-96d9-4a31-9b88-e7daebdcca79
+langcode: en
+status: true
+dependencies:
+  config:
+    - fixed_block_content.fixed_block_content.footer_language_bar
+  module:
+    - fixed_block_content
+  theme:
+    - epa_theme
+id: footerlanguagebar
+theme: epa_theme
+region: pre_footer
+weight: 0
+provider: null
+plugin: 'fixed_block_content:footer_language_bar'
+settings:
+  id: 'fixed_block_content:footer_language_bar'
+  label: 'Footer language bar'
+  label_display: '0'
+  provider: fixed_block_content
+  view_mode: ''
+visibility: {  }
diff --git a/services/drupal/config/sync/coffee.configuration.yml b/services/drupal/config/sync/coffee.configuration.yml
diff --git a/services/drupal/config/sync/core.extension.yml b/services/drupal/config/sync/core.extension.yml
@@ -31,7 +31,6 @@ module:
   ckeditor_resize: 0
   ckeditor_specialchars: 0
   cloudfront_cache_path_invalidate: 0
-  coffee: 0
   components: 0
   config_filter: 0
   config_ignore: 0

diff --git a/services/drupal/config/sync/epa_web_areas.allowed_bulk_change.yml b/services/drupal/config/sync/epa_web_areas.allowed_bulk_change.yml
@@ -0,0 +1,18 @@
+node:
+  event: event
+  faq: faq
+  news_release: news_release
+  page: page
+  perspective: perspective
+  public_notice: public_notice
+  regulation: regulation
+  speeches: speeches
+  webform: webform
+  web_area: 0
+media:
+  audio: audio
+  banner_image: banner_image
+  document: document
+  image: image
+  other: other
+  remote_video: remote_video
diff --git a/services/drupal/config/sync/field.field.block_content.custom_html.body.yml b/services/drupal/config/sync/field.field.block_content.custom_html.body.yml
@@ -6,12 +6,18 @@ dependencies:
     - block_content.type.custom_html
     - field.storage.block_content.body
   module:
-    - custom_add_another
+    - allowed_formats
     - text
 third_party_settings:
-  custom_add_another:
-    custom_add_another: ''
-    custom_remove: ''
+  allowed_formats:
+    allowed_formats:
+      - filtered_html
+      - full_html
+      - inline
+      - restricted_html
+      - restricted_html_no_links
+      - unprocessed
+      - plain_text
 id: block_content.custom_html.body
 field_name: body
 entity_type: block_content

diff --git a/services/drupal/config/sync/fixed_block_content.fixed_block_content.footer_language_bar.yml b/services/drupal/config/sync/fixed_block_content.fixed_block_content.footer_language_bar.yml
@@ -0,0 +1,14 @@
+uuid: 6871ca9d-4c33-4889-bc5e-c60ce998899a
+langcode: en
+status: true
+dependencies:
+  config:
+    - block_content.type.custom_html
+  content:
+    - 'block_content:custom_html:775319d5-c60f-4ee0-961f-f2a56e9b850e'
+id: footer_language_bar
+title: 'Footer language bar'
+block_content_bundle: custom_html
+default_content: '{"_links":{"self":{"href":"https:\/\/epa.ddev.site\/block\/250088?_format=hal_json"},"type":{"href":"http:\/\/fixed_block_content.drupal.org\/rest\/type\/block_content\/custom_html"},"http:\/\/fixed_block_content.drupal.org\/rest\/relation\/block_content\/custom_html\/revision_user":[{"href":"https:\/\/epa.ddev.site\/user\/1?_format=hal_json"}]},"langcode":[{"value":"en","lang":"en"}],"type":[{"target_id":"custom_html"}],"_embedded":{"http:\/\/fixed_block_content.drupal.org\/rest\/relation\/block_content\/custom_html\/revision_user":[{"_links":{"self":{"href":"https:\/\/epa.ddev.site\/user\/1?_format=hal_json"},"type":{"href":"http:\/\/fixed_block_content.drupal.org\/rest\/type\/user\/user"}},"uuid":[{"value":"4d920095-c6ce-4c2f-818d-ecc78d491423"}]}]},"status":[{"value":true,"lang":"en"}],"info":[{"value":"Footer language bar","lang":"en"}],"reusable":[{"value":true}],"default_langcode":[{"value":true,"lang":"en"}],"revision_translation_affected":[{"value":true,"lang":"en"}],"metatag":[{"value":{"canonical_url":"https:\/\/epa.ddev.site\/block\/250088","shortlink":"https:\/\/epa.ddev.site\/block\/250088","title":"| US EPA","og_site_name":"US EPA","og_url":"https:\/\/epa.ddev.site\/block\/250088","og_image_0":"https:\/\/epa.ddev.site\/sites\/all\/themes\/epa\/img\/epa-standard-og.jpg","og_image_width":"1200","og_image_height":"630","og_image_alt":"U.S. Environmental Protection Agency","twitter_cards_type":"summary_large_image","twitter_cards_image_alt":"U.S. Environmental Protection Agency","twitter_cards_image_height":"600","twitter_cards_image_width":"1200","twitter_cards_image":"https:\/\/epa.ddev.site\/sites\/all\/themes\/epa\/img\/epa-standard-twitter.jpg"}}],"body":[{"value":"\u003Cul class=\u0022list list--footer-language-bar\u0022\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance\u0022\u003EAssistance\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#esp\u0022\u003EAyuda\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#ar\u0022\u003E\u0645\u0633\u0627\u0639\u062f\u0629\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#chi-s\u0022\u003E\u5e2e\u52a9 (\u7b80\u4f53\u7248)\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#chi-tr\u0022\u003E\u5e6b\u52a9 (\u7e41\u9ad4\u7248)\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#fr\u0022\u003EAide\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#hc\u0022\u003EAsistans\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#kor\u0022\u003E\uc9c0\uc6d0\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#port\u0022\u003EAssist\u00eancia\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#rus\u0022\u003E\u041f\u043e\u043c\u043e\u0449\u044c\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#tag\u0022\u003ETulong\u003C\/a\u003E\u003C\/li\u003E\r\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#viet\u0022\u003ETr\u1ee3 Gi\u00fap\u003C\/a\u003E\u003C\/li\u003E\r\n\u003C\/ul\u003E","format":"full_html","processed":"\u003Cul class=\u0022list list--footer-language-bar\u0022\u003E\u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance\u0022\u003EAssistance\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#esp\u0022\u003EAyuda\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#ar\u0022\u003E\u0645\u0633\u0627\u0639\u062f\u0629\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#chi-s\u0022\u003E\u5e2e\u52a9 (\u7b80\u4f53\u7248)\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#chi-tr\u0022\u003E\u5e6b\u52a9 (\u7e41\u9ad4\u7248)\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#fr\u0022\u003EAide\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#hc\u0022\u003EAsistans\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#kor\u0022\u003E\uc9c0\uc6d0\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#port\u0022\u003EAssist\u00eancia\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#rus\u0022\u003E\u041f\u043e\u043c\u043e\u0449\u044c\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#tag\u0022\u003ETulong\u003C\/a\u003E\u003C\/li\u003E\n    \u003Cli\u003E\u003Ca href=\u0022https:\/\/www.epa.gov\/lep\/assistance#viet\u0022\u003ETr\u1ee3 Gi\u00fap\u003C\/a\u003E\u003C\/li\u003E\n\u003C\/ul\u003E","summary":"","lang":"en"}]}'
+auto_export: 1
+protected: false
diff --git a/services/drupal/config/sync/language/es/views.view.moderated_content.yml b/services/drupal/config/sync/language/es/views.view.moderated_content.yml
@@ -12,9 +12,6 @@ display:
         type:
           label: 'Tipo de contenido'
           separator: ', '
-        name:
-          label: Autor
-          separator: ', '
         moderation_state:
           label: 'Estado de moderación'
           separator: ', '

diff --git a/services/drupal/config/sync/page_manager.page_variant.dashboard_overview-block_display-0.yml b/services/drupal/config/sync/page_manager.page_variant.dashboard_overview-block_display-0.yml
@@ -26,6 +26,7 @@ variant_settings:
       context_mapping: {  }
       views_label: ''
       items_per_page: none
+      exposed: {  }
       region: top
       weight: 0
       uuid: 6f7a550c-463c-4be8-9593-c9c2145e42f9
@@ -37,6 +38,7 @@ variant_settings:
       context_mapping: {  }
       views_label: ''
       items_per_page: none
+      exposed: {  }
       region: bottom
       weight: 0
       uuid: 4fb74c60-de0a-422f-82c1-b6027e4bd4df

diff --git a/services/drupal/config/sync/system.action.epa_web_areas_update_media_group_association.yml b/services/drupal/config/sync/system.action.epa_web_areas_update_media_group_association.yml
@@ -0,0 +1,13 @@
+uuid: 7563a7f7-1795-4821-82c0-67add9cf18f5
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - epa_web_areas
+id: epa_web_areas_update_media_group_association
+label: 'Update Web Area association'
+type: media
+plugin: epa_web_areas_update_media_group_association
+configuration:
+  updated_group: null
diff --git a/services/drupal/config/sync/system.action.epa_web_areas_update_node_group_association.yml b/services/drupal/config/sync/system.action.epa_web_areas_update_node_group_association.yml
@@ -0,0 +1,13 @@
+uuid: aee885cd-343c-4a64-8fc2-2ecb9ba61d50
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - epa_web_areas
+id: epa_web_areas_update_node_group_association
+label: 'Update Web Area association'
+type: node
+plugin: epa_web_areas_update_node_group_association
+configuration:
+  updated_group: null
diff --git a/services/drupal/config/sync/user.role.authenticated.yml b/services/drupal/config/sync/user.role.authenticated.yml
@@ -22,7 +22,6 @@ dependencies:
   module:
     - actions_permissions
     - admin_toolbar_search
-    - coffee
     - content_moderation
     - content_moderation_revert
     - contextual
@@ -54,7 +53,6 @@ weight: -9
 is_admin: false
 permissions:
   - 'access administration pages'
-  - 'access coffee'
   - 'access content'
   - 'access content overview'
   - 'access contextual links'
@@ -106,6 +104,8 @@ permissions:
   - 'execute entity:unpublish_action paragraphs_library_item'
   - 'execute entity:unpublish_action path_alias'
   - 'execute entity:unpublish_action taxonomy_term'
+  - 'execute epa_web_areas_update_media_group_association media'
+  - 'execute epa_web_areas_update_node_group_association node'
   - 'execute moderation_state_change block_content'
   - 'execute moderation_state_change crop'
   - 'execute moderation_state_change embedded_paragraphs'