Merge pull request #1181 from TechnologyEnhancedLearning/Develop/Features/TD-3683_implement_central_package_management_webui

Merge CPM into Dependabot branch

Author: binon

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

@@ -10,13 +10,75 @@ 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:
           dotnet-version: 8.0.x     
 
       - name: Add Azure artifact
-        run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed'  --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text      
+        run: |
+          dotnet nuget remove source LearningHubFeed || true
+          dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed'  --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text      
       
       - name: Use Node 20 with Yarn
         uses: actions/setup-node@v4

.gitignore

@@ -52,3 +52,4 @@ obj
 /OpenAPI/LearningHub.Nhs.OpenApi/web.config
 /AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
 /WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
+/ReportAPI/LearningHub.Nhs.ReportApi/web.config

AdminUI/LearningHub.Nhs.AdminUI/Controllers/RoadmapController.cs

@@ -99,7 +99,7 @@ public async Task<IActionResult> AddUpdate(UpdateViewModel update)
                 RoadmapTypeId = update.RoadmapTypeId,
             };
             var roadmapId = await this.roadmapService.AddRoadmap(roadmap);
-            return this.RedirectToAction("EditUpdate", new { id = roadmapId });
+            return this.RedirectToAction("Details", new { id = roadmapId });
         }
 
         /// <summary>
@@ -160,7 +160,7 @@ public async Task<IActionResult> EditUpdate(UpdateViewModel update)
                 Id = update.Id,
             };
             await this.roadmapService.UpdateRoadmap(roadmap);
-            return this.RedirectToAction("EditUpdate", new { roadmap.Id });
+            return this.RedirectToAction("Details", new { roadmap.Id });
         }
 
         /// <summary>
@@ -202,6 +202,18 @@ public async Task<IActionResult> Updates(string searchTerm = null)
             return this.View(model);
         }
 
+        /// <summary>
+        /// The Details.
+        /// </summary>
+        /// <param name="id">The id<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpGet]
+        public async Task<IActionResult> Details(int id)
+        {
+            var roadmap = await this.roadmapService.GetIdAsync(id);
+            return this.View(roadmap);
+        }
+
         /// <summary>
         /// The UploadFile.
         /// </summary>

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/Interfaces/IRoadmapService.cs

@@ -3,6 +3,7 @@
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Entities;
+    using LearningHub.Nhs.Models.RoadMap;
 
     /// <summary>
     /// Defines the <see cref="IRoadmapService" />.
@@ -36,6 +37,13 @@ public interface IRoadmapService
         /// <returns>The <see cref="List{Roadmap}"/>.</returns>
         Task<List<Roadmap>> GetUpdates();
 
+        /// <summary>
+        /// The GetIdAsync.
+        /// </summary>
+        /// <param name="id">The id<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{Roadmap}"/>.</returns>
+        Task<RoadMapViewModel> GetIdAsync(int id);
+
         /// <summary>
         /// The UpdateRoadmap.
         /// </summary>