TD-4180: Moved client side validations to server side.

ArunimaGeorge · ArunimaGeorge · commit 9c41649c922e · 2024-12-17T16:34:00.000Z
diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -476,6 +476,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
 
             if (accountCreation.CountryId == "1")
             {
+                await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
                 var regionData = await this.regionService.GetAllPagedAsync(accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
                 return this.View(new AccountCreationListViewModel { Region = regionData.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = regionData.Item1, PageSize = UserRegistrationContentPageSize, HasItems = regionData.Item1 > 0, CurrentPage = accountCreationViewModel.CurrentPageIndex }, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
@@ -537,7 +538,7 @@ public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreat
 
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.RegionId))
             {
-                if (accountCreation.CountryId == "1")
+                if (accountCreation.CountryId == "1" || accountCreation.CountryId == null)
                 {
                     this.ModelState.AddModelError("RegionId", CommonValidationErrorMessages.RegionRequired);
                     var region = await this.regionService.GetAllPagedAsync(1, UserRegistrationContentPageSize);
@@ -748,7 +749,7 @@ public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationVi
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.GradeId) || !gradeCheck)
             {
                 int gradePageSize = UserRegistrationContentPageSize + 5;
-                this.ModelState.AddModelError(string.Empty, CommonValidationErrorMessages.GradeRequired);
+                this.ModelState.AddModelError("GradeId", CommonValidationErrorMessages.GradeRequired);
                 var gradeLevel = await this.gradeService.GetPagedGradesForJobRoleAsync(int.Parse(accountCreation.CurrentRole), 1, gradePageSize);
                 return this.View("CreateAccountGradeSelection", new AccountCreationListViewModel { GradeList = gradeLevel.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = gradeLevel.Item1, PageSize = gradePageSize, HasItems = gradeLevel.Item1 > 0, CurrentPage = 1 }, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -128,7 +128,7 @@
 		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
 		<PackageReference Include="MK.IO" Version="1.5.0" />
-		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.25" />
+		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.26" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySelection.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Select Country";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     bool returnToConfirmation = false;
     if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnToConfirmation"]))
@@ -25,7 +26,7 @@
                 
                 @if (errorHasOccurred)
                 {
-                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FilterText) })" />
+                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FilterText), nameof(Model.CountryId) })" />
                 }
                 <h1 class="nhsuk-heading-xl">Search results for @Model.FilterText</h1>
                 <form asp-controller="Account" asp-action="CreateAccountCountrySelection" method="get">
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Current Role";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     bool returnToConfirmation = false;
     if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnToConfirmation"]))
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountEmailVerification.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountEmailVerification.cshtml
@@ -7,6 +7,7 @@
 
 @{
     ViewData["Title"] = "Email Verification";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     bool returnToConfirmation = false;
     if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnToConfirmation"]))
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountGradeSelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountGradeSelection.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Select Grade";
+    ViewData["DisableValidation"] = true;
     string currentRole = !string.IsNullOrWhiteSpace(Context.Request.Query["CurrentRole"]) ? Context.Request.Query["CurrentRole"] : Model.CurrentRole;
     var routeData = new Dictionary<string, string> { { "CurrentRole", currentRole }, { "ReturnToConfirmation", Context.Request.Query["returnToConfirmation"] } };
     var errorHasOccurred = !ViewData.ModelState.IsValid;
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml
@@ -6,6 +6,7 @@
 
 @{
     ViewData["Title"] = "Personal details";
+    ViewData["DisableValidation"] = true;
     string email = ViewBag.ValidatedEmail;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     AccountCreationTypeEnum accountCreationType = ViewBag.AccountCreationType;
@@ -49,7 +50,7 @@
                     <input type="hidden" name="formSubmission" value="true">
                     @if (errorHasOccurred)
                     {
-                        <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
+                        <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FirstName),nameof(Model.LastName) })" />
                     }
 
                     <vc:text-input asp-for="FirstName"
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
@@ -4,6 +4,7 @@
 
 @{
     ViewData["Title"] = "Primary Specialty";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     string grade = !string.IsNullOrWhiteSpace(Context.Request.Query["gradeId"]) ? Context.Request.Query["gradeId"] : Model.GradeId;
     string regNo = !string.IsNullOrWhiteSpace(Context.Request.Query["registrationNumber"]) ? Context.Request.Query["registrationNumber"] : Model.RegistrationNumber;
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountRegionSelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountRegionSelection.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Region";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     var routeData = new Dictionary<string, string> { { "ReturnToConfirmation", Context.Request.Query["returnToConfirmation"] } };
 }
@@ -16,7 +17,7 @@
                 <vc:back-link asp-controller="Account" asp-action="CreateAccountCountrySelection" asp-all-route-data="@routeData" link-text="Back to: Search for your country" />
                 @if (errorHasOccurred)
                 {
-                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
+                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model.RegionId) })" />
                 }
                 <form asp-controller="Account" asp-action="CreateAccountSubmitRegionSelection" method="post">
                     <input type="hidden" name="formSubmission" value="true">
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlace.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlace.cshtml
@@ -4,6 +4,7 @@
 
 @{
     ViewData["Title"] = "Work Place";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     TextInfo textInfo = CultureInfo.CurrentCulture.TextInfo;
     bool returnToConfirmation = false;
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkStartDate.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkStartDate.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Start Date";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     var exampleDate = DateTime.Today;
     var hintTextLines = new List<string> { $"Enter the date you started your current role, for example, 24 08 2021" };
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -116,8 +116,11 @@
         <script type="text/javascript" src="~/lib/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/jquery.matchHeight.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/site.js" asp-append-version="true"></script>
-        <script type="text/javascript" src="~/lib/jquery-validation/dist/jquery.validate.min.js" asp-append-version="true"></script>
-        <script type="text/javascript" src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js" asp-append-version="true"></script>
+        @if (!ViewData["DisableValidation"]?.Equals(true) ?? true)
+        {
+            <script type="text/javascript" src="~/lib/jquery-validation/dist/jquery.validate.min.js" asp-append-version="true"></script>
+            <script type="text/javascript" src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js" asp-append-version="true"></script>
+        }
     </environment>
     <environment exclude="Development">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"
@@ -127,20 +130,23 @@
                 crossorigin="anonymous"
                 integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=">
         </script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.5/jquery.validate.min.js"
-                asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
-                asp-fallback-test="window.jQuery && window.jQuery.validator"
-                asp-suppress-fallback-integrity="true"
-                crossorigin="anonymous"
-                integrity="sha512-rstIgDs0xPgmG6RX1Aba4KV5cWJbAMcvRCVmglpam9SoHZiUCyQVDdH2LPlxoHtrv17XWblE/V/PP+Tr04hbtA==">
-        </script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/4.0.0/jquery.validate.unobtrusive.min.js"
-                asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+        @if (!ViewData["DisableValidation"]?.Equals(true) ?? true)
+        {
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.5/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            asp-suppress-fallback-integrity="true"
+            crossorigin="anonymous"
+            integrity="sha512-rstIgDs0xPgmG6RX1Aba4KV5cWJbAMcvRCVmglpam9SoHZiUCyQVDdH2LPlxoHtrv17XWblE/V/PP+Tr04hbtA==">
+            </script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/4.0.0/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
                 asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
                 asp-suppress-fallback-integrity="true"
                 crossorigin="anonymous"
                 integrity="sha512-xq+Vm8jC94ynOikewaQXMEkJIOBp7iArs3IhFWSWdRT3Pq8wFz46p+ZDFAR7kHnSFf+zUv52B3prRYnbDRdgog==">
         </script>
+        }
         <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/jquery.matchHeight.min.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/site.min.js" asp-append-version="true"></script>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,5 +1,7 @@
-<environment include="Development">
-    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+@if (!ViewData["DisableValidation"]?.Equals(true) ?? true)
+{
+    <environment include="Development">
+        <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
 <environment exclude="Development">
@@ -16,6 +18,7 @@
             integrity="sha256-9GycpJnliUjJDVDqP0UEu/bsm9U+3dnQUH8+3W10vkY=">
     </script>
 </environment>
+}
 <script type="text/javascript">
     // Add/remove class 'input-validation-error' to the div containing the control with error
 

Original file line number	Diff line number	Diff line change
`@@ -476,6 +476,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie`
`476`	`476`
`477`	`477`	`if (accountCreation.CountryId == "1")`
`478`	`478`	`{`
	`479`	`+ await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);`
`479`	`480`	`var regionData = await this.regionService.GetAllPagedAsync(accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);`
`480`	`481`	`return this.View(new AccountCreationListViewModel { Region = regionData.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = regionData.Item1, PageSize = UserRegistrationContentPageSize, HasItems = regionData.Item1 > 0, CurrentPage = accountCreationViewModel.CurrentPageIndex }, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });`
`481`	`482`	`}`
`@@ -537,7 +538,7 @@ public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreat`
`537`	`538`
`538`	`539`	`if (string.IsNullOrWhiteSpace(accountCreationViewModel.RegionId))`
`539`	`540`	`{`
`540`		`- if (accountCreation.CountryId == "1")`
	`541`	`+ if (accountCreation.CountryId == "1" \|\| accountCreation.CountryId == null)`
`541`	`542`	`{`
`542`	`543`	`this.ModelState.AddModelError("RegionId", CommonValidationErrorMessages.RegionRequired);`
`543`	`544`	`var region = await this.regionService.GetAllPagedAsync(1, UserRegistrationContentPageSize);`
`@@ -748,7 +749,7 @@ public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationVi`
`748`	`749`	`if (string.IsNullOrWhiteSpace(accountCreationViewModel.GradeId) \|\| !gradeCheck)`
`749`	`750`	`{`
`750`	`751`	`int gradePageSize = UserRegistrationContentPageSize + 5;`
`751`		`- this.ModelState.AddModelError(string.Empty, CommonValidationErrorMessages.GradeRequired);`
	`752`	`+ this.ModelState.AddModelError("GradeId", CommonValidationErrorMessages.GradeRequired);`
`752`	`753`	`var gradeLevel = await this.gradeService.GetPagedGradesForJobRoleAsync(int.Parse(accountCreation.CurrentRole), 1, gradePageSize);`
`753`	`754`	`return this.View("CreateAccountGradeSelection", new AccountCreationListViewModel { GradeList = gradeLevel.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = gradeLevel.Item1, PageSize = gradePageSize, HasItems = gradeLevel.Item1 > 0, CurrentPage = 1 }, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });`
`754`	`755`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`@{`
`5`	`5`	`ViewData["Title"] = "Select Country";`
	`6`	`+ ViewData["DisableValidation"] = true;`
`6`	`7`	`var errorHasOccurred = !ViewData.ModelState.IsValid;`
`7`	`8`	`bool returnToConfirmation = false;`
`8`	`9`	`if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnToConfirmation"]))`
`@@ -25,7 +26,7 @@`
`25`	`26`
`26`	`27`	`@if (errorHasOccurred)`
`27`	`28`	`{`
`28`		`- <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FilterText) })" />`
	`29`	`+ <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FilterText), nameof(Model.CountryId) })" />`
`29`	`30`	`}`
`30`	`31`	`<h1 class="nhsuk-heading-xl">Search results for @Model.FilterText</h1>`
`31`	`32`	`<form asp-controller="Account" asp-action="CreateAccountCountrySelection" method="get">`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`@{`
`8`	`8`	`ViewData["Title"] = "Personal details";`
	`9`	`+ ViewData["DisableValidation"] = true;`
`9`	`10`	`string email = ViewBag.ValidatedEmail;`
`10`	`11`	`var errorHasOccurred = !ViewData.ModelState.IsValid;`
`11`	`12`	`AccountCreationTypeEnum accountCreationType = ViewBag.AccountCreationType;`
`@@ -49,7 +50,7 @@`
`49`	`50`	`<input type="hidden" name="formSubmission" value="true">`
`50`	`51`	`@if (errorHasOccurred)`
`51`	`52`	`{`
`52`		`- <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />`
	`53`	`+ <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FirstName),nameof(Model.LastName) })" />`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`<vc:text-input asp-for="FirstName"`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`@{`
`5`	`5`	`ViewData["Title"] = "Region";`
	`6`	`+ ViewData["DisableValidation"] = true;`
`6`	`7`	`var errorHasOccurred = !ViewData.ModelState.IsValid;`
`7`	`8`	`var routeData = new Dictionary<string, string> { { "ReturnToConfirmation", Context.Request.Query["returnToConfirmation"] } };`
`8`	`9`	`}`
`@@ -16,7 +17,7 @@`
`16`	`17`	`<vc:back-link asp-controller="Account" asp-action="CreateAccountCountrySelection" asp-all-route-data="@routeData" link-text="Back to: Search for your country" />`
`17`	`18`	`@if (errorHasOccurred)`
`18`	`19`	`{`
`19`		`- <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />`
	`20`	`+ <vc:error-summary order-of-property-names="@(new[] { nameof(Model.RegionId) })" />`
`20`	`21`	`}`
`21`	`22`	`<form asp-controller="Account" asp-action="CreateAccountSubmitRegionSelection" method="post">`
`22`	`23`	`<input type="hidden" name="formSubmission" value="true">`