Merge pull request #300 from City-of-Helsinki/UHF-8391

UHF-8391 D10
City-of-Helsinki · Nov 20, 2023 · 4d58b26 · 4d58b26
2 parents 2c21ebe + 4cdb475
commit 4d58b26
Show file tree

Hide file tree

Showing 54 changed files with 2,572 additions and 2,287 deletions.
diff --git a/composer.json b/composer.json
@@ -9,26 +9,26 @@
     "require": {
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.7",
-        "drupal/core": "^9.4",
-        "drupal/core-composer-scaffold": "^9.4",
-        "drupal/hdbt": "^5.0",
-        "drupal/hdbt_admin": "^2.0",
-        "drupal/helfi_azure_fs": "^1.1",
+        "drupal/core": "^10.0",
+        "drupal/core-composer-scaffold": "^10.0",
+        "drupal/hdbt": "^6.0",
+        "drupal/hdbt_admin": "^3.0",
+        "drupal/helfi_azure_fs": "^2.0",
         "drupal/helfi_drupal_tools": "dev-main",
         "drupal/helfi_navigation": "^2.0",
-        "drupal/helfi_platform_config": "^3.0",
+        "drupal/helfi_platform_config": "^4.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tpr": "^2.0",
         "drupal/helfi_tunnistamo": "^3.0",
         "drupal/raven": "^4.0",
         "drupal/redis": "^1.5",
         "drupal/stage_file_proxy": "^2.0",
-        "drush/drush": "^11"
+        "drush/drush": "^12"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "drupal/coder": "^8.3",
-        "drupal/core-dev": "^9.1",
+        "drupal/core-dev": "^10.0",
         "jangregor/phpstan-prophecy": "^1.0",
         "mglaman/phpstan-drupal": "^1.2",
         "phpspec/prophecy-phpunit": "^2",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_view_display.media.image.content_card.yml b/conf/cmi/core.entity_view_display.media.image.content_card.yml
@@ -23,6 +23,8 @@ content:
     settings:
       responsive_image_style: content_cards
       image_link: ''
+      image_loading:
+        attribute: eager
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.media.image.hero.yml b/conf/cmi/core.entity_view_display.media.image.hero.yml
@@ -23,6 +23,8 @@ content:
     settings:
       responsive_image_style: hero__left_right
       image_link: ''
+      image_loading:
+        attribute: eager
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.media.image.image.yml b/conf/cmi/core.entity_view_display.media.image.image.yml
@@ -23,6 +23,8 @@ content:
     settings:
       responsive_image_style: image__3_2
       image_link: ''
+      image_loading:
+        attribute: eager
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.media.image.list_of_links.yml b/conf/cmi/core.entity_view_display.media.image.list_of_links.yml
@@ -23,6 +23,8 @@ content:
     settings:
       responsive_image_style: list_of_links__thumbnail
       image_link: ''
+      image_loading:
+        attribute: eager
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.media.remote_video.default.yml b/conf/cmi/core.entity_view_display.media.remote_video.default.yml
@@ -20,6 +20,8 @@ content:
     settings:
       max_width: 1264
       max_height: 714
+      loading:
+        attribute: eager
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -8,7 +8,7 @@ module:
   basic_auth: 0
   block: 0
   breakpoint: 0
-  ckeditor: 0
+  ckeditor5: 0
   config: 0
   config_ignore: 0
   config_rewrite: 0
@@ -112,6 +112,7 @@ module:
   paragraphs_library: 0
   path: 0
   path_alias: 0
+  phpass: 0
   purge: 0
   purge_drush: 0
   purge_processor_cron: 0

diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml
@@ -1,60 +1,80 @@
-uuid: 7ab8e5c8-f767-4fe5-a76c-d7b80964beee
+uuid: 376729f6-c0d2-4d18-be83-700ddb373a40
 langcode: en
 status: true
 dependencies:
   config:
     - filter.format.full_html
   module:
-    - ckeditor
+    - ckeditor5
 _core:
-  default_config_hash: mx77BnIuTY8Yrm6IkLsHnEOv6JJrHPMD_kKgjP0DVi4
+  default_config_hash: rMPZSfUdZCsb509LFsy6EZYI2wjtuonQtf6afD85sQ0
 format: full_html
-editor: ckeditor
+editor: ckeditor5
 settings:
   toolbar:
-    rows:
-      -
-        -
-          name: Formatting
-          items:
-            - Bold
-            - Italic
-            - Strike
-            - Superscript
-            - Subscript
-            - '-'
-            - RemoveFormat
-            - '-'
-            - Format
-        -
-          name: Lists
-          items:
-            - BulletedList
-            - NumberedList
-        -
-          name: Media
-          items:
-            - quote
-        -
-          name: Links
-          items:
-            - DrupalLink
-            - DrupalUnlink
-        -
-          name: Tools
-          items:
-            - Undo
-            - Redo
-            - Cut
-            - Copy
-            - Paste
-            - PasteFromWord
-            - SpecialChar
-            - Table
-            - language_selector
-            - Source
+    items:
+      - bold
+      - italic
+      - strikethrough
+      - superscript
+      - subscript
+      - removeFormat
+      - heading
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - link
+      - helfiQuote
+      - insertTable
+      - helfiLanguageSelector
+      - specialCharacters
+      - '|'
+      - undo
+      - redo
+      - '|'
+      - sourceEditing
   plugins:
-    drupallink:
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_sourceEditing:
+      allowed_tags:
+        - '<dl>'
+        - '<dt>'
+        - '<dd>'
+        - '<blockquote role aria-* cite class>'
+        - '<div role aria-* class>'
+        - '<img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style>'
+        - '<span role aria-* class>'
+        - '<ul type>'
+        - '<ol type>'
+        - '<h2 id>'
+        - '<h3 id>'
+        - '<h4 id>'
+        - '<h5 id>'
+        - '<h6 id>'
+        - '<figure tabindex>'
+        - '<figcaption>'
+    ckeditor5_list:
+      reversed: false
+      startIndex: true
+    linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
-image_upload: {  }
+    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>'
+image_upload:
+  status: false
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: 0
+    height: 0
diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml
@@ -1,43 +1,45 @@
-uuid: 73e5af08-9157-4895-b064-4ddd18f58658
+uuid: c8b15096-e629-453d-acb9-930b6a45f385
 langcode: en
 status: true
 dependencies:
   config:
     - filter.format.minimal
   module:
-    - ckeditor
+    - ckeditor5
 _core:
-  default_config_hash: UYVamJgeMVQeM3VYumbShc-tGJoYe4RhrXqiL_tJw4c
+  default_config_hash: eS-qt8gYhlbOwnV4BIbI-IG-mV85MWJudQS34fp9rb8
 format: minimal
-editor: ckeditor
+editor: ckeditor5
 settings:
   toolbar:
-    rows:
-      -
-        -
-          name: Formatting
-          items:
-            - Bold
-            - Italic
-        -
-          name: Links
-          items:
-            - DrupalLink
-            - DrupalUnlink
-        -
-          name: Lists
-          items:
-            - BulletedList
-            - NumberedList
-        -
-          name: Tools
-          items:
-            - language_selector
-            - Source
+    items:
+      - bold
+      - italic
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - link
+      - helfiLanguageSelector
+      - '|'
+      - sourceEditing
   plugins:
-    drupallink:
+    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>'
 image_upload:
   status: false
   scheme: public

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -18,22 +18,22 @@ field_mapper_config:
     uuid:
       value: $.id
     title:
-      value: '$.attributes[''title'']'
+      value: "$.attributes['title']"
     main_image:
-      uri: '$.relationships[''main_image''][''data''][''relationships''][''media_image''][''data''][''attributes''][''uri''][''url'']'
-      title: '$.relationships[''main_image''][''data''][''relationships''][''media_image''][''data''][''meta''][''alt'']'
+      uri: "$.relationships['main_image']['data']['relationships']['media_image']['data']['attributes']['uri']['url']"
+      title: "$.relationships['main_image']['data']['relationships']['media_image']['data']['meta']['alt']"
     tags:
-      value: '$.relationships[''tags''][''data''][*][''attributes''][''name'']'
+      value: "$.relationships['tags']['data'][*]['attributes']['name']"
     groups:
-      value: '$.relationships[''groups''][''data''][*][''attributes''][''name'']'
+      value: "$.relationships['groups']['data'][*]['attributes']['name']"
     neighbourhoods:
-      value: '$.relationships[''neighbourhoods''][''data''][*][''attributes''][''name'']'
+      value: "$.relationships['neighbourhoods']['data'][*]['attributes']['name']"
     node_url:
-      value: '$.attributes[''path''][''alias'']'
+      value: "$.attributes['path']['alias']"
     published_at:
-      value: '$.attributes[''published_at'']'
+      value: "$.attributes['published_at']"
     short_title:
-      value: '$.attributes[''short_title'']'
+      value: "$.attributes['short_title']"
 storage_client_id: helfi_news
 storage_client_config: {  }
 persistent_cache_max_age: 1800

diff --git a/conf/cmi/field.field.node.landing_page.field_has_hero.yml b/conf/cmi/field.field.node.landing_page.field_has_hero.yml
@@ -12,7 +12,7 @@ field_name: field_has_hero
 entity_type: node
 bundle: landing_page
 label: Hero
-description: 'Select whether you wish to display a hero highlight element on the page. If a hero is selected, it''s heading will be used as the main heading for the page.'
+description: "Select whether you wish to display a hero highlight element on the page. If a hero is selected, it's heading will be used as the main heading for the page."
 required: false
 translatable: true
 default_value:

diff --git a/conf/cmi/field.field.paragraph.banner.field_banner_link_design.yml b/conf/cmi/field.field.paragraph.banner.field_banner_link_design.yml
@@ -14,7 +14,7 @@ field_name: field_banner_link_design
 entity_type: paragraph
 bundle: banner
 label: 'Link design'
-description: 'Choose what kind of design you want to use for the link button. If you don''t add a link to the banner you can ignore this field.'
+description: "Choose what kind of design you want to use for the link button. If you don't add a link to the banner you can ignore this field."
 required: true
 translatable: false
 default_value:

diff --git a/conf/cmi/field.field.paragraph.hero.field_hero_title.yml b/conf/cmi/field.field.paragraph.hero.field_hero_title.yml
@@ -12,7 +12,7 @@ field_name: field_hero_title
 entity_type: paragraph
 bundle: hero
 label: 'Hero heading'
-description: 'If a hero is used on the page, this heading will be used as the page''s main heading.'
+description: "If a hero is used on the page, this heading will be used as the page's main heading."
 required: true
 translatable: false
 default_value: {  }

diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml
@@ -12,7 +12,7 @@ field_name: field_unit_contact_unit
 entity_type: paragraph
 bundle: unit_contact_card
 label: Unit
-description: 'Add here the unit that you want to appear as the contact card. The unit doesn''t have to be published.'
+description: "Add here the unit that you want to appear as the contact card. The unit doesn't have to be published."
 required: true
 translatable: false
 default_value: {  }

diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
@@ -7,7 +7,7 @@ dependencies:
     - helfi_api_base
     - linkit
 _core:
-  default_config_hash: scZe8VBZbfUiJt0xnoGrHbXgRhTOLA-d3g7Byy1lZ4c
+  default_config_hash: tNjU3zbyIKY2QkCWHVv4BVr9AqYQpl592c9MgS00NXc
 name: HTML
 format: full_html
 weight: 0
@@ -24,7 +24,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote aria-* class=""> <ul> <ol start> <li> <h2> <h3> <h4> <h5> <h6> <p class=""> <footer class=""> <br> <a href hreflang !href rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
+      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:
@@ -83,3 +83,9 @@ filters:
     status: true
     weight: -10
     settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: -42
+    settings: {  }