Merge pull request #573 from City-of-Helsinki/dev

khalima · web-flow · commit 77ee58971d2e · 2025-06-03T16:30:10.000+03:00
Dev to main
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/admin_toolbar.settings.yml b/conf/cmi/admin_toolbar.settings.yml
@@ -1 +1,5 @@
 menu_depth: 4
+hoverintent_behavior:
+  enabled: true
+  timeout: 500
+enable_toggle_shortcut: false
diff --git a/conf/cmi/admin_toolbar_tools.settings.yml b/conf/cmi/admin_toolbar_tools.settings.yml
@@ -1,2 +1 @@
 max_bundle_number: 20
-hoverintent_functionality: true
diff --git a/conf/cmi/block.block.external_fallback_menu.yml b/conf/cmi/block.block.external_fallback_menu.yml
@@ -13,7 +13,7 @@ weight: 0
 provider: null
 plugin: external_menu_block_fallback
 settings:
-  id: external_menu_block_fallback
+  id: external_fallback_menu
   label: 'External - Fallback menu'
   label_display: '0'
   provider: helfi_navigation
diff --git a/conf/cmi/block.block.external_footer_bottom_navigation.yml b/conf/cmi/block.block.external_footer_bottom_navigation.yml
@@ -13,7 +13,7 @@ weight: 0
 provider: null
 plugin: 'external_menu_block:footer-bottom-navigation'
 settings:
-  id: 'external_menu_block:footer-bottom-navigation'
+  id: external_footer_bottom_navigation
   label: 'External - Footer bottom navigation'
   label_display: '0'
   provider: helfi_navigation
diff --git a/conf/cmi/block.block.external_footer_top_navigation.yml b/conf/cmi/block.block.external_footer_top_navigation.yml
@@ -13,7 +13,7 @@ weight: 1
 provider: null
 plugin: 'external_menu_block:footer-top-navigation'
 settings:
-  id: 'external_menu_block:footer-top-navigation'
+  id: external_footer_top_navigation
   label: 'City of Helsinki'
   label_display: visible
   provider: helfi_navigation
diff --git a/conf/cmi/block.block.external_footer_top_navigation_2.yml b/conf/cmi/block.block.external_footer_top_navigation_2.yml
@@ -13,7 +13,7 @@ weight: 2
 provider: null
 plugin: 'external_menu_block:footer-top-navigation-2'
 settings:
-  id: 'external_menu_block:footer-top-navigation-2'
+  id: external_footer_top_navigation_2
   label: Connect
   label_display: visible
   provider: helfi_navigation
diff --git a/conf/cmi/block.block.external_header_language_links.yml b/conf/cmi/block.block.external_header_language_links.yml
@@ -13,7 +13,7 @@ weight: 0
 provider: null
 plugin: 'external_menu_block:header-language-links'
 settings:
-  id: 'external_menu_block:header-language-links'
+  id: external_header_language_links
   label: 'External - Header language links'
   label_display: '0'
   provider: helfi_navigation
diff --git a/conf/cmi/block.block.external_header_top_navigation.yml b/conf/cmi/block.block.external_header_top_navigation.yml
@@ -13,7 +13,7 @@ weight: 0
 provider: null
 plugin: 'external_menu_block:header-top-navigation'
 settings:
-  id: 'external_menu_block:header-top-navigation'
+  id: external_header_top_navigation
   label: 'External - Header top navigation'
   label_display: '0'
   provider: helfi_navigation
diff --git a/conf/cmi/block.block.external_menu_mega_menu.yml b/conf/cmi/block.block.external_menu_mega_menu.yml
@@ -13,7 +13,7 @@ weight: 0
 provider: null
 plugin: external_menu_block_main_navigation
 settings:
-  id: external_menu_block_main_navigation
+  id: external_menu_mega_menu
   label: 'External - Mega menu'
   label_display: '0'
   provider: helfi_navigation
diff --git a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - paragraphs.paragraphs_type.accordion
     - paragraphs.paragraphs_type.banner
+    - paragraphs.paragraphs_type.chart
     - paragraphs.paragraphs_type.columns
     - paragraphs.paragraphs_type.contact_card_listing
     - paragraphs.paragraphs_type.content_cards
@@ -42,6 +43,7 @@ settings:
     target_bundles:
       accordion: accordion
       banner: banner
+      chart: chart
       columns: columns
       contact_card_listing: contact_card_listing
       content_cards: content_cards
@@ -63,6 +65,9 @@ settings:
       banner:
         weight: 0
         enabled: true
+      chart:
+        weight: 0
+        enabled: true
       columns:
         weight: 0
         enabled: true
