UHF-9488 Drupal 10.2

composer.json

@@ -49,7 +49,7 @@
         "drupal/scheduler": "^1.3",
         "drupal/search_api": "^1.0",
         "drupal/select2": "^1.12",
-        "drupal/simple_sitemap": "^4.1",
+        "drupal/simple_sitemap": "4.1.7",
         "drupal/siteimprove": "^2.0",
         "drupal/social_media": "^2.0",
         "drupal/stomp": "^2.0",
@@ -62,7 +62,7 @@
         "php": "^8.1"
     },
     "conflict": {
-        "drupal/core": "<10.1 || >=10.2",
+        "drupal/core": "<10.2",
         "drupal/ctools": "<3.11 || ^4.0.1",
         "drupal/helfi_media_map": "*",
         "drupal/simple_sitemap": ">4.1.7",
@@ -75,12 +75,12 @@
                 "https://www.drupal.org/project/content_lock/issues/3343964": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch"
             },
             "drupal/core": {
-                "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "https://www.drupal.org/files/issues/2023-10-02/3091246--allow-menu-tree-manipulators-alter--23.patch",
+                "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "https://www.drupal.org/files/issues/2023-12-18/3091246--allow-menu-tree-manipulators-alter--24.patch",
                 "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299)": "https://www.drupal.org/files/issues/2023-05-07/3163299-104-D10.patch",
                 "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/b628bc051d82a1883768364050aa833824bd48c8/patches/drupal_core_strip_debug_mode_whitespaces_10.1.x.patch",
                 "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch",
                 "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch",
-                "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/a42c905a162c8510348b17cdf60000a0a7f82037/patches/drupal-2313309-render-admin-toolbar-with-admin-language.patch",
+                "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch",
                 "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch"
             },
             "drupal/default_content": {

helfi_platform_config.services.yml

@@ -51,6 +51,7 @@ services:
     arguments:
       - '@entity_type.manager'
       - '@language_manager'
+      - '@router.admin_context'
     tags:
       - { name: event_subscriber }
 

modules/hdbt_admin_tools/assets/css/menu.css

@@ -11,3 +11,7 @@
 [dir="ltr"] .gin--horizontal-toolbar .toolbar .toolbar-bar .toolbar-menu-administration > .toolbar-menu > .menu-item > .toolbar-box > .toolbar-icon:not(.toolbar-handle) {
   padding-right: 1em;
 }
+
+[dir="ltr"] .gin--horizontal-toolbar .toolbar .toolbar-bar .toolbar-menu-administration > .toolbar-menu > .menu-item > .toolbar-icon.is-active {
+  background-color: rgba(38,88,168,0.05);
+}

modules/helfi_ckeditor/config/install/editor.editor.full_html.yml

@@ -39,6 +39,11 @@ settings:
         - heading4
         - heading5
         - heading6
+    ckeditor5_list:
+      properties:
+        reversed: false
+        startIndex: true
+      multiBlock: true
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<dl>'
@@ -57,16 +62,13 @@ settings:
         - '<h6 id>'
         - '<figure tabindex>'
         - '<figcaption>'
-    ckeditor5_list:
-      reversed: false
-      startIndex: true
-    linkit_extension:
-      linkit_enabled: true
-      linkit_profile: helfi
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a aria-label class data-design data-hds-icon-start data-is-external data-link-text data-protocol data-selected-icon data-hds-component data-hds-variant id rel role target="_blank" title>'
         - '<span aria-hidden class role>'
+    linkit_extension:
+      linkit_enabled: true
+      linkit_profile: helfi
 image_upload:
   status: false
   scheme: public

modules/helfi_ckeditor/config/install/editor.editor.minimal.yml

@@ -21,22 +21,24 @@ settings:
       - '|'
       - sourceEditing
   plugins:
+    ckeditor5_list:
+      properties:
+        reversed: false
+        startIndex: true
+      multiBlock: true
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<span role aria-* class>'
         - '<ul type>'
         - '<ol type>'
         - '<a hreflang accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol>'
-    ckeditor5_list:
-      reversed: false
-      startIndex: true
-    linkit_extension:
-      linkit_enabled: true
-      linkit_profile: helfi
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a aria-label class data-design data-hds-icon-start data-is-external data-link-text data-protocol data-selected-icon data-hds-component data-hds-variant id rel role target="_blank" title>'
         - '<span aria-hidden class role>'
+    linkit_extension:
+      linkit_enabled: true
+      linkit_profile: helfi
 image_upload:
   status: false
   scheme: public

modules/helfi_ckeditor/config/install/filter.format.full_html.yml

@@ -9,41 +9,6 @@ name: HTML
 format: full_html
 weight: 0
 filters:
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: true
-    weight: -46
-    settings: {  }
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: true
-    weight: -50
-    settings:
-      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <blockquote role aria-* cite class data-helfi-quote> <div role aria-* class> <span role aria-* class dir> <ul type> <ol type start> <figure tabindex> <figcaption> <strong> <em> <s> <sub> <sup> <a href data-entity-type data-entity-uuid data-entity-substitution aria-label class data-design data-hds-icon-start data-is-external data-link-text data-protocol data-selected-icon data-hds-component data-hds-variant rel role target="_blank"> <li> <table> <tr> <td> <th> <thead> <tbody> <tfoot> <caption> <footer data-helfi-quote-author> <cite>'
-      filter_html_help: true
-      filter_html_nofollow: false
-  filter_htmlcorrector:
-    id: filter_htmlcorrector
-    provider: filter
-    status: true
-    weight: -45
-    settings: {  }
-  filter_url:
-    id: filter_url
-    provider: filter
-    status: true
-    weight: -49
-    settings:
-      filter_url_length: 120
-  linkit:
-    id: linkit
-    provider: linkit
-    status: true
-    weight: -48
-    settings:
-      title: true
   editor_file_reference:
     id: editor_file_reference
     provider: editor
@@ -56,12 +21,27 @@ filters:
     status: false
     weight: -42
     settings: {  }
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: true
+    weight: -46
+    settings: {  }
   filter_caption:
     id: filter_caption
     provider: filter
     status: false
     weight: -41
     settings: {  }
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: true
+    weight: -50
+    settings:
+      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <blockquote role aria-* cite class data-helfi-quote> <div role aria-* class> <span role aria-* class dir> <ul type> <ol type start> <figure tabindex> <figcaption> <strong> <em> <s> <sub> <sup> <a href data-entity-type data-entity-uuid data-entity-substitution aria-label class data-design data-hds-icon-start data-is-external data-link-text data-protocol data-selected-icon data-hds-component data-hds-variant rel role target="_blank"> <li> <table> <tr> <td> <th> <thead> <tbody> <tfoot> <caption> <footer data-helfi-quote-author> <cite>'
+      filter_html_help: true
+      filter_html_nofollow: false
   filter_html_escape:
     id: filter_html_escape
     provider: filter
@@ -74,15 +54,35 @@ filters:
     status: false
     weight: -40
     settings: {  }
-  helfi_link_converter:
-    id: helfi_link_converter
-    provider: helfi_api_base
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
     status: true
-    weight: -10
+    weight: -45
     settings: {  }
   filter_image_lazy_load:
     id: filter_image_lazy_load
     provider: filter
     status: true
     weight: -42
     settings: {  }
+  filter_url:
+    id: filter_url
+    provider: filter
+    status: true
+    weight: -49
+    settings:
+      filter_url_length: 120
+  helfi_link_converter:
+    id: helfi_link_converter
+    provider: helfi_api_base
+    status: true
+    weight: -10
+    settings: {  }
+  linkit:
+    id: linkit
+    provider: linkit
+    status: true
+    weight: -48
+    settings:
+      title: true

modules/helfi_ckeditor/config/install/filter.format.minimal.yml

@@ -42,12 +42,6 @@ filters:
       allowed_html: '<br> <p> <span role aria-* class lang dir> <ul type> <ol type start> <a hreflang accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol href data-entity-type data-entity-uuid data-entity-substitution aria-label class data-hds-icon-start data-hds-component data-hds-variant role> <strong> <em> <li>'
       filter_html_help: true
       filter_html_nofollow: false
-  filter_htmlcorrector:
-    id: filter_htmlcorrector
-    provider: filter
-    status: true
-    weight: -40
-    settings: {  }
   filter_html_escape:
     id: filter_html_escape
     provider: filter
@@ -60,29 +54,35 @@ filters:
     status: false
     weight: -42
     settings: {  }
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
+    status: true
+    weight: -40
+    settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: -47
+    settings: {  }
   filter_url:
     id: filter_url
     provider: filter
     status: true
     weight: -46
     settings:
       filter_url_length: 120
-  linkit:
-    id: linkit
-    provider: linkit
-    status: true
-    weight: -44
-    settings:
-      title: true
   helfi_link_converter:
     id: helfi_link_converter
     provider: helfi_api_base
     status: true
     weight: -10
     settings: {  }
-  filter_image_lazy_load:
-    id: filter_image_lazy_load
-    provider: filter
+  linkit:
+    id: linkit
+    provider: linkit
     status: true
-    weight: -47
-    settings: {  }
+    weight: -44
+    settings:
+      title: true

modules/helfi_ckeditor/config/rewrite/filter.format.plain_text.yml

@@ -7,6 +7,12 @@ name: 'Plain text'
 format: plain_text
 weight: 10
 filters:
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: true
+    weight: 0
+    settings: {  }
   filter_html_escape:
     id: filter_html_escape
     provider: filter
@@ -20,12 +26,6 @@ filters:
     weight: 0
     settings:
       filter_url_length: 120
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: true
-    weight: 0
-    settings: {  }
   helfi_link_converter:
     id: helfi_link_converter
     provider: helfi_api_base

modules/helfi_eu_cookie_compliance/src/Controller/CookieConsentController.php

@@ -9,7 +9,7 @@
 /**
  * Defines CookieConsentController class.
  */
-class CookieConsentController extends ControllerBase {
+final class CookieConsentController extends ControllerBase {
 
   /**
    * Constructs a new instance.

modules/helfi_media/config/install/core.entity_view_mode.media.image.yml

@@ -5,5 +5,6 @@ dependencies:
     - media
 id: media.image
 label: Image
+description: ''
 targetEntityType: media
 cache: true

modules/helfi_media/config/rewrite/views.view.media_library.yml

@@ -473,13 +473,13 @@ display:
     cache_metadata:
       max-age: 0
       contexts:
-        - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
         - 'url.query_args:sort_by'
         - user
         - user.permissions
+        - 'languages:language_content'
       tags: {  }
   page:
     id: page
@@ -1116,7 +1116,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: ''
-          default_argument_skip_url: false
           summary_options:
             base_path: ''
             count: true
@@ -1334,7 +1333,7 @@ display:
             image_link: ''
             image_style: media_library
             image_loading:
-              attribute: lazy
+              attribute: eager
         name:
           id: name
           table: media_field_data
@@ -1374,7 +1373,7 @@ display:
             custom_date_format: ''
             timezone: ''
             tooltip:
-              date_format: ''
+              date_format: long
               custom_date_format: ''
             time_diff:
               enabled: false
@@ -1407,7 +1406,6 @@ display:
           default_argument_type: fixed
           default_argument_options:
             argument: ''
-          default_argument_skip_url: false
           summary_options:
             base_path: ''
             count: true

modules/helfi_node_news_item/config/install/core.entity_view_mode.media.image_content_area.yml

@@ -5,5 +5,6 @@ dependencies:
     - media
 id: media.image_content_area
 label: 'Image (content area)'
+description: ''
 targetEntityType: media
 cache: true

modules/helfi_node_news_item/config/install/core.entity_view_mode.node.card_teaser.yml

@@ -5,5 +5,6 @@ dependencies:
     - node
 id: node.card_teaser
 label: 'Card Teaser'
+description: ''
 targetEntityType: node
 cache: true

modules/helfi_node_news_item/config/install/core.entity_view_mode.node.medium_teaser.yml

@@ -5,5 +5,6 @@ dependencies:
     - node
 id: node.medium_teaser
 label: 'Medium Teaser'
+description: ''
 targetEntityType: node
 cache: true