Merge pull request #1487 from USEPA/main

Version 2024-09-13
USEPA · Sep 13, 2024 · a5e663e · a5e663e
2 parents 17450e0 + 99ffea8
commit a5e663e
Show file tree

Hide file tree

Showing 172 changed files with 3,814 additions and 1,384 deletions.
diff --git a/ci/package-lock.json b/ci/package-lock.json
diff --git a/ci/package.json b/ci/package.json
@@ -1,8 +1,8 @@
 {
   "private": true,
   "dependencies": {
-    "@aws-sdk/client-ecs": "^3.542.0",
-    "@aws-sdk/client-ssm": "^3.540.0",
+    "@aws-sdk/client-ecs": "^3.623.0",
+    "@aws-sdk/client-ssm": "^3.623.0",
     "dedent": "^0.7.0"
   },
   "devDependencies": {

diff --git a/services/drupal/.ddev/docker-compose.localstack.yaml b/services/drupal/.ddev/docker-compose.localstack.yaml
@@ -2,7 +2,7 @@ version: "3.6"
 services:
   localstack:
     container_name: ddev-${DDEV_SITENAME}-localstack
-    image: localstack/localstack:0.12.10
+    image: localstack/localstack:stable
     networks: [default, ddev_default]
     expose:
       - 4566

diff --git a/services/drupal/.ddev/nginx_full/nginx-site.conf b/services/drupal/.ddev/nginx_full/nginx-site.conf
@@ -50,6 +50,28 @@ server {
     rewrite ^/(.*)$ /index.php?q=$1;
   }
 
+  # On any nginx 404, use this internal path
+  error_page 404 /_404;
+
+  # Set up nginx's 404 machinery to return fast-404.html anytime nginx process a 404
+  location = /_404 {
+    # Internal means /_404 can't be visited from outside
+    internal;
+
+    # Return the contents of fast-404.html
+    root /var/www/html/web/themes/epa_theme/source;
+    try_files /fast-404.html =404;
+  }
+
+  location ^~ /newsreleases/search/ {
+    error_page 410 /_404;
+    return 410;
+  }
+
+  location = /newsreleases/search/rss {
+    rewrite ^/(.*)$ /index.php?$query_string;
+  }
+
   location = /libraries {
     rewrite ^/(.*)$ /index.php?$query_string;
   }

diff --git a/services/drupal/Dockerfile b/services/drupal/Dockerfile
@@ -63,13 +63,16 @@ RUN install-php-extensions apcu sockets \
   # GNU wget to override BusyBox
   wget
 
+ARG PHP_ERROR_REPORTING='E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED'
+
 RUN set -ex \
   # This construct echoes the configuration lines to the console as well as outputting them
   # to the ini file that PHP-FPM reads.
   && { \
     echo 'memory_limit=512M'; \
     echo 'upload_max_filesize=1G'; \
     echo 'post_max_size=1G'; \
+    echo "error_reporting=${PHP_ERROR_REPORTING}"; \
   } | tee /usr/local/etc/php/php-fpm-fcgi.ini \
   # Enable special PHP-FPM status pages:
   && sed -i \
@@ -277,11 +280,15 @@ RUN install-php-extensions apcu sockets \
   # See ENTRYPOINT below
   tini
 
-# Allow unlimited memory usage when running Drush tasks (ECS will constrain the memory
-# instead of PHP)
+ARG PHP_ERROR_REPORTING='E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED'
+
 RUN set -ex \
   && { \
+    # Allow unlimited memory usage when running Drush tasks (ECS will constrain the memory
+    # instead of PHP)
     echo 'memory_limit=-1'; \
+    # Switch to our custom error_reporting level
+    echo "error_reporting=${PHP_ERROR_REPORTING}"; \
   } | tee /usr/local/etc/php/php-cli.ini
 
 # Same as nginx: copy the built Drupal filesystem

diff --git a/services/drupal/composer.json b/services/drupal/composer.json
@@ -173,6 +173,8 @@
         "drupal/autologout": "^1.3",
         "drupal/autosave_form": "^1.3",
         "drupal/block_content_permissions": "^1.8",
+        "drupal/block_in_page_403": "^2.0",
+        "drupal/block_in_page_not_found": "^4.2",
         "drupal/block_list_override": "^1.0",
         "drupal/ckeditor": "^1.0",
         "drupal/ckeditor5_dev": "^1.0",
@@ -206,7 +208,7 @@
         "drupal/embed": "^1.4",
         "drupal/entity_browser": "^2.9",
         "drupal/entity_clone": "^2@beta",
-        "drupal/entity_embed": "1.x-dev",
+        "drupal/entity_embed": "^1.5",
         "drupal/entity_usage": "^2.0-beta3",
         "drupal/entitygroupfield": "^1.0.x-dev",
         "drupal/environment_indicator": "4.0.10",

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
@@ -36,7 +36,9 @@
       "PHP message: Error: Call to a member function getEntityTypeId() on null (Layout Builder)": "https://www.drupal.org/files/issues/2023-06-12/3049332-82.diff",
       "Responsive image width/height values are not used from fallback image style": "https://www.drupal.org/files/issues/2023-08-04/3377420-responsive-image-dimension-fallback-style-9.patch",
       "CKEditor 5 toolbar items of multi-value field (typically Paragraphs) overflowing on narrow viewports and overlapping with node form's sidebar on wide viewports": "https://www.drupal.org/files/issues/2024-04-09/3332416-79.patch",
-      "Error: Call to a member function label() on null in Drupal\\menu_link_content\\Form\\MenuLinkContentForm->form() (line 99 of /var/www/html/docroot/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php).": "patches/7228.patch"
+      "Error: Call to a member function label() on null in Drupal\\menu_link_content\\Form\\MenuLinkContentForm->form() (line 99 of /var/www/html/docroot/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php).": "patches/7228.patch",
+      "Media Type links in Media Library modal missing vertical tabs styling in Claro": "https://www.drupal.org/files/issues/2024-01-04/missing_variables_in_claro-3404866-41.patch",
+      "Background colour of UI widgets get overridden on Ajax load.": "https://www.drupal.org/files/issues/2023-08-29/3383631-7_0.patch"
     },
     "drupal/autologout": {
       "Logout Message not rendering markup" : "patches/logout-message-not-rendering-markup.patch"
@@ -228,7 +230,7 @@
       "CKEditor5 readiness": "https://git.drupalcode.org/project/filter_html_plus/-/merge_requests/1.diff"
     },
     "drupal/anchor_link": {
-      "Start a 3.0.x branch for CKEditor Anchor Link for semantic versioning and better integration with Drupal 10, CKEditor 5, and LinkIt" : "https://www.drupal.org/files/issues/2023-04-28/anchor_link-ckeditor5-compatibility-3206676-55.patch"
+      "Start a 3.0.x branch for CKEditor Anchor Link for semantic versioning and better integration with Drupal 10, CKEditor 5, and LinkIt" : "https://www.drupal.org/files/issues/2023-08-22/anchor_link-ckeditor5-compatibility-3206676-98.patch"
     },
     "drupal/hierarchical_term_formatter": {
       "Automated Drupal 10 compatibility fixes": "https://git.drupalcode.org/project/hierarchical_term_formatter/-/merge_requests/5.diff"

diff --git a/services/drupal/config/sync/block.block.epa_breadcrumbs.yml b/services/drupal/config/sync/block.block.epa_breadcrumbs.yml
@@ -0,0 +1,34 @@
+uuid: 43cea374-f49c-4e47-a84f-6479d36482e1
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_in_page_403
+    - block_in_page_not_found
+    - system
+  theme:
+    - epa_theme
+id: epa_breadcrumbs
+theme: epa_theme
+region: title
+weight: -21
+provider: null
+plugin: system_breadcrumb_block
+settings:
+  id: system_breadcrumb_block
+  label: Breadcrumbs
+  label_display: '0'
+  provider: system
+visibility:
+  request_path:
+    id: request_path
+    negate: true
+    pages: '*404*'
+  page_403:
+    id: page_403
+    negate: true
+    page_403: 1
+  page_not_found_request:
+    id: page_not_found_request
+    negate: true
+    page_not_found: true
diff --git a/services/drupal/config/sync/block.block.epa_claro_page_title.yml b/services/drupal/config/sync/block.block.epa_claro_page_title.yml
@@ -7,7 +7,7 @@ dependencies:
 id: epa_claro_page_title
 theme: epa_claro
 region: header
-weight: 0
+weight: -2
 provider: null
 plugin: page_title_block
 settings:

diff --git a/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml b/services/drupal/config/sync/block.block.epa_claro_primary_local_tasks.yml
@@ -7,7 +7,7 @@ dependencies:
 id: epa_claro_primary_local_tasks
 theme: epa_claro
 region: header
-weight: 0
+weight: -1
 provider: null
 plugin: local_tasks_block
 settings:

diff --git a/services/drupal/config/sync/block.block.gesso_page_title.yml b/services/drupal/config/sync/block.block.gesso_page_title.yml
@@ -9,7 +9,7 @@ _core:
 id: gesso_page_title
 theme: epa_theme
 region: title
-weight: -18
+weight: -20
 provider: null
 plugin: page_title_block
 settings:

diff --git a/services/drupal/config/sync/block.block.views_block__internal_alerts_block_1_4.yml b/services/drupal/config/sync/block.block.views_block__internal_alerts_block_1_4.yml
@@ -11,7 +11,7 @@ dependencies:
 id: views_block__internal_alerts_block_1_4
 theme: epa_claro
 region: header
-weight: 0
+weight: -4
 provider: null
 plugin: 'views_block:internal_alerts-block_1'
 settings:

diff --git a/services/drupal/config/sync/block.block.views_block__internal_alerts_block_2_2.yml b/services/drupal/config/sync/block.block.views_block__internal_alerts_block_2_2.yml
@@ -0,0 +1,30 @@
+uuid: 0c0dde08-81e3-4f74-8f5e-b1cbf7bda9fc
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.internal_alerts
+  module:
+    - system
+    - views
+  theme:
+    - epa_claro
+id: views_block__internal_alerts_block_2_2
+theme: epa_claro
+region: header
+weight: -3
+provider: null
+plugin: 'views_block:internal_alerts-block_2'
+settings:
+  id: 'views_block:internal_alerts-block_2'
+  label: ''
+  label_display: '0'
+  provider: views
+  views_label: ''
+  items_per_page: none
+  exposed: {  }
+visibility:
+  request_path:
+    id: request_path
+    negate: false
+    pages: /admin/content/my-web-areas
diff --git a/services/drupal/config/sync/block.block.webareamenu.yml b/services/drupal/config/sync/block.block.webareamenu.yml
@@ -17,11 +17,11 @@ plugin: 'group_content_menu:web_area_menu'
 settings:
   id: 'group_content_menu:web_area_menu'
   label: 'Web Area Menu'
-  label_display: '0'
+  label_display: invisible
   provider: group_content_menu
   context_mapping:
     group: '@group.group_route_context:group'
   level: 1
   depth: 3
-  expand_all_items: false
+  expand_all_items: true
 visibility: {  }