City-of-Helsinki · rpnykanen · Jan 18, 2023 · Jan 13, 2023 · Jan 17, 2023 · Jan 17, 2023
diff --git a/composer.json b/composer.json
@@ -16,6 +16,7 @@
         "drupal/hdbt_admin": "^1.0",
         "drupal/helfi_azure_fs": "^1.0",
         "drupal/helfi_drupal_tools": "dev-main",
+        "drupal/helfi_navigation": "^2.0",
         "drupal/helfi_platform_config": "^2.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tpr": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/block.block.external_fallback_menu.yml b/conf/cmi/block.block.external_fallback_menu.yml
@@ -0,0 +1,23 @@
+uuid: 34b96ae7-44c0-4064-a074-1e9b849f8a46
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+  theme:
+    - hdbt_subtheme
+id: external_fallback_menu
+theme: hdbt_subtheme
+region: header_branding
+weight: 0
+provider: null
+plugin: external_menu_block_fallback
+settings:
+  id: external_menu_block_fallback
+  label: 'External - Fallback menu'
+  label_display: ''
+  provider: helfi_navigation
+  level: 1
+  expand_all_items: true
+  depth: 0
+visibility: {  }
diff --git a/conf/cmi/block.block.external_footer_bottom_navigation.yml b/conf/cmi/block.block.external_footer_bottom_navigation.yml
@@ -0,0 +1,23 @@
+uuid: b3aed364-bd6d-4e3e-b56d-0daee961e47a
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+  theme:
+    - hdbt_subtheme
+id: external_footer_bottom_navigation
+theme: hdbt_subtheme
+region: footer_bottom
+weight: 0
+provider: null
+plugin: 'external_menu_block:footer-bottom-navigation'
+settings:
+  id: 'external_menu_block:footer-bottom-navigation'
+  label: 'External - Footer bottom navigation'
+  label_display: ''
+  provider: helfi_navigation
+  level: 1
+  expand_all_items: false
+  depth: 1
+visibility: {  }
diff --git a/conf/cmi/block.block.external_footer_top_navigation.yml b/conf/cmi/block.block.external_footer_top_navigation.yml
@@ -0,0 +1,23 @@
+uuid: a3c24f17-737a-4f80-a9a7-1425575cbb7e
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+  theme:
+    - hdbt_subtheme
+id: external_footer_top_navigation
+theme: hdbt_subtheme
+region: footer_top
+weight: 1
+provider: null
+plugin: 'external_menu_block:footer-top-navigation'
+settings:
+  id: 'external_menu_block:footer-top-navigation'
+  label: 'City of Helsinki'
+  label_display: visible
+  provider: helfi_navigation
+  level: 1
+  expand_all_items: false
+  depth: 1
+visibility: {  }
diff --git a/conf/cmi/block.block.external_footer_top_navigation_2.yml b/conf/cmi/block.block.external_footer_top_navigation_2.yml
@@ -0,0 +1,23 @@
+uuid: bd561a66-c045-402a-9293-e69d27faa680
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+  theme:
+    - hdbt_subtheme
+id: external_footer_top_navigation_2
+theme: hdbt_subtheme
+region: footer_top
+weight: 2
+provider: null
+plugin: 'external_menu_block:footer-top-navigation-2'
+settings:
+  id: 'external_menu_block:footer-top-navigation-2'
+  label: Connect
+  label_display: visible
+  provider: helfi_navigation
+  level: 1
+  expand_all_items: false
+  depth: 1
+visibility: {  }
diff --git a/conf/cmi/block.block.external_header_language_links.yml b/conf/cmi/block.block.external_header_language_links.yml
@@ -0,0 +1,23 @@
+uuid: fb06cb12-a6a8-4ebe-8e15-e8bd3ab520bf
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+  theme:
+    - hdbt_subtheme
+id: external_header_language_links
+theme: hdbt_subtheme
+region: header_branding
+weight: 0
+provider: null
+plugin: 'external_menu_block:header-language-links'
+settings:
+  id: 'external_menu_block:header-language-links'
+  label: 'External - Header language links'
+  label_display: ''
+  provider: helfi_navigation
+  level: 1
+  expand_all_items: true
+  depth: 2
+visibility: {  }
diff --git a/conf/cmi/block.block.external_header_top_navigation.yml b/conf/cmi/block.block.external_header_top_navigation.yml
@@ -0,0 +1,23 @@
+uuid: 87c950fe-ec02-4cab-96e0-71882034298a
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+  theme:
+    - hdbt_subtheme
+id: external_header_top_navigation
+theme: hdbt_subtheme
+region: header_top
+weight: 0
+provider: null
+plugin: 'external_menu_block:header-top-navigation'
+settings:
+  id: 'external_menu_block:header-top-navigation'
+  label: 'External - Header top navigation'
+  label_display: ''
+  provider: helfi_navigation
+  level: 1
+  expand_all_items: false
+  depth: 1
+visibility: {  }
diff --git a/conf/cmi/block.block.external_menu_mega_menu.yml b/conf/cmi/block.block.external_menu_mega_menu.yml
@@ -0,0 +1,23 @@
+uuid: 097b7710-fbf0-47c8-a558-4ec34a2db88a
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+  theme:
+    - hdbt_subtheme
+id: external_menu_mega_menu
+theme: hdbt_subtheme
+region: header_branding
+weight: 0
+provider: null
+plugin: external_menu_block_main_navigation
+settings:
+  id: external_menu_block_main_navigation
+  label: 'External - Mega menu'
+  label_display: ''
+  provider: helfi_navigation
+  level: 1
+  depth: 2
+  expand_all_items: true
+visibility: {  }
diff --git a/conf/cmi/block.block.hdbt_subtheme_announcements.yml b/conf/cmi/block.block.hdbt_subtheme_announcements.yml
@@ -0,0 +1,20 @@
+uuid: 6a407c7e-1837-4420-abb4-db20529786b3
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_announcements
+  theme:
+    - hdbt_subtheme
+id: hdbt_subtheme_announcements
+theme: hdbt_subtheme
+region: before_content
+weight: -11
+provider: null
+plugin: announcements
+settings:
+  id: announcements
+  label: Announcements
+  label_display: '0'
+  provider: helfi_announcements
+visibility: {  }
diff --git a/conf/cmi/block.block.hdbt_subtheme_heroblock.yml b/conf/cmi/block.block.hdbt_subtheme_heroblock.yml
@@ -12,7 +12,7 @@ _core:
 id: hdbt_subtheme_heroblock
 theme: hdbt_subtheme
 region: before_content
