Merge pull request #454 from essexcountycouncil/FOS-97_fix_event_brea…

…dcrumbs_v2 FOS-97: Adds the parent field to subsites overview pages + config sync w/prod.
essexcountycouncil · Jun 19, 2024 · da40e9b · da40e9b
2 parents a158cfc + aa56b32
commit da40e9b
Show file tree

Hide file tree

Showing 22 changed files with 118 additions and 112 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/default/block.block.ecc_theme_gov_breadcrumbs.yml b/config/default/block.block.ecc_theme_gov_breadcrumbs.yml
@@ -22,4 +22,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/events\r\n/children-young-people-and-families/fostering/events\r\n/children-young-people-and-families/fostering/events/search\r\n/essex-fostering/events\r\n/essex-fostering/events/search"
+    pages: "/events\r\n/children-young-people-and-families/fostering/events\r\n/children-young-people-and-families/fostering/events/search"
diff --git a/...g/default/block.block.ecc_theme_gov_exposedformlocalgov_events_listingpage_all_events.yml b/...g/default/block.block.ecc_theme_gov_exposedformlocalgov_events_listingpage_all_events.yml
@@ -26,4 +26,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/children-young-people-and-families/fostering/events\r\n/children-young-people-and-families/fostering/events/search\r\n/essex-fostering/events\r\n/essex-fostering/events/search"
+    pages: "/children-young-people-and-families/fostering/events\r\n/children-young-people-and-families/fostering/events/search"
diff --git a/config/default/block.block.ecc_theme_gov_exposedformlocalgov_events_searchevents_page.yml b/config/default/block.block.ecc_theme_gov_exposedformlocalgov_events_searchevents_page.yml
@@ -26,4 +26,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/children-young-people-and-families/fostering/events\r\n/children-young-people-and-families/fostering/events/search\r\n/essex-fostering/events\r\n/essex-fostering/events/search"
+    pages: "/children-young-people-and-families/fostering/events\r\n/children-young-people-and-families/fostering/events/search"
diff --git a/config/default/core.entity_form_display.node.localgov_subsites_overview.default.yml b/config/default/core.entity_form_display.node.localgov_subsites_overview.default.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.localgov_subsites_overview.localgov_services_parent
     - field.field.node.localgov_subsites_overview.localgov_subsites_banner
     - field.field.node.localgov_subsites_overview.localgov_subsites_content
     - field.field.node.localgov_subsites_overview.localgov_subsites_hide_menu
@@ -35,6 +36,7 @@ third_party_settings:
         direction: vertical
     group_description:
       children:
+        - localgov_services_parent
         - title
         - localgov_subsites_summary
       label: Description
@@ -87,7 +89,7 @@ mode: default
 content:
   created:
     type: datetime_timestamp
-    weight: 4
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -97,6 +99,16 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  localgov_services_parent:
+    type: entity_reference_autocomplete
+    weight: 39
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   localgov_subsites_banner:
     type: entity_reference_paragraphs
     weight: 37
@@ -121,7 +133,7 @@ content:
     third_party_settings: {  }
   localgov_subsites_hide_menu:
     type: boolean_checkbox
-    weight: 39
+    weight: 40
     region: content
     settings:
       display_label: true
@@ -134,7 +146,7 @@ content:
     third_party_settings: {  }
   localgov_subsites_summary:
     type: string_textarea
-    weight: 1
+    weight: 41
     region: content
     settings:
       rows: 5
@@ -148,53 +160,53 @@ content:
     third_party_settings: {  }
   moderation_state:
     type: moderation_state_default
-    weight: 10
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }
   path:
     type: path
-    weight: 5
+    weight: 6
     region: content
     settings: {  }
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 6
+    weight: 7
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   simple_sitemap:
-    weight: 9
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 2
+    weight: 3
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 7
+    weight: 8
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
-    weight: 0
+    weight: 40
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 3
+    weight: 4
     region: content
     settings:
       match_operator: CONTAINS
@@ -203,7 +215,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
   url_redirects:
-    weight: 8
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }

diff --git a/config/default/core.entity_view_display.node.localgov_subsites_overview.default.yml b/config/default/core.entity_view_display.node.localgov_subsites_overview.default.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.localgov_subsites_overview.localgov_services_parent
     - field.field.node.localgov_subsites_overview.localgov_subsites_banner
     - field.field.node.localgov_subsites_overview.localgov_subsites_content
     - field.field.node.localgov_subsites_overview.localgov_subsites_hide_menu
