Merge branch 'release-v1.1.0' into Develop/Fixes/TD-4168-Framework_Upgrade

Author: swapnamol-abraham

.github/azure-pipeline-webui-ci.yml

@@ -51,6 +51,57 @@ jobs:
     inputs:
       command: restore
       projects: $(BuildParameters.RestoreBuildProjects)
+      # Step 1: Get the version tag from the repository
+- script: |
+    echo "Extracting version from Git tag: $(versionTag)"
+    VERSION=$(echo $(versionTag) | sed 's/^v//')
+    echo "VERSION=$VERSION" >> $(Build.ArtifactStagingDirectory)/version.txt
+  displayName: 'Extract version tag'
+
+# Step 2: Update AssemblyVersion in Web UI .csproj
+- powershell: |
+    $versionFile = "$(Build.ArtifactStagingDirectory)/version.txt"
+    $version = Get-Content $versionFile
+    $version = $version.Trim()
+
+    # Path to your .csproj file (adjust if necessary)
+    $csprojFile = "$(Build.SourcesDirectory)\LearningHub.Nhs.WebUI\LearningHub.Nhs.WebUI.csproj"
+
+    Write-Host "Updating AssemblyVersion and FileVersion and Version  in $csprojFile to $version"
+
+    # Load the .csproj XML file
+    [xml]$csprojXml = Get-Content -Path $csprojFile
+
+    # Update the AssemblyVersion and FileVersion
+    $csprojXml.Project.PropertyGroup.AssemblyVersion = $version
+    $csprojXml.Project.PropertyGroup.FileVersion = $version
+    $csprojXml.Project.PropertyGroup.Version = $version
+
+    # Save the updated .csproj file
+    $csprojXml.Save($csprojFile)
+  displayName: 'Update AssemblyVersion in WebUI .csproj'
+  # Step 2: Update AssemblyVersion in Admin UI .csproj
+- powershell: |
+    $versionFile = "$(Build.ArtifactStagingDirectory)/version.txt"
+    $version = Get-Content $versionFile
+    $version = $version.Trim()
+
+    # Path to your .csproj file (adjust if necessary)
+    $csprojFile = "$(Build.SourcesDirectory)\AdminUI\LearningHub.Nhs.AdminUI\LearningHub.Nhs.AdminUI.csproj"
+
+    Write-Host "Updating AssemblyVersion and FileVersion and Version  in $csprojFile to $version"
+
+    # Load the .csproj XML file
+    [xml]$csprojXml = Get-Content -Path $csprojFile
+
+    # Update the AssemblyVersion and FileVersion
+    $csprojXml.Project.PropertyGroup.AssemblyVersion = $version
+    $csprojXml.Project.PropertyGroup.FileVersion = $version
+    $csprojXml.Project.PropertyGroup.Version = $version
+
+    # Save the updated .csproj file
+    $csprojXml.Save($csprojFile)
+  displayName: 'Update AssemblyVersion in AdminUI .csproj'
   - task: DotNetCoreCLI@2
     displayName: Build
     inputs:

.github/pull_request_template.md

@@ -1,25 +1,25 @@
 ### JIRA link
-_TD-###_
+[TD-####](https://hee-tis.atlassian.net/browse/TD-####)
 
 ### Description
-_Describe what has changed and how that will affect the app. If relevant, add references to the resources you used. Use this as your opportunity to highlight anything odd and give people context around particular decisions._
+_Describe what has changed and how that will affect the app. If relevant, add links to any sources/documentation you used. Highlight anything unusual and give people context around particular decisions._
 
 ### Screenshots
-_Attach screenshots on mobile, tablet and desktop._
+_Paste screenshots for all views created or changed: mobile, tablet and desktop, wave analyser showing no errors._
 
 -----
 ### Developer checks
 (Leave tasks unticked if they haven't been appropriate for your ticket.)
 
 I have:
-- [ ] Run the formatter and made sure there are no IDE errors
-- [ ] Written appropriate unit tests for the changes, including:
-	- accessibility tests for new views
-	- tests for new controller methods
-	- tests for new or modified API endpoints
-- [ ] Manually tested my work with and without JavaScript
-- [ ] Tested any Views or partials created or changed with [Wave Chrome plugin](https://chrome.google.com/webstore/detail/wave-evaluation-tool/jbbplnpkjmmeebjpijfedlgcdilocofh/related) and addressed any valid accessibility issues
-- [ ] Updated/added documentation in [Confluence](https://hee-tis.atlassian.net/wiki/spaces/TP/pages/3477930003/Learning+Hub) and/or [GitHub Readme](https://github.com/TechnologyEnhancedLearning/LearningHub.Nhs.UserApi/blob/master/README.md). List of documentation links added/changed:
+- [ ] Run the IDE auto formatter on all files I’ve worked on and made sure there are no IDE errors relating to them
+- [ ] Written or updated tests for the changes (accessibility ui tests for views, tests for controller, data services, services, view models created or modified) and made sure all tests are passing
+- [ ] Manually tested my work with and without JavaScript (adding notes where functionality requires JavaScript)
+- [ ] Tested any Views or partials created or changed with [Wave Chrome plugin](https://chrome.google.com/webstore/detail/wave-evaluation-tool/jbbplnpkjmmeebjpijfedlgcdilocofh/related). Addressed any valid accessibility issues and documented any invalid errors
+- [ ] Updated my Jira ticket with testing notes, including information about other parts of the system that were touched as part of the MR and need  to be tested to ensure nothing is broken
+- [ ] Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks in the GitHub PR ‘Files Changed’ tab
+Either:
+- [ ] Documented my work in [Confluence](https://hee-tis.atlassian.net/wiki/spaces/TP/pages/3461087233/Development), updating any business rules applied or modified. Updated GitHub readme/documentation for the repository if appropriate. List of documentation links added/changed:
   - [doc_1_here](link_1_here)
-- [ ] Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing is broken
-- [ ] Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks.
+Or:
+- [ ] Confirmed that none of the work that I have undertaken requires any updates to documentation

AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs

@@ -91,11 +91,15 @@ public ResourceController(
         /// The Details.
         /// </summary>
         /// <param name="id">The id<see cref="int"/>.</param>
+        /// <param name="activeTab">The activeTab<see cref="string"/>.</param>
+        /// <param name="status">The status<see cref="string"/>.</param>
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpGet]
-        public async Task<IActionResult> Details(int id)
+        public async Task<IActionResult> Details(int id, string activeTab = "details", string status = "")
         {
             var resource = await this.resourceService.GetResourceVersionExtendedViewModelAsync(id);
+            this.ViewBag.ActiveTab = activeTab;
+            this.ViewBag.Status = status;
             return this.View(resource);
         }
 
@@ -138,6 +142,46 @@ public async Task<IActionResult> GetValidationResults(int resourceVersionId)
             return this.PartialView("_ValidationResults", vm);
         }
 
+        /// <summary>
+        /// The GetDevIdDetails.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        public async Task<IActionResult> GetDevIdDetails(int resourceVersionId)
+        {
+            var vm = await this.resourceService.GetResourceVersionDevIdDetailsAsync(resourceVersionId);
+
+            return this.PartialView("_DevIdDetails", vm);
+        }
+
+        /// <summary>
+        /// The update the dev Id details.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        public async Task<IActionResult> UpdateDevIdDetails(ResourceVersionDevIdViewModel model)
+        {
+            var message = string.Empty;
+            if (string.IsNullOrEmpty(model.DevId))
+            {
+                message = "Enter a Dev id for the resource";
+            }
+            else if (await this.resourceService.DoesDevIdExistsAsync(model.DevId.Trim()))
+            {
+                message = "Duplicate";
+            }
+            else
+            {
+                model.DevId = model.DevId.Trim();
+                await this.resourceService.UpdateDevIdDetailsAsync(model);
+                message = "Success";
+            }
+
+            return this.RedirectToAction("Details", new { id = model.ResourceVersionId, activeTab = "devId", status = message });
+        }
+
         /// <summary>
         /// The Index.
         /// </summary>

AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs

@@ -32,9 +32,30 @@ public interface IResourceService
         /// The GetResourceVersionValidationResultAsync.
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
-        /// <returns>The <see cref="Task{ResourceVersionEventViewModel}}"/>.</returns>
+        /// <returns>The <see cref="Task{ResourceVersionValidationResultViewModel}}"/>.</returns>
         Task<ResourceVersionValidationResultViewModel> GetResourceVersionValidationResultAsync(int resourceVersionId);
 
+        /// <summary>
+        /// The GetResourceVersionDevIdDetailsAsync.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{ResourceVersionDevIdViewModel}}"/>.</returns>
+        Task<ResourceVersionDevIdViewModel> GetResourceVersionDevIdDetailsAsync(int resourceVersionId);
+
+        /// <summary>
+        /// Check dev id already exist against a resource.
+        /// </summary>
+        /// <param name="devId">string devId.</param>
+        /// <returns>The <see cref="Task{bool}"/>.</returns>
+        Task<bool> DoesDevIdExistsAsync(string devId);
+
+        /// <summary>
+        /// To update dev id details for a resource.
+        /// </summary>
+        /// <param name="model">the ResourceVersionDevIdViewModel.</param>
+        /// <returns>The <see cref="Task{ResourceVersionDevIdViewModel}}"/>.</returns>
+        Task UpdateDevIdDetailsAsync(ResourceVersionDevIdViewModel model);
+
         /// <summary>
         /// The GetResourceVersionExtendedViewModelAsync.
         /// </summary>