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

Dev to main
City-of-Helsinki · Sep 27, 2023 · 7748739 · 7748739
2 parents 8557f26 + 3ae0571
commit 7748739
Show file tree

Hide file tree

Showing 20 changed files with 235 additions and 135 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "drupal/helfi_platform_config": "^3.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tpr": "^2.0",
-        "drupal/helfi_tunnistamo": "^2.0",
+        "drupal/helfi_tunnistamo": "^3.0",
         "drupal/raven": "^4.0",
         "drupal/redis": "^1.5",
         "drupal/stage_file_proxy": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.base_field_override.node.announcement.title.yml b/conf/cmi/core.base_field_override.node.announcement.title.yml
@@ -0,0 +1,20 @@
+uuid: 0c1eff25-e0bb-47c5-948c-bd110ae24337
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.announcement
+_core:
+  default_config_hash: v0rg9ztfYRnKz2PXAcGD_Q52rTcPbwqaZLw3tXWd4rM
+id: node.announcement.title
+field_name: title
+entity_type: node
+bundle: announcement
+label: 'Administrative title'
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/conf/cmi/core.entity_form_display.node.announcement.default.yml b/conf/cmi/core.entity_form_display.node.announcement.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.announcement.field_announcement_content_pages
     - field.field.node.announcement.field_announcement_link
     - field.field.node.announcement.field_announcement_service_pages
+    - field.field.node.announcement.field_announcement_title
     - field.field.node.announcement.field_announcement_type
     - field.field.node.announcement.field_announcement_unit_pages
     - node.type.announcement
@@ -20,15 +21,15 @@ dependencies:
     - select2
     - text
 _core:
-  default_config_hash: le2Wzlas0qZ9Bj-o6WlJbHDeisFrucs9F4B3VOK8t_w
+  default_config_hash: 0ewsu2ZhpNhAo4t7wkUgEa9ABQAkcsF7IXtR-kFeDUg
 id: node.announcement.default
 targetEntityType: node
 bundle: announcement
 mode: default
 content:
   body:
     type: text_textarea_with_summary
-    weight: 15
+    weight: 18
     region: content
     settings:
       rows: 9
@@ -44,14 +45,14 @@ content:
     third_party_settings: {  }
   field_announcement_all_pages:
     type: boolean_checkbox
-    weight: 11
+    weight: 13
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_announcement_content_pages:
     type: select2_entity_reference
-    weight: 12
+    weight: 14
     region: content
     settings:
       width: 100%
@@ -61,32 +62,40 @@ content:
     third_party_settings: {  }
   field_announcement_link:
     type: link_default
-    weight: 16
+    weight: 19
     region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
   field_announcement_service_pages:
     type: select2_entity_reference
-    weight: 14
+    weight: 16
     region: content
     settings:
       width: 100%
       autocomplete: true
       match_operator: CONTAINS
       match_limit: 20
     third_party_settings: {  }
+  field_announcement_title:
+    type: string_textfield
+    weight: 17
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_announcement_type:
     type: select2
-    weight: 10
+    weight: 11
     region: content
     settings:
       width: 100%
     third_party_settings: {  }
   field_announcement_unit_pages:
     type: select2_entity_reference
-    weight: 13
+    weight: 15
     region: content
     settings:
       width: 100%
@@ -125,7 +134,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   simple_sitemap:
-    weight: 10
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }

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_view_display.node.announcement.default.yml b/conf/cmi/core.entity_view_display.node.announcement.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.announcement.field_announcement_content_pages
     - field.field.node.announcement.field_announcement_link
     - field.field.node.announcement.field_announcement_service_pages
+    - field.field.node.announcement.field_announcement_title
     - field.field.node.announcement.field_announcement_type
     - field.field.node.announcement.field_announcement_unit_pages
     - node.type.announcement
@@ -17,7 +18,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: IHF-sP4Gq6tdTyWDxQDDEdLbHz3-QzklMNE1QA2mQU0
+  default_config_hash: LQ9K_wCbd758UCcNEORQvFUQ7gNJddkukiwwYHrZv4c
 id: node.announcement.default
 targetEntityType: node
 bundle: announcement
@@ -42,6 +43,14 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
+  field_announcement_title:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 4
+    region: content
   field_announcement_type:
     type: list_default
     label: hidden

diff --git a/conf/cmi/core.entity_view_display.node.announcement.teaser.yml b/conf/cmi/core.entity_view_display.node.announcement.teaser.yml
@@ -9,14 +9,15 @@ dependencies:
     - field.field.node.announcement.field_announcement_content_pages
     - field.field.node.announcement.field_announcement_link
     - field.field.node.announcement.field_announcement_service_pages
+    - field.field.node.announcement.field_announcement_title
     - field.field.node.announcement.field_announcement_type
     - field.field.node.announcement.field_announcement_unit_pages
     - node.type.announcement
   module:
     - text
     - user
 _core:
-  default_config_hash: FhIJpRvY90w782EYtR2V2Yfppyglwp191xkVdXEEbbM
+  default_config_hash: OwH532HYBVjDOUW0iJnoDWc2yFGZwwGJnAZEmZPjLCA
 id: node.announcement.teaser
 targetEntityType: node
 bundle: announcement
@@ -40,6 +41,7 @@ hidden:
   field_announcement_content_pages: true
   field_announcement_link: true
   field_announcement_service_pages: true
+  field_announcement_title: true
   field_announcement_type: true
   field_announcement_unit_pages: true
   langcode: true

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
   service_id: 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
@@ -3,13 +3,13 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: XBOd0Lfy5FpXJkeuZi75vBaT7ffFCENINrui5kCVygo
+  default_config_hash: ZjzZvHTvsEfBX_dhlTXEZmLbS_ELM5uV7xbXTaR7D7g
 id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
@@ -37,6 +37,8 @@ field_mapper_config:
       value: '$.attributes["field_announcement_link"]["title"]'
     announcement_link_url:
       value: '$.attributes["field_announcement_link"]["uri"]'
+    announcement_assistive_technology_close_button_title:
+      value: '$.attributes["field_announcement_title"]'
 storage_client_id: helfi_announcements
 storage_client_config: {  }
 persistent_cache_max_age: 600