@@ -31,6 +32,7 @@ content:
 hidden:
   content_moderation_control: true
   links: true
+  localgov_services_parent: true
   localgov_subsites_banner: true
   localgov_subsites_hide_menu: true
   localgov_subsites_pages: true

diff --git a/config/default/core.entity_view_display.node.localgov_subsites_overview.grid_item.yml b/config/default/core.entity_view_display.node.localgov_subsites_overview.grid_item.yml
@@ -0,0 +1,39 @@
+uuid: c73f0056-fe64-4748-a16e-33138f893678
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.node.grid_item
+    - field.field.node.localgov_subsites_overview.localgov_services_parent
+    - field.field.node.localgov_subsites_overview.localgov_subsites_banner
+    - field.field.node.localgov_subsites_overview.localgov_subsites_content
+    - field.field.node.localgov_subsites_overview.localgov_subsites_hide_menu
+    - field.field.node.localgov_subsites_overview.localgov_subsites_summary
+    - field.field.node.localgov_subsites_overview.localgov_subsites_theme
+    - node.type.localgov_subsites_overview
+  module:
+    - user
+_core:
+  default_config_hash: Yv1Fqu3ujR5VZCsncrWGDZzY9E0cKh9pXqJt-bsPYmY
+id: node.localgov_subsites_overview.grid_item
+targetEntityType: node
+bundle: localgov_subsites_overview
+mode: grid_item
+content:
+  localgov_subsites_summary:
+    type: basic_string
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  content_moderation_control: true
+  links: true
+  localgov_services_parent: true
+  localgov_subsites_banner: true
+  localgov_subsites_content: true
+  localgov_subsites_hide_menu: true
+  localgov_subsites_pages: true
+  localgov_subsites_theme: true
+  search_api_excerpt: true
diff --git a/config/default/core.entity_view_display.node.localgov_subsites_overview.search_index.yml b/config/default/core.entity_view_display.node.localgov_subsites_overview.search_index.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.search_index
+    - field.field.node.localgov_subsites_overview.localgov_services_parent
     - field.field.node.localgov_subsites_overview.localgov_subsites_banner
     - field.field.node.localgov_subsites_overview.localgov_subsites_content
     - field.field.node.localgov_subsites_overview.localgov_subsites_hide_menu
@@ -39,6 +40,7 @@ content:
 hidden:
   content_moderation_control: true
   links: true
+  localgov_services_parent: true
   localgov_subsites_banner: true
   localgov_subsites_hide_menu: true
   localgov_subsites_pages: true

diff --git a/config/default/core.entity_view_display.node.localgov_subsites_overview.search_result.yml b/config/default/core.entity_view_display.node.localgov_subsites_overview.search_result.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.search_result
+    - field.field.node.localgov_subsites_overview.localgov_services_parent
     - field.field.node.localgov_subsites_overview.localgov_subsites_banner
     - field.field.node.localgov_subsites_overview.localgov_subsites_content
     - field.field.node.localgov_subsites_overview.localgov_subsites_hide_menu
@@ -29,6 +30,7 @@ content:
 hidden:
   content_moderation_control: true
   links: true
+  localgov_services_parent: true
   localgov_subsites_banner: true
   localgov_subsites_content: true
   localgov_subsites_hide_menu: true

diff --git a/config/default/core.entity_view_display.node.localgov_subsites_overview.teaser.yml b/config/default/core.entity_view_display.node.localgov_subsites_overview.teaser.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
+    - field.field.node.localgov_subsites_overview.localgov_services_parent
     - field.field.node.localgov_subsites_overview.localgov_subsites_banner
     - field.field.node.localgov_subsites_overview.localgov_subsites_content
     - field.field.node.localgov_subsites_overview.localgov_subsites_hide_menu
@@ -29,6 +30,7 @@ content:
 hidden:
   content_moderation_control: true
   links: true
+  localgov_services_parent: true
   localgov_subsites_banner: true
   localgov_subsites_content: true
   localgov_subsites_hide_menu: true

diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml
@@ -39,7 +39,6 @@ module:
   ecc_cludo_search: 0
   ecc_content_moderation: 0
   ecc_cookie_compliance: 0
-  ecc_deploy: 0
   ecc_events: 0
   ecc_menu: 0
   ecc_subsites: 0

diff --git a/config/default/ecc_subsites.settings.yml b/config/default/ecc_subsites.settings.yml
@@ -1,2 +1,2 @@
-fostering_path: /essex-fostering
+fostering_path: /children-young-people-and-families/fostering/events
 fostering_homepage: 1884
diff --git a/config/default/field.field.node.localgov_subsites_overview.localgov_services_parent.yml b/config/default/field.field.node.localgov_subsites_overview.localgov_services_parent.yml
@@ -0,0 +1,26 @@
+uuid: 6d38670d-aafb-429f-8510-0d58a573463f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.localgov_services_parent
+    - node.type.localgov_services_landing
+    - node.type.localgov_services_sublanding
+    - node.type.localgov_subsites_overview
+id: node.localgov_subsites_overview.localgov_services_parent
+field_name: localgov_services_parent
+entity_type: node
+bundle: localgov_subsites_overview
+label: 'Services: Parent'
+description: 'Optionally add the directory to a Service.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: localgov_services
+  handler_settings:
+    target_bundles:
+      localgov_services_landing: localgov_services_landing
+      localgov_services_sublanding: localgov_services_sublanding
+field_type: entity_reference
diff --git a/config/default/pathauto.pattern.localgov_event.yml b/config/default/pathauto.pattern.localgov_event.yml
@@ -9,12 +9,12 @@ _core:
 id: localgov_event
 label: Event
 type: 'canonical_entities:node'
-pattern: 'essex-fostering/events/[node:title]'
+pattern: 'children-young-people-and-families/fostering/events/[node:title]'
 selection_criteria:
-  dcb2841c-2170-4937-8333-e91597bc709c:
+  1f812977-85ac-4c66-9e52-2973d3947b16:
     id: 'entity_bundle:node'
     negate: false
-    uuid: dcb2841c-2170-4937-8333-e91597bc709c
+    uuid: 1f812977-85ac-4c66-9e52-2973d3947b16
     context_mapping:
       node: node
     bundles:

diff --git a/config/default/pathauto.pattern.localgov_services_landing.yml b/config/default/pathauto.pattern.localgov_services_landing.yml
@@ -11,10 +11,10 @@ label: 'Services Landing Page'
 type: 'canonical_entities:node'
 pattern: '[node:title]'
 selection_criteria:
-  42d90085-1126-4394-9349-88a26a0317f5:
+  5dc4dbbd-1e2e-48c9-9055-18da12f8bf6b:
     id: 'entity_bundle:node'
     negate: false
-    uuid: 42d90085-1126-4394-9349-88a26a0317f5
+    uuid: 5dc4dbbd-1e2e-48c9-9055-18da12f8bf6b
     context_mapping:
       node: node
     bundles:

diff --git a/config/default/pathauto.pattern.localgov_subsites_page.yml b/config/default/pathauto.pattern.localgov_subsites_page.yml
@@ -11,10 +11,10 @@ label: 'Subsite page'
 type: 'canonical_entities:node'
 pattern: '[node:localgov_subsites_parent:entity:url:relative]/[node:title]'
 selection_criteria:
-  a17ad9f1-47e0-407c-9351-970cb7dc958c:
+  f8b49777-eee1-48dd-a57c-4138e0f99cd7:
     id: 'entity_bundle:node'
     negate: false
-    uuid: a17ad9f1-47e0-407c-9351-970cb7dc958c
+    uuid: f8b49777-eee1-48dd-a57c-4138e0f99cd7
     context_mapping:
       node: node
     bundles:

diff --git a/config/default/views.view.localgov_events_listing.yml b/config/default/views.view.localgov_events_listing.yml
@@ -1454,7 +1454,7 @@ display:
         title: false
       exposed_block: true
       display_extenders: {  }
-      path: essex-fostering/events
+      path: children-young-people-and-families/fostering/events
       menu:
         type: none
         title: Events

diff --git a/config/default/views.view.localgov_events_search.yml b/config/default/views.view.localgov_events_search.yml
@@ -263,7 +263,7 @@ display:
         cache: false
       exposed_block: true
       display_extenders: {  }
-      path: essex-fostering/events/search
+      path: children-young-people-and-families/fostering/events/search
     cache_metadata:
       max-age: -1
       contexts: