Merge pull request #429 from USEPA/main

All work from main to live for appscan-20210903
USEPA · Sep 3, 2021 · 6f97892 · 6f97892
2 parents 3cc76da + 99e16fa
commit 6f97892
Show file tree

Hide file tree

Showing 40 changed files with 551 additions and 199 deletions.
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
@@ -28,7 +28,8 @@
       "Only allow requests to the media preview route via XHR": "patches/media-preview-xhr-only.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",
-      "Allow layout builder blocks to be optional depending on whether the required context exists": "https://www.drupal.org/files/issues/2021-08-13/3056907-context-15.patch"
+      "Allow layout builder blocks to be optional depending on whether the required context exists": "https://www.drupal.org/files/issues/2021-08-13/3056907-context-15.patch",
+      "Patch Layout Builder to get it to avoid creating webform submission field blocks": "patches/layout-builder-webform-performance-enhancements.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",
@@ -72,10 +73,10 @@
       "Clear image derivatives when image is replaced": "https://www.drupal.org/files/issues/2020-02-25/media_entity_file_replace-clear_image_cache-3106363-4.patch"
     },
     "drupal/entity_clone": {
-      "Circular dependencies of not cloned child should return the original entity": "https://www.drupal.org/files/issues/2019-10-21/entity_clone-circular-dependencies-original-entity-3089111-2.diff",
       "The entity does not have an ID": "https://www.drupal.org/files/issues/2020-03-11/entity_id-3119137-3.patch",
-      "Do not recurse into entities that need not be cloned": "https://www.drupal.org/files/issues/2019-03-22/entity_clone-avoid_unnecessary_recursion_3010626-5.patch",
-      "Support referencing another entity twice": "https://www.drupal.org/files/issues/2019-05-27/3057448-cant-clone-nodes-that-reference-another-node-twice-3.patch"
+      "Do not recurse into entities that need not be cloned": "https://www.drupal.org/files/issues/2020-08-10/entity_clone-avoid_unnecessary_recursion_3010626-13.patch",
+      "Support referencing another entity twice": "https://www.drupal.org/files/issues/2019-05-27/3057448-cant-clone-nodes-that-reference-another-node-twice-3.patch",
+      "Corrupted data when cloning nodes that contain paragraphs": "https://www.drupal.org/files/issues/2021-04-06/corrupted_data_paragraphs-3060223-46.patch"
     },
     "drupal/facets_pretty_paths": {
       "Allow pretty paths to work with contextual filters": "https://www.drupal.org/files/issues/2019-10-14/2952005-5-facets_pretty_paths.patch",

diff --git a/services/drupal/config/spanish/metatag.metatag_defaults.global.yml b/services/drupal/config/spanish/metatag.metatag_defaults.global.yml
@@ -0,0 +1,23 @@
+uuid: 05b2ac00-41bd-4fd7-a2ee-85490d5eeacb
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: sL588ui1E_8-2c_UupwyYxcqX2OVyMFp3HTLbbFqvPc
+id: global
+label: Global
+tags:
+  canonical_url: '[current-page:url:absolute]'
+  shortlink: '[current-page:url:unaliased]'
+  title: '[current-page:title] | [site:name]'
+  og_image: /sites/all/themes/epa/img/epa-es-standard.jpg
+  og_image_alt: 'U.S. Environmental Protection Agency'
+  og_image_height: '630'
+  og_image_width: '1200'
+  og_site_name: '[site:name]'
+  og_url: '[current-page:url:absolute]'
+  twitter_cards_image: /sites/all/themes/epa/img/epa-es-standard-1200x600.jpg
+  twitter_cards_image_alt: 'U.S. Environmental Protection Agency'
+  twitter_cards_image_height: '600'
+  twitter_cards_image_width: '1200'
+  twitter_cards_type: summary_large_image
diff --git a/services/drupal/config/sync/block.block.news_releases_language.yml b/services/drupal/config/sync/block.block.news_releases_language.yml
@@ -0,0 +1,23 @@
+uuid: d38d82d4-55d3-4ab3-b8b0-1189a74484d5
+langcode: en
+status: true
+dependencies:
+  config:
+    - facets.facet.news_releases_language
+  module:
+    - facets
+  theme:
+    - epa_theme
+id: news_releases_language
+theme: epa_theme
+region: disabled
+weight: 0
+provider: null
+plugin: 'facet_block:news_releases_language'
+settings:
+  id: 'facet_block:news_releases_language'
+  label: Language
+  provider: facets
+  label_display: '0'
+  block_id: news_releases_language
+visibility: {  }
diff --git a/services/drupal/config/sync/config_split.config_split.spanish.yml b/services/drupal/config/sync/config_split.config_split.spanish.yml
@@ -10,6 +10,7 @@ module: {  }
 theme: {  }
 blacklist: {  }
 graylist:
+  - metatag.metatag_defaults.global
   - pathologic.settings
   - system.site
 graylist_dependents: true

diff --git a/services/drupal/config/sync/core.extension.yml b/services/drupal/config/sync/core.extension.yml
@@ -117,6 +117,7 @@ module:
   metatag: 0
   metatag_facebook: 0
   metatag_open_graph: 0
+  metatag_twitter_cards: 0
   migrate: 0
   migrate_drupal: 0
   migrate_plus: 0

diff --git a/services/drupal/config/sync/entity_clone.settings.yml b/services/drupal/config/sync/entity_clone.settings.yml
@@ -23,6 +23,10 @@ form_settings:
     default_value: true
     hidden: true
     disable: false
+  group_content_menu:
+    hidden: true
+    default_value: false
+    disable: false
   media:
     hidden: true
     default_value: false
@@ -47,6 +51,14 @@ form_settings:
     default_value: true
     hidden: true
     disable: false
+  redirect:
+    hidden: true
+    default_value: false
+    disable: false
+  search_api_task:
+    hidden: true
+    default_value: false
+    disable: false
   taxonomy_term:
     hidden: true
     default_value: false
@@ -59,3 +71,4 @@ form_settings:
     default_value: true
     hidden: true
     disable: false
+take_ownership: 1
diff --git a/services/drupal/config/sync/facets.facet.faqs_topic.yml b/services/drupal/config/sync/facets.facet.faqs_topic.yml
@@ -45,12 +45,6 @@ processor_configs:
       sort: 20
     settings:
       sort: ASC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:

diff --git a/services/drupal/config/sync/facets.facet.news_releases_geographic_locations.yml b/services/drupal/config/sync/facets.facet.news_releases_geographic_locations.yml
@@ -45,12 +45,6 @@ processor_configs:
       sort: 20
     settings:
       sort: ASC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:

diff --git a/services/drupal/config/sync/facets.facet.news_releases_language.yml b/services/drupal/config/sync/facets.facet.news_releases_language.yml
@@ -0,0 +1,63 @@
+uuid: af9929ff-c68c-4cf7-8a5b-fbeecd20bfda
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api.index.news_releases
+    - views.view.search_news_releases
+  module:
+    - facets_pretty_paths
+    - search_api
+third_party_settings:
+  facets_pretty_paths:
+    coder: default_coder
+id: news_releases_language
+name: Language
+url_alias: news_releases_language
+weight: 0
+min_count: 1
+show_only_one_result: false
+field_identifier: field_language
+facet_source_id: 'search_api:views_page__search_news_releases__page_1'
+widget:
+  type: links
+  config:
+    show_numbers: true
+    soft_limit: 10
+    soft_limit_settings:
+      show_less_label: 'Show less'
+      show_more_label: 'Show more'
+    show_reset_link: false
+    reset_text: 'Show all'
+    hide_reset_when_no_selection: false
+query_operator: or
+use_hierarchy: false
+keep_hierarchy_parents_active: false
+expand_hierarchy: false
+enable_parent_when_child_gets_disabled: true
+hard_limit: 0
+exclude: false
+only_visible_when_facet_source_is_visible: false
+processor_configs:
+  count_widget_order:
+    processor_id: count_widget_order
+    weights:
+      sort: 30
+    settings:
+      sort: DESC
+  list_item:
+    processor_id: list_item
+    weights:
+      build: 5
+    settings: {  }
+  url_processor_handler:
+    processor_id: url_processor_handler
+    weights:
+      pre_query: 50
+      build: 15
+    settings: {  }
+empty_behavior:
+  behavior: text
+  text_format: plain_text
+  text: 'This is empty'
+show_title: false
diff --git a/services/drupal/config/sync/facets.facet.news_releases_press_office.yml b/services/drupal/config/sync/facets.facet.news_releases_press_office.yml
@@ -45,6 +45,12 @@ processor_configs:
       sort: 20
     settings:
       sort: ASC
+  display_value_widget_order:
+    processor_id: display_value_widget_order
+    weights:
+      sort: 40
+    settings:
+      sort: ASC
   term_weight_widget_order:
     processor_id: term_weight_widget_order
     weights:

diff --git a/services/drupal/config/sync/facets.facet.news_releases_subjects.yml b/services/drupal/config/sync/facets.facet.news_releases_subjects.yml
@@ -45,12 +45,6 @@ processor_configs:
       sort: 20
     settings:
       sort: ASC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:

diff --git a/services/drupal/config/sync/facets.facet.public_notices_location_of_prop_action.yml b/services/drupal/config/sync/facets.facet.public_notices_location_of_prop_action.yml
@@ -45,12 +45,6 @@ processor_configs:
       sort: 20
     settings:
       sort: ASC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:

diff --git a/services/drupal/config/sync/facets.facet.public_notices_program_or_statute.yml b/services/drupal/config/sync/facets.facet.public_notices_program_or_statute.yml
@@ -45,12 +45,6 @@ processor_configs:
       sort: 20
     settings:
       sort: ASC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:

diff --git a/services/drupal/config/sync/facets.facet.public_notices_proposed_actions.yml b/services/drupal/config/sync/facets.facet.public_notices_proposed_actions.yml
@@ -45,12 +45,6 @@ processor_configs:
       sort: 20
     settings:
       sort: ASC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:

diff --git a/services/drupal/config/sync/field.field.paragraph.banner_slide.field_text.yml b/services/drupal/config/sync/field.field.paragraph.banner_slide.field_text.yml
@@ -11,9 +11,9 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    inline: inline
-    filtered_html: '0'
+    filtered_html: filtered_html
     full_html: '0'
+    inline: '0'
     unprocessed: '0'
     plain_text: '0'
   custom_add_another:

diff --git a/services/drupal/config/sync/field.storage.node.field_language.yml b/services/drupal/config/sync/field.storage.node.field_language.yml
@@ -16,40 +16,40 @@ settings:
       label: English
     -
       value: es
-      label: Spanish
+      label: 'Español Spanish'
     -
       value: ar
-      label: Arabic
+      label: 'Arabic عربى'
     -
       value: zh_CN
-      label: 'Chinese, Simplified'
+      label: '中文: 简体版 Simplified Chinese'
     -
       value: zh_TW
-      label: 'Chinese, Traditional'
+      label: '中文: 繁體版 Traditional Chinese'
     -
       value: fr
-      label: French
+      label: 'Français French'
     -
       value: ht
-      label: 'Haitian Creole'
+      label: 'Kreyòl ayisyen Haitian Creole'
     -
       value: it
-      label: Italian
+      label: 'Italiano Italian'
     -
       value: ko
-      label: Korean
+      label: '한국어 Korean'
     -
       value: pt
-      label: Portuguese
+      label: 'Português Portuguese'
     -
       value: ru
-      label: Russian
+      label: 'Pусский Russian'
     -
       value: tl
-      label: Tagalog
+      label: 'Tagalog Tagalog'
     -
       value: vi
-      label: Vietnamese
+      label: 'Tiếng Việt Vietnamese'
   allowed_values_function: ''
 module: options
 locked: false

diff --git a/services/drupal/config/sync/metatag.metatag_defaults.global.yml b/services/drupal/config/sync/metatag.metatag_defaults.global.yml
@@ -7,9 +7,17 @@ _core:
 id: global
 label: Global
 tags:
+  canonical_url: '[current-page:url:absolute]'
   shortlink: '[current-page:url:unaliased]'
   title: '[current-page:title] | [site:name]'
-  canonical_url: '[current-page:url:absolute]'
-  og_image: /sites/all/themes/epa/img/epa-seal-large.png
-  og_url: '[current-page:url:absolute]'
+  og_image: /sites/all/themes/epa/img/epa-standard-og.jpg
+  og_image_alt: 'U.S. Environmental Protection Agency'
+  og_image_height: '630'
+  og_image_width: '1200'
   og_site_name: '[site:name]'
+  og_url: '[current-page:url:absolute]'
+  twitter_cards_image: /sites/all/themes/epa/img/epa-standard-twitter.jpg
+  twitter_cards_image_alt: 'U.S. Environmental Protection Agency'
+  twitter_cards_image_height: '600'
+  twitter_cards_image_width: '1200'
+  twitter_cards_type: summary_large_image
diff --git a/services/drupal/config/sync/metatag.metatag_defaults.node.yml b/services/drupal/config/sync/metatag.metatag_defaults.node.yml
@@ -25,7 +25,7 @@ tags:
   description: '[node:field_description:value]'
   article_modified_time: '[node:field_last_published:date:custom:Y-m-d]'
   article_published_time: '[node:created:custom:c]'
-  og_type: Government
+  og_type: website
   og_updated_time: '[node:field_last_published:date:custom:Y-m-d]'
   og_description: '[node:field_description:value]'
   og_country_name: 'United States of America'

diff --git a/services/drupal/config/sync/metatag.metatag_defaults.node__news_release.yml b/services/drupal/config/sync/metatag.metatag_defaults.node__news_release.yml
@@ -6,3 +6,11 @@ id: node__news_release
 label: 'Content: News Release'
 tags:
   epa_pressoffice: '[node:field_press_office]'
+  og_image: /sites/all/themes/epa/img/epa-news-releases-og.jpg
+  og_image_alt: 'U.S. Environmental Protection Agency News Release'
+  og_image_height: '630'
+  og_image_width: '1200'
+  twitter_cards_image: /sites/all/themes/epa/img/epa-news-releases-twitter.jpg
+  twitter_cards_image_alt: 'U.S. Environmental Protection Agency News Release'
+  twitter_cards_image_height: '1200'
+  twitter_cards_image_width: '600'
diff --git a/services/drupal/config/sync/search_api.index.frequent_questions.yml b/services/drupal/config/sync/search_api.index.frequent_questions.yml
@@ -144,6 +144,6 @@ tracker_settings:
   default:
     indexing_order: fifo
 options:
-  index_directly: false
+  index_directly: true
   cron_limit: 50
 server: localhost