From 9e6b69f20b08393d396f52a0e13c10ed05b3a8b0 Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Tue, 9 Jul 2024 10:31:20 +0100
Subject: [PATCH 01/15] Update: From ckeditor4 4.17.0 to ckeditor5 42.0.0
 (fixes #2772)

---
 .../scaffold/backboneFormsOverrides.js        |  55 ++++--
 routes/index/index.hbs                        | 156 +++++++++++++++++-
 2 files changed, 193 insertions(+), 18 deletions(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index 0c091bed8..8134e490c 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -85,7 +85,7 @@ define([
     }
 
     until(isAttached(this.$el)).then(function() {
-      this.editor = CKEDITOR.replace(this.$el[0], {
+      this.editor = CKEDITOR.create(this.$el[0], {
         dataIndentationChars: '',
         disableNativeSpellChecker: false,
         enterMode: CKEDITOR[Origin.constants.ckEditorEnterMode],
@@ -112,24 +112,45 @@ define([
             elements.forEach(function(element) { writer.setRules(element, rules); });
           }
         },
-        toolbar: [
-          { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source', '-', 'ShowBlocks' ] },
-          { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
-          { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll' ] },
-          { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv' ] },
-          { name: 'direction', items: [ 'BidiLtr', 'BidiRtl' ] },
-          '/',
-          { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'] },
-          { name: 'styles', items: [ 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] },
-          { name: 'links', items: [ 'Link', 'Unlink' ] },
-          { name: 'colors', items: [ 'TextColor', 'BGColor' ] },
-          { name: 'insert', items: [ 'SpecialChar', 'Table' ] },
-          { name: 'tools', items: [] },
-          { name: 'others', items: [ '-' ] }
-        ]
+        plugins: window.CKEDITOR.pluginsConfig,
+        toolbar: {
+          items: [
+            'sourceEditing',
+            'showBlocks',
+            'undo',
+            'redo',
+            '|',
+            'findAndReplace',
+            'selectAll',
+            '|',
+            'numberedList',
+            'bulletedList',
+            'blockQuote',
+            'indent',
+            'outdent',
+            '|',
+            'heading',
+            '|',
+            'bold',
+            'italic',
+            'underline',
+            'strikethrough',
+            'subscript',
+            'superscript',
+            'alignment',
+            'removeFormat',
+            '|',
+            'link',
+            'fontColor',
+            'fontBackgroundColor',
+            '|',
+            'specialCharacters',
+            'insertTable'
+          ],
+          shouldNotGroupWhenFull: true
+        }
       });
     }.bind(this));
-
     return this;
   };
 
diff --git a/routes/index/index.hbs b/routes/index/index.hbs
index 2ebbecf0c..356aa581c 100644
--- a/routes/index/index.hbs
+++ b/routes/index/index.hbs
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="css/adapt.css" />
     <link rel="stylesheet" href="font-awesome-4.5.0/css/font-awesome.min.css">
     <script type="text/javascript" src="modernizr.js"></script>
-    <script src="//cdn.ckeditor.com/4.17.0/full-all/ckeditor.js"></script>
+		<link rel="stylesheet" href="https://cdn.ckeditor.com/ckeditor5/42.0.0/ckeditor5.css">
     {{#if isProduction}}
       <script type="text/javascript" src="require.js" data-main="js/origin.js{{#if dateStampAsString}}?{{dateStampAsString}}{{/if}}"></script>
     {{else}}
@@ -47,5 +47,159 @@
         </div>
       </div>
     </div>
+    <script type="importmap">
+			{
+				"imports": {
+					"ckeditor5": "https://cdn.ckeditor.com/ckeditor5/42.0.0/ckeditor5.js",
+					"ckeditor5/": "https://cdn.ckeditor.com/ckeditor5/42.0.0/"
+				}
+			}
+		</script>
+    <script type="module">
+      import {
+        ClassicEditor,
+        AccessibilityHelp,
+        Alignment,
+        Autoformat,
+        AutoImage,
+        AutoLink,
+        Autosave,
+        BalloonToolbar,
+        BlockQuote,
+        BlockToolbar,
+        Bold,
+        CKBox,
+        CKBoxImageEdit,
+        Clipboard,
+        CloudServices,
+        Code,
+        CodeBlock,
+        Essentials,
+        FindAndReplace,
+        Font,
+        Heading,
+        Highlight,
+        HorizontalLine,
+        HtmlEmbed,
+        ImageBlock,
+        ImageCaption,
+        ImageInline,
+        ImageInsert,
+        ImageInsertViaUrl,
+        ImageResize,
+        ImageStyle,
+        ImageTextAlternative,
+        ImageToolbar,
+        ImageUpload,
+        Indent,
+        IndentBlock,
+        Italic,
+        Link,
+        LinkImage,
+        List,
+        ListProperties,
+        MediaEmbed,
+        Mention,
+        Paragraph,
+        PasteFromOffice,
+        PictureEditing,
+        RemoveFormat,
+        SelectAll,
+        ShowBlocks,
+        SourceEditing,
+        SpecialCharacters,
+        SpecialCharactersArrows,
+        SpecialCharactersCurrency,
+        SpecialCharactersEssentials,
+        SpecialCharactersLatin,
+        SpecialCharactersMathematical,
+        SpecialCharactersText,
+        Strikethrough,
+        Subscript,
+        Superscript,
+        Table,
+        TableCellProperties,
+        TableProperties,
+        TableToolbar,
+        TextTransformation,
+        TodoList,
+        Underline,
+        Undo
+      } from 'ckeditor5';
+      
+      window.CKEDITOR = ClassicEditor
+      window.CKEDITOR.pluginsConfig = [
+        AccessibilityHelp,
+        Alignment,
+        Autoformat,
+        AutoImage,
+        AutoLink,
+        Autosave,
+        BalloonToolbar,
+        BlockQuote,
+        BlockToolbar,
+        Bold,
+        CKBox,
+        CKBoxImageEdit,
+        Clipboard,
+        CloudServices,
+        Code,
+        CodeBlock,
+        Essentials,
+        FindAndReplace,
+        Font,
+        Heading,
+        Highlight,
+        HorizontalLine,
+        HtmlEmbed,
+        ImageBlock,
+        ImageCaption,
+        ImageInline,
+        ImageInsert,
+        ImageInsertViaUrl,
+        ImageResize,
+        ImageStyle,
+        ImageTextAlternative,
+        ImageToolbar,
+        ImageUpload,
+        Indent,
+        IndentBlock,
+        Italic,
+        Link,
+        LinkImage,
+        List,
+        ListProperties,
+        MediaEmbed,
+        Mention,
+        Paragraph,
+        PasteFromOffice,
+        PictureEditing,
+        RemoveFormat,
+        SelectAll,
+        ShowBlocks,
+        SourceEditing,
+        SpecialCharacters,
+        SpecialCharactersArrows,
+        SpecialCharactersCurrency,
+        SpecialCharactersEssentials,
+        SpecialCharactersLatin,
+        SpecialCharactersMathematical,
+        SpecialCharactersText,
+        Strikethrough,
+        Subscript,
+        Superscript,
+        Table,
+        TableCellProperties,
+        TableProperties,
+        TableToolbar,
+        TextTransformation,
+        TodoList,
+        Underline,
+        Undo
+      ];
+    </script>
+    <script>
+
+    </script>
   </body>
 </html>

From 3f68a1c326bda4e608ced63d6edec2760277f2ce Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Tue, 9 Jul 2024 10:33:05 +0100
Subject: [PATCH 02/15] Remove extra script tag

---
 routes/index/index.hbs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/routes/index/index.hbs b/routes/index/index.hbs
index 356aa581c..4aa7f59d2 100644
--- a/routes/index/index.hbs
+++ b/routes/index/index.hbs
@@ -198,8 +198,5 @@
         Undo
       ];
     </script>
-    <script>
-
-    </script>
   </body>
 </html>

From 11a57837dc832e85f7da1062c53993037438cd29 Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Tue, 9 Jul 2024 10:50:43 +0100
Subject: [PATCH 03/15] Clearup fix

---
 .../scaffold/backboneFormsOverrides.js        | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index 8134e490c..541b45c9e 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -84,8 +84,8 @@ define([
       };
     }
 
-    until(isAttached(this.$el)).then(function() {
-      this.editor = CKEDITOR.create(this.$el[0], {
+    until(isAttached(this.$el)).then(() => {
+      return CKEDITOR.create(this.$el[0], {
         dataIndentationChars: '',
         disableNativeSpellChecker: false,
         enterMode: CKEDITOR[Origin.constants.ckEditorEnterMode],
@@ -129,8 +129,6 @@ define([
             'indent',
             'outdent',
             '|',
-            'heading',
-            '|',
             'bold',
             'italic',
             'underline',
@@ -149,8 +147,15 @@ define([
           ],
           shouldNotGroupWhenFull: true
         }
-      });
-    }.bind(this));
+      }).then(editor => {
+        this.editor = editor
+        CKEDITOR.instances = CKEDITOR.instances || []
+        CKEDITOR.instances.length = CKEDITOR.instances.length || 0;
+        this.editor.id = CKEDITOR.instances.length
+        CKEDITOR.instances.length++;
+        CKEDITOR.instances[this.editor.id] = this.editor
+      })
+    });
     return this;
   };
 
@@ -170,8 +175,8 @@ define([
 
   // ckeditor removal
   Backbone.Form.editors.TextArea.prototype.remove = function() {
-    this.editor.removeAllListeners();
-    CKEDITOR.remove(this.editor);
+    this.editor.stopListening()
+    delete CKEDITOR.instances[this.editor]
   };
 
   // add override to allow prevention of validation

From d99f179e17a9e924b518456d4e3116623d34f8d9 Mon Sep 17 00:00:00 2001
From: Tom Taylor <hello@tomtaylor.name>
Date: Thu, 11 Jul 2024 10:50:57 +0100
Subject: [PATCH 04/15] Update text area styles

---
 .../src/modules/scaffold/less/textArea.less   | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/frontend/src/modules/scaffold/less/textArea.less b/frontend/src/modules/scaffold/less/textArea.less
index 1307e80f6..0814f88e2 100644
--- a/frontend/src/modules/scaffold/less/textArea.less
+++ b/frontend/src/modules/scaffold/less/textArea.less
@@ -1,26 +1,9 @@
 .field-editor {
-  .cke_chrome {
-    border-color: #ccc;
-    border-radius: 2px;
-    overflow: hidden;
-    box-shadow: none;
-    width: 93%;
-  }
-
-  .cke_top {
-    background: #eee;
-    border-color: #ccc;
-    box-shadow: none;
-  }
-
-  .cke_bottom {
-    background: @white;
-    border-color: #ccc;
-  }
+  .ck.ck-editor {
+    width: 93% !important;
 
-  .cke_toolgroup {
-    background-image: none;
-    background: @white;
-    border-color: #ccc;
+    .ck.ck-content {
+      min-height: 200px !important;
+    }
   }
 }

From faef5df3da907a95fe01dd5918e7e5125a3b2d04 Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 11 Jul 2024 11:20:05 +0100
Subject: [PATCH 05/15] Comment out potentially unneeded plugins

---
 routes/index/index.hbs | 88 +++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/routes/index/index.hbs b/routes/index/index.hbs
index 4aa7f59d2..68e1caede 100644
--- a/routes/index/index.hbs
+++ b/routes/index/index.hbs
@@ -58,51 +58,51 @@
     <script type="module">
       import {
         ClassicEditor,
-        AccessibilityHelp,
+        // AccessibilityHelp,
         Alignment,
         Autoformat,
-        AutoImage,
+        // AutoImage,
         AutoLink,
         Autosave,
         BalloonToolbar,
         BlockQuote,
         BlockToolbar,
         Bold,
-        CKBox,
-        CKBoxImageEdit,
+        // CKBox,
+        // CKBoxImageEdit,
         Clipboard,
-        CloudServices,
+        // CloudServices,
         Code,
         CodeBlock,
         Essentials,
         FindAndReplace,
         Font,
-        Heading,
+        // Heading,
         Highlight,
-        HorizontalLine,
-        HtmlEmbed,
-        ImageBlock,
-        ImageCaption,
-        ImageInline,
-        ImageInsert,
-        ImageInsertViaUrl,
-        ImageResize,
-        ImageStyle,
-        ImageTextAlternative,
-        ImageToolbar,
-        ImageUpload,
+        // HorizontalLine,
+        // HtmlEmbed,
+        // ImageBlock,
+        // ImageCaption,
+        // ImageInline,
+        // ImageInsert,
+        // ImageInsertViaUrl,
+        // ImageResize,
+        // ImageStyle,
+        // ImageTextAlternative,
+        // ImageToolbar,
+        // ImageUpload,
         Indent,
         IndentBlock,
         Italic,
         Link,
-        LinkImage,
+        // LinkImage,
         List,
         ListProperties,
-        MediaEmbed,
+        // MediaEmbed,
         Mention,
         Paragraph,
         PasteFromOffice,
-        PictureEditing,
+        // PictureEditing,
         RemoveFormat,
         SelectAll,
         ShowBlocks,
@@ -122,58 +122,58 @@
         TableProperties,
         TableToolbar,
         TextTransformation,
-        TodoList,
+        // TodoList,
         Underline,
         Undo
       } from 'ckeditor5';
       
       window.CKEDITOR = ClassicEditor
       window.CKEDITOR.pluginsConfig = [
-        AccessibilityHelp,
+        // AccessibilityHelp,
         Alignment,
         Autoformat,
-        AutoImage,
+        // AutoImage,
         AutoLink,
         Autosave,
         BalloonToolbar,
         BlockQuote,
         BlockToolbar,
         Bold,
-        CKBox,
-        CKBoxImageEdit,
+        // CKBox,
+        // CKBoxImageEdit,
         Clipboard,
-        CloudServices,
+        // CloudServices,
         Code,
         CodeBlock,
         Essentials,
         FindAndReplace,
         Font,
-        Heading,
+        // Heading,
         Highlight,
-        HorizontalLine,
-        HtmlEmbed,
-        ImageBlock,
-        ImageCaption,
-        ImageInline,
-        ImageInsert,
-        ImageInsertViaUrl,
-        ImageResize,
-        ImageStyle,
-        ImageTextAlternative,
-        ImageToolbar,
-        ImageUpload,
+        // HorizontalLine,
+        // HtmlEmbed,
+        // ImageBlock,
+        // ImageCaption,
+        // ImageInline,
+        // ImageInsert,
+        // ImageInsertViaUrl,
+        // ImageResize,
+        // ImageStyle,
+        // ImageTextAlternative,
+        // ImageToolbar,
+        // ImageUpload,
         Indent,
         IndentBlock,
         Italic,
         Link,
-        LinkImage,
+        // LinkImage,
         List,
         ListProperties,
-        MediaEmbed,
+        // MediaEmbed,
         Mention,
         Paragraph,
         PasteFromOffice,
-        PictureEditing,
+        // PictureEditing,
         RemoveFormat,
         SelectAll,
         ShowBlocks,
@@ -193,7 +193,7 @@
         TableProperties,
         TableToolbar,
         TextTransformation,
-        TodoList,
+        // TodoList,
         Underline,
         Undo
       ];

From d9ba29770e86f27d924a03c914f352f2a1c2793e Mon Sep 17 00:00:00 2001
From: Tom Taylor <hello@tomtaylor.name>
Date: Thu, 11 Jul 2024 13:28:24 +0100
Subject: [PATCH 06/15] Remove unused CKEditor plugins

---
 routes/index/index.hbs | 52 ------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/routes/index/index.hbs b/routes/index/index.hbs
index 68e1caede..3c8588260 100644
--- a/routes/index/index.hbs
+++ b/routes/index/index.hbs
@@ -58,52 +58,27 @@
     <script type="module">
       import {
         ClassicEditor,
-        // AccessibilityHelp,
         Alignment,
         Autoformat,
-        // AutoImage,
         AutoLink,
         Autosave,
         BalloonToolbar,
         BlockQuote,
         BlockToolbar,
         Bold,
-        // CKBox,
-        // CKBoxImageEdit,
         Clipboard,
-        // CloudServices,
         Code,
-        CodeBlock,
         Essentials,
         FindAndReplace,
         Font,
-        // Heading,
         Highlight,
-        // HorizontalLine,
-        // HtmlEmbed,
-        // ImageBlock,
-        // ImageCaption,
-        // ImageInline,
-        // ImageInsert,
-        // ImageInsertViaUrl,
-        // ImageResize,
-        // ImageStyle,
-        // ImageTextAlternative,
-        // ImageToolbar,
-        // ImageUpload,
         Indent,
         IndentBlock,
         Italic,
         Link,
-        // LinkImage,
         List,
         ListProperties,
-        // MediaEmbed,
-        Mention,
         Paragraph,
-        PasteFromOffice,
-        // PictureEditing,
-        RemoveFormat,
         SelectAll,
         ShowBlocks,
         SourceEditing,
@@ -122,59 +97,33 @@
         TableProperties,
         TableToolbar,
         TextTransformation,
-        // TodoList,
         Underline,
         Undo
       } from 'ckeditor5';
       
       window.CKEDITOR = ClassicEditor
       window.CKEDITOR.pluginsConfig = [
-        // AccessibilityHelp,
         Alignment,
         Autoformat,
-        // AutoImage,
         AutoLink,
         Autosave,
         BalloonToolbar,
         BlockQuote,
         BlockToolbar,
         Bold,
-        // CKBox,
-        // CKBoxImageEdit,
         Clipboard,
-        // CloudServices,
         Code,
-        CodeBlock,
         Essentials,
         FindAndReplace,
         Font,
-        // Heading,
         Highlight,
-        // HorizontalLine,
-        // HtmlEmbed,
-        // ImageBlock,
-        // ImageCaption,
-        // ImageInline,
-        // ImageInsert,
-        // ImageInsertViaUrl,
-        // ImageResize,
-        // ImageStyle,
-        // ImageTextAlternative,
-        // ImageToolbar,
-        // ImageUpload,
         Indent,
         IndentBlock,
         Italic,
         Link,
-        // LinkImage,
         List,
         ListProperties,
-        // MediaEmbed,
-        Mention,
         Paragraph,
-        PasteFromOffice,
-        // PictureEditing,
-        RemoveFormat,
         SelectAll,
         ShowBlocks,
         SourceEditing,
@@ -193,7 +142,6 @@
         TableProperties,
         TableToolbar,
         TextTransformation,
-        // TodoList,
         Underline,
         Undo
       ];

From 412b450cdd90b078de83936c3152f9771836794b Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 11 Jul 2024 16:29:19 +0100
Subject: [PATCH 07/15] Update
 frontend/src/modules/scaffold/backboneFormsOverrides.js

---
 frontend/src/modules/scaffold/backboneFormsOverrides.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index 541b45c9e..4b7b073ee 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -176,7 +176,7 @@ define([
   // ckeditor removal
   Backbone.Form.editors.TextArea.prototype.remove = function() {
     this.editor.stopListening()
-    delete CKEDITOR.instances[this.editor]
+    delete CKEDITOR.instances[this.editor.id]
   };
 
   // add override to allow prevention of validation

From bb1c3284804b9a9219f819964458e1b487a40ac6 Mon Sep 17 00:00:00 2001
From: Simon Date <simon@adaptfreelancer.com>
Date: Thu, 15 Aug 2024 11:11:04 +0100
Subject: [PATCH 08/15] Enables CKeditior html elements

---
 .../src/modules/scaffold/backboneFormsOverrides.js    | 11 ++++++++++-
 routes/index/index.hbs                                |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index 4b7b073ee..7da8d130f 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -90,7 +90,16 @@ define([
         disableNativeSpellChecker: false,
         enterMode: CKEDITOR[Origin.constants.ckEditorEnterMode],
         entities: false,
-        extraAllowedContent: Origin.constants.ckEditorExtraAllowedContent,
+        htmlSupport: {
+          allow: [
+              {
+                  name: /.*/,
+                  attributes: true,
+                  classes: true,
+                  styles: true
+              }
+          ]
+        },
         on: {
           change: function() {
             this.trigger('change', this);
diff --git a/routes/index/index.hbs b/routes/index/index.hbs
index 3c8588260..ec9764b98 100644
--- a/routes/index/index.hbs
+++ b/routes/index/index.hbs
@@ -70,6 +70,7 @@
         Code,
         Essentials,
         FindAndReplace,
+        GeneralHtmlSupport,
         Font,
         Highlight,
         Indent,
@@ -115,6 +116,7 @@
         Code,
         Essentials,
         FindAndReplace,
+        GeneralHtmlSupport,
         Font,
         Highlight,
         Indent,

From 13eba42bf29fe8bb647faad76c13ac70685ad890 Mon Sep 17 00:00:00 2001
From: Simon Date <simon@adaptfreelancer.com>
Date: Thu, 15 Aug 2024 12:21:42 +0100
Subject: [PATCH 09/15] Imports values from configuration

---
 .../src/modules/scaffold/backboneFormsOverrides.js   | 12 ++++++------
 lib/configuration.js                                 |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index 7da8d130f..b26ed0859 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -92,12 +92,12 @@ define([
         entities: false,
         htmlSupport: {
           allow: [
-              {
-                  name: /.*/,
-                  attributes: true,
-                  classes: true,
-                  styles: true
-              }
+            {
+              "name": new RegExp(Origin.constants.ckEditorExtraAllowedContent.name),
+              "attributes": Origin.constants.ckEditorExtraAllowedContent.attributes,
+              "classes": Origin.constants.ckEditorExtraAllowedContent.classes,
+              "styles": Origin.constants.ckEditorExtraAllowedContent.styles
+            }
           ]
         },
         on: {
diff --git a/lib/configuration.js b/lib/configuration.js
index c4554b125..01c6f9cef 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -32,7 +32,7 @@ var ALLOWED_CLIENT_SIDE_KEYS = [
   'useSmtp',
   'isProduction',
   'maxLoginAttempts',
-  'ckEditorExtraAllowedContent',
+  'htmlSupport',
   'ckEditorEnterMode',
   'maxFileUploadSize',
   'supportLink',
@@ -81,7 +81,7 @@ function Configuration() {
   this.conf = {
     root: this.serverRoot,
     maxLoginAttempts: 3,
-    ckEditorExtraAllowedContent: 'span(*)',
+    htmlSupport: '.*',
     maxFileUploadSize: '200MB',
     ckEditorEnterMode: 'ENTER_P'
   };

From 54633992aa76eec6648703043f3e122cc8d99ee6 Mon Sep 17 00:00:00 2001
From: Simon Date <simon@adaptfreelancer.com>
Date: Thu, 15 Aug 2024 12:40:17 +0100
Subject: [PATCH 10/15] Changed attribute name

---
 frontend/src/modules/scaffold/backboneFormsOverrides.js | 8 ++++----
 lib/configuration.js                                    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index b26ed0859..39e49ee33 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -93,10 +93,10 @@ define([
         htmlSupport: {
           allow: [
             {
-              "name": new RegExp(Origin.constants.ckEditorExtraAllowedContent.name),
-              "attributes": Origin.constants.ckEditorExtraAllowedContent.attributes,
-              "classes": Origin.constants.ckEditorExtraAllowedContent.classes,
-              "styles": Origin.constants.ckEditorExtraAllowedContent.styles
+              "name": new RegExp(Origin.constants.htmlSupportAllowed.name),
+              "attributes": Origin.constants.htmlSupportAllowed.attributes,
+              "classes": Origin.constants.htmlSupportAllowed.classes,
+              "styles": Origin.constants.htmlSupportAllowed.styles
             }
           ]
         },
diff --git a/lib/configuration.js b/lib/configuration.js
index 01c6f9cef..413d87827 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -32,7 +32,7 @@ var ALLOWED_CLIENT_SIDE_KEYS = [
   'useSmtp',
   'isProduction',
   'maxLoginAttempts',
-  'htmlSupport',
+  'htmlSupportAllowed',
   'ckEditorEnterMode',
   'maxFileUploadSize',
   'supportLink',
@@ -81,7 +81,7 @@ function Configuration() {
   this.conf = {
     root: this.serverRoot,
     maxLoginAttempts: 3,
-    htmlSupport: '.*',
+    htmlSupportAllowed: '.*',
     maxFileUploadSize: '200MB',
     ckEditorEnterMode: 'ENTER_P'
   };

From a8ea170ffa13ccf8fe3f8d3e7fc39ba619e3dbd3 Mon Sep 17 00:00:00 2001
From: Simon Date <simon@adaptfreelancer.com>
Date: Thu, 15 Aug 2024 12:48:06 +0100
Subject: [PATCH 11/15] New config object updated

---
 lib/configuration.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/configuration.js b/lib/configuration.js
index 413d87827..a2f6b75c3 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -81,7 +81,12 @@ function Configuration() {
   this.conf = {
     root: this.serverRoot,
     maxLoginAttempts: 3,
-    htmlSupportAllowed: '.*',
+    htmlSupportAllowed: {
+      name: ".*",
+      attributes: true,
+      classes: true,
+      styles: true
+    },
     maxFileUploadSize: '200MB',
     ckEditorEnterMode: 'ENTER_P'
   };

From 127fee500ebfe2049a74f8bc56785995e5a950ff Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 15 Aug 2024 14:25:43 +0100
Subject: [PATCH 12/15] Allow multiple htmlsupport rules

---
 .../modules/scaffold/backboneFormsOverrides.js | 13 +++++--------
 lib/configuration.js                           | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index 39e49ee33..e54ca1374 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -91,14 +91,11 @@ define([
         enterMode: CKEDITOR[Origin.constants.ckEditorEnterMode],
         entities: false,
         htmlSupport: {
-          allow: [
-            {
-              "name": new RegExp(Origin.constants.htmlSupportAllowed.name),
-              "attributes": Origin.constants.htmlSupportAllowed.attributes,
-              "classes": Origin.constants.htmlSupportAllowed.classes,
-              "styles": Origin.constants.htmlSupportAllowed.styles
-            }
-          ]
+          // Convert all allow/disallow values to regexp, as config is json only
+          allow: ((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allow) || [])
+            .map(obj => Object.fromEntries(Object.entries(obj).map(([name, value]) => ([name, new RegExp(value)])))),
+          disallow: ((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.disallow) || [])
+            .map(obj => Object.fromEntries(Object.entries(obj).map(([name, value]) => ([name, new RegExp(value)]))))
         },
         on: {
           change: function() {
diff --git a/lib/configuration.js b/lib/configuration.js
index a2f6b75c3..f4d7f10de 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -32,7 +32,7 @@ var ALLOWED_CLIENT_SIDE_KEYS = [
   'useSmtp',
   'isProduction',
   'maxLoginAttempts',
-  'htmlSupportAllowed',
+  'ckEditorHtmlSupport',
   'ckEditorEnterMode',
   'maxFileUploadSize',
   'supportLink',
@@ -81,11 +81,17 @@ function Configuration() {
   this.conf = {
     root: this.serverRoot,
     maxLoginAttempts: 3,
-    htmlSupportAllowed: {
-      name: ".*",
-      attributes: true,
-      classes: true,
-      styles: true
+    ckEditorHtmlSupport: {
+      allow: [{
+        name: "^(blockquote|ul|ol|span)$"
+      },{
+        name: ".*",
+        classes: ".*",
+        styles: ".*"
+      },{
+        name: "^a$",
+        attributes: "^target$"
+      }]
     },
     maxFileUploadSize: '200MB',
     ckEditorEnterMode: 'ENTER_P'

From 2f1d2feb9d61f511f4d28ab67d87c8cfa58df2b3 Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 15 Aug 2024 14:58:21 +0100
Subject: [PATCH 13/15] Allow complex htmlSupport rules

---
 .../scaffold/backboneFormsOverrides.js        | 31 ++++++++++++++++---
 lib/configuration.js                          |  8 +++--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index e54ca1374..bf19548d8 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -84,6 +84,31 @@ define([
       };
     }
 
+    function convertStringsToRegExDeep (arr) {
+      function processEntry ([key, value]) {
+        if (typeof value === "string") {
+          return [
+            key,
+            new RegExp(value, 'i')
+          ];
+        }
+        if (Array.isArray(value)) {
+          return [
+            key,
+            arr.map((value, index) => processEntry([index, value])[1])
+          ];
+        }
+        if (typeof value === "object" && value !== null) {
+          return [
+            key,
+            Object.fromEntries(Object.entries(value).map(processEntry))
+          ];
+        }
+        return [key, value];
+      }
+      return arr.map((value, index) => processEntry([index, value])[1])
+    }
+
     until(isAttached(this.$el)).then(() => {
       return CKEDITOR.create(this.$el[0], {
         dataIndentationChars: '',
@@ -92,10 +117,8 @@ define([
         entities: false,
         htmlSupport: {
           // Convert all allow/disallow values to regexp, as config is json only
-          allow: ((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allow) || [])
-            .map(obj => Object.fromEntries(Object.entries(obj).map(([name, value]) => ([name, new RegExp(value)])))),
-          disallow: ((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.disallow) || [])
-            .map(obj => Object.fromEntries(Object.entries(obj).map(([name, value]) => ([name, new RegExp(value)]))))
+          allow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allow) || []),
+          disallow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.disallow) || [])
         },
         on: {
           change: function() {
diff --git a/lib/configuration.js b/lib/configuration.js
index f4d7f10de..03f039d3d 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -86,11 +86,13 @@ function Configuration() {
         name: "^(blockquote|ul|ol|span)$"
       },{
         name: ".*",
-        classes: ".*",
-        styles: ".*"
+        classes: true,
+        styles: true
       },{
         name: "^a$",
-        attributes: "^target$"
+        attributes: {
+          target: true
+        }
       }]
     },
     maxFileUploadSize: '200MB',

From 6e56c37cd37f1b9f67e6eb663fec904df9a85f9c Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 15 Aug 2024 15:02:31 +0100
Subject: [PATCH 14/15] Updated comment

---
 frontend/src/modules/scaffold/backboneFormsOverrides.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index bf19548d8..c0d85fc1a 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -116,7 +116,7 @@ define([
         enterMode: CKEDITOR[Origin.constants.ckEditorEnterMode],
         entities: false,
         htmlSupport: {
-          // Convert all allow/disallow values to regexp, as config is json only
+          // Convert all allow/disallow strings to regexp, as config is json only
           allow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allow) || []),
           disallow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.disallow) || [])
         },

From 3a21ebbe16cfa87b321d3fe5fc4c50b5c77b4e34 Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 15 Aug 2024 15:14:37 +0100
Subject: [PATCH 15/15] Reduced code footprint

---
 .../scaffold/backboneFormsOverrides.js        | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/frontend/src/modules/scaffold/backboneFormsOverrides.js b/frontend/src/modules/scaffold/backboneFormsOverrides.js
index c0d85fc1a..2485ea109 100644
--- a/frontend/src/modules/scaffold/backboneFormsOverrides.js
+++ b/frontend/src/modules/scaffold/backboneFormsOverrides.js
@@ -86,24 +86,13 @@ define([
 
     function convertStringsToRegExDeep (arr) {
       function processEntry ([key, value]) {
-        if (typeof value === "string") {
-          return [
-            key,
-            new RegExp(value, 'i')
-          ];
-        }
-        if (Array.isArray(value)) {
-          return [
-            key,
-            arr.map((value, index) => processEntry([index, value])[1])
-          ];
-        }
-        if (typeof value === "object" && value !== null) {
-          return [
-            key,
-            Object.fromEntries(Object.entries(value).map(processEntry))
-          ];
-        }
+        value = (typeof value === "string")
+          ? new RegExp(value, 'i')
+          : Array.isArray(value)
+            ? arr.map((value, index) => processEntry([index, value])[1])
+            : (typeof value === "object" && value !== null)
+              ? Object.fromEntries(Object.entries(value).map(processEntry))
+              : value;
         return [key, value];
       }
       return arr.map((value, index) => processEntry([index, value])[1])