-weight: -11
+weight: -10
 provider: null
 plugin: hero_block
 settings:

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -43,6 +43,7 @@ module:
   hdbt_admin_tools: 0
   hdbt_component_library: 0
   hdbt_content: 0
+  health_check: 0
   helfi_announcements: 0
   helfi_api_base: 0
   helfi_azure_fs: 0
@@ -56,6 +57,7 @@ module:
   helfi_media: 0
   helfi_media_map: 0
   helfi_media_map_config: 0
+  helfi_navigation: 0
   helfi_news_feed: 0
   helfi_platform_config: 0
   helfi_proxy: 0
@@ -103,11 +105,13 @@ module:
   readonly_field_widget: 0
   redirect: 0
   responsive_image: 0
+  rest: 0
   role_delegation: 0
   scheduler: 0
   search_api: 0
   select2: 0
   select2_icon: 0
+  serialization: 0
   simple_sitemap: 0
   social_media: 0
   sophron: 0

diff --git a/conf/cmi/elasticsearch_connector.cluster.rekry.yml b/conf/cmi/elasticsearch_connector.cluster.rekry.yml
@@ -7,13 +7,13 @@ name: Rekry
 url: 'http://elastic:9200'
 options:
   multiple_nodes_connection: false
-  use_authentication: 1
+  use_authentication: true
   authentication_type: Basic
   username: ''
   password: ''
-  timeout: '3'
+  timeout: 3
   rewrite:
-    rewrite_index: 1
+    rewrite_index: true
     index:
       prefix: ''
       suffix: ''
