Merge RC changes to CI

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

@@ -9,99 +9,38 @@ jobs:
     runs-on: windows-latest
     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
+      - name: Use Node 14
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: Upgrade npm to the latest version
-        run: npm install -g [email protected]
+          node-version: '14'
+          cache: 'npm'  
 
-      - name: Typescript install WebUI
-        run: yarn install --network-timeout 600000 --frozen-lockfile
+      - name: npm install WebUI
+        run: npm install 
         working-directory: ./LearningHub.Nhs.WebUI
-
-      - name: Typescript build WebUI
-        run: yarn build:webpack
+      
+      - name: npm build WebUI
+        run: npm run build:webpack
         working-directory: ./LearningHub.Nhs.WebUI     
 
-      - name: Typescript install AdminUI
-        run: yarn install 
+      - name: npm install AdminUI
+        run: npm install 
         working-directory: ./AdminUI/LearningHub.Nhs.AdminUI
-
-      - name: Typescript build AdminUI
-        run: yarn build:webpack
-        working-directory: ./AdminUI/LearningHub.Nhs.AdminUI     
+      
+      - name: npm build AdminUI
+        run: npm run build:webpack
+        working-directory: ./AdminUI/LearningHub.Nhs.AdminUI   
 
       - name: Setup MSBuild
         uses: microsoft/[email protected]
@@ -181,5 +120,4 @@ jobs:
           }
 
       # - name: Test
-        # run: dotnet test ${{ env.BuildParameters.TestProjects }}       
-
+        # run: dotnet test ${{ env.BuildParameters.TestProjects }}            

.gitignore

@@ -53,3 +53,6 @@ obj
 /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/web.config
+/LearningHub.Nhs.WebUI/web.config
+/WebAPI/LearningHub.Nhs.API/web.config

AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs

@@ -27,6 +27,11 @@ public class WebSettings
         /// </summary>
         public string LearningHubApiUrl { get; set; }
 
+        /// <summary>
+        /// Gets or sets the OpenApiUrl.
+        /// </summary>
+        public string OpenApiUrl { get; set; }
+
         /// <summary>
         /// Gets or sets the user api url.
         /// </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/Helpers/IOpenApiFacade.cs

@@ -0,0 +1,59 @@
+namespace LearningHub.Nhs.AdminUI.Helpers
+{
+    using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Common;
+
+    /// <summary>
+    /// Defines the <see cref="IOpenApiFacade" />.
+    /// </summary>
+    public interface IOpenApiFacade
+    {
+        /// <summary>
+        /// The GetAsync.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="url">The url.</param>
+        /// <returns>The <see cref="Task{T}"/>.</returns>
+        Task<T> GetAsync<T>(string url)
+            where T : class, new();
+
+        /// <summary>
+        /// The PostAsync.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <param name="url">The url.</param>
+        /// <param name="body">The body.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task PostAsync<T>(string url, T body)
+            where T : class, new();
+
+        /// <summary>
+        /// The PostAsync.
+        /// </summary>
+        /// <typeparam name="T">The type.</typeparam>
+        /// <typeparam name="TBody">.</typeparam>
+        /// <param name="url">The url.</param>
+        /// <param name="body">The body.</param>
+        /// <returns>The <see cref="Task{T}"/>.</returns>
+        Task<ApiResponse> PostAsync<T, TBody>(string url, TBody body)
+            where T : class, new()
+            where TBody : class, new();
+
+        /// <summary>
+        /// The PutAsync.
+        /// </summary>
+        /// <param name="url">The url.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<ApiResponse> PutAsync(string url);
+
+        /// <summary>
+        /// The PutAsync.
+        /// </summary>
+        /// <typeparam name="T">.</typeparam>
+        /// <param name="url">The url.</param>
+        /// <param name="body">The body.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<ApiResponse> PutAsync<T>(string url, T body)
+            where T : class, new();
+    }
+}

AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs

@@ -85,7 +85,15 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                 case ResourceTypeEnum.Article:
                     return "Read";
                 case ResourceTypeEnum.Audio:
-                    return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    if ((myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000) > myLearningDetailedItemViewModel.ResourceDurationMilliseconds)
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ResourceDurationMilliseconds);
+                    }
+                    else
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    }
+
                 case ResourceTypeEnum.Embedded:
                     return string.Empty;
                 case ResourceTypeEnum.Equipment:
@@ -113,7 +121,15 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                     }
 
                 case ResourceTypeEnum.Video:
-                    return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    if ((myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000) > myLearningDetailedItemViewModel.ResourceDurationMilliseconds)
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ResourceDurationMilliseconds);
+                    }
+                    else
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    }
+
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
                 case ResourceTypeEnum.Html: