Merge Open API changes to RC (LH EnglishlIvy 1.3.1-Open API Changes)

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

@@ -10,6 +10,66 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Modify web.config files in all apps
+        shell: pwsh
+        run: |
+          $webConfigPaths = @(
+            "${{ github.workspace }}\AdminUI\LearningHub.Nhs.AdminUI\web.config",
+            "${{ github.workspace }}\WebAPI\LearningHub.Nhs.Api\web.config",
+            "${{ github.workspace }}\LearningHub.Nhs.WebUI\web.config"
+          )
+
+          foreach ($path in $webConfigPaths) {
+            if (Test-Path $path) {
+              Write-Host "Modifying $path"
+              [xml]$config = Get-Content $path
+
+              if (-not $config.configuration.'system.webServer') {
+                  $systemWebServer = $config.CreateElement("system.webServer")
+                  $config.configuration.AppendChild($systemWebServer) | Out-Null
+              } else {
+                  $systemWebServer = $config.configuration.'system.webServer'
+              }
+
+              if (-not $systemWebServer.httpProtocol) {
+                  $httpProtocol = $config.CreateElement("httpProtocol")
+                  $systemWebServer.AppendChild($httpProtocol) | Out-Null
+              } else {
+                  $httpProtocol = $systemWebServer.httpProtocol
+              }
+
+              if (-not $httpProtocol.customHeaders) {
+                  $customHeaders = $config.CreateElement("customHeaders")
+                  $httpProtocol.AppendChild($customHeaders) | Out-Null
+              } else {
+                  $customHeaders = $httpProtocol.customHeaders
+              }
+
+              foreach ($name in @("X-Powered-By", "Server")) {
+                  $removeNode = $config.CreateElement("remove")
+                  $removeNode.SetAttribute("name", $name)
+                  $customHeaders.AppendChild($removeNode) | Out-Null
+              }
+
+              if (-not $systemWebServer.security) {
+                  $security = $config.CreateElement("security")
+                  $systemWebServer.AppendChild($security) | Out-Null
+              } else {
+                  $security = $systemWebServer.security
+              }
+
+              if (-not $security.requestFiltering) {
+                  $requestFiltering = $config.CreateElement("requestFiltering")
+                  $requestFiltering.SetAttribute("removeServerHeader", "true")
+                  $security.AppendChild($requestFiltering) | Out-Null
+              }
+
+              $config.Save($path)
+            } else {
+              Write-Host "File not found: $path"
+            }
+          }
+
       - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v3
         with:

AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs

@@ -197,7 +197,15 @@ public async Task<IActionResult> Details(UserGroupAdminDetailViewModel userGroup
             if (userGroup.IsNew())
             {
                 validationResult = await this.userGroupService.CreateUserGroup(userGroup);
-                userGroup = await this.userGroupService.GetUserGroupAdminDetailbyIdAsync(validationResult.CreatedId.Value);
+                if (validationResult.IsValid)
+                {
+                    userGroup = await this.userGroupService.GetUserGroupAdminDetailbyIdAsync(validationResult.CreatedId.Value);
+                }
+                else
+                {
+                    this.ViewBag.ErrorMessage = $"Update failed: {string.Join(Environment.NewLine, validationResult.Details)}";
+                    return this.View("Details", userGroup);
+                }
             }
             else
             {

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <ckeditor v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
+        <ckeditor class="nhsuk-textarea" v-model="description" :config="editorConfig" @ready="onEditorReady" @blur="onBlur"></ckeditor>
         <div :class="[`pt-2 footer-text${this.valid ? '' : ' text-danger'}`]">{{ hint }}</div>
     </div>
 </template>

AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/CatalogueOwner.cshtml

@@ -47,14 +47,14 @@
             <div class="row mt-5">
                 <div class="col-12">
                     <label>Catalogue owner email address</label>
-                    <input asp-for="OwnerEmailAddress" class="form-control" maxlength="250" />
+                    <input asp-for="OwnerEmailAddress" class="form-control nhsuk-input" maxlength="250" />
                     <span asp-validation-for="OwnerEmailAddress"></span>
                 </div>
             </div>
             <div class="row mt-5">
                 <div class="col-12">
                     <label>Notes</label>
-                    <textarea asp-for="Notes" class="form-control"></textarea>
+                    <textarea asp-for="Notes" class="form-control nhsuk-input"></textarea>
                     <span asp-validation-for="Notes"></span>
                 </div>
             </div>

AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml

@@ -137,7 +137,7 @@
         <div class="row mt-5">
             <div class="col-12">
                 <label for="Description">Description</label>
-                <textarea asp-for="Description" class="form-control"></textarea>
+                <textarea asp-for="Description" class="form-control nhsuk-input"></textarea>
                 <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
                 <span asp-validation-for="Description"></span>
             </div>

AdminUI/LearningHub.Nhs.AdminUI/Views/Notifications/CreateEdit.cshtml

@@ -73,7 +73,7 @@
                 </div>
                 <div class="form-group col-12">
                     <label asp-for="Message" class="control-label"></label>
-                    <textarea asp-for="Message" class="form-control" rows="10" required></textarea>
+                    <textarea asp-for="Message" class="form-control nhsuk-input" rows="10" required></textarea>
                     <span asp-validation-for="Message" class="text-danger"></span>
                 </div>
                 <div class="form-group col-lg-3 col-md-6">

AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml

@@ -571,6 +571,32 @@
                             </dl>
                         </div>
                     }
+                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Html)
+                    {
+                        <div class="col-12">
+                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+                            <dl>
+                                <dt>Resource Version Id</dt>
+                                <dd>@Html.DisplayFor(model => model.ResourceVersionId)</dd>
+                                <dt>Resource Type</dt>
+                                <dd>
+                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
+                                </dd>
+                                <dt>ESR Link</dt>
+                                <dd><a href="@Model.HtmlDetails.HostedContentUrl" target="_blank">@Model.HtmlDetails.HostedContentUrl</a></dd>
+                                @if (Model.HtmlDetails.File != null)
+                                {
+                                    <dt>Zip File</dt>
+                                    <dd>
+                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.HtmlDetails.File.FilePath, Model.HtmlDetails.File.FileName)" target="_blank" download>@Model.HtmlDetails.File.FileName</a>
+                                    </dd>
+                                }
+
+                                <dt>Content Folder</dt>
+                                <dd>@Model.HtmlDetails.ContentFilePath</dd>
+                            </dl>
+                        </div>
+                    }
 
                     @if (Model.ResourceTypeEnum == ResourceTypeEnum.Assessment)
                     {

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

@@ -78,14 +78,7 @@
     </environment>
     @*<script type="text/javascript" src="~/js/bundle/header.js"></script>*@
     <partial name="~/Views/Shared/_ValidationScriptsPartial.cshtml" />
-
     @RenderSection("Scripts", required: false)
-    <script type="text/javascript" src="~/js/pageunload.js" asp-append-version="true"></script>
-    <script type="text/javascript">
-        // Bind the function to the unload event
-        window.onunload = tellServerBrowserClosed;
-
-    </script>
 </body>
 </html>
 <!-- Build number: @settings.Value.BuildNumber -->

AdminUI/LearningHub.Nhs.AdminUI/Views/UserGroup/_UsersModal.cshtml

@@ -41,10 +41,10 @@
             {
             <tr>
                 <td style="vertical-align: middle">
-                    @Html.ActionLink(item.Id.ToString(), "Details", new { id = item.Id })
+                        @Html.ActionLink(item.Id.ToString(), "Details", "User", new { id = item.Id })
                 </td>
                 <td style="vertical-align: middle">
-                    @Html.ActionLink(item.UserName.ToString(), "Details", new { id = item.Id })
+                        @Html.ActionLink(item.UserName.ToString(), "Details", "User", new { id = item.Id })
                 </td>
                 <td style="vertical-align: middle">
                     <input type="checkbox" id=@($"user_{item.Id}") class="list-item-checked" />