diff --git a/conf/cmi/language/fi/block.block.external_footer_top_navigation.yml b/conf/cmi/language/fi/block.block.external_footer_top_navigation.yml
@@ -0,0 +1,2 @@
+settings:
+  label: 'Helsingin kaupunki'
diff --git a/conf/cmi/language/fi/block.block.external_footer_top_navigation_2.yml b/conf/cmi/language/fi/block.block.external_footer_top_navigation_2.yml
@@ -0,0 +1,2 @@
+settings:
+  label: 'Ota yhteyttä'
diff --git a/conf/cmi/language/sv/block.block.claro_local_actions.yml b/conf/cmi/language/sv/block.block.claro_local_actions.yml
@@ -0,0 +1,2 @@
+settings:
+  label: 'Primary admin actions'
diff --git a/conf/cmi/language/sv/block.block.external_footer_top_navigation.yml b/conf/cmi/language/sv/block.block.external_footer_top_navigation.yml
@@ -0,0 +1,2 @@
+settings:
+  label: 'Helsingfors stad'
diff --git a/conf/cmi/language/sv/block.block.external_footer_top_navigation_2.yml b/conf/cmi/language/sv/block.block.external_footer_top_navigation_2.yml
@@ -0,0 +1,2 @@
+settings:
+  label: 'Ta kontakt'
diff --git a/conf/cmi/language/sv/block.block.gin_local_actions.yml b/conf/cmi/language/sv/block.block.gin_local_actions.yml
@@ -0,0 +1,2 @@
+settings:
+  label: 'Primary admin actions'
diff --git a/conf/cmi/language/sv/block.block.hdbt_local_actions.yml b/conf/cmi/language/sv/block.block.hdbt_local_actions.yml
@@ -0,0 +1,2 @@
+settings:
+  label: 'Primary admin actions'
diff --git a/conf/cmi/language/sv/field.storage.node.field_announcement_type.yml b/conf/cmi/language/sv/field.storage.node.field_announcement_type.yml
@@ -0,0 +1,8 @@
+settings:
+  allowed_values:
+    -
+      label: Notification
+    -
+      label: Attention
+    -
+      label: Alert
diff --git a/conf/cmi/language/sv/image.style.wide.yml b/conf/cmi/language/sv/image.style.wide.yml
@@ -0,0 +1 @@
+label: 'Wide (1090)'
diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.remote_video.yml
@@ -0,0 +1 @@
+label: 'Remote video'
diff --git a/conf/cmi/language/sv/user.role.read_only.yml b/conf/cmi/language/sv/user.role.read_only.yml
@@ -0,0 +1 @@
+label: 'Read only'
diff --git a/conf/cmi/rest.resource.helfi_debug_data.yml b/conf/cmi/rest.resource.helfi_debug_data.yml
@@ -0,0 +1,20 @@
+uuid: 48470dd7-ae2c-4982-9118-6c9dfb5625cc
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_api_base
+    - serialization
+    - user
+_core:
+  default_config_hash: KAED1HS0Um83W8RZTAfYcoY3nZSt-WgFsHIrHRS9S00
+id: helfi_debug_data
+plugin_id: helfi_debug_data
+granularity: resource
+configuration:
+  methods:
+    - GET
+  formats:
+    - json
+  authentication:
+    - cookie
diff --git a/conf/cmi/rest.resource.helfi_debug_package_version.yml b/conf/cmi/rest.resource.helfi_debug_package_version.yml
@@ -0,0 +1,20 @@
+uuid: 4e4fff15-5eda-426d-9139-74b8041f823b
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_api_base
+    - serialization
+    - user
+_core:
+  default_config_hash: dzVTrmIL-p2ULabxQs_FbqNgAQ-GSPnFgfBMCz53MWg
+id: helfi_debug_package_version
+plugin_id: helfi_debug_package_version
+granularity: resource
+configuration:
+  methods:
+    - GET
+  formats:
+    - json
+  authentication:
+    - cookie
diff --git a/conf/cmi/rest.resource.helfi_global_mobile_menu.yml b/conf/cmi/rest.resource.helfi_global_mobile_menu.yml
@@ -0,0 +1,20 @@
+uuid: b824c58b-213f-426a-a59c-55b933f719d0
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+    - serialization
+    - user
+_core:
+  default_config_hash: Qf_SdgU-K7GNIk7gSZf5Q8I4bWcUHcbxUSl9KimR8J0
+id: helfi_global_mobile_menu
+plugin_id: helfi_global_mobile_menu
+granularity: resource
+configuration:
+  methods:
+    - GET
+  formats:
+    - json
+  authentication:
+    - cookie
diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml
@@ -7,6 +7,9 @@ dependencies:
     - helfi_api_base
     - media
     - system
+    - rest
+  config:
+    - rest.resource.helfi_global_mobile_menu
 _core:
   default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow
 id: anonymous
@@ -18,3 +21,4 @@ permissions:
   - 'display eu cookie compliance popup'
   - 'view media'
   - 'view remote entities'
+  - 'restful get helfi_global_mobile_menu'
diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml
@@ -8,6 +8,9 @@ dependencies:
     - media
     - system
     - toolbar
+    - rest
+  config:
+    - rest.resource.helfi_global_mobile_menu
 _core:
   default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI
 id: authenticated
@@ -20,3 +23,4 @@ permissions:
   - 'display eu cookie compliance popup'
   - 'view media'
   - 'view remote entities'
+  - 'restful get helfi_global_mobile_menu'