Merge pull request #545 from USEPA/main

Merge main to live for release

services/drupal/composer.json

@@ -213,7 +213,7 @@
         "drupal/content_moderation_revert": "1.x-dev",
         "drupal/core-composer-scaffold": "~9.1.0",
         "drupal/core-recommended": "~9.2.0",
-        "drupal/cshs": "^1.2",
+        "drupal/cshs": "^3.5",
         "drupal/csv_serialization": "^1.5",
         "drupal/default_content": "^1.0-alpha9",
         "drupal/devel": "^4.0",
@@ -292,7 +292,7 @@
         "drupal/views_ajax_get": "^1.0-rc2",
         "drupal/views_autocomplete_filters": "^1.3",
         "drupal/views_block_filter_block": "^1.0",
-        "drupal/views_bulk_operations": "^3.9",
+        "drupal/views_bulk_operations": "^4.0",
         "drupal/views_custom_cache_tag": "^1.2",
         "drupal/views_data_export": "^1.0",
         "drupal/views_send": "^1.5",

services/drupal/composer.patches.json

@@ -13,7 +13,7 @@
       "Workaround for \"Call to a member function getLabel() after enabling layout_builder\"": "https://www.drupal.org/files/issues/2020-04-08/2985882-field-85.patch",
       "#3165306 - Add type column to entity revision tables": "https://www.drupal.org/files/issues/2021-02-12/add-type-on-entity-revision-tables-3165306-22-9_1_x.patch",
       "Change icon for media library in CKEditor": "patches/drupal-switch-ckeditor-media-library-icon-2.patch",
-      "Improve performance of LatestRevision Views filter": "https://www.drupal.org/files/issues/2019-11-29/drupal-latest_revision_views_filter_performance-2949939-8.patch",
+      "Improve performance of LatestRevision Views filter": "https://www.drupal.org/files/issues/2021-07-27/drupal-views_filter_latest_revision_performance-2949939-20.patch",
       "Don't run trimmed text through Xss::filter()": "https://www.drupal.org/files/issues/2019-12-10/drupal-core-2922569-9.patch",
       "#3047022 - Properly handle block_content access control for revisions": "https://www.drupal.org/files/issues/2021-02-11/3047022-56.patch",
       "Don't strip view mode from embedded media just because selected view mode matches default": "https://www.drupal.org/files/issues/2020-11-11/drupal_core-mediaembed_default_view_mode-3109289-24.patch",
@@ -22,8 +22,8 @@
       "Do not crash when an entity is missing from a views relationship (this may need to be just papering over an underlying problem)": "https://www.drupal.org/files/issues/2020-09-08/get_cache_tags_null-3169694-2.patch",
       "Validation for views datetime filter": "patches/views-exposed-datetime-validation-2.patch",
       "Fix off-canvas style issues that pertain to multi-select lists": "https://www.drupal.org/files/issues/2020-01-28/drupal_core-settings_tray_multiple_select_css-3080698-9.patch",
-      "Add Views autocomplete filter for all entity reference fields": "https://www.drupal.org/files/issues/2021-06-15/2429699-414.patch",
-      "Provides a link to the latest revision": "https://www.drupal.org/files/issues/2020-09-02/2906455-29.patch",
+      "Add Views autocomplete filter for all entity reference fields": "https://www.drupal.org/files/issues/2021-11-09/2429699-446.patch",
+      "Provides a link to the latest revision": "https://www.drupal.org/files/issues/2021-11-03/2906455-33.patch",
       "Avoid exception that blocks page rendering when image file is missing from disk": "https://www.drupal.org/files/issues/2827921-remove-missing-responsive-image-width-exception.patch",
       "Allow referencing unpublished nodes if user has access to them": "https://www.drupal.org/files/issues/2021-06-09/2845144_52.patch",
       "Action on embedded form improperly set https://www.drupal.org/project/drupal/issues/2840283": "https://www.drupal.org/files/issues/2021-08-10/linked-display-2840283-48.patch",
@@ -33,7 +33,13 @@
       "Fix color contrast accessibility on vertical tabs": "https://www.drupal.org/files/issues/2021-06-16/3219165-3.patch",
       "Allow modules to alter EditorLinkDialog to specify link text": "https://www.drupal.org/files/issues/2020-09-11/2741945-85.patch",
       "Display node title by default when creating link with drupalink, allow configuration.": "https://www.drupal.org/files/issues/2021-03-04/2961554-19.patch",
