TD-5390- Solved Validation Issues

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/Support/RequestSupportTicketController.cs

@@ -117,31 +117,36 @@ public IActionResult RequestSummary(DlsSubApplication dlsSubApplication, Request
             ).GetAwaiter().GetResult(); ;
             var model = new RequestSummaryViewModel(data);
             data.setRequestSubjectDetails(model);
+            if (!ModelState.IsValid)
+            {
+                ModelState.Clear();
+            }
             return View("RequestSummary", model);
         }
 
         [HttpPost]
         [Route("/{dlsSubApplication}/RequestSupport/SetRequestSummary")]
         public IActionResult SetRequestSummary(DlsSubApplication dlsSubApplication, RequestSummaryViewModel requestDetailsmodel)
         {
-            if (requestDetailsmodel.RequestSubject == null)
-            {
-                ModelState.AddModelError("RequestSubject", "Please enter request summary");
-                return View("RequestSummary", requestDetailsmodel);
-            }
-            if (requestDetailsmodel.RequestDescription == null)
+            var data = multiPageFormService.GetMultiPageFormData<RequestSupportTicketData>(
+                MultiPageFormDataFeature.AddCustomWebForm("RequestSupportTicketCWF"),
+                TempData
+                ).GetAwaiter().GetResult();
+            requestDetailsmodel.RequestType = data.RequestType;
+
+            // Check if RequestDescription is null or contains any default empty tags ("<p><br></p>").  
+            // This ensures that when a user navigates to the submit page and returns to SetRequestSummary,  
+            // removing the description completely results in an actual empty value rather than leftover HTML tags.
+            if (requestDetailsmodel.RequestDescription == "<p><br></p>")
             {
                 ModelState.AddModelError("RequestDescription", "Please enter request description");
-                return View("RequestSummary", requestDetailsmodel);
             }
+
             if (!ModelState.IsValid)
             {
                 return View("RequestSummary", requestDetailsmodel);
             }
-            var data = multiPageFormService.GetMultiPageFormData<RequestSupportTicketData>(
-                MultiPageFormDataFeature.AddCustomWebForm("RequestSupportTicketCWF"),
-                TempData
-            ).GetAwaiter().GetResult(); ;
+
             data.setRequestSubjectDetails(requestDetailsmodel);
             setRequestSupportTicketData(data);
             return RedirectToAction("RequestAttachment", new { dlsSubApplication });

DigitalLearningSolutions.Web/ViewModels/Support/RequestSupportTicket/RequestSummaryViewModel.cs

@@ -18,9 +18,14 @@ public RequestSummaryViewModel(RequestSupportTicketData data)
             RequestDescription = data.RequestDescription;
         }
         [MaxLength(250, ErrorMessage = "Summary must be 250 characters or fewer")]
+        [Required(ErrorMessage = "Please enter request summary")]
         public string? RequestSubject { get; set; }
+
+        [Required(ErrorMessage = "Please enter request description")]
         public string? RequestDescription { get; set; }
+
         public int? RequestTypeId { get; set; }
+
         public string? RequestType { get; set; }
     }
 }

DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestSummary.cshtml

@@ -4,11 +4,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.Support.RequestSupportTicket;
 @model RequestSummaryViewModel;
 @{
-    bool errorHasOccurred = false;
-    @if (Model.RequestSubject == null && !ViewData.ModelState.IsValid)
-    {
-        errorHasOccurred = true;
-    }
+    var errorHasOccurred = !ViewData.ModelState.IsValid;
     ViewData["Title"] = "Request details";
     var cancelLinkData = Html.GetRouteValues();
 }