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

teroelonen · web-flow · commit f1819f6a8d53 · 2025-03-25T17:00:14.000+02:00
Dev to main
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -18,7 +18,7 @@ dependencies:
     - publication_date
     - scheduler
 _core:
-  default_config_hash: nz2kuZQ53sXaRjzi5GT0LPTskHJFGOgRZuY2XwpDYls
+  default_config_hash: toCt5Nw1UzFFFR3oZf7s_L5Oll3qiUCvinBYTsausRw
 id: node.landing_page.default
 targetEntityType: node
 bundle: landing_page
@@ -128,9 +128,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   status:
     type: boolean_checkbox
     weight: 12
diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml
@@ -17,7 +17,7 @@ dependencies:
     module:
       - hdbt_admin_tools
 _core:
-  default_config_hash: 4aVXtSrHJBF5egM_I1orTmSf5g3lm-WcG6PD6HfPWFU
+  default_config_hash: lQyC2S5i5_fCJAL4WOUq6uRHDEi2cMp_3ikdn2_Ivc8
 id: paragraph.banner.default
 targetEntityType: paragraph
 bundle: banner
@@ -42,8 +42,8 @@ content:
     weight: 4
     region: content
     settings:
-      linkit_auto_link_text: false
       linkit_profile: helfi
+      linkit_auto_link_text: false
     third_party_settings: {  }
   field_banner_link_design:
     type: design_field_widget
diff --git a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml
@@ -14,7 +14,7 @@ dependencies:
     module:
       - linkit
 _core:
-  default_config_hash: Z6srfoJRBBcEO67EuXCDQauOFUjyUkmg6Kz-FGDQOWg
+  default_config_hash: gpIk2Gvwdo4l2nyLq5n_mobrJZYwUfweVy7MOidu7aM
 id: paragraph.list_of_links_item.default
 targetEntityType: paragraph
 bundle: list_of_links_item
@@ -40,8 +40,8 @@ content:
     weight: 1
     region: content
     settings:
-      linkit_auto_link_text: false
       linkit_profile: helfi
+      linkit_auto_link_text: false
     third_party_settings: {  }
 hidden:
   created: 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: klULx3zqlYgz7OOfeGsjBYHQmFp8V6_aMlFUYaOQRmA
+  default_config_hash: AdQTkdWVzyuDdL7pLE58TQaW22mHyWhp9Gi3B9O3_Ls
 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: Z5cLehFHTeqGLzRMPiYu5ifBzZ2bCw3JYViB-iLqVWA
+  default_config_hash: 5dAbG-fTXnpYj8PrSdYl3AT2z_0wNUelRRmy76FiDCM
 id: helfi_hearings
 label: 'Helfi: Hearing'
 label_plural: 'Helfi: Hearing'
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: _EBh68cyUNEhZdqfsN5IEH5ieC-ND8JOMk5t_uhXdJc
+  default_config_hash: aw8aj1KLI2Gmj3lsfTP64Fxzj4o-H8SvihSBBUXp9h0
 id: helfi_surveys
 label: 'Helfi: Survey'
 label_plural: 'Helfi: Surveys'
diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml
@@ -1,10 +1,10 @@
 _core:
-  default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8
+  default_config_hash: Q-rouGjsZPL2nUPOuO0OkaDr7ft6gsrH2UfbJ5w08TE
 langcode: en
-path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
 site_settings:
   default_icon: home-smoke
   theme_color: tram
   koro: vibration
 footer_settings:
   footer_color: dark
+path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json
diff --git a/conf/cmi/helfi_platform_config.matomo_settings.yml b/conf/cmi/helfi_platform_config.matomo_settings.yml
@@ -0,0 +1 @@
+matomo_site_id: '1101'
diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml
@@ -6,7 +6,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: xQTb_j-YlLPQwNO2XMGCrBrq-ugsswFVJm555d3I_5k
+  default_config_hash: GN0YHIauCNLb32jUFByiXsBnaGgrF4Q5TICZiWhtz7Y
 id: er_tpr_unit
 label: 'Entity reference - TPR Unit'
 module: views
@@ -91,6 +91,7 @@ display:
         type: mini
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 10
           total_pages: null
           id: 0
@@ -105,7 +106,6 @@ 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/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml
@@ -7,7 +7,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: aWWCfu_BLTqXUnVK428-5vmOLyDFaF5vc_wSCogl_CU
+  default_config_hash: 1dRKNkYLtZD9PWHvIf80gU-ZzsLrw-XvViAgSO-9_GE
 id: locked_services
 label: 'Locked services'
 module: views
@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml
@@ -7,7 +7,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: 2RwuySoO0jIj7tuWxKcXUsKZnepI9xt3yhSIYXiBQe8
+  default_config_hash: 7wB3KZwczepkrNZxMZs4jSXgtWq4m601vFsgvD6mHrk
 id: locked_units
 label: 'Locked units'
 module: views
@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
@@ -10,7 +10,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: tYU3ozJEdEzgBo7vNnkTpTLq-d2yJOpuOWqzo8j_jl0
+  default_config_hash: HvP4CD_k8sjz85mIG76_thr_6_em_CWt5zLnjdZwLFw
 id: service_list
 label: 'Service list'
 module: views
@@ -109,6 +109,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 4
           total_pages: null
           id: 0
@@ -126,7 +127,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
@@ -646,6 +646,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 5
           total_pages: null
           id: 0
@@ -663,7 +664,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml
@@ -8,7 +8,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: nPWw6LpPY3CT9DQwdHOOtIiHmatTZbcX6eSBxtbrq5A
+  default_config_hash: bdWMGn-99uHvD1Gd4cLZNrF0xYXFnan65xiFDlHc6GM
 id: service_units
 label: 'Service units'
 module: views
@@ -93,6 +93,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 15
           total_pages: null
           id: 0
@@ -110,7 +111,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml
@@ -9,7 +9,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: ILA5x_MmTaGv2HHx487USFFmiMtmmkGyp24bT1Y_V84
+  default_config_hash: sGxrTeDVc_OZ34V0aOwO-uHLjH-ybevUsGg0Go39NRE
 id: unit_search
 label: 'Unit search'
 module: views
@@ -286,6 +286,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 15
           total_pages: null
           id: 0
@@ -303,7 +304,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