-      "Fix aria-describedby in radios and checkboxes.": "https://www.drupal.org/files/issues/2020-09-08/2839344_0.patch"
+      "Fix aria-describedby in radios and checkboxes.": "https://www.drupal.org/files/issues/2020-09-08/2839344_0.patch",
+      "Allow overriding of which view is used for Media Library": "patches/drupal-switch-media-library-view-2971209.patch",
+      "Improve performance of looking up latest revision": "patches/drupal-speedup_latest_revision_queries-2950869-mr715-730a0c.patch",
+      "Improve consistency of revision terminology labeling in revision UI": "https://www.drupal.org/files/issues/2021-12-03/2899719-D9_2-36.patch",
+      "Allow reverting current revision": "https://www.drupal.org/files/issues/2021-12-10/allow-reverting-current-rev-3252521-D9_2-5.patch",
+      "Prevent reverting latest revision (custom patch so that it plays nicely with our patches for 3252521 and 2899719)": "patches/disallow-reverting-latest-rev-3252540-D9_2-2-custom.patch",
+      "Use EPA-preferred terminology for revision reversion operation. This patch needs to be applied on top of the patches for 3252521, 2899719, and 3252540": "patches/rename-revision-revert-operation-button.patch"
     },
     "drupal/s3fs": {
       "Module should initialize default credentials provider instead of instance profile when use_instance_profile is TRUE": "https://www.drupal.org/files/issues/2020-03-24/3122091-2-s3fs-default-provider.patch",
@@ -90,7 +96,8 @@
     },
     "drupal/elasticsearch_connector": {
       "Parse data facets from epoch milliseconds format to seconds": "https://www.drupal.org/files/issues/2020-11-27/3096887-elasticsearch_connector_-7.x-parse_date_facets-7.patch",
-      "Facet OR: global aggregation does not take views filter into account": "https://www.drupal.org/files/issues/2021-02-02/elasticsearch_connector-facet_OR_global_aggregation_does_not_take_views_filter_into_account-3014805-24.patch"
+      "Facet OR: global aggregation does not take views filter into account": "https://www.drupal.org/files/issues/2021-02-02/elasticsearch_connector-facet_OR_global_aggregation_does_not_take_views_filter_into_account-3014805-24.patch",
+      "Accurately count total number of results": "https://www.drupal.org/files/issues/2021-11-18/3250145-1-track-total-hits.patch"
     },
     "drupal/redis": {
       "Enable cluster mode support": "https://www.drupal.org/files/issues/2020-02-06/2900947-17.patch"
@@ -153,7 +160,9 @@
       "Fixes invalid address: (Reply-To) error": "https://www.drupal.org/files/issues/2021-03-11/smtp_invalid-address_reply-to_3191046_13.patch"
     },
     "drupal/group_content_menu": {
-      "Set active trail correctly": "https://www.drupal.org/files/issues/2021-04-21/group_content_menu-active_trail_cache_problem-3209011-10.patch"
+      "Set active trail correctly": "https://www.drupal.org/files/issues/2021-04-21/group_content_menu-active_trail_cache_problem-3209011-10.patch",
+      "Update node form alter logic to be more passive (https://www.drupal.org/project/group_content_menu/issues/3211822)": "https://www.drupal.org/files/issues/2021-05-12/3211822-10.patch",
+      "Menu item edit permissions issues (https://www.drupal.org/project/group_content_menu/issues/3152938)": "https://www.drupal.org/files/issues/2021-10-20/3152938-40_0.patch"
     },
     "drupal/media_migration": {
       "Add media_wysiwyg_filter just once": "https://www.drupal.org/files/issues/2020-11-07/media_migration-add_media_wysiwyg_filter_once-3181180-2.patch"
@@ -185,6 +194,10 @@
     },
     "drupal/linked_field": {
       "Generate relative links rather than absolute": "https://www.drupal.org/files/issues/2020-05-22/linked_field-relative-destination-url-3139179-1-D8.patch"
+    },
+    "drupal/diff": {
+      "Patch diff interface to get language to match core patches in these issues: 3252521, 2899719, and 3252540": "patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch",
+      "Add classes to allow color-coding of revisions list": "https://www.drupal.org/files/issues/2021-12-03/diff-add_classes-3252547-2.patch"
     }
   }
 }

services/drupal/config/sync/core.entity_view_display.paragraph.from_library.default.yml

@@ -14,7 +14,7 @@ mode: default
 content:
   field_reusable_paragraph:
     weight: 0
-    label: above
+    label: hidden
     settings:
       link: true
       view_mode: default

services/drupal/config/sync/core.entity_view_display.paragraph.html.default.yml

@@ -14,7 +14,7 @@ mode: default
 content:
   field_body:
     weight: 1
-    label: above
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     type: text_default

services/drupal/config/sync/core.entity_view_display.paragraph.link_list.default.yml

@@ -14,7 +14,7 @@ mode: default
 content:
   field_links:
     weight: 2
-    label: above
+    label: hidden
     settings:
       trim_length: ''
       url_only: false

services/drupal/config/sync/core.entity_view_display.paragraph.slideshow.default.yml

@@ -16,7 +16,7 @@ content:
   field_slides:
     type: entity_reference_revisions_entity_view
     weight: 1
-    label: above
+    label: hidden
     settings:
       view_mode: default
       link: ''

services/drupal/config/sync/core.extension.yml

@@ -185,6 +185,7 @@ module:
   views_ajax_get: 0
   views_autocomplete_filters: 0
   views_block_filter_block: 0
+  views_bulk_operations: 0
   views_custom_cache_tag: 0
   views_data_export: 0
   views_send: 0

services/drupal/config/sync/field.field.node.event.field_paragraphs.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.storage.node.field_paragraphs
     - node.type.event
     - paragraphs.paragraphs_type.box
+    - paragraphs.paragraphs_type.card_group
     - paragraphs.paragraphs_type.dynamic_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.header
@@ -41,6 +42,7 @@ settings:
       dynamic_list: dynamic_list
       slideshow: slideshow
       from_library: from_library
+      card_group: card_group
     target_bundles_drag_drop:
       applicants_or_respondents:
         weight: -26
@@ -58,7 +60,7 @@ settings:
         weight: 24
         enabled: false
       card_group:
-        enabled: false
+        enabled: true
         weight: 25
       cfr:
         weight: -25

services/drupal/config/sync/field.field.node.news_release.field_paragraphs.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.storage.node.field_paragraphs
     - node.type.news_release
     - paragraphs.paragraphs_type.box
+    - paragraphs.paragraphs_type.card_group
     - paragraphs.paragraphs_type.dynamic_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.header
@@ -41,6 +42,7 @@ settings:
       dynamic_list: dynamic_list
       slideshow: slideshow
       from_library: from_library
+      card_group: card_group
     target_bundles_drag_drop:
       applicants_or_respondents:
         weight: -26
@@ -58,7 +60,7 @@ settings:
         weight: 24
         enabled: false
       card_group:
-        enabled: false
+        enabled: true
         weight: 25
       cfr:
         weight: -25

services/drupal/config/sync/field.field.node.page.field_paragraphs.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.storage.node.field_paragraphs
     - node.type.page
     - paragraphs.paragraphs_type.box
+    - paragraphs.paragraphs_type.card_group
     - paragraphs.paragraphs_type.dynamic_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.header
@@ -41,6 +42,7 @@ settings:
       dynamic_list: dynamic_list
       slideshow: slideshow
       from_library: from_library
+      card_group: card_group
     target_bundles_drag_drop:
       applicants_or_respondents:
         weight: -26
@@ -58,7 +60,7 @@ settings:
         weight: 24
         enabled: false
       card_group:
-        enabled: false
+        enabled: true
         weight: 25
       cfr:
         weight: -25

services/drupal/config/sync/field.field.node.perspective.field_paragraphs.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.storage.node.field_paragraphs
     - node.type.perspective
     - paragraphs.paragraphs_type.box
+    - paragraphs.paragraphs_type.card_group
     - paragraphs.paragraphs_type.dynamic_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.header
@@ -41,6 +42,7 @@ settings:
       dynamic_list: dynamic_list
       slideshow: slideshow
       from_library: from_library
