USEPA · carsoncho · Sep 13, 2024 · Sep 12, 2023 · Sep 12, 2023 · Sep 12, 2023
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",

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
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.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.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: {  }
diff --git a/services/drupal/config/sync/core.entity_form_display.group.web_area.default.yml b/services/drupal/config/sync/core.entity_form_display.group.web_area.default.yml
@@ -27,28 +27,28 @@ mode: default
 content:
   field_allow_news_releases:
     type: boolean_checkbox
-    weight: 11
+    weight: 10
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_allow_perspectives:
     type: boolean_checkbox
-    weight: 12
+    weight: 11
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_allow_speeches:
     type: boolean_checkbox
-    weight: 13
+    weight: 12
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_contact_us_form:
     type: entity_reference_autocomplete
-    weight: 6
+    weight: 5
     region: content
     settings:
       match_operator: CONTAINS
@@ -78,25 +78,19 @@ content:
     third_party_settings: {  }
   field_machine_name:
     type: string_textfield
-    weight: 9
+    weight: 8
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_migration_review_complete:
     type: boolean_checkbox
-    weight: 10
+    weight: 9
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
-  field_navigation_style:
-    type: options_buttons
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   field_publisher:
     type: entity_reference_autocomplete
     weight: 2
@@ -109,22 +103,22 @@ content:
     third_party_settings: {  }
   field_share_image:
     type: media_library_widget
-    weight: 14
+    weight: 13
     region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
   field_web_area_comments:
     type: string_textarea
-    weight: 8
+    weight: 7
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
   field_web_council_representative:
     type: entity_reference_autocomplete
-    weight: 7
+    weight: 6
     region: content
     settings:
       match_operator: CONTAINS
@@ -147,7 +141,15 @@ content:
     settings:
       include_locked: true
     third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 14
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
 hidden:
   field_homepage_pub_date: true
+  field_navigation_style: true
   path: true
   uid: true
diff --git a/services/drupal/config/sync/core.entity_view_display.node.news_release.default.yml b/services/drupal/config/sync/core.entity_view_display.node.news_release.default.yml
@@ -49,7 +49,7 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 6
     region: content
   field_paragraphs:
     type: entity_reference_revisions_entity_view
@@ -99,6 +99,19 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
+  field_subjects:
+    type: epa_core_hierarchical_term_facet_formatter
+    label: inline
+    settings:
+      display: all
+      link: true
+      wrap: none
+      separator: ' | '
+      reverse: false
+      facet_source: news_releases_subjects
+    third_party_settings: {  }
+    weight: 5
+    region: content
 hidden:
   content_moderation_control: true
   entitygroupfield: true
@@ -118,7 +131,6 @@ hidden:
   field_review_deadline: true
   field_scheduled_transition: true
   field_search_text: true
-  field_subjects: true
   field_type: true
   langcode: true
   links: true

diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml
@@ -130,39 +130,6 @@ third_party_settings:
                     token: ''
             weight: 8
             additional: {  }
-          fd1dcbe7-5e00-4baa-beb4-4413d0187598:
-            uuid: fd1dcbe7-5e00-4baa-beb4-4413d0187598
-            region: content
-            configuration:
-              id: 'field_block:node:perspective:field_subjects'
-              label: 'Related Information'
-              label_display: visible
-              provider: layout_builder
-              context_mapping:
-                entity: layout_builder.entity
-                view_mode: view_mode
-              formatter:
-                type: token_formatters_entity_reference
-                label: hidden
-                settings:
-                  text: '<a href="/perspectives/search/perspectives_subjects/[term:tid]">Read other EPA Perspectives about [term:name]</a>'
-                  link: ''
-                third_party_settings:
-                  linked_field:
-                    linked: 0
-                    type: field
-                    destination:
-                      field: ''
-                      custom: ''
-                    advanced:
-                      title: ''
-                      target: ''
-                      class: ''
-                      rel: ''
-                      text: ''
-                    token: ''
-            weight: 5
-            additional: {  }
           50c7a665-d0e2-448d-9ba4-86a146dd0591:
             uuid: 50c7a665-d0e2-448d-9ba4-86a146dd0591
             region: content

diff --git a/services/drupal/config/sync/core.entity_view_display.node.speeches.default.yml b/services/drupal/config/sync/core.entity_view_display.node.speeches.default.yml
@@ -37,6 +37,7 @@ dependencies:
   module:
     - datetime
     - entity_reference_revisions
+    - epa_core
     - epa_web_areas
     - link
     - metatag
@@ -244,10 +245,15 @@ content:
     weight: 28
     region: content
   field_subjects:
-    type: entity_reference_label
-    label: above
+    type: epa_core_hierarchical_term_facet_formatter
+    label: inline
     settings:
+      display: all
       link: true
+      wrap: none
+      separator: ' | '
+      reverse: false
+      facet_source: speeches_subjects
     third_party_settings: {  }
     weight: 5
     region: content

diff --git a/services/drupal/config/sync/core.extension.yml b/services/drupal/config/sync/core.extension.yml
@@ -21,6 +21,8 @@ module:
   block: 0
   block_content: 0
   block_content_permissions: 0
+  block_in_page_403: 0
+  block_in_page_not_found: 0
   block_list_override: 0
   breakpoint: 0
   ckeditor: 0
@@ -66,6 +68,7 @@ module:
   entitygroupfield: 0
   environment_indicator: 0
   epa_alerts: 0
+  epa_breadcrumbs: 0
   epa_clone: 0
   epa_cloudfront: 0
   epa_cloudwatch: 0

diff --git a/services/drupal/config/sync/epa_theme.settings.yml b/services/drupal/config/sync/epa_theme.settings.yml
@@ -7,3 +7,4 @@ logo:
   use_default: 1
 favicon:
   use_default: 1
+include_current_page_in_breadcrumb: 0