City-of-Helsinki · xkhaven · Sep 25, 2023 · Sep 25, 2023
diff --git a/composer.lock b/composer.lock
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
@@ -15,7 +15,7 @@ dependencies:
     - path
     - readonly_field_widget
 _core:
-  default_config_hash: fBGDQ46DbT3UoCm-GrCSgq6Fd6pARcmF3BNBKxO-qaE
+  default_config_hash: TuN2oM9gnDHnqYyB_3Y28xQmAKLYtQD0cry_Qo4jByo
 id: tpr_service.tpr_service.default
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -33,7 +33,7 @@ content:
     third_party_settings: {  }
   errand_services:
     type: readonly_field_widget
-    weight: 7
+    weight: 8
     region: content
     settings:
       label: above
@@ -43,7 +43,7 @@ content:
     third_party_settings: {  }
   field_content:
     type: paragraphs
-    weight: 9
+    weight: 11
     region: content
     settings:
       title: Paragraph
@@ -62,7 +62,7 @@ content:
     third_party_settings: {  }
   field_lower_content:
     type: paragraphs
-    weight: 11
+    weight: 15
     region: content
     settings:
       title: Paragraph
@@ -81,14 +81,14 @@ content:
     third_party_settings: {  }
   field_metatags:
     type: metatag_firehose
-    weight: 8
+    weight: 10
     region: content
     settings:
       sidebar: false
     third_party_settings: {  }
   field_sidebar_content:
     type: paragraphs
-    weight: 10
+    weight: 12
     region: content
     settings:
       title: Paragraph
@@ -107,17 +107,24 @@ content:
     third_party_settings: {  }
   has_unit:
     type: readonly_field_widget
-    weight: 27
+    weight: 18
     region: content
     settings:
       label: above
       formatter_type: null
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  hide_service_points:
+    type: boolean_checkbox
+    weight: 14
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   hide_sidebar_navigation:
     type: boolean_checkbox
-    weight: 21
+    weight: 16
     region: content
     settings:
       display_label: true
@@ -131,7 +138,7 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
-    weight: 6
+    weight: 7
     region: content
     settings:
       label: above
@@ -159,7 +166,7 @@ content:
     third_party_settings: {  }
   name_synonyms:
     type: readonly_field_widget
-    weight: 26
+    weight: 17
     region: content
     settings:
       label: above
@@ -169,13 +176,13 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 7
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }
   service_id:
     type: readonly_field_widget
-    weight: 28
+    weight: 19
     region: content
     settings:
       label: above
@@ -184,7 +191,7 @@ content:
       show_description: false
     third_party_settings: {  }
   simple_sitemap:
-    weight: 10
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }

diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -88,8 +88,8 @@ content:
     third_party_settings: {  }
   contacts:
     type: readonly_field_widget
-    weight: 36
     region: content
+    weight: 36
     settings:
       label: above
       formatter_type: null
@@ -180,8 +180,8 @@ content:
     third_party_settings: {  }
   highlights:
     type: readonly_field_widget
-    weight: 33
     region: content
+    weight: 33
     settings:
       label: above
       formatter_type: null
@@ -207,8 +207,8 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
-    weight: 31
     region: content
+    weight: 31
     settings:
       label: above
       formatter_type: null
@@ -245,8 +245,8 @@ content:
     third_party_settings: {  }
   opening_hours:
     type: readonly_field_widget
-    weight: 32
     region: content
+    weight: 32
     settings:
       label: above
       formatter_type: null
@@ -255,8 +255,8 @@ content:
     third_party_settings: {  }
   other_info:
     type: readonly_field_widget
-    weight: 34
     region: content
+    weight: 34
     settings:
       label: above
       formatter_type: null
@@ -298,8 +298,8 @@ content:
     third_party_settings: {  }
   price_info:
     type: readonly_field_widget
-    weight: 35
     region: content
+    weight: 35
     settings:
       label: above
       formatter_type: null

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
@@ -14,7 +14,7 @@ dependencies:
     - metatag
     - text
 _core:
-  default_config_hash: 26lfekZ94e-EhgSzEv_7KLsDbUr7VnPlFuJk0GdpVtc
+  default_config_hash: bipB-zcUXW3e12wtjBTJ42I9vKovNlR8ZW8o-73Reas
 id: tpr_service.tpr_service.default
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -111,6 +111,7 @@ content:
 hidden:
   created: true
   has_unit: true
+  hide_service_points: true
   langcode: true
   name_synonyms: true
   search_api_excerpt: true

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
@@ -12,7 +12,7 @@ dependencies:
     - helfi_tpr
     - text
 _core:
-  default_config_hash: arzHjXolWlH8pmxrz3B8CZjJ9zTVIIXnLNyZD3EK6uw
+  default_config_hash: _3hhx9CkvItBW_aQmvGwqAsj65Tat3XlacXqHwECJgo
 id: tpr_service.tpr_service.teaser
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -49,6 +49,7 @@ hidden:
   field_metatags: true
   field_sidebar_content: true
   has_unit: true
+  hide_service_points: true
   langcode: true
   links: true
   name_synonyms: 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
@@ -12,7 +12,7 @@ dependencies:
     - helfi_tpr
     - text
 _core:
-  default_config_hash: xB11NuB4PFanx7E4ETdV0gOTv4_GPPPt-Ix-sw4MKHU
+  default_config_hash: eoKQQ4Dm1sXFoG58JFBy_EocUfCV1R4fVs65N63D7xo
 id: tpr_service.tpr_service.teaser_search_result
 targetEntityType: tpr_service
 bundle: tpr_service
@@ -93,6 +93,7 @@ hidden:
   field_metatags: true
   field_sidebar_content: true
   has_unit: true
+  hide_service_points: true
   langcode: true
   links: true
   name_override: 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
@@ -8,8 +8,8 @@ id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

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: pUd-EuRjmmZcRI9CC31DmD1tyVIMUKNtqAHiBjxB9Q0
+  default_config_hash: MvCiaSrdVcljMT3wLlt5V47it0_DgXogcHidiHT4sug
 id: service_list
 label: 'Service list'
 module: views
@@ -361,6 +361,12 @@ display:
     position: 1
     display_options:
       display_extenders: {  }
+      pager:
+        type: none
+        options:
+          offset: 0
+      defaults:
+        pager: false
     cache_metadata:
       max-age: -1
       contexts: