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

Dev to main
City-of-Helsinki · Jan 17, 2024 · d04fa5c · d04fa5c
2 parents 916049e + 3b68e2d
commit d04fa5c
Show file tree

Hide file tree

Showing 44 changed files with 298 additions and 204 deletions.
diff --git a/composer.json b/composer.json
@@ -41,9 +41,6 @@
         "weitzman/drupal-test-traits": "^2.0"
     },
     "conflict": {
-        "drupal/core": ">=10.2",
-        "drupal/core-composer-scaffold": ">=10.2",
-        "drupal/core-dev": ">=10.2",
         "drupal/drupal": "*"
     },
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_mode.media.media_library.yml b/conf/cmi/core.entity_form_mode.media.media_library.yml
@@ -11,5 +11,6 @@ _core:
   default_config_hash: Tdhz-aDHfDoV1Ul9umtItxGTrjkFzoNAkDw8FWXjYA0
 id: media.media_library
 label: 'Media library'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_form_mode.user.register.yml b/conf/cmi/core.entity_form_mode.user.register.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: flXhTcp55yLcyy7ZLOhPGKGZobZQJdkAFVWV3LseiuI
 id: user.register
 label: Register
+description: ''
 targetEntityType: user
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.block.token.yml b/conf/cmi/core.entity_view_mode.block.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - block
 id: block.token
 label: Token
+description: ''
 targetEntityType: block
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.file.token.yml b/conf/cmi/core.entity_view_mode.file.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - file
 id: file.token
 label: Token
+description: ''
 targetEntityType: file
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: q8QZDYrGHAdl67dw9Z1DdTCTIhOo3lpW0dGN70STnCk
 id: helfi_news.medium_teaser
 label: 'Medium Teaser'
+description: ''
 targetEntityType: helfi_news
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.content_card.yml b/conf/cmi/core.entity_view_mode.media.content_card.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: ZkAUzH7gBMP0I7VgZKkEsPYaKWHNjny_nb49e8n1HAE
 id: media.content_card
 label: 'Content card'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.full.yml b/conf/cmi/core.entity_view_mode.media.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 6NBUEuGmlkClK8Fb76tSMMpO2eZ4LWCBdbUk4z7CuP0
 id: media.full
 label: 'Full content'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.hero.yml b/conf/cmi/core.entity_view_mode.media.hero.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: XHi0bUTi0UQU5CFI90xrtRS1tLLlwUSrMhNft4fY_XA
 id: media.hero
 label: Hero
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.image.yml b/conf/cmi/core.entity_view_mode.media.image.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: _B3q0O_xZZoTEPGo67JMyvbBEstnyqiAJjk8to3c1QM
 id: media.image
 label: Image
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.list_of_links.yml b/conf/cmi/core.entity_view_mode.media.list_of_links.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: PHC5-ZAHrmao9xAd6ZMuFwwm9kIEBb4E31qjN0JkovE
 id: media.list_of_links
 label: 'List of Links'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.media_library.yml b/conf/cmi/core.entity_view_mode.media.media_library.yml
@@ -11,5 +11,6 @@ _core:
   default_config_hash: Tdhz-aDHfDoV1Ul9umtItxGTrjkFzoNAkDw8FWXjYA0
 id: media.media_library
 label: 'Media library'
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.media.token.yml b/conf/cmi/core.entity_view_mode.media.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - media
 id: media.token
 label: Token
+description: ''
 targetEntityType: media
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.menu_link_content.token.yml b/conf/cmi/core.entity_view_mode.menu_link_content.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - menu_link_content
 id: menu_link_content.token
 label: Token
+description: ''
 targetEntityType: menu_link_content
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.diff.yml b/conf/cmi/core.entity_view_mode.node.diff.yml
@@ -12,5 +12,6 @@ _core:
   default_config_hash: pqZNtad5J9THcdbYjwPD4qINqvrTxnOd8KCWn6tUBRs
 id: node.diff
 label: 'Revision comparison'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.full.yml b/conf/cmi/core.entity_view_mode.node.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: ElrtInxGjZd7GaapJ5O9n-ugi2hG2IxFivtgn0tHOsk
 id: node.full
 label: 'Full content'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.rss.yml b/conf/cmi/core.entity_view_mode.node.rss.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: vlYzr-rp2f9NMp-Qlr4sFjlqRq-90mco5-afLNGwCrU
 id: node.rss
 label: RSS
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.search_index.yml b/conf/cmi/core.entity_view_mode.node.search_index.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: fVFfJv_GzBRE-wpRHbfD5a3VjnhbEOXG6lvRd3uaccY
 id: node.search_index
 label: 'Search index'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.search_result.yml b/conf/cmi/core.entity_view_mode.node.search_result.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 6GCOQ-jP2RbdbHA5YWQ6bT8CfGbqrBYKOSC_XY4E3ZM
 id: node.search_result
 label: 'Search result highlighting input'
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.teaser.yml b/conf/cmi/core.entity_view_mode.node.teaser.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4
 id: node.teaser
 label: Teaser
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.node.token.yml b/conf/cmi/core.entity_view_mode.node.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - node
 id: node.token
 label: Token
+description: ''
 targetEntityType: node
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.paragraph.preview.yml b/conf/cmi/core.entity_view_mode.paragraph.preview.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: h3BeHVei4Lnyqbkao3YiF4KqoY-DhRvUNfEgKG8Rgjg
 id: paragraph.preview
 label: Preview
+description: ''
 targetEntityType: paragraph
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml b/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: _YqHTUZ5t7SWq5sE0bJwbSNH9CaL_KIbwu-rURJ6sXo
 id: paragraphs_library_item.summary
 label: Summary
+description: ''
 targetEntityType: paragraphs_library_item
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.path_alias.token.yml b/conf/cmi/core.entity_view_mode.path_alias.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - path_alias
 id: path_alias.token
 label: Token
+description: ''
 targetEntityType: path_alias
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml b/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: '-PPKjsNQPvoIDjOuUAvlLocYD976MNjb9Zpgyz5_BWE'
 id: taxonomy_term.full
 label: 'Taxonomy term page'
+description: ''
 targetEntityType: taxonomy_term
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml b/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - taxonomy
 id: taxonomy_term.token
 label: Token
+description: ''
 targetEntityType: taxonomy_term
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.user.compact.yml b/conf/cmi/core.entity_view_mode.user.compact.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: 71CSAr_LNPcgu6D6jI4INl1KATkahmeyUFBETAWya8g
 id: user.compact
 label: Compact
+description: ''
 targetEntityType: user
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.user.full.yml b/conf/cmi/core.entity_view_mode.user.full.yml
@@ -8,5 +8,6 @@ _core:
   default_config_hash: mQIF_foYjmnVSr9MpcD4CTaJE_FpO1AyDd_DskztGhM
 id: user.full
 label: 'User account'
+description: ''
 targetEntityType: user
 cache: true
diff --git a/conf/cmi/core.entity_view_mode.user.token.yml b/conf/cmi/core.entity_view_mode.user.token.yml
@@ -6,5 +6,6 @@ dependencies:
     - user
 id: user.token
 label: Token
+description: ''
 targetEntityType: user
 cache: true
diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml
@@ -43,8 +43,10 @@ settings:
         - heading5
         - heading6
     ckeditor5_list:
-      reversed: false
-      startIndex: true
+      properties:
+        reversed: false
+        startIndex: true
+      multiBlock: true
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<dl>'

diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml
@@ -25,8 +25,10 @@ settings:
       - sourceEditing
   plugins:
     ckeditor5_list:
-      reversed: false
-      startIndex: true
+      properties:
+        reversed: false
+        startIndex: true
+      multiBlock: true
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<span role aria-* class>'

diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
@@ -12,41 +12,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
@@ -59,12 +24,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
@@ -77,15 +57,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