From edc4710f212666a70c351e93ee8184ab4f8db658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Fri, 9 Feb 2024 13:32:18 +0200
Subject: [PATCH 01/18] UHF-9497: Removed obsolete attributes from full and
 minimal filter formats.

---
 .../install/editor.editor.full_html.yml       | 22 +++----------------
 .../config/install/editor.editor.minimal.yml  | 10 +++------
 .../install/filter.format.full_html.yml       |  2 +-
 .../config/install/filter.format.minimal.yml  |  2 +-
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index c3a19c398..4ee0d71fa 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -45,27 +45,11 @@ settings:
         startIndex: true
       multiBlock: true
     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>'
+      allowed_tags: {  }
     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>'
+        - '<a class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
+        - '<span aria-hidden class>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 27c4467bf..8028c04fa 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -27,15 +27,11 @@ settings:
         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>'
+      allowed_tags: {  }
     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>'
+        - '<a class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
+        - '<span aria-hidden class>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
diff --git a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
index 13c80f4d8..7569fed9f 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
@@ -39,7 +39,7 @@ filters:
     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>'
+      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span aria-hidden class role dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
index 38b66c672..3007c65da 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      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>'
+      allowed_html: '<br> <p> <strong> <em> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span aria-hidden class role dir>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:

From 29c17f3bf8c83a31809754a6749138ffcf27a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Fri, 9 Feb 2024 13:32:59 +0200
Subject: [PATCH 02/18] UHF-9497: Added an update hook to convert old link
 button data-attributes to follow new HDS data-attributes.

---
 .../helfi_ckeditor.ckeditor5.yml              |  4 +-
 modules/helfi_ckeditor/helfi_ckeditor.install | 94 +++++++++++++++++++
 2 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
index 5f02c8596..e9252c84c 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
+++ b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
@@ -12,8 +12,8 @@ helfi_ckeditor_helfi_link:
     label: Helfi Link
     library: helfi_ckeditor/helfi_link
     elements:
-      - <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>
+      - <a class data-design data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">
+      - <span aria-hidden class>
     conditions:
       plugins:
         - ckeditor5_link
diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index 35571ce82..0b6b38df8 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -149,3 +149,97 @@ function helfi_ckeditor_update_9005(): void {
     }
   }
 }
+
+/**
+ * UHF-9497 Import revised filter and editor formats.
+ */
+function helfi_ckeditor_update_9006(): void {
+  \Drupal::service('helfi_platform_config.config_update_helper')
+    ->update('helfi_ckeditor');
+}
+
+/**
+ * UHF-9497 Iterate through long text fields and replace anchor data attributes to new format.
+ */
+function helfi_ckeditor_update_9007(): void {
+  $entity_type_manager = Drupal::entityTypeManager();
+  $field_storage = $entity_type_manager->getStorage('field_config');
+
+  // Search and replace following data.
+  $data_to_be_converted = [
+    'data-selected-icon=' => 'data-hds-icon-start=',
+    'data-design="hds-button hds-button--primary"' => 'data-hds-component="button"',
+    'data-design="hds-button hds-button--secondary"' => 'data-hds-component="button" data-hds-variant="secondary"',
+    'data-design="hds-button hds-button--supplementary"' => 'data-hds-component="button" data-hds-variant="supplementary"',
+    'data-design="link"' => '',
+    'data-design=' => 'data-hds-component="button" data-hds-variant=',
+    'class="hds-button hds-button--primary" ' => '',
+    'class="hds-button hds-button--secondary" ' => '',
+    'class="hds-button hds-button--supplementary" ' => '',
+  ];
+
+  $count = 0;
+  $data_link_count = 0;
+
+  // Load all field configurations.
+  /** @var \Drupal\field\Entity\FieldConfig $field_config */
+  foreach ($field_storage->loadMultiple() as $field_config) {
+
+    // Go through each field and check for long text fields (html formatted).
+    if ($field_config->getType() === 'text_long') {
+      $field_storage_definition = $field_config->getFieldStorageDefinition();
+      $entity_type = $field_config->getTargetEntityTypeId();
+
+      /** @var \Drupal\Core\Entity\Sql\SqlEntityStorageInterface $storage */
+      $storage = $entity_type_manager->getStorage($entity_type);
+      /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
+      $table_mapping = $storage->getTableMapping();
+
+      // Get current field's table name and column.
+      $table_name = $table_mapping->getDedicatedDataTableName($field_storage_definition);
+      $column = $table_mapping->getFieldColumnName($field_storage_definition,'value');
+
+      // Go through our data array, treat array key as data to search for
+      // and array value as replacement. Use sql replace to replace the data.
+      foreach ($data_to_be_converted as $old => $new) {
+        $update = Drupal::database()->update($table_name);
+        $update->expression(
+          $column,
+          "REPLACE($column, :old_value, :new_value)",
+          [
+            ':old_value' => $old,
+            ':new_value' => $new,
+          ]
+        );
+        $count += $update->execute();
+      }
+
+      // Search for <a> elements containing data-link-text.
+      $regex = '<a(.*?)data-link-text="[^"]*"(.*?)>';
+      $query = \Drupal::database()->select($table_name, 'v')
+        ->distinct()
+        ->fields('v', ['entity_id', $column])
+        ->condition($column, $regex, 'REGEXP');
+      $query_result = $query->execute()->fetchAll();
+
+      if (!empty($query_result)) {
+        $data_link_count += count($query_result);
+        $replacement = '<a$1$2>';
+        $update = \Drupal::database()->update($table_name);
+        $update->expression(
+          $column,
+          "REGEXP_REPLACE($column, :pattern, :replacement)",
+          [':pattern' => $regex, ':replacement' => $replacement]
+        );
+        $update->execute();
+      }
+    }
+  }
+  // Set messages if there were changes.
+  if ($count > 0) {
+    \Drupal::messenger()->addMessage(t('Converted @number old CKE4 anchor data-attributes to new HDS button data-attributes.', ['@number' => $count]));
+  }
+  if ($data_link_count > 0) {
+    \Drupal::messenger()->addMessage(t('Removed data-link-text attribute from @number anchor elements.', ['@number' => $data_link_count]));
+  }
+}