+      card_group: card_group
     target_bundles_drag_drop:
       applicants_or_respondents:
         weight: -30
@@ -61,7 +63,7 @@ settings:
         weight: 26
         enabled: false
       card_group:
-        enabled: false
+        enabled: true
         weight: 27
       cfr:
         weight: -26

services/drupal/config/sync/field.field.node.web_area.field_paragraphs.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.storage.node.field_paragraphs
     - node.type.web_area
     - paragraphs.paragraphs_type.box
+    - paragraphs.paragraphs_type.card_group
     - paragraphs.paragraphs_type.dynamic_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.header
@@ -41,6 +42,7 @@ settings:
       dynamic_list: dynamic_list
       slideshow: slideshow
       from_library: from_library
+      card_group: card_group
     target_bundles_drag_drop:
       applicants_or_respondents:
         weight: -26
@@ -58,7 +60,7 @@ settings:
         weight: 24
         enabled: false
       card_group:
-        enabled: false
+        enabled: true
         weight: 25
       cfr:
         weight: -25

services/drupal/config/sync/field.field.node.webform.field_paragraphs.yml

@@ -6,6 +6,7 @@ dependencies:
     - field.storage.node.field_paragraphs
     - node.type.webform
     - paragraphs.paragraphs_type.box
+    - paragraphs.paragraphs_type.card_group
     - paragraphs.paragraphs_type.dynamic_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.header
@@ -41,6 +42,7 @@ settings:
       dynamic_list: dynamic_list
       slideshow: slideshow
       from_library: from_library
+      card_group: card_group
     target_bundles_drag_drop:
       applicants_or_respondents:
         weight: -26
@@ -58,7 +60,7 @@ settings:
         weight: 24
         enabled: false
       card_group:
-        enabled: false
+        enabled: true
         weight: 25
       cfr:
         weight: -25

services/drupal/config/sync/filter.format.filtered_html.yml

@@ -34,7 +34,7 @@ filters:
     status: true
     weight: -48
     settings:
-      allowed_html: '<* accesskey aria-* class id role style tabindex title data data-* name hidden><a href hreflang occurrence id name target rel> <article> <div> <pre> <br> <p> <blockquote cite> <hr> <figure> <figcaption> <ol reversed start type> <ul type> <li> <dl> <dt> <dd> <address> <hgroup> <h2> <h3> <h4> <h5> <h6> <em> <i> <strong> <b> <small> <s> <section> <span> <sub> <sup> <mark> <abbr !title> <q cite> <cite> <ins data-date> <del cite datetime> <dfn> <time datetime pubdate> <var> <samp> <code> <kbd> <wbr> <bdo dir> <bdi> <ruby> <rt> <rp> <table summary> <colgroup span> <col span> <caption> <tbody> <thead> <tfoot> <tr> <th colspan headers rowspan scope> <td colspan headers rowspan scope> <details open> <summary> <form action method> <fieldset disabled form name> <legend> <label for form> <input checked size type value disabled placeholder required readonly autocomplete autofocus> <textarea rows cols disabled placeholder required readonly autocomplete autofocus> <meter min max low high optimum form value> <select multiple size> <optgroup disabled label> <option value> <output for form name> <button type value> <datalist> <keygen autofocus challenge disabled form keytype name> <progress max value> <img alt crossorigin height longdesc src width usemap data-caption data-align> <embed height src type width> <object form height name type usemap width> <param name value> <iframe allowfullscreen height name sandbox scrolling seamless src srcdoc width> <video autoplay buffered controls crossorigin height loop muted played preload poster src width> <audio autoplay buffered controls loop muted played preloadsrc> <source media src type> <track default kind label src srclang> <canvas height width> <map name> <area alt coords href hreflang media rel shape target type> <drupal-media data-caption data-align data-entity-type data-entity-uuid alt><drupal-inline-media data-entity-type data-entity-uuid><drupal-paragraph data-embed-button data-entity-label data-paragraph-id drupal-paragraph data-paragraph-revision-id>'
+      allowed_html: '<* accesskey aria-* class id role style tabindex title data data-* name hidden><a href hreflang occurrence id name target rel> <article> <div> <pre> <br> <p> <blockquote cite> <hr> <figure> <figcaption> <ol reversed start type> <ul type> <li> <dl> <dt> <dd> <address> <hgroup> <h2> <h3> <h4> <h5> <h6> <em> <i> <strong> <b> <small> <s> <section> <span> <sub> <sup> <mark> <abbr !title> <q cite> <cite> <ins data-date> <del cite datetime> <dfn> <time datetime pubdate> <var> <samp> <code> <kbd> <wbr> <bdo dir> <bdi> <ruby> <rt> <rp> <table summary width height> <colgroup span> <col span> <caption> <tbody> <thead> <tfoot> <tr> <th colspan headers rowspan scope> <td colspan headers rowspan scope width height> <details open> <summary> <form action method> <fieldset disabled form name> <legend> <label for form> <input checked size type value disabled placeholder required readonly autocomplete autofocus> <textarea rows cols disabled placeholder required readonly autocomplete autofocus> <meter min max low high optimum form value> <select multiple size> <optgroup disabled label> <option value> <output for form name> <button type value> <datalist> <keygen autofocus challenge disabled form keytype name> <progress max value> <img alt crossorigin height longdesc src width usemap data-caption data-align> <embed height src type width> <object form height name type usemap width> <param name value> <iframe allowfullscreen height name sandbox scrolling seamless src srcdoc width> <video autoplay buffered controls crossorigin height loop muted played preload poster src width> <audio autoplay buffered controls loop muted played preloadsrc> <source media src type> <track default kind label src srclang> <canvas height width> <map name> <area alt coords href hreflang media rel shape target type> <drupal-media data-caption data-align data-entity-type data-entity-uuid alt><drupal-inline-media data-entity-type data-entity-uuid><drupal-paragraph data-embed-button data-entity-label data-paragraph-id drupal-paragraph data-paragraph-revision-id>'
       filter_html_help: true
       filter_html_nofollow: false
   media_embed:

services/drupal/config/sync/group.role.web_area-30cda0a61.yml

@@ -28,6 +28,7 @@ permissions:
   - 'create group_node:faq entity'
   - 'create group_node:news_release entity'
   - 'create group_node:page entity'
+  - 'create group_node:perspective entity'
   - 'create group_node:public_notice entity'
   - 'create group_node:regulation entity'
   - 'create group_node:webform entity'
@@ -40,6 +41,7 @@ permissions:
   - 'delete any group_node:faq entity'
   - 'delete any group_node:news_release entity'
   - 'delete any group_node:page entity'
+  - 'delete any group_node:perspective entity'
   - 'delete any group_node:public_notice entity'
   - 'delete any group_node:regulation entity'
   - 'delete any group_node:webform entity'
@@ -52,6 +54,7 @@ permissions:
   - 'delete own group_node:faq entity'
   - 'delete own group_node:news_release entity'
   - 'delete own group_node:page entity'
+  - 'delete own group_node:perspective entity'
   - 'delete own group_node:public_notice entity'
   - 'delete own group_node:regulation entity'
   - 'delete own group_node:webform entity'
@@ -65,6 +68,7 @@ permissions:
   - 'update any group_node:faq entity'
   - 'update any group_node:news_release entity'
   - 'update any group_node:page entity'
+  - 'update any group_node:perspective entity'
   - 'update any group_node:public_notice entity'
   - 'update any group_node:regulation entity'
   - 'update any group_node:web_area entity'
@@ -79,6 +83,7 @@ permissions:
   - 'update own group_node:faq entity'
   - 'update own group_node:news_release entity'
   - 'update own group_node:page entity'
+  - 'update own group_node:perspective entity'
   - 'update own group_node:public_notice entity'
   - 'update own group_node:regulation entity'
   - 'update own group_node:web_area entity'
@@ -94,6 +99,7 @@ permissions:
   - 'view group_node:faq entity'
   - 'view group_node:news_release entity'
   - 'view group_node:page entity'
+  - 'view group_node:perspective entity'
   - 'view group_node:public_notice entity'
   - 'view group_node:regulation entity'
   - 'view group_node:web_area entity'
@@ -107,6 +113,7 @@ permissions:
   - 'view unpublished group_node:faq entity'
   - 'view unpublished group_node:news_release entity'
   - 'view unpublished group_node:page entity'
+  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:public_notice entity'
   - 'view unpublished group_node:regulation entity'
   - 'view unpublished group_node:web_area entity'