diff --git a/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml b/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml
@@ -11,29 +11,21 @@ dependencies:
     - link
     - text
 _core:
-  default_config_hash: RPiB_poa2hBtdepgZvpwegxerpRhNyCkRIr_OEt_l-M
+  default_config_hash: Tr1PTyUJrukVqjbGkjYF2PxuMjPn4889aId_bnYo1ic
 id: media.helfi_chart.default
 targetEntityType: media
 bundle: helfi_chart
 mode: default
 content:
   created:
     type: datetime_timestamp
-    weight: 6
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_helfi_chart_title:
-    type: string_textfield
-    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   field_helfi_chart_transcript:
     type: text_textarea
-    weight: 3
+    weight: 2
     region: content
     settings:
       rows: 5
@@ -49,7 +41,7 @@ content:
     third_party_settings: {  }
   langcode:
     type: language_select
-    weight: 4
+    weight: 3
     region: content
     settings:
       include_locked: true
@@ -64,7 +56,7 @@ content:
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 5
+    weight: 4
     region: content
     settings:
       match_operator: CONTAINS
@@ -73,5 +65,6 @@ content:
       placeholder: ''
     third_party_settings: {  }
 hidden:
+  field_helfi_chart_title: true
   path: true
   status: true
diff --git a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.field.tpr_service.tpr_service.field_content
+    - field.field.tpr_service.tpr_service.field_hide_errand_services
     - field.field.tpr_service.tpr_service.field_lower_content
     - field.field.tpr_service.tpr_service.field_metatags
     - field.field.tpr_service.tpr_service.field_sidebar_content
@@ -15,7 +16,7 @@ dependencies:
     - path
     - readonly_field_widget
 _core:
-  default_config_hash: amvJn8QveSpTGPn4OxMMjWzFFf7N17O7DvmtGbcW9UI
+  default_config_hash: 65eWpXHIJMgZmdka4RWOp5mjaMVbi9GSSnEFuMEVkV0
 id: tpr_service.tpr_service.default
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -60,6 +61,13 @@ content:
         collapse_edit_all: collapse_edit_all
         duplicate: duplicate
     third_party_settings: {  }
+  field_hide_errand_services:
+    type: boolean_checkbox
+    weight: 26
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_lower_content:
     type: paragraphs
     weight: 15
diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.field.tpr_service.tpr_service.field_content
+    - field.field.tpr_service.tpr_service.field_hide_errand_services
     - field.field.tpr_service.tpr_service.field_lower_content
     - field.field.tpr_service.tpr_service.field_metatags
     - field.field.tpr_service.tpr_service.field_sidebar_content
@@ -14,7 +15,7 @@ dependencies:
     - metatag
     - text
 _core:
-  default_config_hash: FpnYo5IdVxWpdELG0Wm8Nzi1kXiJrrIjm28ViLuz4Mk
+  default_config_hash: fwusaj8kHWkTb0SlKf1cJyAjJ4GLmy7U9kVv_ody87c
 id: tpr_service.tpr_service.default
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -45,6 +46,16 @@ content:
     third_party_settings: {  }
     weight: 4
     region: content
+  field_hide_errand_services:
+    type: boolean
+    label: hidden
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 9
+    region: content
   field_lower_content:
     type: entity_reference_revisions_entity_view
     label: hidden
diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml
@@ -5,14 +5,15 @@ dependencies:
   config:
     - core.entity_view_mode.tpr_service.teaser
     - field.field.tpr_service.tpr_service.field_content
+    - field.field.tpr_service.tpr_service.field_hide_errand_services
     - field.field.tpr_service.tpr_service.field_lower_content
     - field.field.tpr_service.tpr_service.field_metatags
     - field.field.tpr_service.tpr_service.field_sidebar_content
   module:
     - helfi_tpr
     - text
 _core:
-  default_config_hash: Omdo6M-IMXkz9G6hFOYAv8AUs4xpI0Twd_xy_nqlIXA
+  default_config_hash: BKJdRgCeG3fkmATTkCV3UnrG7P38ZKikpC9TeMaqnqg
 id: tpr_service.tpr_service.teaser
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -45,6 +46,7 @@ hidden:
   created: true
   errand_services: true
   field_content: true
+  field_hide_errand_services: true
   field_lower_content: true
   field_metatags: true
   field_sidebar_content: true
diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
@@ -5,14 +5,15 @@ dependencies:
   config:
     - core.entity_view_mode.tpr_service.teaser_search_result
     - field.field.tpr_service.tpr_service.field_content
+    - field.field.tpr_service.tpr_service.field_hide_errand_services
     - field.field.tpr_service.tpr_service.field_lower_content
     - field.field.tpr_service.tpr_service.field_metatags
     - field.field.tpr_service.tpr_service.field_sidebar_content
   module:
     - helfi_tpr
     - text
 _core:
