From 0ca243dd5788ccb226aeac17dddec6eae680f10a Mon Sep 17 00:00:00 2001
From: Rohit Shrivastava <Rohit.Shrivastava@hee.nhs.uk>
Date: Wed, 9 Oct 2024 08:15:24 +0100
Subject: [PATCH] TD-4333 Making Course Admin Fields Optional Again

---
 .../NewlineSeparatedStringListHelper.cs       |   2 +-
 .../CourseSetup/AdminFieldAnswersViewModel.cs |   1 -
 .../AdminFields/AddAdminField.cshtml          |   2 +-
 .../AdminFields/EditAdminField.cshtml         | 101 +++++++++---------
 4 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/DigitalLearningSolutions.Data/Helpers/NewlineSeparatedStringListHelper.cs b/DigitalLearningSolutions.Data/Helpers/NewlineSeparatedStringListHelper.cs
index e00f8d560a..12dd4ff09d 100644
--- a/DigitalLearningSolutions.Data/Helpers/NewlineSeparatedStringListHelper.cs
+++ b/DigitalLearningSolutions.Data/Helpers/NewlineSeparatedStringListHelper.cs
@@ -17,7 +17,7 @@ public static string RemoveStringFromNewlineSeparatedList(string list, int index
         public static string AddStringToNewlineSeparatedList(string? list, string newItem)
         {
             var options = list != null ? SplitNewlineSeparatedList(list) : new List<string>();
-            options.Add(newItem.Trim());
+            options.Add(newItem?.Trim());
             return JoinNewlineSeparatedList(options);
         }
 
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/AdminFieldAnswersViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/AdminFieldAnswersViewModel.cs
index 0949508854..cb92d6d0f4 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/AdminFieldAnswersViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/AdminFieldAnswersViewModel.cs
@@ -23,7 +23,6 @@ public AdminFieldAnswersViewModel(
 
         public List<string> Options => NewlineSeparatedStringListHelper.SplitNewlineSeparatedList(OptionsString);
 
-        [Required(ErrorMessage = "Enter a response")]
         [MaxLength(100, ErrorMessage = "Response must be 100 characters or fewer")]
         public string? Answer { get; set; }
 
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml
index dc4bd6aa3f..fa3505a2ee 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml
@@ -53,7 +53,7 @@
                          autocomplete=""
                          hint-text=""
                          css-class="nhsuk-u-width-full"
-                         required="true" />
+                         required="false" />
           <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
         </div>
       </div>
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml
index 070d2628b9..6e9712781d 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml
@@ -6,65 +6,66 @@
 <link rel="stylesheet" href="@Url.Content("~/css/shared/cardWithButtons.css")" asp-append-version="true">
 
 @{
-  var errorHasOccurred = !ViewData.ModelState.IsValid;
-  ViewData["Title"] = errorHasOccurred ? "Error: Edit course admin field" : "Edit course admin field";
-  var cancelLinkData = Html.GetRouteValues();
+    var errorHasOccurred = !ViewData.ModelState.IsValid;
+    ViewData["Title"] = errorHasOccurred ? "Error: Edit course admin field" : "Edit course admin field";
+    var cancelLinkData = Html.GetRouteValues();
 }
 
 <div class="nhsuk-grid-row">
-  <div class="nhsuk-grid-column-full">
-    @if (errorHasOccurred) {
-      <vc:error-summary order-of-property-names="@(new []{ nameof(EditAdminFieldViewModel.OptionsString), nameof(EditAdminFieldViewModel.Answer)})" />
-    }
-    <h1 class="nhsuk-heading-xl">Edit course admin field</h1>
+    <div class="nhsuk-grid-column-full">
+        @if (errorHasOccurred)
+        {
+            <vc:error-summary order-of-property-names="@(new []{ nameof(EditAdminFieldViewModel.OptionsString), nameof(EditAdminFieldViewModel.Answer)})" />
+        }
+        <h1 class="nhsuk-heading-xl">Edit course admin field</h1>
 
-    <form method="post" novalidate asp-action="EditAdminField">
-      <div class="hidden-submit">
-        <button name="action" class="nhsuk-button" value="@AdminFieldsController.AddPromptAction" aria-hidden="true" tabindex="-1">Add</button>
-      </div>
+        <form method="post" novalidate asp-action="EditAdminField">
+            <div class="hidden-submit">
+                <button name="action" class="nhsuk-button" value="@AdminFieldsController.AddPromptAction" aria-hidden="true" tabindex="-1">Add</button>
+            </div>
 
-      <input type="hidden" asp-for="OptionsString" />
-      <input type="hidden" asp-for="Prompt" />
-      <input type="hidden" asp-for="PromptNumber" />
+            <input type="hidden" asp-for="OptionsString" />
+            <input type="hidden" asp-for="Prompt" />
+            <input type="hidden" asp-for="PromptNumber" />
 
-      <vc:field-name-value-display display-name="Field" field-value="@Model.Prompt" />
+            <vc:field-name-value-display display-name="Field" field-value="@Model.Prompt" />
 
-      @if (string.IsNullOrEmpty(Model.OptionsString))
-      {
-        <partial name="_NoConfiguredAnswers" />
-      }
-      else
-      {
-        <partial name="_AdminFieldAnswerTable" model="Model" />
-      }
+            @if (string.IsNullOrEmpty(Model.OptionsString))
+            {
+                <partial name="_NoConfiguredAnswers" />
+            }
+            else
+            {
+                <partial name="_AdminFieldAnswerTable" model="Model" />
+            }
 
-      <div class="nhsuk-grid-row divider">
-        <div class="nhsuk-grid-column-one-half">
-          <vc:text-input asp-for="@nameof(Model.Answer)"
-                         label="Add a new response"
-                         populate-with-current-value="true"
-                         type="text"
-                         spell-check="true"
-                         autocomplete=""
-                         hint-text=""
-                         css-class="nhsuk-u-width-full"
-                         required="true" />
-          <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
-        </div>
-      </div>
+            <div class="nhsuk-grid-row divider">
+                <div class="nhsuk-grid-column-one-half">
+                    <vc:text-input asp-for="@nameof(Model.Answer)"
+                                   label="Add a new response"
+                                   populate-with-current-value="true"
+                                   type="text"
+                                   spell-check="true"
+                                   autocomplete=""
+                                   hint-text=""
+                                   css-class="nhsuk-u-width-full"
+                                   required="false" />
+                    <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
+                </div>
+            </div>
 
-      <div class="nhsuk-grid-row divider">
-        <div class="nhsuk-grid-column-one-half">
-          <p class="nhsuk-label">Want to edit responses in bulk?</p>
-          <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.BulkAction">Bulk edit</button>
-        </div>
-      </div>
+            <div class="nhsuk-grid-row divider">
+                <div class="nhsuk-grid-column-one-half">
+                    <p class="nhsuk-label">Want to edit responses in bulk?</p>
+                    <button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.BulkAction">Bulk edit</button>
+                </div>
+            </div>
 
-      <div class="nhsuk-u-margin-bottom-3">
-        <button name="action" class="nhsuk-button" value="@AdminFieldsController.SaveAction">Save</button>
-      </div>
-    </form>
+            <div class="nhsuk-u-margin-bottom-3">
+                <button name="action" class="nhsuk-button" value="@AdminFieldsController.SaveAction">Save</button>
+            </div>
+        </form>
 
-    <vc:cancel-link asp-controller="AdminFields" asp-action="Index" asp-all-route-data="@cancelLinkData" />
-  </div>
+        <vc:cancel-link asp-controller="AdminFields" asp-action="Index" asp-all-route-data="@cancelLinkData" />
+    </div>
 </div>