Merge Begonai changes to master

.github/workflows/continuous-integration-workflow.yml

@@ -26,17 +26,17 @@ jobs:
       - name: Use Node 12.19
         uses: actions/setup-node@v4
         with:
-          node-version: '12.19'
-
+           node-version: '18'
+           
       - name: Install dependencies
         run: |
           cd ./Auth/LearningHub.Nhs.Auth
-          npm install -f
+          yarn install
 
       - name: Run Webpack build
         run: |
           cd ./Auth/LearningHub.Nhs.Auth
-          npm run build
+          yarn build:webpack
 
       - name: Setup MSBuild
         uses: microsoft/[email protected]

Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs

@@ -427,6 +427,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(LoginInputModel mode
         {
             var vm = await this.BuildLoginViewModelAsync(model.ReturnUrl);
             vm.Username = model.Username;
+            vm.Password = model.Password;
             vm.RememberLogin = model.RememberLogin;
             return vm;
         }

Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj

@@ -112,7 +112,7 @@
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
-		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.23" />
+		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.27" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>

Auth/LearningHub.Nhs.Auth/Views/Account/LHLogin.cshtml

@@ -2,6 +2,7 @@
 @{
   ViewData["Title"] = "Login";
   ViewData["Layout"] = "learninghub/_Layout";
+  ViewData["DisableValidation"] = true;
   // OpenAthens url needs to makes sure that the return to WebUI first hits the authorisationrequired endpoint,
   // which contains it's own redirect to within the UI.
   // If a return url is specified we want to use it for the authorisationrequired original url
@@ -54,7 +55,7 @@
 
           <vc:text-input asp-for="Username"
                        label="Enter your username"
-                       populate-with-current-value="false"
+                       populate-with-current-value="true"
                        type="text"
                        spell-check="false"
                        hint-text="A username is different to an email address"
@@ -65,7 +66,7 @@
 
           <vc:text-input asp-for="Password"
                        label="Enter your password"
-                       populate-with-current-value="false"
+                       populate-with-current-value="true"
                        type="password"
                        spell-check="false"
                        hint-text=""

Auth/LearningHub.Nhs.Auth/Views/Shared/Components/DateInput/Default.cshtml

@@ -8,7 +8,7 @@
     var yearErrorCss = Model.HasYearError ? "nhsuk-input--error" : "";
     var hintTextLine = string.Empty;
 }
-
+@* Removed pattern property *@
 <div class="@Model.CssClass @errorCss" id="@Model.Id">
     <fieldset class="nhsuk-fieldset" aria-describedby="@Model.Id-hint" role="group">
         <legend class="nhsuk-fieldset__legend nhsuk-label">
@@ -54,12 +54,12 @@
                            id="@Model.DayId"
                            name="@Model.DayId"
                            value="@Model.DayValue"
-                           type="number"
-                           pattern="[0-9]*"
+                           type="text"
                            min="1"
                            max="31"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -69,12 +69,12 @@
                            id="@Model.MonthId"
                            name="@Model.MonthId"
                            value="@Model.MonthValue"
-                           type="number"
-                           pattern="[0-9]*"
+                           type="text"
                            min="1"
                            max="12"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -84,12 +84,12 @@
                            id="@Model.YearId"
                            name="@Model.YearId"
                            value="@Model.YearValue"
-                           type="number"
-                           pattern="[0-9]*"
+                           type="text"
                            min="1900"
                            max="9999"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
         </div>

Auth/LearningHub.Nhs.Auth/Views/Shared/Components/ErrorSummary/Default.cshtml

@@ -21,6 +21,10 @@
             </ul>
         </div>
     </div>
+    <script>
+        const errorSummary = document.querySelector("#error-summary-title").parentElement;
+        errorSummary.focus();
+    </script>
 }
 else
 {

Auth/LearningHub.Nhs.Auth/Views/Shared/Components/RadioList/Default.cshtml

@@ -9,7 +9,7 @@
 
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
 
-    <fieldset class="nhsuk-fieldset" aria-describedby="@(!string.IsNullOrEmpty(Model.HintText) ? $"{Model.Label.RemoveWhitespace()}-hint" : string.Empty)">
+    <fieldset id="@Model.AspFor" class="nhsuk-fieldset" aria-describedby="@(!string.IsNullOrEmpty(Model.HintText) ? $"{Model.Label.RemoveWhitespace()}-hint" : string.Empty)">
         <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
             @if (Model.IsPageHeading.GetValueOrDefault() == true)
             {
@@ -44,7 +44,7 @@
 
         @if (Model.Required && !Model.HasError)
         {
-            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
+            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3" aria-live="assertive" role="alert">
             </div>
         }
 
@@ -131,5 +131,4 @@
 
         </div>
     </fieldset>
-
 </div>

Auth/LearningHub.Nhs.Auth/Views/Shared/Components/TextInput/Default.cshtml

@@ -2,8 +2,8 @@
 @using NHSUKViewComponents.Web.Helpers
 @model TextInputViewModel
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
-    <label class="nhsuk-label" for="@Model.Name">
-        @Model.Label
+    <label class="nhsuk-label @(string.IsNullOrWhiteSpace(Model.Label) ? "nhsuk-u-visually-hidden" : "")" for="@Model.Name">
+        @(string.IsNullOrWhiteSpace(Model.Label) ? "N/A" : @Model.Label)
     </label>
     @if (Model.HintText != null)
     {

Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml

@@ -8,7 +8,7 @@
   }
 }
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />

Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,8 +1,10 @@
-<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">
+@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">
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.17.0/jquery.validate.min.js"
           asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
           asp-fallback-test="window.jQuery && window.jQuery.validator"
@@ -15,32 +17,48 @@
           crossorigin="anonymous"
           integrity="sha256-9GycpJnliUjJDVDqP0UEu/bsm9U+3dnQUH8+3W10vkY=">
   </script>
-</environment>
+  </environment>
+}
 <script type="text/javascript">
-  // Add/remove class 'input-validation-error' to the div containing the control with error
-  $(function () {
-    $('form').each(function () {
-      if ($(this).data("validator")) {
-        var valSettings = $(this).data("validator").settings
-        valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator)
-        valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator)
-      }
+  // Add/remove class 'input-validation-error' to the div containing the control with error.
+
+    let errorElements = [];
+    let submitAttempted = false;
+    document.querySelector('form').onsubmit = () => { submitAttempted = true; errorElements = []; }
+
+    $(function () {
+        $('form').each(function () {
+            if ($(this).data("validator")) {
+                var valSettings = $(this).data("validator").settings;
+                 valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator);
+                valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator);
+            }
+        });
     });
-  });
 
-  function wrap(functionToWrap, beforeFunction) {
-    return function () {
-      var args = Array.prototype.slice.call(arguments);
-      beforeFunction.apply(this, args);
-      return functionToWrap.apply(this, args);
+   function wrap(functionToWrap, beforeFunction) {
+        return function () {
+            var args = Array.prototype.slice.call(arguments);
+            beforeFunction.apply(this, args);
+            if (errorElements.length && submitAttempted) {
+               errorElements[0]['obj'].focus();
+                submitAttempted = false;
+            }
+
+            return functionToWrap.apply(this, args);
+        };
     };
-  };
 
-  function highlightDecorator(element, errorClass, validClass) {
-    $(element).closest("div").addClass(errorClass).removeClass(validClass);
-  }
-  function unhighlightDecorator(element, errorClass, validClass) {
-    $(element).closest("div").addClass(validClass).removeClass(errorClass);
-  }
+    function highlightDecorator(element, errorClass, validClass) {
+        $(element).closest("div").addClass(errorClass).removeClass(validClass);
+        let itemExists = errorElements.some(obj => obj['id'] == element.id);
+        if (!itemExists) {
+            errorElements.push({ 'id': element.id, 'obj': element });
+        }
+    }
+    function unhighlightDecorator(element, errorClass, validClass) {
+        $(element).closest("div").addClass(validClass).removeClass(errorClass);
+        errorElements = errorElements.filter((elm) => elm.id != element.id);
+    }
 
 </script>

Auth/LearningHub.Nhs.Auth/package.json

@@ -23,7 +23,7 @@
     "concurrently": "^7.2.0",
     "core-js": "^3.6.5",
     "nhsuk-frontend": "^7.0.0",
-    "node": "^12.19.1"
+    "node": "^18"
   },
   "devDependencies": {
     "@babel/core": "^7.14.0",

LearningHub.Nhs.UserApi.Repository/Extentions/IQueryableExtensions.cs

@@ -121,7 +121,7 @@ public static async Task<T> FirstOrDefaultWithNoLockAsync<T>(this IQueryable<T>
         }
 
         /// <summary>
-        /// ToListWithNoLock.
+        /// ToListWithNoLock..
         /// </summary>
         /// <typeparam name="T">Type.</typeparam>
         /// <param name="query">Query.</param>