From aad2fdc877cf6682ca8d041968fdccbafc61de6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Fri, 9 Feb 2024 13:40:57 +0200
Subject: [PATCH 03/18] UHF-9497: Removed class and role attributes from span
 elements.

---
 .../helfi_ckeditor/config/install/editor.editor.full_html.yml   | 2 +-
 modules/helfi_ckeditor/config/install/editor.editor.minimal.yml | 2 +-
 .../helfi_ckeditor/config/install/filter.format.full_html.yml   | 2 +-
 modules/helfi_ckeditor/config/install/filter.format.minimal.yml | 2 +-
 modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index 4ee0d71fa..6d25169b8 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -49,7 +49,7 @@ settings:
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
-        - '<span aria-hidden class>'
+        - '<span aria-hidden>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 8028c04fa..4187cfe63 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -31,7 +31,7 @@ settings:
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
-        - '<span aria-hidden class>'
+        - '<span aria-hidden>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
diff --git a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
index 7569fed9f..64771080f 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span aria-hidden class role dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
+      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span aria-hidden dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
index 3007c65da..9d8cde20b 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p> <strong> <em> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span aria-hidden class role dir>'
+      allowed_html: '<br> <p> <strong> <em> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span aria-hidden dir>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
index e9252c84c..d3503f0e5 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
+++ b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
@@ -13,7 +13,7 @@ helfi_ckeditor_helfi_link:
     library: helfi_ckeditor/helfi_link
     elements:
       - <a class data-design data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">
-      - <span aria-hidden class>
+      - <span aria-hidden>
     conditions:
       plugins:
         - ckeditor5_link

From d4d86f7b4c0517064783d04ca5215ddfe907481e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Fri, 9 Feb 2024 13:51:50 +0200
Subject: [PATCH 04/18] UHF-9497: Removed the regex for data-link-text as it
 doesn't seem to work properly.

---
 modules/helfi_ckeditor/helfi_ckeditor.install | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index 0b6b38df8..f5d669686 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -179,7 +179,6 @@ function helfi_ckeditor_update_9007(): void {
   ];
 
   $count = 0;
-  $data_link_count = 0;
 
   // Load all field configurations.
   /** @var \Drupal\field\Entity\FieldConfig $field_config */
@@ -213,33 +212,10 @@ function helfi_ckeditor_update_9007(): void {
         );
         $count += $update->execute();
       }
-
-      // Search for <a> elements containing data-link-text.
-      $regex = '<a(.*?)data-link-text="[^"]*"(.*?)>';
-      $query = \Drupal::database()->select($table_name, 'v')
-        ->distinct()
-        ->fields('v', ['entity_id', $column])
-        ->condition($column, $regex, 'REGEXP');
-      $query_result = $query->execute()->fetchAll();
-
-      if (!empty($query_result)) {
-        $data_link_count += count($query_result);
-        $replacement = '<a$1$2>';
-        $update = \Drupal::database()->update($table_name);
-        $update->expression(
-          $column,
-          "REGEXP_REPLACE($column, :pattern, :replacement)",
-          [':pattern' => $regex, ':replacement' => $replacement]
-        );
-        $update->execute();
-      }
     }
   }
   // Set messages if there were changes.
   if ($count > 0) {
     \Drupal::messenger()->addMessage(t('Converted @number old CKE4 anchor data-attributes to new HDS button data-attributes.', ['@number' => $count]));
   }
-  if ($data_link_count > 0) {
-    \Drupal::messenger()->addMessage(t('Removed data-link-text attribute from @number anchor elements.', ['@number' => $data_link_count]));
-  }
 }

From 6e9418003fd1269a3243b73af7fb28f9a000474c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 12 Feb 2024 09:02:53 +0200
Subject: [PATCH 05/18] UHF-9497: Fixed the backreference for the regex in
 data-link-text removal query.

---
 modules/helfi_ckeditor/helfi_ckeditor.install | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index f5d669686..14d75160b 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -179,6 +179,7 @@ function helfi_ckeditor_update_9007(): void {
   ];
 
   $count = 0;
+  $data_link_count = 0;
 
   // Load all field configurations.
   /** @var \Drupal\field\Entity\FieldConfig $field_config */
@@ -212,10 +213,33 @@ function helfi_ckeditor_update_9007(): void {
         );
         $count += $update->execute();
       }
+
+      // Search for <a> elements containing data-link-text.
+      $regex = '<a(.*?)data-link-text="[^"]*"(.*?)>';
+      $query = \Drupal::database()->select($table_name, 'v')
+        ->distinct()
+        ->fields('v', ['entity_id', $column])
+        ->condition($column, $regex, 'REGEXP');
+      $query_result = $query->execute()->fetchAll();
+
+      if (!empty($query_result)) {
+        $data_link_count += count($query_result);
+        $replacement = '<a\1\2>';
+        $update = \Drupal::database()->update($table_name);
+        $update->expression(
+          $column,
+          "REGEXP_REPLACE($column, :pattern, :replacement)",
+          [':pattern' => $regex, ':replacement' => $replacement]
+        );
+        $update->execute();
+      }
     }
   }
   // Set messages if there were changes.
   if ($count > 0) {
     \Drupal::messenger()->addMessage(t('Converted @number old CKE4 anchor data-attributes to new HDS button data-attributes.', ['@number' => $count]));
   }
+  if ($data_link_count > 0) {
+    \Drupal::messenger()->addMessage(t('Removed data-link-text attribute from @number anchor elements.', ['@number' => $data_link_count]));
+  }
 }

From ee876ce50b3d3f0ebca401c5a271cb4cd3dc2862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 12 Feb 2024 10:09:14 +0200
Subject: [PATCH 06/18] UHF-9497: Removed class attributes from anchor tags.

---
 .../helfi_ckeditor/config/install/editor.editor.full_html.yml  | 2 +-
 .../helfi_ckeditor/config/install/editor.editor.minimal.yml    | 2 +-
 .../helfi_ckeditor/config/install/filter.format.full_html.yml  | 2 +-
 .../helfi_ckeditor/config/install/filter.format.minimal.yml    | 2 +-
 modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml            | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index 6d25169b8..fb38d95a6 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -48,7 +48,7 @@ settings:
       allowed_tags: {  }
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
-        - '<a class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
+        - '<a data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
         - '<span aria-hidden>'
     linkit_extension:
       linkit_enabled: true
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 4187cfe63..6acd805a9 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -30,7 +30,7 @@ settings:
       allowed_tags: {  }
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
-        - '<a class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
+        - '<a data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
         - '<span aria-hidden>'
     linkit_extension:
       linkit_enabled: true
diff --git a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
index 64771080f..2d0aae41a 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span aria-hidden dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
+      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span aria-hidden dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
index 9d8cde20b..139ae7c48 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p> <strong> <em> <a href class data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span aria-hidden dir>'
+      allowed_html: '<br> <p> <strong> <em> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span aria-hidden dir>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
index d3503f0e5..ab8b0e641 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
+++ b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
@@ -12,8 +12,7 @@ helfi_ckeditor_helfi_link:
     label: Helfi Link
     library: helfi_ckeditor/helfi_link
     elements:
-      - <a class data-design data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">
-      - <span aria-hidden>
+      - <a data-design data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">
     conditions:
       plugins:
         - ckeditor5_link

From d5bdc99b1203fc48ee7b3a6ab5850b98539a4ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 12 Feb 2024 10:17:52 +0200
Subject: [PATCH 07/18] UHF-9497: Removed aria-hidden from span elements.

---
 .../helfi_ckeditor/config/install/editor.editor.full_html.yml   | 2 +-
 modules/helfi_ckeditor/config/install/editor.editor.minimal.yml | 2 +-
 .../helfi_ckeditor/config/install/filter.format.full_html.yml   | 2 +-
 modules/helfi_ckeditor/config/install/filter.format.minimal.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index fb38d95a6..ce7352774 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -49,7 +49,7 @@ settings:
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
-        - '<span aria-hidden>'
+        - '<span>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 6acd805a9..3619964f3 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -31,7 +31,7 @@ settings:
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
-        - '<span aria-hidden>'
+        - '<span>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
diff --git a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
index 2d0aae41a..ac16cb4ff 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span aria-hidden dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
+      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
index 139ae7c48..c5cb8ec01 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p> <strong> <em> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span aria-hidden dir>'
+      allowed_html: '<br> <p> <strong> <em> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span dir>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:

From c6a1d739eeb794d94196a0a1914bf1b727fb7bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 12 Feb 2024 10:50:08 +0200
Subject: [PATCH 08/18] UHF-9497: Removed span from editor configurations.

---
 .../helfi_ckeditor/config/install/editor.editor.full_html.yml    | 1 -
 modules/helfi_ckeditor/config/install/editor.editor.minimal.yml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index ce7352774..755d6e250 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -49,7 +49,6 @@ settings:
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
-        - '<span>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 3619964f3..46eae9193 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -31,7 +31,6 @@ settings:
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank">'
-        - '<span>'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: helfi

From 3302e6358563ead0c4ad9b8940aac1714e5409ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 12 Feb 2024 11:29:45 +0200
Subject: [PATCH 09/18] UHF-9497: Changed the updb hook message as the affected
 rows were incorrect.

---
 modules/helfi_ckeditor/helfi_ckeditor.install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index 14d75160b..896250683 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -211,6 +211,8 @@ function helfi_ckeditor_update_9007(): void {
             ':new_value' => $new,
           ]
         );
+        // Note! The execution will return every row, even the ones which data
+        // was not affected.
         $count += $update->execute();
       }
 
@@ -237,7 +239,7 @@ function helfi_ckeditor_update_9007(): void {
   }
   // Set messages if there were changes.
   if ($count > 0) {
-    \Drupal::messenger()->addMessage(t('Converted @number old CKE4 anchor data-attributes to new HDS button data-attributes.', ['@number' => $count]));
+    \Drupal::messenger()->addMessage(t('Converted old link button data-attributes to new HDS button data-attributes.'));
   }
   if ($data_link_count > 0) {
     \Drupal::messenger()->addMessage(t('Removed data-link-text attribute from @number anchor elements.', ['@number' => $data_link_count]));

From b6d21950d3efdf32d8ceac69dd462cc4b3aeeadb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 12 Feb 2024 12:42:19 +0200
Subject: [PATCH 10/18] UHF-9497: Fixed phpcs.

---
 modules/helfi_ckeditor/helfi_ckeditor.install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index 896250683..d7eb19e3d 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -159,7 +159,7 @@ function helfi_ckeditor_update_9006(): void {
 }
 
 /**
- * UHF-9497 Iterate through long text fields and replace anchor data attributes to new format.
+ * UHF-9497 Replace data attributes to HDS data attributes in long text fields.
  */
 function helfi_ckeditor_update_9007(): void {
   $entity_type_manager = Drupal::entityTypeManager();
@@ -197,7 +197,7 @@ function helfi_ckeditor_update_9007(): void {
 
       // Get current field's table name and column.
       $table_name = $table_mapping->getDedicatedDataTableName($field_storage_definition);
-      $column = $table_mapping->getFieldColumnName($field_storage_definition,'value');
+      $column = $table_mapping->getFieldColumnName($field_storage_definition, 'value');
 
       // Go through our data array, treat array key as data to search for
       // and array value as replacement. Use sql replace to replace the data.

From b0178eccf667cbd8b9662cb5c462745419c945e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 14 Feb 2024 08:48:36 +0200
Subject: [PATCH 11/18] UHF-9497: Converted mysql REGEX to LIKE and handled the
 data-link-text removal with php preg_replace.

---
 modules/helfi_ckeditor/helfi_ckeditor.install | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index d7eb19e3d..c791facd8 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -216,24 +216,33 @@ function helfi_ckeditor_update_9007(): void {
         $count += $update->execute();
       }
 
-      // Search for <a> elements containing data-link-text.
-      $regex = '<a(.*?)data-link-text="[^"]*"(.*?)>';
+      // Fetch the data for <a> elements containing data-link-text.
+      $pattern = '%<a%data-link-text="%"%';
       $query = \Drupal::database()->select($table_name, 'v')
         ->distinct()
         ->fields('v', ['entity_id', $column])
-        ->condition($column, $regex, 'REGEXP');
+        ->condition($column, $pattern, 'LIKE');
       $query_result = $query->execute()->fetchAll();
 
-      if (!empty($query_result)) {
-        $data_link_count += count($query_result);
-        $replacement = '<a\1\2>';
-        $update = \Drupal::database()->update($table_name);
-        $update->expression(
-          $column,
-          "REGEXP_REPLACE($column, :pattern, :replacement)",
-          [':pattern' => $regex, ':replacement' => $replacement]
+      // Process the data and update the database.
+      // The query result is always an array.
+      foreach ($query_result as $result) {
+        if (!str_contains($result->$column, 'data-link-text=')) {
+          continue;
+        }
+        $data_without_link_text = preg_replace(
+          '/data-link-text="[^"]*"/',
+          '', $result->$column
         );
-        $update->execute();
+
+        if ($result->$column != $data_without_link_text) {
+          $data_link_count++;
+          // Update the database
+          $update = \Drupal::database()->update($table_name)
+            ->fields([$column => $data_without_link_text])
+            ->condition('entity_id', $result->entity_id)
+            ->execute();
+        }
       }
     }
   }

From d345c296d3366031669c8db2505e6978e74c961e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Thu, 15 Feb 2024 13:50:20 +0200
Subject: [PATCH 12/18] UHF-9497: Added CKEditor5 paste filter module and
 configured settings for it.

---
 composer.json                                 |  1 +
 .../install/editor.editor.full_html.yml       | 73 +++++++++++++++++++
 .../config/install/editor.editor.minimal.yml  | 73 +++++++++++++++++++
 .../install/filter.format.full_html.yml       |  2 +-
 .../config/install/filter.format.minimal.yml  |  2 +-
 .../helfi_ckeditor.ckeditor5.yml              |  3 +-
 modules/helfi_ckeditor/helfi_ckeditor.install |  7 +-
 7 files changed, 157 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 5ac09ece2..e0df5e9c7 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
         "drupal/admin_toolbar": "^3.0",
         "drupal/allowed_formats": "^2.0",
         "drupal/ckeditor": "^1.0",
+        "drupal/ckeditor5_paste_filter": "^1.0",
         "drupal/config_filter": "^2.6",
         "drupal/config_ignore": "^3.0",
         "drupal/config_rewrite": "^1.4",
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index 755d6e250..2b37cc3bb 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -44,6 +44,79 @@ settings:
         reversed: false
         startIndex: true
       multiBlock: true
+    ckeditor5_paste_filter_pasteFilter:
+      enabled: true
+      filters:
+        -
+          enabled: true
+          weight: -10
+          search: '<o:p><\/o:p>'
+          replace: ''
+        -
+          enabled: true
+          weight: -9
+          search: '(<[^>]*) (style="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -8
+          search: '(<[^>]*) (face="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -7
+          search: '(<[^>]*) (class="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -6
+          search: '(<[^>]*) (valign="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -5
+          search: '<font[^>]*>'
+          replace: ''
+        -
+          enabled: true
+          weight: -4
+          search: '<\/font>'
+          replace: ''
+        -
+          enabled: true
+          weight: -3
+          search: '<span[^>]*>'
+          replace: ''
+        -
+          enabled: true
+          weight: -2
+          search: '<\/span>'
+          replace: ''
+        -
+          enabled: true
+          weight: -1
+          search: '<p>&nbsp;<\/p>'
+          replace: ''
+        -
+          enabled: true
+          weight: 0
+          search: '<p><\/p>'
+          replace: ''
+        -
+          enabled: true
+          weight: 1
+          search: '<b><\/b>'
+          replace: ''
+        -
+          enabled: true
+          weight: 2
+          search: '<i><\/i>'
+          replace: ''
+        -
+          enabled: true
+          weight: 3
+          search: '<a name="OLE_LINK[^"]*">(.*?)<\/a>'
+          replace: $1
     ckeditor5_sourceEditing:
       allowed_tags: {  }
     helfi_ckeditor_helfi_link:
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 46eae9193..c2ac91e9d 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -26,6 +26,79 @@ settings:
         reversed: false
         startIndex: true
       multiBlock: true
+    ckeditor5_paste_filter_pasteFilter:
+      enabled: true
+      filters:
+        -
+          enabled: true
+          weight: -10
+          search: '<o:p><\/o:p>'
+          replace: ''
+        -
+          enabled: true
+          weight: -9
+          search: '(<[^>]*) (style="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -8
+          search: '(<[^>]*) (face="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -7
+          search: '(<[^>]*) (class="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -6
+          search: '(<[^>]*) (valign="[^"]*")'
+          replace: $1
+        -
+          enabled: true
+          weight: -5
+          search: '<font[^>]*>'
+          replace: ''
+        -
+          enabled: true
+          weight: -4
+          search: '<\/font>'
+          replace: ''
+        -
+          enabled: true
+          weight: -3
+          search: '<span[^>]*>'
+          replace: ''
+        -
+          enabled: true
+          weight: -2
+          search: '<\/span>'
+          replace: ''
+        -
+          enabled: true
+          weight: -1
+          search: '<p>&nbsp;<\/p>'
+          replace: ''
+        -
+          enabled: true
+          weight: 0
+          search: '<p><\/p>'
+          replace: ''
+        -
+          enabled: true
+          weight: 1
+          search: '<b><\/b>'
+          replace: ''
+        -
+          enabled: true
+          weight: 2
+          search: '<i><\/i>'
+          replace: ''
+        -
+          enabled: true
+          weight: 3
+          search: '<a name="OLE_LINK[^"]*">(.*?)<\/a>'
+          replace: $1
     ckeditor5_sourceEditing:
       allowed_tags: {  }
     helfi_ckeditor_helfi_link:
diff --git a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
index ac16cb4ff..903131f6c 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
+      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href data-entity-type data-entity-uuid data-entity-substitution data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank"> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
index c5cb8ec01..1aacba108 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p> <strong> <em> <a href data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank" data-entity-type data-entity-uuid data-entity-substitution> <ul> <ol start> <li> <span dir>'
+      allowed_html: '<br> <p> <strong> <em> <a href data-entity-type data-entity-uuid data-entity-substitution data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank"> <ul> <ol start> <li> <span dir>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
index ab8b0e641..e44d8d5e7 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
+++ b/modules/helfi_ckeditor/helfi_ckeditor.ckeditor5.yml
@@ -33,7 +33,8 @@ helfi_ckeditor_helfi_language_selector:
       helfiLanguageSelector:
         label: Select language
     elements:
-      - <span dir lang>
+      - <span>
+      - <span lang dir>
     class: Drupal\helfi_ckeditor\Plugin\CKEditor5Plugin\HelfiLanguageSelector
 
 helfi_ckeditor_helfi_quote:
diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index c791facd8..2657f643d 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -151,9 +151,14 @@ function helfi_ckeditor_update_9005(): void {
 }
 
 /**
- * UHF-9497 Import revised filter and editor formats.
+ * UHF-9497 Install CKEditor5 paste filter and import revised filter formats.
  */
 function helfi_ckeditor_update_9006(): void {
+  $module_installer = \Drupal::service('module_installer');
+
+  if (!\Drupal::moduleHandler()->moduleExists('ckeditor5_paste_filter')) {
+    $module_installer->install(['ckeditor5_paste_filter']);
+  }
   \Drupal::service('helfi_platform_config.config_update_helper')
     ->update('helfi_ckeditor');
 }

From 86ccf1cd8712f22984e32a9d5cf88005e67fb844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Thu, 15 Feb 2024 14:00:14 +0200
Subject: [PATCH 13/18] UHF-9497: Install supportive modules/extensions during
 module install.

---
 modules/helfi_ckeditor/helfi_ckeditor.install | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index 2657f643d..f527e1645 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -28,6 +28,17 @@ function helfi_ckeditor_grant_permissions() : void {
   helfi_platform_config_grant_permissions($permissions);
 }
 
+/**
+ * Installs CKEditor5 plugins and extensions.
+ */
+function helfi_ckeditor_install_ckeditor5_supportive_plugins() : void {
+  $module_installer = \Drupal::service('module_installer');
+
+  if (!\Drupal::moduleHandler()->moduleExists('ckeditor5_paste_filter')) {
+    $module_installer->install(['ckeditor5_paste_filter']);
+  }
+}
+
 /**
  * Implements hook_install().
  */
@@ -39,6 +50,7 @@ function helfi_ckeditor_install($is_syncing) : void {
   }
 
   helfi_ckeditor_grant_permissions();
+  helfi_ckeditor_install_ckeditor5_supportive_plugins();
 }
 
 /**
@@ -154,11 +166,8 @@ function helfi_ckeditor_update_9005(): void {
  * UHF-9497 Install CKEditor5 paste filter and import revised filter formats.
  */
 function helfi_ckeditor_update_9006(): void {
-  $module_installer = \Drupal::service('module_installer');
+  helfi_ckeditor_install_ckeditor5_supportive_plugins();
 
-  if (!\Drupal::moduleHandler()->moduleExists('ckeditor5_paste_filter')) {
-    $module_installer->install(['ckeditor5_paste_filter']);
-  }
   \Drupal::service('helfi_platform_config.config_update_helper')
     ->update('helfi_ckeditor');
 }

From a99821969c7006f8bed1cf666570eaeb5c67b4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Thu, 15 Feb 2024 16:40:33 +0200
Subject: [PATCH 14/18] UHF-9497: Updated CKEditor paste filter settings.

---
 .../config/install/editor.editor.full_html.yml           | 9 ++-------
 .../config/install/editor.editor.minimal.yml             | 9 ++-------
 modules/helfi_ckeditor/helfi_ckeditor.install            | 2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index 2b37cc3bb..1c0caaf63 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -85,13 +85,8 @@ settings:
         -
           enabled: true
           weight: -3
-          search: '<span[^>]*>'
-          replace: ''
-        -
-          enabled: true
-          weight: -2
-          search: '<\/span>'
-          replace: ''
+          search: '<span(?![^>]*\b(?:dir|lang)="[^"]*")[^>]*>(.*?)<\/span>'
+          replace: $1
         -
           enabled: true
           weight: -1
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index c2ac91e9d..544fd557a 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -67,13 +67,8 @@ settings:
         -
           enabled: true
           weight: -3
-          search: '<span[^>]*>'
-          replace: ''
-        -
-          enabled: true
-          weight: -2
-          search: '<\/span>'
-          replace: ''
+          search: '<span(?![^>]*\b(?:dir|lang)="[^"]*")[^>]*>(.*?)<\/span>'
+          replace: $1
         -
           enabled: true
           weight: -1
diff --git a/modules/helfi_ckeditor/helfi_ckeditor.install b/modules/helfi_ckeditor/helfi_ckeditor.install
index 026416714..768364744 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -251,7 +251,7 @@ function helfi_ckeditor_update_9007(): void {
 
         if ($result->$column != $data_without_link_text) {
           $data_link_count++;
-          // Update the database
+          // Update the database.
           $update = \Drupal::database()->update($table_name)
             ->fields([$column => $data_without_link_text])
             ->condition('entity_id', $result->entity_id)

From 4bbc4809bb291de963f5a1714eb57485a095d054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 19 Feb 2024 08:46:15 +0200
Subject: [PATCH 15/18] UHF-9497: Added ckeditor5_paste_filter as a dependency
 for the editor.editor.full_hmtl|minimal configurations.

---
 .../helfi_ckeditor/config/install/editor.editor.full_html.yml    | 1 +
 modules/helfi_ckeditor/config/install/editor.editor.minimal.yml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index 1c0caaf63..c9fde266e 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -5,6 +5,7 @@ dependencies:
     - filter.format.full_html
   module:
     - ckeditor5
+    - ckeditor5_paste_filter
 format: full_html
 editor: ckeditor5
 settings:
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 544fd557a..a3e8df516 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -5,6 +5,7 @@ dependencies:
     - filter.format.minimal
   module:
     - ckeditor5
+    - ckeditor5_paste_filter
 format: minimal
 editor: ckeditor5
 settings:

From 326ff9bdabe78c148510e754714f8eb3cf87d6f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 19 Feb 2024 12:39:08 +0200
Subject: [PATCH 16/18] UHF-9497: Added ckeditor5_paste_filter as a dependency
 for the helfi_ckeditor module.

---
 modules/helfi_ckeditor/helfi_ckeditor.info.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/helfi_ckeditor/helfi_ckeditor.info.yml b/modules/helfi_ckeditor/helfi_ckeditor.info.yml
index b01e041f2..5cfdd95d7 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.info.yml
+++ b/modules/helfi_ckeditor/helfi_ckeditor.info.yml
@@ -3,6 +3,7 @@ type: module
 core_version_requirement: '^9 || ^10'
 dependencies:
   - drupal:ckeditor5
+  - drupal:ckeditor5_paste_filter
   - drupal:filter
   - helfi_api_base:helfi_api_base
   - helfi_platform_config:helfi_platform_config

From a5bffaae182a75739ceeb6bd778463b0ed31a403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 19 Feb 2024 16:16:32 +0200
Subject: [PATCH 17/18] UHF-9497: Refined the CKEditor5 paste filter settings.

---
 .../install/editor.editor.full_html.yml       | 41 +++++++++++++------
 .../config/install/editor.editor.minimal.yml  | 41 +++++++++++++------
 2 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
index c9fde266e..bf2dd88ea 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -50,69 +50,84 @@ settings:
       filters:
         -
           enabled: true
-          weight: -10
+          weight: 0
           search: '<o:p><\/o:p>'
           replace: ''
         -
           enabled: true
-          weight: -9
+          weight: 1
           search: '(<[^>]*) (style="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -8
+          weight: 2
           search: '(<[^>]*) (face="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -7
+          weight: 3
           search: '(<[^>]*) (class="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -6
+          weight: 4
           search: '(<[^>]*) (valign="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -5
+          weight: 5
           search: '<font[^>]*>'
           replace: ''
         -
           enabled: true
-          weight: -4
+          weight: 6
           search: '<\/font>'
           replace: ''
         -
           enabled: true
-          weight: -3
+          weight: 7
           search: '<span(?![^>]*\b(?:dir|lang)="[^"]*")[^>]*>(.*?)<\/span>'
           replace: $1
         -
           enabled: true
-          weight: -1
+          weight: 8
+          search: '<p><span lang="[^"]*"><\/span><\/p>'
+          replace: ''
+        -
+          enabled: true
+          weight: 9
+          search: '<span lang="[^"]*"><\/span>'
+          replace: ''
+        -
+          enabled: true
+          weight: 10
           search: '<p>&nbsp;<\/p>'
           replace: ''
         -
           enabled: true
-          weight: 0
+          weight: 11
           search: '<p><\/p>'
           replace: ''
         -
           enabled: true
-          weight: 1
+          weight: 12
           search: '<b><\/b>'
           replace: ''
         -
           enabled: true
-          weight: 2
+          weight: 13
           search: '<i><\/i>'
           replace: ''
         -
           enabled: true
-          weight: 3
+          weight: 14
           search: '<a name="OLE_LINK[^"]*">(.*?)<\/a>'
           replace: $1
+        -
+          enabled: true
+          weight: 15
+          search: '<a name="[^"]*">(.*?)<\/a>'
+          replace: $1
     ckeditor5_sourceEditing:
       allowed_tags: {  }
     helfi_ckeditor_helfi_link:
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index a3e8df516..95ca7b926 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -32,69 +32,84 @@ settings:
       filters:
         -
           enabled: true
-          weight: -10
+          weight: 0
           search: '<o:p><\/o:p>'
           replace: ''
         -
           enabled: true
-          weight: -9
+          weight: 1
           search: '(<[^>]*) (style="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -8
+          weight: 2
           search: '(<[^>]*) (face="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -7
+          weight: 3
           search: '(<[^>]*) (class="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -6
+          weight: 4
           search: '(<[^>]*) (valign="[^"]*")'
           replace: $1
         -
           enabled: true
-          weight: -5
+          weight: 5
           search: '<font[^>]*>'
           replace: ''
         -
           enabled: true
-          weight: -4
+          weight: 6
           search: '<\/font>'
           replace: ''
         -
           enabled: true
-          weight: -3
+          weight: 7
           search: '<span(?![^>]*\b(?:dir|lang)="[^"]*")[^>]*>(.*?)<\/span>'
           replace: $1
         -
           enabled: true
-          weight: -1
+          weight: 8
+          search: '<p><span lang="[^"]*"><\/span><\/p>'
+          replace: ''
+        -
+          enabled: true
+          weight: 9
+          search: '<span lang="[^"]*"><\/span>'
+          replace: ''
+        -
+          enabled: true
+          weight: 10
           search: '<p>&nbsp;<\/p>'
           replace: ''
         -
           enabled: true
-          weight: 0
+          weight: 11
           search: '<p><\/p>'
           replace: ''
         -
           enabled: true
-          weight: 1
+          weight: 12
           search: '<b><\/b>'
           replace: ''
         -
           enabled: true
-          weight: 2
+          weight: 13
           search: '<i><\/i>'
           replace: ''
         -
           enabled: true
-          weight: 3
+          weight: 14
           search: '<a name="OLE_LINK[^"]*">(.*?)<\/a>'
           replace: $1
+        -
+          enabled: true
+          weight: 15
+          search: '<a name="[^"]*">(.*?)<\/a>'
+          replace: $1
     ckeditor5_sourceEditing:
       allowed_tags: {  }
     helfi_ckeditor_helfi_link:

From 1f3a9cae38c37752ff5caeec0b9f3edec14853ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Mon, 19 Feb 2024 16:49:09 +0200
Subject: [PATCH 18/18] UHF-9497: Reordered filter configurations.

---
 .../helfi_ckeditor/config/install/filter.format.full_html.yml   | 2 +-
 modules/helfi_ckeditor/config/install/filter.format.minimal.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
index 903131f6c..e950d0b49 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.full_html.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <a href data-entity-type data-entity-uuid data-entity-substitution data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank"> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <span dir> <blockquote data-helfi-quote> <footer data-helfi-quote-author> <cite>'
+      allowed_html: '<br> <p data-helfi-quote-text> <h2> <h3> <h4> <h5> <h6> <blockquote data-helfi-quote> <span dir> <ul> <ol start> <li> <strong> <em> <s> <sub> <sup> <a href data-entity-type data-entity-uuid data-entity-substitution data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank"> <table> <tr> <td> <th> <thead> <tbody> <footer data-helfi-quote-author> <cite>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
diff --git a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
index 1aacba108..2a136d631 100644
--- a/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/filter.format.minimal.yml
@@ -39,7 +39,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p> <strong> <em> <a href data-entity-type data-entity-uuid data-entity-substitution data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank"> <ul> <ol start> <li> <span dir>'
+      allowed_html: '<br> <p> <span dir> <ul> <ol start> <li> <a href data-entity-type data-entity-uuid data-entity-substitution data-hds-icon-start data-is-external data-protocol data-hds-component data-hds-variant rel target="_blank"> <strong> <em>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape: