UHF-10719: Merge remote-tracking branch 'origin/dev' into UHF-10719-e…

…s-errors
City-of-Helsinki · Nov 8, 2024 · db027b7 · db027b7
2 parents 31860b6 + bddd84f
commit db027b7
Show file tree

Hide file tree

Showing 24 changed files with 231 additions and 187 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml
@@ -19,13 +19,13 @@ dependencies:
   module:
     - field_group
     - hdbt_admin_tools
-    - helfi_annif
     - linkit
     - media_library
     - paragraphs
     - path
     - publication_date
     - radioactivity
+    - readonly_field_widget
     - scheduler
     - select2
 third_party_settings:
@@ -79,6 +79,7 @@ third_party_settings:
     group_updating_news:
       children:
         - field_news_item_updating_news
+        - field_news_item_updating_news
       label: 'Updating news'
       region: content
       parent_name: ''
@@ -96,6 +97,9 @@ third_party_settings:
         - annif_suggested_topics
         - in_recommendations
         - show_annif_block
+        - in_recommendations
+        - show_annif_block
+        - annif_keywords
       label: 'Automatically recommended content'
       region: content
       parent_name: ''
@@ -252,7 +256,7 @@ content:
     third_party_settings: {  }
   in_recommendations:
     type: boolean_checkbox
-    weight: 30
+    weight: 0
     region: content
     settings:
       display_label: true
@@ -296,7 +300,7 @@ content:
     third_party_settings: {  }
   show_annif_block:
     type: boolean_checkbox
-    weight: 31
+    weight: 1
     region: content
     settings:
       display_label: true
@@ -361,5 +365,19 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  annif_keywords:
+    type: readonly_field_widget
+    weight: 2
+    region: content
+    settings:
+      label: above
+      formatter_type: entity_reference_label
+      formatter_settings:
+        entity_reference_entity_view:
+          view_mode: default
+        entity_reference_label:
+          link: false
+      show_description: false
+    third_party_settings: {  }
 hidden:
   hide_sidebar_navigation: true
diff --git a/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_form_display.paragraph.remote_video.default.yml
@@ -14,7 +14,7 @@ dependencies:
     - media_library
     - text
 _core:
-  default_config_hash: AMDZDzWNP90sUgt9bSZf2RbL7KmSxkXMKIiueo1JSWg
+  default_config_hash: VflHWgcqxxjyQ5dI9XiXzqbtlh7Pl2_qqR3bz8Zj1jg
 id: paragraph.remote_video.default
 targetEntityType: paragraph
 bundle: remote_video

diff --git a/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml b/conf/cmi/core.entity_view_display.paragraph.remote_video.default.yml
@@ -13,7 +13,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: hYT61xkhP2zXO2VXijtXVPkoENlhLvIv5DRycKMm6iE
+  default_config_hash: TfUdaKwrwdr5ime_VDVt5VlOtlUx4tcGTVyC7dmC3Gk
 id: paragraph.remote_video.default
 targetEntityType: paragraph
 bundle: remote_video

diff --git a/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_iframe_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.paragraph.field_iframe_title
     - paragraphs.paragraphs_type.remote_video
 _core:
-  default_config_hash: KFqLYybhQZx8DQDevmx8l7O1E7nmPwIhkizJrBbxTXs
+  default_config_hash: JYywo5MvoMggJZYuVwtPzZGrJ8oHmGN4s34-HCX-dXw
 id: paragraph.remote_video.field_iframe_title
 field_name: field_iframe_title
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video.yml
@@ -7,7 +7,7 @@ dependencies:
     - media.type.remote_video
     - paragraphs.paragraphs_type.remote_video
 _core:
-  default_config_hash: b_L89pXt7d85BtmH-jz-VizHh8JhDMro97VxdqxFy2Y
+  default_config_hash: EXTjrddbTsWRr2VDlxXQJcB0pQrLZGTeRStWnqxAOG0
 id: paragraph.remote_video.field_remote_video
 field_name: field_remote_video
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.yml
@@ -12,7 +12,7 @@ third_party_settings:
   allowed_formats:
     allowed_formats: {  }
 _core:
-  default_config_hash: emEHEeE_yt_Z5EVGuPcPk9m--eTj8gCieN9Gzw08GLU
+  default_config_hash: A2oygDMUUEZROK-5xNHDtxbP0CCJUDm3nePQUVGy1Xs
 id: paragraph.remote_video.field_remote_video_description
 field_name: field_remote_video_description
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.paragraph.field_remote_video_title
     - paragraphs.paragraphs_type.remote_video
 _core:
-  default_config_hash: Kn3u7ICuSPlxFZiNdYRyNxEnd-I9Yye00bz2l39BXFQ
+  default_config_hash: RRecftjvqzqgVOvTJu1DCSfdvfNPW6a2yVip2zeVRs0
 id: paragraph.remote_video.field_remote_video_title
 field_name: field_remote_video_title
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml
@@ -12,7 +12,7 @@ third_party_settings:
   allowed_formats:
     allowed_formats: {  }
 _core:
-  default_config_hash: Zv-7KNCky603k38t9PbBgreu9IPTSpVw-bLEa3ptVlE
+  default_config_hash: 5Nx79ltzK2J0MvbXe4PH97S013geVCVJ9Pwfe9zhrGw
 id: paragraph.remote_video.field_remote_video_video_desc
 field_name: field_remote_video_video_desc
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_title.yml
@@ -6,14 +6,14 @@ dependencies:
     - field.storage.paragraph.field_remote_video_video_title
     - paragraphs.paragraphs_type.remote_video
 _core:
-  default_config_hash: Bp1tvXNbkNozGjMop7bTopoVYSimcgFctt5eELalVbY
+  default_config_hash: OetItkfP7vdKFfRMKUkRAiIavZrk78vEeZ0lYtv3kU8
 id: paragraph.remote_video.field_remote_video_video_title
 field_name: field_remote_video_video_title
 entity_type: paragraph
 bundle: remote_video
 label: 'Title of the video'
 description: ''
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/conf/cmi/field.storage.paragraph.field_remote_video.yml b/conf/cmi/field.storage.paragraph.field_remote_video.yml
@@ -6,7 +6,7 @@ dependencies:
     - media
     - paragraphs
 _core:
-  default_config_hash: Bh7n9tsOmq_MtUy_bjD_jxqlduNcg-6UJvy4_r4txc8
+  default_config_hash: xIhmycJh9-kE1HhCcr8tjhZ4IQO8hZBz62eVFANtyx8
 id: paragraph.field_remote_video
 field_name: field_remote_video
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_description.yml b/conf/cmi/field.storage.paragraph.field_remote_video_description.yml
@@ -6,7 +6,7 @@ dependencies:
     - paragraphs
     - text
 _core:
-  default_config_hash: cq3pdUIwmiOxVLXVLyNHCrQUxQlsS7rClbJnKKks_JU
+  default_config_hash: Y4hTJol9Wy9ZyomH_1QSspaJSkZwk-IUUpuTqOmpBxM
 id: paragraph.field_remote_video_description
 field_name: field_remote_video_description
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_title.yml b/conf/cmi/field.storage.paragraph.field_remote_video_title.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: 0k4C3yk8Ne0kpMQ0Jc4AD4B3Acm7CQKI_Ug0u-4ZUYE
+  default_config_hash: jw2V9D7zXEWDwG7TQvLH8_n3m_A7W1t4s_8C5fUPHQk
 id: paragraph.field_remote_video_title
 field_name: field_remote_video_title
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml b/conf/cmi/field.storage.paragraph.field_remote_video_video_desc.yml
@@ -6,7 +6,7 @@ dependencies:
     - paragraphs
     - text
 _core:
-  default_config_hash: j86-6zpgZg50s_H3TClf9Soi0TR-N1JMtPIEcskvxTo
+  default_config_hash: AugkKo0s1rzTVWEU231Gjm8aktv5Jo14JMyg_1-64Lc
 id: paragraph.field_remote_video_video_desc
 field_name: field_remote_video_video_desc
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml b/conf/cmi/field.storage.paragraph.field_remote_video_video_title.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: NQK8C_re4avi5sgPKbEZUF-Pb5ZV05qUxasNqGulkBU
+  default_config_hash: qCBWtWuaF6QcegWsQZ5k2TBU_r3_2meMw8CbzLJdczY
 id: paragraph.field_remote_video_video_title
 field_name: field_remote_video_video_title
 entity_type: paragraph

diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml
@@ -1,2 +1,2 @@
 label: 'Videoupotus (tuettu muilla kielillä)'
-description: 'Videoupotus Youtubesta tai Helsinki-kanavalta.'
+description: 'Tällä lohkolla voit upottaa videon ulkoisesta palvelusta. Tukee tällä hetkellä vain YouTubea.'
diff --git a/conf/cmi/metatag.settings.yml b/conf/cmi/metatag.settings.yml
@@ -10,3 +10,4 @@ entity_type_groups:
       basic: basic
       open_graph: open_graph
       twitter_cards: twitter_cards
+tag_trim_end: '|.,-:;/+&([{"'''
diff --git a/conf/cmi/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/paragraphs.paragraphs_type.remote_video.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 7ACTSU3dw6y63zALTmg5uHqXetngx1XyycIXNYypUnk
+  default_config_hash: e1F_uSG80Cz1Et_JPUBQuzLDDOw_GTFX7E3xvDT8eCA
 id: remote_video
 label: 'Remote video (supported in other languages)'
 icon_uuid: null

diff --git a/conf/cmi/raven.settings.yml b/conf/cmi/raven.settings.yml
@@ -4,10 +4,10 @@ client_key: ''
 environment: ''
 release: ''
 log_levels:
-  emergency: false
-  alert: false
-  critical: false
-  error: false
+  emergency: true
+  alert: true
+  critical: true
+  error: true
   warning: false
   notice: false
   info: false
@@ -16,7 +16,7 @@ stack: true
 timeout: 2.0
 message_limit: 2048
 trace: false
-fatal_error_handler: false
+fatal_error_handler: true
 fatal_error_handler_memory: 2560
 javascript_error_handler: false
 drush_error_handler: true