-  default_config_hash: Zqle6dVKIzR8o-4kbybadE49WQ-T_Np_CypDeRRSYqg
+  default_config_hash: vdwiUtqY9K7YfZOmpVfwtroedTHUv5nAl5jBItljoo8
 id: tpr_service.tpr_service.teaser_search_result
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -89,6 +90,7 @@ content:
 hidden:
   created: true
   field_content: true
+  field_hide_errand_services: true
   field_lower_content: true
   field_metatags: true
   field_sidebar_content: true
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: AdQTkdWVzyuDdL7pLE58TQaW22mHyWhp9Gi3B9O3_Ls
+  default_config_hash: xcT7P7y4b_MfF_8e7oOpiEU1mjj7pH-iQhFNNcnDRpc
 id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 5dAbG-fTXnpYj8PrSdYl3AT2z_0wNUelRRmy76FiDCM
+  default_config_hash: Z5cLehFHTeqGLzRMPiYu5ifBzZ2bCw3JYViB-iLqVWA
 id: helfi_hearings
 label: 'Helfi: Hearing'
 label_plural: 'Helfi: Hearing'
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: daIUGTR2nijXztOFPGoKZP9hdqNwUXU1g1Iksa29Rxo
+  default_config_hash: z5y2Q4YIOEn4aZvLFEALd5PBpkI9EfONstMuMZL6hmg
 id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 1KCEz52lFemwPMfVitwlGcbzmkcAJPGSSe6loUbVJc8
+  default_config_hash: 2vWhIsIWAsZyO2IG5F4HKao0jGLcBtwKYtnyleuuz7g
 id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 09-lIa9cl9PNPVIBXCVIR8yBfofPifSwhAsD0QVh8l8
+  default_config_hash: et1iN-VlxVYWFwF5aiP6wYr_Dhf0h6Wfrakz5Lyyjkc
 id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: vs16WpCdsWseKb-U81zRJbzykB25mE69iOEXv4ZhxCM
+  default_config_hash: 5P-ayxO6U797l3B_P95pNVT8grlPAycLH2HkM6IMe_w
 id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: aw8aj1KLI2Gmj3lsfTP64Fxzj4o-H8SvihSBBUXp9h0
+  default_config_hash: mjiFy9is17K3yros3zaXqYiHCGqtsve3PKJJ49h-eUM
 id: helfi_surveys
 label: 'Helfi: Survey'
 label_plural: 'Helfi: Surveys'
diff --git a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: Ll_0kw3O6gGsRvmdTi7l4K2pwhUrL0yQT4uPcttspmA
+  default_config_hash: LYl9zNEVjxc3dAdVydk1wvfBxZPgTISTBXd6U2-za0g
 id: linkedevents_event
 label: 'LinkedEvents: Event'
 label_plural: 'LinkedEvents: Events'
diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml
@@ -6,14 +6,14 @@ dependencies:
     - field.storage.media.field_helfi_chart_title
     - media.type.helfi_chart
 _core:
-  default_config_hash: 1-AJXcAy0ANS-0BXwAAz8RiB9_s6MfjOP7Mh02yl1X4
+  default_config_hash: 9iQHX3id8uF5Q4OOE6IyROLWTu0Mg_Tud7tZbmJXPAE
 id: media.helfi_chart.field_helfi_chart_title
 field_name: field_helfi_chart_title
 entity_type: media
 bundle: helfi_chart
 label: Title
 description: 'The chart is rendered via inline frame. Iframe needs a label so users can determine what content is being presented in the iframe.'
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_hide_errand_services.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_hide_errand_services.yml
@@ -0,0 +1,26 @@
+uuid: 1259baa8-0eb1-4be2-afea-d4f7073ec7b9
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.tpr_service.field_hide_errand_services
+  module:
+    - helfi_tpr
+_core:
+  default_config_hash: wV9PkDuLtHsijJyNmichODHwjquB-ejunNkH9H-hX98
+id: tpr_service.tpr_service.field_hide_errand_services
+field_name: field_hide_errand_services
+entity_type: tpr_service
+bundle: tpr_service
+label: 'Hide errand services'
+description: 'Toggle to hide or show errand services on this service entity.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/conf/cmi/field.storage.tpr_service.field_hide_errand_services.yml b/conf/cmi/field.storage.tpr_service.field_hide_errand_services.yml
diff --git a/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_hide_errand_services.yml b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_hide_errand_services.yml
diff --git a/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_hide_errand_services.yml b/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_hide_errand_services.yml

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`max_bundle_number: 20`
`2`		`-hoverintent_functionality: true`