From ea4932a1a226cd9c8ccf77f6e3ef49b35d5bb076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 10 Apr 2024 14:16:47 +0300
Subject: [PATCH 1/5] UHF-9280: Added <chat-trigger> tag to filter and editor
 configurations.

---
 .../helfi_ckeditor/config/install/editor.editor.full_html.yml  | 1 +
 .../helfi_ckeditor/config/install/editor.editor.minimal.yml    | 3 ++-
 .../helfi_ckeditor/config/install/filter.format.full_html.yml  | 2 +-
 .../helfi_ckeditor/config/install/filter.format.minimal.yml    | 2 +-
 4 files changed, 5 insertions(+), 3 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 899e1cb0c..adf81427c 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -132,6 +132,7 @@ settings:
       allowed_tags:
         - '<figure tabindex>'
         - '<figcaption>'
+        - '<chat-trigger data-chat-trigger>'
     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">'
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 95ca7b926..9a79d4c83 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -111,7 +111,8 @@ settings:
           search: '<a name="[^"]*">(.*?)<\/a>'
           replace: $1
     ckeditor5_sourceEditing:
-      allowed_tags: {  }
+      allowed_tags:
+        - '<chat-trigger data-chat-trigger>'
     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">'
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 97d6ad876..812e6e819 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 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> <figure tabindex> <figcaption>'
+      allowed_html: '<br> <chat-trigger data-chat-trigger> <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> <figure tabindex> <figcaption>'
       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 2a136d631..aa384b4a2 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 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>'
+      allowed_html: '<br> <chat-trigger data-chat-trigger> <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:

From 6c37e06f12e97da8ed4db4fbac2cd203aeeb2e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 10 Apr 2024 14:17:57 +0300
Subject: [PATCH 2/5] UHF-9280: Added an update hook to update ckeditor
 configurations.

---
 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 dafc2dc1c..40a71218e 100644
--- a/modules/helfi_ckeditor/helfi_ckeditor.install
+++ b/modules/helfi_ckeditor/helfi_ckeditor.install
@@ -270,9 +270,9 @@ function helfi_ckeditor_update_9007(): void {
 }
 
 /**
- * UHF-9497 Added missing figcaption and figure elements.
+ * UHF-9497 Added chat-trigger element to ckeditor configurations.
  */
-function helfi_ckeditor_update_9008(): void {
+function helfi_ckeditor_update_9009(): void {
   \Drupal::service('helfi_platform_config.config_update_helper')
     ->update('helfi_ckeditor');
 }

From 23684cf9953eb290e2cd1e28d5f78c00f33c878e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 10 Apr 2024 16:25:13 +0300
Subject: [PATCH 3/5] UHF-9280: Switched the chat-trigger tag to paragraph
 data-attribute.

---
 .../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 adf81427c..e5362be1a 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.full_html.yml
@@ -132,7 +132,7 @@ settings:
       allowed_tags:
         - '<figure tabindex>'
         - '<figcaption>'
-        - '<chat-trigger data-chat-trigger>'
+        - '<p data-chat-trigger>'
     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">'
diff --git a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
index 9a79d4c83..e3cd02503 100644
--- a/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
+++ b/modules/helfi_ckeditor/config/install/editor.editor.minimal.yml
@@ -112,7 +112,7 @@ settings:
           replace: $1
     ckeditor5_sourceEditing:
       allowed_tags:
-        - '<chat-trigger data-chat-trigger>'
+        - '<p data-chat-trigger>'
     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">'
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 812e6e819..b6c649654 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> <chat-trigger data-chat-trigger> <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> <figure tabindex> <figcaption>'
+      allowed_html: '<br> <p data-chat-trigger 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> <figure tabindex> <figcaption>'
       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 aa384b4a2..63ab30eca 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> <chat-trigger data-chat-trigger> <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>'
+      allowed_html: '<br> <p data-chat-trigger> <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:

From 7d31f9ecb9d7f8b14dbd9f32205a15db55b154d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 10 Apr 2024 16:29:41 +0300
Subject: [PATCH 4/5] UHF-9280: Added a small documentation.

---
 modules/helfi_ckeditor/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/helfi_ckeditor/README.md b/modules/helfi_ckeditor/README.md
index 7fe519a8d..6bffa6142 100644
--- a/modules/helfi_ckeditor/README.md
+++ b/modules/helfi_ckeditor/README.md
@@ -28,6 +28,11 @@ Related files.
 - `package.json and package-lock.json` : Defines the node modules and scripts for compiling the theme.
 - `webpack.config.js` : Configuration file for the webpack-tool
 
+## Features
+
+### Chat trigger
+Hel.fi CKEditor supports data-attribute for opening a chat from a button/link in content. To use this feature add  `<p data-chat-trigger="#trigger-listener">Open chat</p>` to CKEditor source.
+
 ## Known issues
 
 ### My CKEditor plugin custom elements/attributes do not appear on the "Allowed HTML tags" list

From a189ca24685df6e5f0ba21e2672e09b4aede86e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 10 Apr 2024 16:32:31 +0300
Subject: [PATCH 5/5] Update README.md

---
 modules/helfi_ckeditor/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/helfi_ckeditor/README.md b/modules/helfi_ckeditor/README.md
index 6bffa6142..d1d899b6f 100644
--- a/modules/helfi_ckeditor/README.md
+++ b/modules/helfi_ckeditor/README.md
@@ -31,7 +31,8 @@ Related files.
 ## Features
 
 ### Chat trigger
-Hel.fi CKEditor supports data-attribute for opening a chat from a button/link in content. To use this feature add  `<p data-chat-trigger="#trigger-listener">Open chat</p>` to CKEditor source.
+The Hel.fi CKEditor supports a data attribute for opening a chat from a button or link within content. To utilize this feature, add `<p data-chat-trigger="#trigger-listener">Open chat</p>` to the CKEditor source.
+
 
 ## Known issues