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

Dev to main

.platform/schema

@@ -1 +1 @@
-8
+9

composer.json

@@ -69,7 +69,8 @@
             "php-http/discovery": false
         },
         "audit": {
-            "abandoned": "report"
+            "abandoned": "report",
+            "ignore": ["GHSA-mg8j-w93w-xjgc"]
         }
     },
     "extra": {

conf/cmi/core.entity_form_display.node.news_article.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:
@@ -78,9 +78,9 @@ third_party_settings:
         required_fields: true
     group_automatically_recommended:
       children:
+        - annif_suggested_topics
         - in_recommendations
         - show_annif_block
-        - annif_keywords
       label: 'Automatically recommended content'
       region: content
       parent_name: ''
@@ -99,19 +99,11 @@ targetEntityType: node
 bundle: news_article
 mode: default
 content:
-  annif_keywords:
-    type: readonly_field_widget
-    weight: 30
+  annif_suggested_topics:
+    type: suggested_topics_reference
+    weight: 31
     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
+    settings: {  }
     third_party_settings: {  }
   created:
     type: datetime_timestamp
@@ -231,7 +223,7 @@ content:
     third_party_settings: {  }
   in_recommendations:
     type: boolean_checkbox
-    weight: 28
+    weight: 32
     region: content
     settings:
       display_label: true
@@ -275,7 +267,7 @@ content:
     third_party_settings: {  }
   show_annif_block:
     type: boolean_checkbox
-    weight: 29
+    weight: 33
     region: content
     settings:
       display_label: true

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,7 +79,6 @@ third_party_settings:
     group_updating_news:
       children:
         - field_news_item_updating_news
-        - field_news_item_updating_news
       label: 'Updating news'
       region: content
       parent_name: ''
@@ -94,9 +93,9 @@ third_party_settings:
         required_fields: false
     group_automatically_recommended:
       children:
+        - annif_suggested_topics
         - in_recommendations
         - show_annif_block
-        - annif_keywords
       label: 'Automatically recommended content'
       region: content
       parent_name: ''
@@ -115,19 +114,11 @@ targetEntityType: node
 bundle: news_item
 mode: default
 content:
-  annif_keywords:
-    type: readonly_field_widget
-    weight: 2
+  annif_suggested_topics:
+    type: suggested_topics_reference
+    weight: 29
     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
+    settings: {  }
     third_party_settings: {  }
   created:
     type: datetime_timestamp
@@ -261,7 +252,7 @@ content:
     third_party_settings: {  }
   in_recommendations:
     type: boolean_checkbox
-    weight: 0
+    weight: 30
     region: content
     settings:
       display_label: true
@@ -305,7 +296,7 @@ content:
     third_party_settings: {  }
   show_annif_block:
     type: boolean_checkbox
-    weight: 1
+    weight: 31
     region: content
     settings:
       display_label: true

conf/cmi/eu_cookie_compliance.cookie_category.essential.yml

@@ -3,11 +3,11 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: kfnLYqpxtvBYopdnyeB0TYzlfLynAY6hIegpzFNdDKw
+  default_config_hash: tsGLdAqnFNOsUkYbiBTtLnQLwrg4ySe6BnJzSBpAkFk
 id: essential
 label: 'Essential cookies'
 description:
-  value: '<p>Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.</p><figure class="table" tabindex="0"><table><thead><tr><th>Name</th><th>Provider</th><th>Purpose of the cookie</th><th>Validity</th><th>Type</th></tr></thead><tbody><tr><td>cookiehub</td><td>cookiehub.com</td><td>Used by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>www.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>avustukset.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>AWSELBCORS</td><td>siteimproveanalytics.io</td><td>The cookie is related to a load distribution function used to direct requests to servers with the least traffic.</td><td>Session</td><td>Third party</td></tr><tr><td>mtm_cookie_consent</td><td>kartta.hel.fi</td><td>A technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.</td><td>10950 days</td><td>&nbsp;</td></tr><tr><td>JSESSIONID</td><td><p>helsinkikanava.fi</p><p>coh-chat-app-prod.eu-de.mybluemix.net</p></td><td>The cookie is an obligatory cookie that facilitates visiting the website.</td><td>Session</td><td>Third party</td></tr><tr><td>JSESSIONID</td><td>coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud</td><td>Used for chat app functionality. Its value is used to access session data on server of the application.</td><td>Session</td><td>Third party</td></tr><tr><td>COOKIE_SUPPORT</td><td>helsinkikanava.fi</td><td>The cookie facilitates managing cookies on the website.</td><td>365 days</td><td>Third party</td></tr><tr><td>GUEST_LANGUAGE_ID</td><td>helsinkikanava.fi</td><td>This cookie is generated by the Liferay, its&nbsp;function is to store the language preferences.</td><td>365 days</td><td>Third party</td></tr><tr><td>helfi-settings</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about closed announcements and accordions'' state.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.visitor.autologout_login</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.</td><td>365 days</td><td>&nbsp;</td></tr></tbody></table></figure>'
+  value: '<p>Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.</p><figure class="table" tabindex="0"><table><thead><tr><th>Name</th><th>Provider</th><th>Purpose of the cookie</th><th>Validity</th><th>Type</th></tr></thead><tbody><tr><td>cookiehub</td><td>cookiehub.com</td><td>Used by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-version</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what version of the cookie consent the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>cookie-agreed-categories</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to store information&nbsp;about what cookie categories the user has agreed to.</td><td>100 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>www.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>SSESS*</td><td>avustukset.hel.fi</td><td>A cookie related to the operation of the content management system.</td><td>23 days</td><td>&nbsp;</td></tr><tr><td>AWSELBCORS</td><td>siteimproveanalytics.io</td><td>The cookie is related to a load distribution function used to direct requests to servers with the least traffic.</td><td>Session</td><td>Third party</td></tr><tr><td>mtm_cookie_consent</td><td>kartta.hel.fi</td><td>A technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies.</td><td>10950 days</td><td>&nbsp;</td></tr><tr><td>JSESSIONID</td><td><p>helsinkikanava.fi</p><p>coh-chat-app-prod.eu-de.mybluemix.net</p></td><td>The cookie is an obligatory cookie that facilitates visiting the website.</td><td>Session</td><td>Third party</td></tr><tr><td>JSESSIONID</td><td>coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud</td><td>Used for chat app functionality. Its value is used to access session data on server of the application.</td><td>Session</td><td>Third party</td></tr><tr><td>COOKIE_SUPPORT</td><td>helsinkikanava.fi</td><td>The cookie facilitates managing cookies on the website.</td><td>365 days</td><td>Third party</td></tr><tr><td>GUEST_LANGUAGE_ID</td><td>helsinkikanava.fi</td><td>This cookie is generated by the Liferay, its&nbsp;function is to store the language preferences.</td><td>365 days</td><td>Third party</td></tr><tr><td>helfi-settings</td><td>www.hel.fi</td><td>Used by www.hel.fi Drupal to store information&nbsp;about closed announcements and accordions'' state.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.visitor.autologout_login</td><td>avustukset.hel.fi</td><td>Used by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity.</td><td>365 days</td><td>&nbsp;</td></tr><tr><td>editoria11yResultCount</td><td>www.hel.fi</td><td>Tracks accessibility issues for the current page when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.sidebarExpanded.desktop</td><td>www.hel.fi</td><td>Stores whether the admin sidebar is expanded or collapsed on desktop when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.sidebarExpanded.mobile</td><td>www.hel.fi</td><td>Stores whether the admin sidebar is expanded or collapsed on mobile when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.gin.darkmode</td><td>www.hel.fi</td><td>Stores the user''s dark mode preference in the admin theme when logged in as an editor on hel.fi.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.toolbar.subtrees.*</td><td>www.hel.fi</td><td>Stores the expanded or collapsed state of submenus in the Drupal admin toolbar for a logged-in editor, ensuring consistency across page loads.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.off-canvas.css.*</td><td>www.hel.fi</td><td>Stores cached CKEditor CSS in localStorage for a logged-in editor, using a key with a cache-busting query to ensure the latest CSS is loaded.</td><td>-</td><td>Local storage</td></tr><tr><td>ed11ySeen</td><td>www.hel.fi</td><td>Tracks which accessibility issues a logged-in editor has already seen to avoid duplicate notifications.</td><td>-</td><td>Local storage</td></tr><tr><td>editoria11yResultCount</td><td>www.hel.fi</td><td>Tracks the number of accessibility issues found on specific pages for a logged-in editor, helping monitor and address them.</td><td>-</td><td>Local storage</td></tr><tr><td>Drupal.toolbar.toolbarState</td><td>www.hel.fi</td><td>Stores the state of the admin toolbar for a logged-in editor, including its orientation, active tab and state of expansion.</td><td>Session</td><td>Session storage</td></tr><tr><td>escapeAdminPath</td><td>www.hel.fi</td><td>Stores the URL to redirect a logged-in editor from the admin interface back to the main site.</td><td>Session</td><td>Session storage</td></tr></tbody></table></figure>'
   format: full_html
 checkbox_default_state: required
 weight: -9

conf/cmi/language.entity.en.yml

@@ -7,5 +7,5 @@ _core:
 id: en
 label: English
 direction: ltr
-weight: -8
+weight: -11
 locked: false