From 63ecbe4672e19839e24e86299754ee5a1f1230b6 Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Tue, 1 Sep 2026 15:50:23 +0100
Subject: [PATCH 1/4] TD-6907-ManageOptionalCompetenciesPrompt max length
 validation added.

---
 .../CompetencyAssessments.cs                              | 8 ++++++--
 .../SetOptionalCompetencyLearnerPromptViewModel.cs        | 4 ++++
 .../SetOptionalCompetencyLearnerPrompt.cshtml             | 7 ++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
index 25888699d5..8e37943c5f 100644
--- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
+++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -775,9 +775,13 @@ public IActionResult SetOptionalCompetencyLearnerPrompt(int competencyAssessment
         }
         [HttpPost]
         [Route("/Self-Assessment/{competencyAssessmentId}/{vocabularyPlural}/Optional/LearnerPrompt")]
-        public IActionResult SetOptionalCompetencyLearnerPrompt(SetOptionalCompetencyLearnerPromptFormData model)
+        public IActionResult SetOptionalCompetencyLearnerPrompt(SetOptionalCompetencyLearnerPromptViewModel model)
         {
-            
+            if (model.ManageOptionalCompetenciesPrompt?.Length > 1000)
+            {
+                ModelState.AddModelError(nameof(model.ManageOptionalCompetenciesPrompt), "Prompt text must be 1000 characters or fewer");
+                return View("SetOptionalCompetencyLearnerPrompt", model);
+            }
             competencyAssessmentService.UpdateManageOptionalCompetenciesPrompt(model.ID, model.ManageOptionalCompetenciesPrompt);
             return RedirectToAction("ManageOptionalCompetencies", new { competencyAssessmentId = model.ID, vocabularyPlural = model.VocabularyPlural });
         }
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SetOptionalCompetencyLearnerPromptViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SetOptionalCompetencyLearnerPromptViewModel.cs
index 7c58320f22..ac2fa489a1 100644
--- a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SetOptionalCompetencyLearnerPromptViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SetOptionalCompetencyLearnerPromptViewModel.cs
@@ -7,6 +7,10 @@
 
     public class SetOptionalCompetencyLearnerPromptViewModel : SetOptionalCompetencyLearnerPromptFormData
     {
+        public SetOptionalCompetencyLearnerPromptViewModel()
+        {
+        }
+
         public SetOptionalCompetencyLearnerPromptViewModel(CompetencyAssessmentBase competencyAssessmentBase, IEnumerable<Competency> competencies)
         {
             ID = competencyAssessmentBase.ID;
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
index 5b3329863c..33d1b16988 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
@@ -3,6 +3,7 @@
 @{
     ViewData["Title"] = $"Set optional {Model.VocabularyPlural.ToLower()} learner prompt";
     ViewData["Application"] = "Framework service";
+    var errorHasOccurred = !ViewData.ModelState.IsValid && ViewData.ModelState.ContainsKey(nameof(Model.ManageOptionalCompetenciesPrompt));
 }
 <link rel="stylesheet" href="@Url.Content("~/css/jodit.css")" asp-append-version="true">
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
@@ -24,6 +25,10 @@
     </nav>
 }
 <div class="nhsuk-form-group">
+    @if (errorHasOccurred)
+    {
+        <vc:error-summary order-of-property-names="@(new[] { nameof(Model.ManageOptionalCompetenciesPrompt) })" />
+    }
     <h1 class="app-page-heading">
         <span class="nhsuk-caption-xl">
             @Model.CompetencyAssessmentName
@@ -45,12 +50,12 @@
                           hint-text="This text will be displayed above the optional @Model.VocabularyPlural.ToLower() list."
                           populate-with-current-value="true"
                           spell-check="false" />
-            <span nhs-validation-for="ManageOptionalCompetenciesPrompt"></span>
         </nhs-form-group>
         <input type="hidden" asp-for="ID" />
         <input type="hidden" asp-for="VocabularyPlural" />
         <input type="hidden" asp-for="VocabularySingular" />
         <input type="hidden" asp-for="PublishStatusID" />
+        <input type="hidden" asp-for="CompetencyAssessmentName" />
 
         <hr class="nhsuk-section-break nhsuk-section-break--m" />
         <button class="nhsuk-button" type="submit">

From f7e7d6c911217972463f2493a92680b1c6e13fca Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Tue, 1 Sep 2026 17:05:11 +0100
Subject: [PATCH 2/4] Message text updated

---
 .../CompetencyAssessmentsController/CompetencyAssessments.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
index 8e37943c5f..85937ac133 100644
--- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
+++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -779,7 +779,7 @@ public IActionResult SetOptionalCompetencyLearnerPrompt(SetOptionalCompetencyLea
         {
             if (model.ManageOptionalCompetenciesPrompt?.Length > 1000)
             {
-                ModelState.AddModelError(nameof(model.ManageOptionalCompetenciesPrompt), "Prompt text must be 1000 characters or fewer");
+                ModelState.AddModelError(nameof(model.ManageOptionalCompetenciesPrompt), "Prompt text cannot exceed 1000 characters.");
                 return View("SetOptionalCompetencyLearnerPrompt", model);
             }
             competencyAssessmentService.UpdateManageOptionalCompetenciesPrompt(model.ID, model.ManageOptionalCompetenciesPrompt);

From 43333093fe648a11dddfa66d51ea2c1a554314fe Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Mon, 7 Sep 2026 09:35:11 +0100
Subject: [PATCH 3/4] TD-6907- Added latest version of Jodit editor.

---
 ...02609021546_Alter_Table_SelfAssessments.cs | 23 +++++++++++++++++++
 .../CompetencyAssessments.cs                  |  9 +++++++-
 .../Scripts/frameworks/htmleditor.ts          |  2 ++
 .../Styles/jodit.scss                         |  3 ++-
 DigitalLearningSolutions.Web/package.json     |  2 +-
 DigitalLearningSolutions.Web/yarn.lock        | 18 ++++-----------
 6 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 DigitalLearningSolutions.Data.Migrations/202609021546_Alter_Table_SelfAssessments.cs

diff --git a/DigitalLearningSolutions.Data.Migrations/202609021546_Alter_Table_SelfAssessments.cs b/DigitalLearningSolutions.Data.Migrations/202609021546_Alter_Table_SelfAssessments.cs
new file mode 100644
index 0000000000..5ea9f07726
--- /dev/null
+++ b/DigitalLearningSolutions.Data.Migrations/202609021546_Alter_Table_SelfAssessments.cs
@@ -0,0 +1,23 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+    [Migration(202609021546)]
+    public class Alter_Table_SelfAssessments : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("SelfAssessments")
+                .AlterColumn("ManageOptionalCompetenciesPrompt")
+                .AsString(2000)
+                .Nullable();
+        }
+
+        public override void Down()
+        {
+            Alter.Table("SelfAssessments")
+                .AlterColumn("ManageOptionalCompetenciesPrompt")
+                .AsString(1000)
+                .Nullable();
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
index 85937ac133..10d40e1b4c 100644
--- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
+++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -777,11 +777,18 @@ public IActionResult SetOptionalCompetencyLearnerPrompt(int competencyAssessment
         [Route("/Self-Assessment/{competencyAssessmentId}/{vocabularyPlural}/Optional/LearnerPrompt")]
         public IActionResult SetOptionalCompetencyLearnerPrompt(SetOptionalCompetencyLearnerPromptViewModel model)
         {
-            if (model.ManageOptionalCompetenciesPrompt?.Length > 1000)
+            if (StringHelper.StripHtmlTags(model.ManageOptionalCompetenciesPrompt).Length > 1000)
             {
                 ModelState.AddModelError(nameof(model.ManageOptionalCompetenciesPrompt), "Prompt text cannot exceed 1000 characters.");
                 return View("SetOptionalCompetencyLearnerPrompt", model);
             }
+
+            if (model.ManageOptionalCompetenciesPrompt?.Length > 2000)
+            {
+                ModelState.AddModelError(nameof(model.ManageOptionalCompetenciesPrompt),
+                    "The formatted content is too large to save.Please reduce the content or formatting.");
+                return View("SetOptionalCompetencyLearnerPrompt", model);
+            }
             competencyAssessmentService.UpdateManageOptionalCompetenciesPrompt(model.ID, model.ManageOptionalCompetenciesPrompt);
             return RedirectToAction("ManageOptionalCompetencies", new { competencyAssessmentId = model.ID, vocabularyPlural = model.VocabularyPlural });
         }
diff --git a/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts b/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts
index 3952d26df3..a5becf079c 100644
--- a/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts
+++ b/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts
@@ -1,4 +1,5 @@
 import { Jodit } from 'jodit';
+import 'jodit/esm/plugins/all.js';
 import DOMPurify from 'dompurify';
 
 let jodited = false;
@@ -59,6 +60,7 @@ if (jodited === false) {
       'ol', '|',
       'undo', 'redo',
     ],
+    countTextSpaces: true,
     style: {
       backgroundColor: '#FFF',
     },
diff --git a/DigitalLearningSolutions.Web/Styles/jodit.scss b/DigitalLearningSolutions.Web/Styles/jodit.scss
index 416099e8f7..a4b59c85af 100644
--- a/DigitalLearningSolutions.Web/Styles/jodit.scss
+++ b/DigitalLearningSolutions.Web/Styles/jodit.scss
@@ -1,9 +1,10 @@
-@use "jodit/build/jodit.min";
+@use "jodit/es2021/jodit.min.css";
 
 .jodit-error {
   border: 2px solid red !important;
   border-radius: 4px;
 }
+
 .jodit-placeholder {
   display: none !important;
 }
diff --git a/DigitalLearningSolutions.Web/package.json b/DigitalLearningSolutions.Web/package.json
index 61e313fbfc..ca3bd09dbc 100644
--- a/DigitalLearningSolutions.Web/package.json
+++ b/DigitalLearningSolutions.Web/package.json
@@ -27,7 +27,7 @@
     "date-fns": "^2.30.0",
     "dompurify": "^2.5.9",
     "input-range-scss": "^1.5.3",
-    "jodit": "^3.24.9",
+    "jodit": "4.14.2",
     "js-cookie": "^3.0.8",
     "js-search": "^2.0.1",
     "lodash": "^4.18.1",
diff --git a/DigitalLearningSolutions.Web/yarn.lock b/DigitalLearningSolutions.Web/yarn.lock
index 798d9c8731..7dc696d698 100644
--- a/DigitalLearningSolutions.Web/yarn.lock
+++ b/DigitalLearningSolutions.Web/yarn.lock
@@ -2084,11 +2084,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-autobind-decorator@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/autobind-decorator/-/autobind-decorator-2.4.0.tgz#ea9e1c98708cf3b5b356f7cf9f10f265ff18239c"
-  integrity sha512-OGYhWUO72V6DafbF8PM8rm3EPbfuyMZcJhtm5/n26IDwO18pohE4eNazLoCGhPiXOCD0gEGmrbU3849QvM8bbw==
-
 available-typed-arrays@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
@@ -2481,7 +2476,7 @@ core-js-compat@^3.48.0:
   dependencies:
     browserslist "^4.28.1"
 
-core-js@^3.28.0, core-js@^3.49.0:
+core-js@^3.49.0:
   version "3.49.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.49.0.tgz#8b4d520ac034311fa21aa616f017ada0e0dbbddd"
   integrity sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==
@@ -4431,13 +4426,10 @@ jest@^28.1.3:
     import-local "^3.0.2"
     jest-cli "^28.1.3"
 
-jodit@^3.24.9:
-  version "3.24.9"
-  resolved "https://registry.yarnpkg.com/jodit/-/jodit-3.24.9.tgz#575a0218996f31003c230f81db0f056132dea9b5"
-  integrity sha512-t2d73v7GFbGI08ZzdCTwrzi8ZtoOG4icGzD6IIN2e+ghlpUKYxcHZ/Rmy6/mc6055172z+tv7QSr9BcOz6IOFQ==
-  dependencies:
-    autobind-decorator "^2.4.0"
-    core-js "^3.28.0"
+jodit@4.14.2:
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/jodit/-/jodit-4.14.2.tgz#bd25cef983fe3d085f63ed1798dab53249aa1048"
+  integrity sha512-+/VWCJZaRpEOVqVw+20vCf3z7SiE9zxrr6EMoFGa3EKvcDv2HEql3d5TBEWCJzecxA9z5SxPDZUHQiRpyxz98Q==
 
 js-cookie@^3.0.8:
   version "3.0.8"

From 56bc4ed46f40fedaf1e961c0af2eb10902dbb934 Mon Sep 17 00:00:00 2001
From: Auldrin-Possa <auldrin.possa@hee.nhs.uk>
Date: Mon, 7 Sep 2026 10:08:00 +0100
Subject: [PATCH 4/4] TD-6907-Allowed Jodit plugins import with .js extension

---
 DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts b/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts
index a5becf079c..b10a1c6042 100644
--- a/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts
+++ b/DigitalLearningSolutions.Web/Scripts/frameworks/htmleditor.ts
@@ -1,4 +1,5 @@
 import { Jodit } from 'jodit';
+// eslint-disable-next-line import/extensions
 import 'jodit/esm/plugins/all.js';
 import DOMPurify from 'dompurify';