Merged 1.x

localgovdrupal · Jul 12, 2024 · b8ddb6f · b8ddb6f
2 parents 41d177c + 8a3b814
commit b8ddb6f
Show file tree

Hide file tree

Showing 59 changed files with 1,955 additions and 1,918 deletions.
diff --git a/composer.json b/composer.json
@@ -77,6 +77,13 @@
                 "Ensure CKEditor save buttons are visible in modal windows.": "patches/layout_paragraphs_no_save_button.patch"
             }
         },
+        "patches-ignore": {
+            "localgovdrupal/localgov_services": {
+                "drupal/core": {
+                    "node_access filters out accessible nodes when node is left joined (1349080)" : "https://git.drupalcode.org/project/drupal/-/commit/c271adb.diff"
+                }
+            }
+        },
         "drupal-scaffold": {
             "locations": {
                 "web-root": "web/"

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/block.block.lgd_org_theme_mainnavigation.yml b/config/sync/block.block.lgd_org_theme_mainnavigation.yml
@@ -0,0 +1,38 @@
+uuid: 346b355a-20dd-4267-8d18-f4e673190287
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.main
+  module:
+    - menu_block
+    - system
+  theme:
+    - lgd_org_theme
+id: lgd_org_theme_mainnavigation
+theme: lgd_org_theme
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'menu_block:main'
+settings:
+  id: 'menu_block:main'
+  label: 'Main navigation'
+  label_display: visible
+  provider: menu_block
+  follow: false
+  follow_parent: child
+  label_link: true
+  label_type: fixed
+  level: 1
+  depth: 0
+  expand_all_items: true
+  parent: 'main:menu_link_content:08d3d468-a9ac-422c-b863-2acd87fc7607'
+  render_parent: false
+  suggestion: main
+  hide_on_nonactive: false
+visibility:
+  request_path:
+    id: request_path
+    negate: false
+    pages: "/community/our-suppliers/supplier-directory/*\r\n"
diff --git a/config/sync/block.block.lgd_org_theme_mainnavigation_3.yml b/config/sync/block.block.lgd_org_theme_mainnavigation_3.yml
@@ -0,0 +1,38 @@
+uuid: 5f84b249-5f27-4a0a-b3b4-67f4603badbe
+langcode: en
+status: true
+dependencies:
+  config:
+    - system.menu.main
+  module:
+    - menu_block
+    - system
+  theme:
+    - lgd_org_theme
+id: lgd_org_theme_mainnavigation_3
+theme: lgd_org_theme
+region: sidebar_second
+weight: 0
+provider: null
+plugin: 'menu_block:main'
+settings:
+  id: 'menu_block:main'
+  label: 'Main navigation'
+  label_display: visible
+  provider: menu_block
+  follow: false
+  follow_parent: child
+  label_link: true
+  label_type: fixed
+  level: 1
+  depth: 0
+  expand_all_items: true
+  parent: 'main:menu_link_content:87ade040-ddfd-4371-81ae-5fa77c5d406d'
+  render_parent: false
+  suggestion: main
+  hide_on_nonactive: false
+visibility:
+  request_path:
+    id: request_path
+    negate: false
+    pages: '/products/localgov-drupal-cms/case-studies/*'
diff --git a/config/sync/block_content.type.big_numbers.yml b/config/sync/block_content.type.big_numbers.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: big_numbers
 label: 'Big numbers'
-revision: 0
+revision: false
 description: ''
diff --git a/config/sync/block_content.type.special_block.yml b/config/sync/block_content.type.special_block.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: special_block
 label: 'Special block'
-revision: 0
+revision: false
 description: ''
diff --git a/config/sync/block_content.type.text_and_link.yml b/config/sync/block_content.type.text_and_link.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: text_and_link
 label: 'Text and link'
-revision: 0
+revision: false
 description: ''
diff --git a/config/sync/core.entity_form_display.node.localgov_directories_page.default.yml b/config/sync/core.entity_form_display.node.localgov_directories_page.default.yml
@@ -121,7 +121,8 @@ content:
     type: address_default
     weight: 15
     region: content
-    settings: {  }
+    settings:
+      wrapper_type: details
     third_party_settings: {  }
   localgov_directory_channels:
     type: localgov_directories_channel_selector

diff --git a/config/sync/core.entity_form_display.node.localgov_directory_promo_page.default.yml b/config/sync/core.entity_form_display.node.localgov_directory_promo_page.default.yml
@@ -145,7 +145,8 @@ content:
     type: address_default
     weight: 6
     region: content
-    settings: {  }
+    settings:
+      wrapper_type: details
     third_party_settings: {  }
   localgov_directory_banner:
     type: paragraphs

diff --git a/config/sync/core.entity_form_display.paragraph.localgov_contact.default.yml b/config/sync/core.entity_form_display.paragraph.localgov_contact.default.yml
@@ -146,7 +146,8 @@ content:
     type: address_default
     weight: 35
     region: content
-    settings: {  }
+    settings:
+      wrapper_type: details
     third_party_settings: {  }
   localgov_contact_email:
     type: email_default

diff --git a/config/sync/editor.editor.webform_default.yml b/config/sync/editor.editor.webform_default.yml
@@ -46,4 +46,5 @@ settings:
       multiBlock: true
     ckeditor5_sourceEditing:
       allowed_tags: {  }
-image_upload: {  }
+image_upload:
+  status: false
diff --git a/config/sync/editor.editor.wysiwyg.yml b/config/sync/editor.editor.wysiwyg.yml
@@ -119,9 +119,3 @@ settings:
       allow_view_mode_override: true
 image_upload:
   status: false
-  scheme: public
-  directory: inline-images
-  max_size: ''
-  max_dimensions:
-    width: 0
-    height: 0
diff --git a/config/sync/entity_usage.settings.yml b/config/sync/entity_usage.settings.yml
@@ -2,6 +2,7 @@ _core:
   default_config_hash: AXUBMTvVtpcNp0jKjDaWjSHqMy6HjuUf7j4yVbXgazI
 local_task_enabled_entity_types:
   - paragraphs_library_item
+  - media
 track_enabled_base_fields: false
 edit_warning_message_entity_types:
   - paragraphs_library_item

diff --git a/config/sync/hotjar.settings.yml b/config/sync/hotjar.settings.yml
@@ -1,5 +1,6 @@
 _core:
   default_config_hash: XWHtTGfKpwNV1L-8e-KL_ZjGkM7LE6nOx64gcHjDNkk
+langcode: en
 account: '3568555'
 snippet_version: 6
 snippet_path: 'public://hotjar/hotjar.script.js'

diff --git a/config/sync/layout_paragraphs.modal_settings.yml b/config/sync/layout_paragraphs.modal_settings.yml
@@ -0,0 +1 @@
+{  }
diff --git a/config/sync/node.type.localgov_directories_org.yml b/config/sync/node.type.localgov_directories_org.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Directory organisation'
 type: localgov_directories_org
 description: 'An organisation. Either as first class directory entry, or used for Open Referral directory entries.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_directories_page.yml b/config/sync/node.type.localgov_directories_page.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Directory page'
 type: localgov_directories_page
 description: 'A simple directory entry.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_directories_venue.yml b/config/sync/node.type.localgov_directories_venue.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Directory venue'
 type: localgov_directories_venue
 description: 'A venue entry with location.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_directory.yml b/config/sync/node.type.localgov_directory.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Directory channel'
 type: localgov_directory
 description: 'Main directory landing page.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_directory_promo_page.yml b/config/sync/node.type.localgov_directory_promo_page.yml
@@ -13,7 +13,7 @@ _core:
 name: 'Directory promotional page'
 type: localgov_directory_promo_page
 description: 'A directory page allowing unstructured content areas.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_news_article.yml b/config/sync/node.type.localgov_news_article.yml
@@ -17,7 +17,7 @@ _core:
 name: 'News article'
 type: localgov_news_article
 description: 'A stand-alone news article that may also appear in a news listing page.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 0
 display_submitted: false
diff --git a/config/sync/node.type.localgov_newsroom.yml b/config/sync/node.type.localgov_newsroom.yml
@@ -17,7 +17,7 @@ _core:
 name: Newsroom
 type: localgov_newsroom
 description: 'A page for listing and featuring news articles.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 0
 display_submitted: false
diff --git a/config/sync/node.type.localgov_page.yml b/config/sync/node.type.localgov_page.yml
@@ -14,7 +14,7 @@ _core:
 name: Page
 type: localgov_page
 description: 'Page content that allows the building of rich content using Paragraphs.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_services_landing.yml b/config/sync/node.type.localgov_services_landing.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Service landing page'
 type: localgov_services_landing
 description: 'Top level section page for each service.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 0
 display_submitted: false
diff --git a/config/sync/node.type.localgov_services_page.yml b/config/sync/node.type.localgov_services_page.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Service page'
 type: localgov_services_page
 description: 'Basic page that can be placed in a service and on a service sub landing page.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 0
 display_submitted: false
diff --git a/config/sync/node.type.localgov_services_sublanding.yml b/config/sync/node.type.localgov_services_sublanding.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Service sub-landing page'
 type: localgov_services_sublanding
 description: 'Pages for detail and links to specific pages within a service.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 0
 display_submitted: false
diff --git a/config/sync/node.type.localgov_step_by_step_overview.yml b/config/sync/node.type.localgov_step_by_step_overview.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Step by step overview'
 type: localgov_step_by_step_overview
 description: 'Main step by step page.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_step_by_step_page.yml b/config/sync/node.type.localgov_step_by_step_page.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Step by step page'
 type: localgov_step_by_step_page
 description: 'Step page associated with a step by step overview page.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 1
 display_submitted: false
diff --git a/config/sync/node.type.localgov_subsites_overview.yml b/config/sync/node.type.localgov_subsites_overview.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Subsite overview'
 type: localgov_subsites_overview
 description: 'Main subsite landing page.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 0
 display_submitted: false
diff --git a/config/sync/node.type.localgov_subsites_page.yml b/config/sync/node.type.localgov_subsites_page.yml
@@ -14,7 +14,7 @@ _core:
 name: 'Subsite page'
 type: localgov_subsites_page
 description: 'General subsite pages attached to an overview page.'
-help: ''
+help: null
 new_revision: true
 preview_mode: 0
 display_submitted: false
diff --git a/config/sync/node.type.webform.yml b/config/sync/node.type.webform.yml
@@ -17,7 +17,7 @@ _core:
 name: Webform
 type: webform
 description: 'A basic page with a webform attached.'
-help: ''
+help: null
 new_revision: false
 preview_mode: 1
 display_submitted: true
diff --git a/config/sync/system.cron.yml b/config/sync/system.cron.yml
@@ -3,4 +3,4 @@ _core:
 threshold:
   requirements_warning: 172800
   requirements_error: 1209600
-logging: 1
+logging: true
diff --git a/config/sync/system.date.yml b/config/sync/system.date.yml
@@ -2,7 +2,7 @@ _core:
   default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo
 first_day: 0
 country:
-  default: ''
+  default: null
 timezone:
   default: UTC
   user:

diff --git a/config/sync/taxonomy.vocabulary.localgov_topic.yml b/config/sync/taxonomy.vocabulary.localgov_topic.yml
@@ -8,3 +8,4 @@ name: Topic
 vid: localgov_topic
 description: 'Topic tags group together related content across all services'
 weight: 0
+new_revision: false
diff --git a/config/sync/user.role.localgov_author.yml b/config/sync/user.role.localgov_author.yml
@@ -43,6 +43,7 @@ weight: 3
 is_admin: null
 permissions:
   - 'access content overview'
+  - 'access geo_entity_library entity browser pages'
   - 'access media overview'
   - 'access page_components entity browser pages'
   - 'access paragraphs_library_items entity browser pages'

diff --git a/config/sync/user.role.localgov_contributor.yml b/config/sync/user.role.localgov_contributor.yml
@@ -22,6 +22,7 @@ dependencies:
     - entity_browser
     - file
     - filter
+    - geo_entity
     - media
     - node
     - paragraphs
@@ -41,13 +42,15 @@ weight: 4
 is_admin: null
 permissions:
   - 'access content overview'
+  - 'access geo_entity_library entity browser pages'
   - 'access media overview'
   - 'access page_components entity browser pages'
   - 'access paragraphs_library_items entity browser pages'
   - 'access shortcuts'
   - 'access toolbar'
   - 'create council_logo media'
   - 'create document media'
+  - 'create geo'
   - 'create image media'
   - 'create localgov_directories_page content'
   - 'create localgov_directories_venue content'

diff --git a/config/sync/user.role.localgov_editor.yml b/config/sync/user.role.localgov_editor.yml
@@ -59,6 +59,7 @@ permissions:
   - 'access content overview'
   - 'access directory facets overview'
   - 'access geo overview'
+  - 'access geo_entity_library entity browser pages'
   - 'access help pages'
   - 'access media overview'
   - 'access page_components entity browser pages'

diff --git a/config/sync/views.view.archive.yml b/config/sync/views.view.archive.yml
@@ -43,6 +43,7 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
+          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/config/sync/views.view.block_content.yml b/config/sync/views.view.block_content.yml
@@ -287,6 +287,7 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
+          pagination_heading_level: h4
       exposed_form:
         type: basic
         options: