From 4935eb18ace64417b35d6b6560aa6650a55a1639 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Tue, 16 Apr 2024 12:06:30 +0100
Subject: [PATCH 01/13] Apply additional corrections for TD3162 and TD3163

---
 LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml       | 5 +++--
 LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml  | 4 ++--
 LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml   | 4 ++--
 LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml    | 4 ++--
 .../Views/Resource/_ResourceInformation.cshtml           | 9 ++++++++-
 LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml     | 4 ++--
 LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml    | 4 ++--
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
index 933391f2c..23be8c9a0 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
@@ -126,7 +126,7 @@
       <div class="catalogue-title nhsuk-u-margin-bottom-7">
         @if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
         {
-          <img alt="catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
+          <img alt="ELFH catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
         }
 
         <h1 class="heading-lg title nhsuk-u-margin-bottom-0">@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)</h1>
@@ -146,7 +146,8 @@
            asp-route-title="@Model.Catalogue.Name.Truncate(60)"
            asp-route-nodeId="@Model.Catalogue.NodeId"
            asp-route-path="@Model.Catalogue.Url"
-           asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">@(Model.Catalogue.IsBookmarked ? "Remove from" : "Add to")  my bookmarks</a>
+           asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)"
+           aria-label="@(Model.Catalogue.IsBookmarked ? "Remove from" : "Add to")  my bookmarks">@(Model.Catalogue.IsBookmarked ? "Remove from" : "Add to")  my bookmarks</a>
         </div>
       }
 
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
index 34a983eaa..2e7f5c50b 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
@@ -2,8 +2,8 @@
 
 <form id="search" asp-controller="catalogue" asp-action="index" asp-fragment="searchTab" method="get" role="search">
     <div class="nhsuk-form-group  nhsuk-header__search-form--search-results">
-        <label class="nhsuk-label nhsuk-u-visually-hidden" for="search-field">Search</label>
-        <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="search-field" value="@Model" placeholder="Search">
+        <label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search</label>
+        <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" value="@Model" placeholder="Search">
         <button class="nhsuk-search__submit" type="submit">
             <span class="nhsuk-u-visually-hidden">
                 Submit
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
index 735a0d209..4512c50f7 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
@@ -63,11 +63,11 @@
           @if (providerExists)
           {
             var provider = @Model.Providers.First();
-            <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
+            <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
           }
           else if (!string.IsNullOrEmpty(Model.BadgeUrl))
           {
-            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.BadgeUrl))" alt="@(Model.Name)" class="catalogue-badge" />
+            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-badge" />
           }
         </div>
       </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
index 1beb6a69b..309c4dad3 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
@@ -77,11 +77,11 @@
           @if (providerExists)
           {
             var provider = @Model.Item2.Providers.First();
-            <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
+            <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
           }
           else if (!string.IsNullOrEmpty(Model.Item2.BadgeUrl))
           {
-            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.Item2.BadgeUrl))" alt="@(Model.Item2.CatalogueName)" class="catalogue-badge" />
+            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.Item2.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-badge" />
           }
         </div>
       </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceInformation.cshtml b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceInformation.cshtml
index 97ec1f190..98342b4db 100644
--- a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceInformation.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceInformation.cshtml
@@ -7,6 +7,7 @@
 @inject Microsoft.Extensions.Options.IOptions<LearningHub.Nhs.WebUI.Configuration.Settings> options
 @{
   var resourceItem = Model.ResourceItem;
+  bool providerExists = Model.ResourceItem.Providers?.Count > 0;
 
   bool CanDisplayEsrLink()
   {
@@ -39,9 +40,15 @@
         <div class="display__flex-space-between">
           <h2>Resource details</h2>
 
+          @if (providerExists)
+          {
+            var providersss = @resourceItem.Providers;
+            var provider = @resourceItem.Providers.First();
+            <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
+          }
           @if (!string.IsNullOrEmpty(resourceItem.Catalogue.BadgeUrl))
           {
-            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(resourceItem.Catalogue.BadgeUrl))" alt="@(resourceItem.Catalogue.Name)" class="catalogue-badge" />
+            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(resourceItem.Catalogue.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-badge" />
           }
         </div>
 
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
index 2beea978a..961f9c1aa 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
@@ -2,8 +2,8 @@
 
 <form id="search" asp-controller="search" asp-action="results" method="get" role="search">
     <div class="nhsuk-u-margin-bottom-5 nhsuk-header__search-form--search-results">
-        <label class="nhsuk-label nhsuk-u-visually-hidden" for="search-field">Search the learning hub</label>
-        <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="search-field" placeholder="Search the learning hub" value="@Model">
+        <label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search the learning hub</label>
+        <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" placeholder="Search the learning hub" value="@Model">
         <button class="nhsuk-search__submit" type="submit">
             <span class="nhsuk-u-visually-hidden">
                 Submit
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index ffdb72ec2..33ccb4ceb 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -27,7 +27,7 @@
       @await Component.InvokeAsync("NavigationItems", new { navView = "MobileTopRightNav", controllerName = controllerName })
       @if (User.Identity.IsAuthenticated) {
         <div class="nhsuk-header__menu">
-          <label class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
+          <button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</button>
           @await Component.InvokeAsync("NavigationItems", new { navView = "MenuNotificationDot" })
         </div>
       }
@@ -41,7 +41,7 @@
 
   @if (User.Identity.IsAuthenticated) {
     <div class="nhsuk-header__menu nhsuk-header__not-mobile">
-      <label class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</label>
+      <button class="nhsuk-header__menu-toggle" id="toggle-menu" aria-controls="header-navigation" aria-expanded="false">Menu</button>
       @await Component.InvokeAsync("NavigationItems", new { navView = "MenuNotificationDot" })
     </div>
   }

From c3a29834204e95194539a2c1722328a61288c01f Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Tue, 16 Apr 2024 14:21:18 +0100
Subject: [PATCH 02/13] TD-3023 unpublished and deleted draft resource file
 refactor

---
 .../Controllers/Api/ContributeController.cs   |  19 ++-
 .../Controllers/ResourceController.cs         |   2 +-
 .../Interfaces/IFileService.cs                |   3 +-
 .../Interfaces/IResourceService.cs            |   8 +
 LearningHub.Nhs.WebUI/Services/FileService.cs |  35 ++++-
 .../Services/ResourceService.cs               |  30 ++++
 .../Controllers/ResourceController.cs         |   6 +-
 .../IResourceService.cs                       |   3 +-
 .../ResourceService.cs                        | 139 ++++++++++++++++--
 9 files changed, 227 insertions(+), 18 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
index f6ab9963a..279bda210 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
@@ -224,11 +224,14 @@ public async Task<ActionResult> DeleteResourceKeywordAsync([FromBody] KeywordDel
         [Route("DeleteResourceVersion/{resourceversionId}")]
         public async Task<ActionResult> DeleteResourceVersion(int resourceVersionId)
         {
-            var associatedFile = await this.resourceService.GetResourceVersionExtendedAsync(resourceVersionId);
+            var associatedFile = await this.resourceService.GetObsoleteResourceFile(resourceVersionId, true);
             var validationResult = await this.contributeService.DeleteResourceVersionAsync(resourceVersionId);
             if (validationResult.IsValid)
             {
-                _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile); });
+                if (associatedFile.Any())
+                {
+                    _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, associatedFile); });
+                }
             }
 
             return this.Ok(validationResult);
@@ -338,7 +341,19 @@ public ActionResult GetSettings()
         [Route("PublishResourceVersion")]
         public async Task<ActionResult> PublishResourceVersionAsync([FromBody] PublishViewModel publishViewModel)
         {
+            var associatedResource = await this.resourceService.GetResourceVersionExtendedAsync(publishViewModel.ResourceVersionId);
             var validationResult = await this.contributeService.SubmitResourceVersionForPublishAsync(publishViewModel);
+            if (validationResult.IsValid)
+            {
+                if (associatedResource.ResourceTypeEnum != ResourceTypeEnum.Scorm && associatedResource.ResourceTypeEnum != ResourceTypeEnum.Html)
+                {
+                    var obsoleteFiles = await this.resourceService.GetObsoleteResourceFile(publishViewModel.ResourceVersionId);
+                    if (obsoleteFiles.Any())
+                    {
+                        await this.fileService.PurgeResourceFile(null, obsoleteFiles);
+                    }
+                }
+            }
 
             return this.Ok(validationResult);
         }
diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 34fa4c19b..cf2ce9596 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -413,7 +413,7 @@ public async Task<IActionResult> UnpublishConfirm(ResourceUnpublishConfirmViewMo
 
             if (validationResult.IsValid)
             {
-                _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile); });
+                _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile, null); });
                 if (viewModel.CatalogueNodeVersionId == 1)
                 {
                     return this.Redirect("/my-contributions/unpublished");
diff --git a/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs b/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs
index e800efc41..c74a1681f 100644
--- a/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs
+++ b/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs
@@ -48,7 +48,8 @@ public interface IFileService
         /// The PurgeResourceFile.
         /// </summary>
         /// <param name="vm">The vm.<see cref="ResourceVersionExtendedViewModel"/>.</param>
+        /// <param name="filePaths">.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        Task PurgeResourceFile(ResourceVersionExtendedViewModel vm);
+        Task PurgeResourceFile(ResourceVersionExtendedViewModel vm = null, List<string> filePaths = null);
     }
 }
diff --git a/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs b/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs
index fb54a2777..c09ab0704 100644
--- a/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs
+++ b/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs
@@ -282,5 +282,13 @@ public interface IResourceService
         /// <param name="resourceVersionId">resource version id.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<LearningHubValidationResult> DeleteAllResourceVersionProviderAsync(int resourceVersionId);
+
+        /// <summary>
+        /// The GetObsoleteResourceFile.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId.</param>
+        /// <param name="deletedResource">.</param>
+        /// <returns>The <see cref="T:Task{List{FileTypeViewModel}}"/>.</returns>
+        Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, bool deletedResource = false);
     }
 }
diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs
index 4bfc997a5..1aa8078e8 100644
--- a/LearningHub.Nhs.WebUI/Services/FileService.cs
+++ b/LearningHub.Nhs.WebUI/Services/FileService.cs
@@ -7,6 +7,7 @@
     using System.Threading.Tasks;
     using Azure.Storage.Files.Shares;
     using Azure.Storage.Files.Shares.Models;
+    using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Interfaces;
@@ -94,7 +95,7 @@ private ShareClient InputArchiveShareClient
                     }
                 }
 
-                return this.shareClient;
+                return this.archiveShareClient;
             }
         }
 
@@ -201,9 +202,17 @@ public async Task<string> ProcessFile(Stream fileBytes, string fileName, string
         /// The PurgeResourceFile.
         /// </summary>
         /// <param name="vm">The vm.<see cref="ResourceVersionExtendedViewModel"/>.</param>
+        /// <param name="filePaths">.</param>
         /// <returns>The <see cref="Task"/>.</returns>
-        public async Task PurgeResourceFile(ResourceVersionExtendedViewModel vm)
+        public async Task PurgeResourceFile(ResourceVersionExtendedViewModel vm = null, List<string> filePaths = null)
         {
+            if (filePaths != null
+                && filePaths.Any())
+            {
+                await this.MoveInPutDirectoryToArchive(filePaths);
+                return;
+            }
+
             if (vm != null)
             {
                 var allContentPath = new List<string>();
@@ -235,7 +244,29 @@ public async Task PurgeResourceFile(ResourceVersionExtendedViewModel vm)
                         }
                     }
                 }
+                else if (vm.CaseDetails != null)
+                {
+                    var blockCollection = vm.CaseDetails.BlockCollection;
+                    foreach (var entry in blockCollection.Blocks)
+                    {
+                        if (entry.ImageCarouselBlock != null)
+                        {
+                            foreach (var item in entry.ImageCarouselBlock?.ImageBlockCollection?.Blocks)
+                            {
+                                allFilePath.Add(item?.MediaBlock?.Image?.File.FilePath);
+                            }
+                        }
+                        else if (entry.WholeSlideImageBlock != null)
+                        {
+                            foreach (var item in entry.WholeSlideImageBlock.WholeSlideImageBlockItems)
+                            {
+                                allFilePath.Add(item?.WholeSlideImage?.File.FilePath);
+                            }
+                        }
+                    }
+                }
 
+                // audio and video to be added
                 await this.MoveInPutDirectoryToArchive(allFilePath);
                 await this.MoveOutPutDirectoryToArchive(allContentPath);
             }
diff --git a/LearningHub.Nhs.WebUI/Services/ResourceService.cs b/LearningHub.Nhs.WebUI/Services/ResourceService.cs
index 31608b797..ade01a5f8 100644
--- a/LearningHub.Nhs.WebUI/Services/ResourceService.cs
+++ b/LearningHub.Nhs.WebUI/Services/ResourceService.cs
@@ -1274,5 +1274,35 @@ public async Task<LearningHubValidationResult> DeleteAllResourceVersionProviderA
 
             return apiResponse.ValidationResult;
         }
+
+        /// <summary>
+        /// The GetObsoleteResourceFile.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId.</param>
+        /// <param name="deletedResource">.</param>
+        /// <returns>The <see cref="T:Task{List{FileTypeViewModel}}"/>.</returns>
+        public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, bool deletedResource = false)
+        {
+            List<string> filePaths = null;
+
+            var client = await this.LearningHubHttpClient.GetClientAsync();
+
+            var request = $"Resource/GetObsoleteResourceFile/{resourceVersionId}/{deletedResource}";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                filePaths = JsonConvert.DeserializeObject<List<string>>(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
+                        ||
+                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return filePaths;
+        }
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
index 849a04ae1..18044a758 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
@@ -447,12 +447,14 @@ public async Task<ActionResult> GetResourceVersionsAsync(int resourceId)
         /// Get file directory for unpublished or deleted versions.
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <param name="deletedResource">.</param>
         /// <returns>The <see cref="Task{String}"/>.</returns>
         [HttpGet]
         [Route("GetObsoleteResourceFile/{resourceVersionId}")]
-        public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId)
+        [Route("GetObsoleteResourceFile/{resourceVersionId}/{deletedResource}")]
+        public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, bool deletedResource = false)
         {
-            return await this.resourceService.GetObsoleteResourceFile(resourceVersionId);
+            return await this.resourceService.GetObsoleteResourceFile(resourceVersionId, deletedResource);
         }
 
         /// <summary>
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
index 23929ec65..511aa8500 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
@@ -233,8 +233,9 @@ public interface IResourceService
         /// Get file directory for unpublished or deleted versions.
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <param name="deletedResource">.</param>
         /// <returns>The <see cref="List{String}"/>.</returns>
-        Task<List<string>> GetObsoleteResourceFile(int resourceVersionId);
+        Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, bool deletedResource = false);
 
         /// <summary>
         /// Delete resource version async.
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 2993e46af..69663fcc7 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1320,12 +1320,12 @@ public async Task<List<ResourceVersionViewModel>> GetResourceVersionsAsync(int r
         /// Get file directory for unpublished or deleted versions.
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <param name="deletedResource">.</param>
         /// <returns>The <see cref="List{String}"/>.</returns>
-        public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId)
+        public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, bool deletedResource = false)
         {
             var retVal = new List<string>();
-            File fileDetails = null;
-            var resource = await this.GetResourceVersionByIdAsync(resourceVersionId);
+            var resource = await this.GetResourceVersionExtendedViewModelAsync(resourceVersionId);
             var rvs = await this.resourceVersionRepository.GetResourceVersionsAsync(resource.ResourceId);
             rvs = rvs.Where(x => x.Id != resourceVersionId && x.PublicationId > 0).OrderByDescending(x => x.PublicationId).ToList();
             var rv = rvs.FirstOrDefault();
@@ -1334,21 +1334,142 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId)
                 var extendedResourceVersion = await this.GetResourceVersionExtendedViewModelAsync(rv.Id);
                 if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Scorm)
                 {
-                    retVal.Add(extendedResourceVersion.ScormDetails.ContentFilePath);
+                    if (resource.ScormDetails?.ContentFilePath != extendedResourceVersion.ScormDetails.ContentFilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.ScormDetails.ContentFilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.ScormDetails?.File?.FilePath);
+                        }
+                    }
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Html)
                 {
-                    retVal.Add(extendedResourceVersion.HtmlDetails.ContentFilePath);
+                    if (resource.HtmlDetails?.ContentFilePath != extendedResourceVersion.HtmlDetails.ContentFilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.HtmlDetails.ContentFilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.HtmlDetails?.File?.FilePath);
+                        }
+                    }
+                }
+                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
+                {
+                    if (resource.GenericFileDetails.File.FilePath != extendedResourceVersion.GenericFileDetails.File.FilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.GenericFileDetails.File.FilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.GenericFileDetails.File.FilePath);
+                        }
+                    }
+                }
+                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Image)
+                {
+                    if (resource.ImageDetails.File.FilePath != extendedResourceVersion.ImageDetails.File.FilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.ImageDetails.File.FilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.ImageDetails.File.FilePath);
+                        }
+                    }
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Audio)
                 {
-                    retVal.Add(extendedResourceVersion.AudioDetails.File.FilePath);
-                    retVal.Add(extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                    if (resource.AudioDetails.File.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.AudioDetails.File.FilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.AudioDetails.File.FilePath);
+                        }
+                    }
+
+                    if (resource.AudioDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                        }
+                    }
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Video)
                 {
-                    retVal.Add(extendedResourceVersion.VideoDetails.File.FilePath);
-                    retVal.Add(extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath);
+                    if (resource.VideoDetails.File.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.VideoDetails.File.FilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.VideoDetails.File.FilePath);
+                        }
+                    }
+
+                    if (resource.VideoDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
+                    {
+                        if (!deletedResource)
+                        {
+                            retVal.Add(extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath);
+                        }
+                        else
+                        {
+                            retVal.Add(resource.VideoDetails.ResourceAzureMediaAsset.FilePath);
+                        }
+                    }
+                }
+                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Article)
+                {
+                    var inputResourceFiles = resource.ArticleDetails.Files.ToList();
+                    var previousPublishedfiles = extendedResourceVersion.ArticleDetails.Files.ToList();
+                    if (!deletedResource)
+                    {
+                        if (previousPublishedfiles.Any())
+                        {
+                            foreach (var file in previousPublishedfiles)
+                            {
+                                if (!inputResourceFiles.Where(x => x.FilePath == file.FilePath).Any())
+                                {
+                                    retVal.Add(file.FilePath);
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (inputResourceFiles.Any())
+                        {
+                            foreach (var file in inputResourceFiles)
+                            {
+                                if (!previousPublishedfiles.Where(x => x.FilePath == file.FilePath).Any())
+                                {
+                                    retVal.Add(file.FilePath);
+                                }
+                            }
+                        }
+                    }
                 }
             }
 

From 27b6cfa577b341f6a71c63b09a978c82cb793c53 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 17 Apr 2024 08:24:44 +0100
Subject: [PATCH 03/13] TD-3023 limit the removal of output content to scorm
 and html resource during resource unpublish activity.

---
 LearningHub.Nhs.WebUI/Controllers/ResourceController.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index cf2ce9596..7a1245acc 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -413,7 +413,11 @@ public async Task<IActionResult> UnpublishConfirm(ResourceUnpublishConfirmViewMo
 
             if (validationResult.IsValid)
             {
-                _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile, null); });
+                if (associatedFile.ScormDetails != null || associatedFile.HtmlDetails != null)
+                {
+                    _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile, null); });
+                }
+
                 if (viewModel.CatalogueNodeVersionId == 1)
                 {
                     return this.Redirect("/my-contributions/unpublished");

From 0a9403e8f545b98ae856d871909a2c17677503f6 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 17 Apr 2024 10:05:06 +0100
Subject: [PATCH 04/13] TD-3741 - LMS server issue related to active content
 cache is null.

---
 LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
index cad178569..12adf699d 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
@@ -230,6 +230,11 @@ private async Task<bool> Commit(SCO scoObject)
             try
             {
                 var activeContent = this.userService.GetActiveContentAsync().Result;
+                if (activeContent.Count == 0)
+                {
+                    return false;
+                }
+
                 if (!activeContent.Any(ac => ac.ScormActivityId == scoObject.InstanceId))
                 {
                     throw new Exception($"User does not have ActiveContent for ScormActivityId={scoObject.InstanceId}");

From 011e9c0124ee362eb8a3f2cf6365ed3a446ab0e5 Mon Sep 17 00:00:00 2001
From: Sarathlal Sarangadharan <Sarathlal.Sarangadharan@hee.nhs.uk>
Date: Wed, 17 Apr 2024 11:42:07 +0100
Subject: [PATCH 05/13] TD-4047: Duplicate records appearing in Mylearning
 page. Brought back removed code to fix the issue and implemented same logic
 in newly created stored procedures.

---
 .../Activity/GetUserLatestActivityCheck.sql   | 26 ++++++++++++++++++-
 .../Activity/GetUserLearningActivities.sql    | 25 +++++++++++++++++-
 .../GetUserLearningActivitiesCount.sql        | 26 ++++++++++++++++++-
 .../Activity/ResourceActivityRepository.cs    |  8 +++---
 4 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql
index 235868d43..a5a351969 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
@@ -144,7 +144,31 @@ FROM (
                      WHERE  ([ScormActivity].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity].[ResourceActivityId])										 
 				) 
 					IS NULL
-			)		
+			)
+		AND   
+				(
+					(
+					   -- resource type is not video/audio and launch resource activity doesn't exists
+					   [Res].[ResourceTypeId] NOT IN (7,2) AND NOT (EXISTS
+								(
+									SELECT 1 FROM   [activity].[ResourceActivity] AS [ResAct1]
+									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId]
+								))
+					)
+				OR  
+					-- or launch resource activity completed
+					EXISTS
+					(
+							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] = 3
+					)
+					
+				)
+		AND
+				(
+					-- resource type is not assessment and activity status is launched
+					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] = 1
+				)
 
 ) AS [t2]
 LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index 5eb46e6cb..def1b45e4 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -213,7 +213,30 @@ FROM (
 				) 
 					IS NULL
 			)		
-		
+		AND   
+				(
+					(
+					   -- resource type is not video/audio and launch resource activity doesn't exists
+					   [Res].[ResourceTypeId] NOT IN (7,2) AND NOT (EXISTS
+								(
+									SELECT 1 FROM   [activity].[ResourceActivity] AS [ResAct1]
+									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId]
+								))
+					)
+				OR  
+					-- or launch resource activity completed
+					EXISTS
+					(
+							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] = 3
+					)
+					
+				)
+		AND
+				(
+					-- resource type is not assessment and activity status is launched
+					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] = 1
+				)
 		AND
 				(
 						@filterActivityStatus = 0			
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index 329cbcfed..4bd7cf1d2 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -128,7 +128,31 @@ FROM (
                      WHERE  ([ScormActivity].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity].[ResourceActivityId])										 
 				) 
 					IS NULL
-			)		
+			)	
+		AND   
+				(
+					(
+					   -- resource type is not video/audio and launch resource activity doesn't exists
+					   [Res].[ResourceTypeId] NOT IN (7,2) AND NOT (EXISTS
+								(
+									SELECT 1 FROM   [activity].[ResourceActivity] AS [ResAct1]
+									WHERE  [ResAct1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ResAct1].[LaunchResourceActivityId]
+								))
+					)
+				OR  
+					-- or launch resource activity completed
+					EXISTS
+					(
+							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
+							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] = 3
+					)
+					
+				)
+		AND
+				(
+					-- resource type is not assessment and activity status is launched
+					[Res].[ResourceTypeId] <> 11 OR [ResourceActivity].[ActivityStatusId] = 1
+				)
 		AND   
 					(
 						@filterActivityStatus = 0			
diff --git a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
index 9b70c942b..1c3a96adb 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
@@ -96,6 +96,7 @@ public IQueryable<ResourceActivity> GetByUserId(int userId)
             //
             // For assessment activities, only include the original activities that were created when starting the assessment. The created end record is only for consistency.
             // It's easier to get the real assessment resource activity from the original resource activity, so only fetch that one.
+            // TD-4047: As part of this defect bringing back the removed code which then used for the new stored procedure created as part of performance improvement.
             return this.DbContext.ResourceActivity
                .Include(r => r.Resource)
                .ThenInclude(r => r.ResourceReference)
@@ -111,9 +112,10 @@ public IQueryable<ResourceActivity> GetByUserId(int userId)
                .Include(r => r.NodePath)
                .AsNoTracking()
              .Where(r =>
-                            r.UserId == userId && r.ScormActivity.First().CmiCoreLessonStatus != (int)ActivityStatusEnum.Completed &&
-                           ((!r.InverseLaunchResourceActivity.Any()) ||
-                              r.InverseLaunchResourceActivity.Any()))
+                      r.UserId == userId && r.ScormActivity.First().CmiCoreLessonStatus != (int)ActivityStatusEnum.Completed &&
+                     ((r.Resource.ResourceTypeEnum != ResourceTypeEnum.Video && r.Resource.ResourceTypeEnum != ResourceTypeEnum.Audio && !r.InverseLaunchResourceActivity.Any()) ||
+                        r.InverseLaunchResourceActivity.Any(y => y.ActivityStatusId == (int)ActivityStatusEnum.Completed)) &&
+                     (r.Resource.ResourceTypeEnum != ResourceTypeEnum.Assessment || r.ActivityStatusId == (int)ActivityStatusEnum.Launched))
               .OrderByDescending(r => r.ActivityStart);
         }
 

From 9a81d19b61e473121d8255f0e6c68f548847c792 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 17 Apr 2024 14:11:18 +0100
Subject: [PATCH 06/13] Corrected the naming convention for uniformity

---
 LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs          | 2 +-
 LearningHub.Nhs.WebUI/Views/MyLearning/_filterSummary.cshtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs b/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs
index bbf6740f2..c7ae8692d 100644
--- a/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs
+++ b/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs
@@ -185,7 +185,7 @@ public List<CheckboxListItemViewModel> StatusFilterCheckbox()
             var checkboxes = new List<CheckboxListItemViewModel>()
             {
                 new CheckboxListItemViewModel("Complete", "Completed", null),
-                new CheckboxListItemViewModel("Incomplete", "In Progress", null),
+                new CheckboxListItemViewModel("Incomplete", "In progress", null),
                 new CheckboxListItemViewModel("Passed", "Passed", null),
                 new CheckboxListItemViewModel("Failed", "Failed", null),
                 new CheckboxListItemViewModel("Downloaded", "Downloaded", null),
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/_filterSummary.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/_filterSummary.cshtml
index 2e9c726b0..42ad771b1 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/_filterSummary.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/_filterSummary.cshtml
@@ -57,7 +57,7 @@
     }
     @if (Model.Incomplete)
     {
-        filtersummary = filtersummary + $" <strong class='nhsuk-tag'>In Progress</strong>";
+        filtersummary = filtersummary + $" <strong class='nhsuk-tag'>In progress</strong>";
     }
     @if (Model.Passed)
     {

From a9dd7fe3b68ad29eb515b0ac12f278f5190dd373 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 17 Apr 2024 15:13:45 +0100
Subject: [PATCH 07/13] TD-3955 : Reverted the changes related to the Scorm
 commit

---
 .../Controllers/Api/ScormController.cs           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
index 12adf699d..66516430e 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
@@ -230,10 +230,10 @@ private async Task<bool> Commit(SCO scoObject)
             try
             {
                 var activeContent = this.userService.GetActiveContentAsync().Result;
-                if (activeContent.Count == 0)
-                {
-                    return false;
-                }
+                ////if (activeContent.Count == 0)
+                ////{
+                ////    return false;
+                ////}
 
                 if (!activeContent.Any(ac => ac.ScormActivityId == scoObject.InstanceId))
                 {
@@ -265,10 +265,10 @@ private async Task<bool> Commit(SCO scoObject)
 
                 // Persist update.
                 await this.activityService.UpdateScormActivityAsync(scoObject);
-                if (scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Completed) || scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Passed))
-                {
-                    await this.activityService.CompleteScormActivity(scoObject);
-                }
+                ////if (scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Completed) || scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Passed))
+                ////{
+                ////    await this.activityService.CompleteScormActivity(scoObject);
+                ////}
 
                 return true;
             }

From fc75b2519ef8ee2c05219cbe42d117ea71e683db Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 17 Apr 2024 17:08:32 +0100
Subject: [PATCH 08/13] TD-1325: Reverted the changes as it is causing some LMS
 server issues

---
 .../Controllers/Api/ScormController.cs              |  9 ---------
 .../Activity/ScormActivityComplete.sql              | 13 +++++++------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
index 66516430e..ba9ed57f3 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
@@ -230,11 +230,6 @@ private async Task<bool> Commit(SCO scoObject)
             try
             {
                 var activeContent = this.userService.GetActiveContentAsync().Result;
-                ////if (activeContent.Count == 0)
-                ////{
-                ////    return false;
-                ////}
-
                 if (!activeContent.Any(ac => ac.ScormActivityId == scoObject.InstanceId))
                 {
                     throw new Exception($"User does not have ActiveContent for ScormActivityId={scoObject.InstanceId}");
@@ -265,10 +260,6 @@ private async Task<bool> Commit(SCO scoObject)
 
                 // Persist update.
                 await this.activityService.UpdateScormActivityAsync(scoObject);
-                ////if (scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Completed) || scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Passed))
-                ////{
-                ////    await this.activityService.CompleteScormActivity(scoObject);
-                ////}
 
                 return true;
             }
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql
index 48258f338..c04238a5a 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/ScormActivityComplete.sql	
@@ -6,7 +6,7 @@
 -- Modification History
 --
 -- 11-06-2021  Killian Davies	Initial Revision
--- 22-03-2024  Sarathlal		TD-1325
+-- 17-04-2024  Swapna Abraham	Reverted TD-1325 changes
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[ScormActivityComplete]
 (
@@ -24,7 +24,7 @@ BEGIN
 	DECLARE @DurationSeconds int
 	DECLARE @ScormActivityDurationLimitHours int = 10 * 60 * 60
 	DECLARE @AmendDate datetimeoffset(7) = ISNULL(TODATETIMEOFFSET(DATEADD(mi, @UserTimezoneOffset, GETUTCDATE()), @UserTimezoneOffset), SYSDATETIMEOFFSET())
-	DECLARE @CmiCoreSessionTime NVARCHAR(MAX)
+
 	SELECT 
 		@ScormResourceActivityId = [ResourceActivityId],
 		@ActivityStatusId = CmiCoreLesson_status,
@@ -33,8 +33,7 @@ BEGIN
 							WHEN (activity.ScormTimeToSeconds(CmiCoreSession_time) >= @ScormActivityDurationLimitHours) THEN (@ScormActivityDurationLimitHours - 1)
 							ELSE activity.ScormTimeToSeconds(CmiCoreSession_time) 
 						   END,
-		@Score = CmiCoreScoreRaw,
-		@CmiCoreSessionTime = CmiCoreSession_time
+		@Score = CmiCoreScoreRaw
 	FROM 
 		activity.ScormActivity sa
 	INNER JOIN	
@@ -54,7 +53,7 @@ BEGIN
 	END
 
 	-- Validation ported from e-LfH: completed status requires duration > 0
-	IF ((@ActivityStatusId IN (3, 4, 5) AND @DurationSeconds > 0) OR (@ActivityStatusId=3 AND @CmiCoreSessionTime =''))
+	IF (@ActivityStatusId IN (3, 4, 5) AND @DurationSeconds > 0)
 	BEGIN TRY
 		BEGIN TRAN
 
@@ -123,4 +122,6 @@ BEGIN
 				,@ErrorState
 				);
 	END CATCH
-END
\ No newline at end of file
+END
+
+GO
\ No newline at end of file

From 6cb0c530b1c5abede0912e62bc08a802f7505b73 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 18 Apr 2024 13:15:58 +0100
Subject: [PATCH 09/13] TD-4052 bugfix

---
 .../Controllers/Api/ContributeController.cs            |  4 ++--
 LearningHub.Nhs.WebUI/Services/FileService.cs          |  4 ++++
 WebAPI/LearningHub.Nhs.Services/ResourceService.cs     | 10 +++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
index 279bda210..ba8e6b975 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
@@ -228,7 +228,7 @@ public async Task<ActionResult> DeleteResourceVersion(int resourceVersionId)
             var validationResult = await this.contributeService.DeleteResourceVersionAsync(resourceVersionId);
             if (validationResult.IsValid)
             {
-                if (associatedFile.Any())
+                if (associatedFile != null && associatedFile.Any())
                 {
                     _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, associatedFile); });
                 }
@@ -348,7 +348,7 @@ public async Task<ActionResult> PublishResourceVersionAsync([FromBody] PublishVi
                 if (associatedResource.ResourceTypeEnum != ResourceTypeEnum.Scorm && associatedResource.ResourceTypeEnum != ResourceTypeEnum.Html)
                 {
                     var obsoleteFiles = await this.resourceService.GetObsoleteResourceFile(publishViewModel.ResourceVersionId);
-                    if (obsoleteFiles.Any())
+                    if (obsoleteFiles != null && obsoleteFiles.Any())
                     {
                         await this.fileService.PurgeResourceFile(null, obsoleteFiles);
                     }
diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs
index 1aa8078e8..d9a95f440 100644
--- a/LearningHub.Nhs.WebUI/Services/FileService.cs
+++ b/LearningHub.Nhs.WebUI/Services/FileService.cs
@@ -405,6 +405,10 @@ private async Task MoveInPutDirectoryToArchive(List<string> allDirectoryRef)
                 {
                     var directory = this.ShareClient.GetDirectoryClient(directoryRef);
                     var archiveDirectory = this.InputArchiveShareClient.GetDirectoryClient(directoryRef);
+                    if (!directory.Exists())
+                    {
+                        continue;
+                    }
 
                     await foreach (var fileItem in directory.GetFilesAndDirectoriesAsync())
                     {
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 69663fcc7..f7d855edc 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1390,7 +1390,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Audio)
                 {
-                    if (resource.AudioDetails.File.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
+                    if (resource.AudioDetails?.File?.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1402,7 +1402,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                         }
                     }
 
-                    if (resource.AudioDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
+                    if (resource.AudioDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1416,7 +1416,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Video)
                 {
-                    if (resource.VideoDetails.File.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
+                    if (resource.VideoDetails?.File?.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1428,7 +1428,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                         }
                     }
 
-                    if (resource.VideoDetails.ResourceAzureMediaAsset.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
+                    if (resource.VideoDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
                     {
                         if (!deletedResource)
                         {
@@ -1443,7 +1443,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Article)
                 {
                     var inputResourceFiles = resource.ArticleDetails.Files.ToList();
-                    var previousPublishedfiles = extendedResourceVersion.ArticleDetails.Files.ToList();
+                    var previousPublishedfiles = extendedResourceVersion.ArticleDetails?.Files?.ToList();
                     if (!deletedResource)
                     {
                         if (previousPublishedfiles.Any())

From 497c23d12ca9eba7ab25c1406db42f506342059b Mon Sep 17 00:00:00 2001
From: Sarathlal Sarangadharan <Sarathlal.Sarangadharan@hee.nhs.uk>
Date: Fri, 19 Apr 2024 11:55:33 +0100
Subject: [PATCH 10/13] TD-4057: Limited the characters to 3000 to findwise

---
 WebAPI/LearningHub.Nhs.Services/CatalogueService.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
index f9c26859d..c34cc4b9f 100644
--- a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
@@ -259,6 +259,7 @@ public async Task<LearningHubValidationResult> CreateCatalogueAsync(int userId,
             if (cnv != null)
             {
                 var searchModel = this.mapper.Map<SearchCatalogueRequestModel>(cnv);
+                searchModel.Description = searchModel.Description.Substring(0, 2995) + "</p>";
                 await this.findwiseApiFacade.AddOrReplaceAsync(new List<SearchCatalogueRequestModel> { searchModel });
             }
 

From 8979d3a186425e3f212cb290ef1834a526dc324a Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Fri, 19 Apr 2024 13:32:36 +0100
Subject: [PATCH 11/13] Replace search button text to Search. Correct catalogue
 alt name. Remove button role from bookmark links. Replace search bar val
 "submit" with "search". Replace h3 with h2 for search items. Add fieldset and
 legend to search filter.

---
 .../Styles/nhsuk/pages/catalogue.scss         |  6 +++-
 .../Styles/nhsuk/pages/search.scss            |  4 +++
 .../Views/Catalogue/Catalogues.cshtml         |  4 +--
 .../Views/Catalogue/Index.cshtml              |  4 +--
 .../Views/Catalogue/_ContentStructure.cshtml  |  2 +-
 .../Views/Catalogue/_SearchBar.cshtml         |  4 +--
 .../Views/Home/_CatalogueCard.cshtml          |  2 +-
 .../Views/Home/_ResourceCard.cshtml           |  2 +-
 .../Views/Resource/Resource.cshtml            |  4 +--
 .../Search/_CatalogueSearchResult.cshtml      |  4 +--
 .../Views/Search/_ResourceFilter.cshtml       | 32 ++++++++++++-------
 .../Views/Search/_ResourceSearchResult.cshtml |  2 +-
 .../Views/Search/_SearchBar.cshtml            |  4 +--
 13 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
index 4aba85b35..611b62efa 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
@@ -91,9 +91,13 @@ textarea {
     padding: 20px 0 32px 0;
     border-bottom: 1px solid $nhsuk-grey-light;
 
-    p, h3 {
+    p, h2, h3 {
         margin: 0;
     }
+
+    h2.nhsuk-u-reading-width {
+        font-size: x-large;
+    }
 }
 
 .personal-details-table {
diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
index 9e800942d..c43713aaa 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
@@ -156,6 +156,10 @@
         .search-filter-items {
             border-top: 1px $nhsuk-grey-light solid;
             background-color: $nhsuk-grey-white;
+
+            h2 {
+                font-size: larger;
+            }
         }
     }
 
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
index d184442fb..6eda29434 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
@@ -76,7 +76,7 @@
                     }
                   </div>
                   <div>
-                    <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+                    <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
                      asp-route-bookmarked="@item.IsBookmarked"
                      asp-route-id="@item.BookmarkId"
                      asp-route-title="@item.Name.Truncate(60)"
@@ -90,7 +90,7 @@
                 <div>
                   @if (!string.IsNullOrEmpty(item.BadgeUrl))
                   {
-                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
+                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
                   }
                 </div>
               </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
index 23be8c9a0..4a62262bc 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
@@ -126,7 +126,7 @@
       <div class="catalogue-title nhsuk-u-margin-bottom-7">
         @if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
         {
-          <img alt="ELFH catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
+          <img alt="Provider's catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
         }
 
         <h1 class="heading-lg title nhsuk-u-margin-bottom-0">@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)</h1>
@@ -140,7 +140,7 @@
       @if (ViewBag.UserAuthenticated)
       {
         <div class="nhsuk-u-margin-bottom-4">
-          <a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+          <a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
            asp-route-bookmarked="@Model.Catalogue.IsBookmarked"
            asp-route-id="@Model.Catalogue.BookmarkId"
            asp-route-title="@Model.Catalogue.Name.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
index 492ab0933..abab52181 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
@@ -25,7 +25,7 @@
     }
         else
         {
-            <h3 class="nhsuk-u-reading-width"><a asp-controller="Resource" asp-action="Index" asp-route-resourcereferenceid="@item.ResourceReferenceId">@item.Name</a></h3>
+            <h2 class="nhsuk-u-reading-width"><a asp-controller="Resource" asp-action="Index" asp-route-resourcereferenceid="@item.ResourceReferenceId">@item.Name</a></h2>
             <div class="resource-metadata">
                 <div class="nhsuk-u-padding-right-5"><span class="nhsuk-u-font-weight-bold">Type:</span> @UtilityHelper.GetPrettifiedResourceTypeName((ResourceTypeEnum)item.ResourceTypeId, item.DurationInMilliseconds)</div>
                 <div class="nhsuk-u-padding-right-5 star-rating-container">
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
index 2e7f5c50b..c8d254bf8 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/_SearchBar.cshtml
@@ -5,9 +5,7 @@
         <label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search</label>
         <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" value="@Model" placeholder="Search">
         <button class="nhsuk-search__submit" type="submit">
-            <span class="nhsuk-u-visually-hidden">
-                Submit
-            </span>
+            <span class="nhsuk-u-visually-hidden">Search</span>
             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
             </svg>
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
index 4512c50f7..ac50513b8 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
@@ -50,7 +50,7 @@
             }
           </div>
           <div>
-            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
                asp-route-bookmarked="@Model.IsBookmarked"
                asp-route-id="@Model.BookmarkId"
                asp-route-title="@Model.Name.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
index 309c4dad3..6379cddb7 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
@@ -65,7 +65,7 @@
             }
           </div>
           <div>
-            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
+            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" asp-controller="Bookmark" asp-action="BookmarkResource"
                asp-route-bookmarked="@Model.Item2.IsBookmarked"
                asp-route-id="@Model.Item2.BookmarkId"
                asp-route-title="@Model.Item2.Title.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml b/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
index 0c89a0f24..cf63994c4 100644
--- a/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
@@ -190,7 +190,7 @@
                         </form>
                     }
                 </div>
-                <a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
+                <a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkResource"
                    asp-route-bookmarked="@Model.ResourceItem.IsBookmarked"
                    asp-route-id="@Model.ResourceItem.BookmarkId"
                    asp-route-title="@Model.ResourceItem.Title.Truncate(60)"
@@ -256,7 +256,7 @@
                                 </form>
                             }
                         </div>
-                        <a class="nhsuk-u-font-size-16" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
+                        <a class="nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkResource"
                            asp-route-bookmarked="@Model.ResourceItem.IsBookmarked"
                            asp-route-id="@Model.ResourceItem.BookmarkId"
                            asp-route-title="@Model.ResourceItem.Title.Truncate(60)"
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
index 2bcfbf19c..a27a7aba0 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
@@ -89,11 +89,11 @@
                 <div>
                   @if (provider != null)
                   {
-                    <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
+                    <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
                   }
                   else @if (hasBadge)
                   {
-                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
+                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="Provider's catalogue badge" class="catalogue-card-badge" />
                   }
                 </div>
               </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml
index 818f2bf1f..429eae962 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceFilter.cshtml
@@ -89,8 +89,10 @@
                     }
 
                     <div class="nhsuk-grid-row">
-                        <div class="nhsuk-grid-column-full">
-                            <h4>Sort by:</h4>
+                        <fieldset class="nhsuk-grid-column-full">
+                            <legend>
+                                <h2>Sort by:</h2>
+                            </legend>
 
                             <div class="nhsuk-radios">
                                 @foreach (var sortItem in resourceResult.SortItemList)
@@ -107,7 +109,7 @@
                                 }
 
                             </div>
-                        </div>
+                        </fieldset>
                     </div>
 
                     @if (resourceResult.SearchResourceAccessLevelFilters != null && resourceResult.SearchResourceAccessLevelFilters.Any())
@@ -115,8 +117,10 @@
                         <hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />
 
                         <div class="nhsuk-grid-row">
-                            <div class="nhsuk-grid-column-full">
-                                <h4>Filter by audience access level:</h4>
+                            <fieldset class="nhsuk-grid-column-full">
+                                <legend>
+                                    <h2>Filter by audience access level:</h2>
+                                </legend>
 
                                 <div class="nhsuk-checkboxes">
                                     @foreach (var filter in resourceResult.SearchResourceAccessLevelFilters)
@@ -132,7 +136,7 @@
                                         </div>
                                     }
                                 </div>
-                            </div>
+                            </fieldset>
                         </div>
                     }
 
@@ -141,8 +145,10 @@
                         <hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />
 
                         <div class="nhsuk-grid-row">
-                            <div class="nhsuk-grid-column-full">
-                                <h4>Filter by provider:</h4>
+                            <fieldset class="nhsuk-grid-column-full">
+                                <legend>
+                                    <h2>Filter by provider:</h2>
+                                </legend>
 
                                 <div class="nhsuk-checkboxes">
                                     @foreach (var filter in resourceResult.SearchProviderFilters)
@@ -159,15 +165,17 @@
                                         </div>
                                     }
                                 </div>
-                            </div>
+                            </fieldset>
                         </div>
                     }
 
                     <hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4" />
 
                     <div class="nhsuk-grid-row">
-                        <div class="nhsuk-grid-column-full">
-                            <h4>Filter by:</h4>
+                        <fieldset class="nhsuk-grid-column-full">
+                            <legend>
+                                <h2>Filter by:</h2>
+                            </legend>
 
                             <div class="nhsuk-checkboxes">
                                 @foreach (var filter in resourceResult.SearchFilters)
@@ -185,7 +193,7 @@
                                 }
 
                             </div>
-                        </div>
+                        </fieldset>
                     </div>
 
                     <button class="nhsuk-button nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-0" data-module="nhsuk-button" type="submit">
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
index 6e0f806bd..f5eac8b6c 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
@@ -82,7 +82,7 @@
     <div class="resource-author">
       @if (!string.IsNullOrWhiteSpace(item.CatalogueBadgeUrl) && showCatalogueFieldsInResources)
       {
-        <img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" alt="Resource catalog badge"/>
+        <img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" alt="Provider's catalogue badge"/>
       }
 
       @if (!string.IsNullOrEmpty(item.CatalogueName) && !this.Model.CatalogueId.HasValue && showCatalogueFieldsInResources)
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
index 961f9c1aa..620d6cb76 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_SearchBar.cshtml
@@ -5,9 +5,7 @@
         <label class="nhsuk-label nhsuk-u-visually-hidden" for="sub-search-field">Search the learning hub</label>
         <input class="nhsuk-input nhsuk-search__input" type="search" name="term" autocomplete="off" id="sub-search-field" placeholder="Search the learning hub" value="@Model">
         <button class="nhsuk-search__submit" type="submit">
-            <span class="nhsuk-u-visually-hidden">
-                Submit
-            </span>
+            <span class="nhsuk-u-visually-hidden">Search</span>
             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
             </svg>

From 4944fb51eecd244da01dc05d1672d633fdb91e48 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 22 Apr 2024 09:33:50 +0100
Subject: [PATCH 12/13] TD-3023 move deleted case resource files to archive

---
 .../Controllers/Api/ContributeController.cs   | 101 ++++++++++++++++++
 LearningHub.Nhs.WebUI/Services/FileService.cs |  14 ++-
 .../ResourceService.cs                        |  67 ++++++++++++
 3 files changed, 179 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
index ba8e6b975..a1716767a 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
@@ -9,6 +9,7 @@
     using System.Web;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
+    using LearningHub.Nhs.Models.Resource.Blocks;
     using LearningHub.Nhs.Models.Resource.Contribute;
     using LearningHub.Nhs.Models.Resource.Files;
     using LearningHub.Nhs.WebUI.Interfaces;
@@ -490,7 +491,9 @@ public async Task<ActionResult> SaveWeblinkDetailAsync([FromBody] WebLinkViewMod
         [Route("SaveCaseDetail")]
         public async Task<ActionResult> SaveCaseDetailAsync([FromBody] CaseViewModel request)
         {
+            var existingResourceState = await this.resourceService.GetResourceVersionExtendedAsync(request.ResourceVersionId);
             int resourceVersionId = await this.contributeService.SaveCaseDetailAsync(request);
+            this.RemoveDeletedCaseFiles(existingResourceState?.CaseDetails, request);
             return this.Ok(resourceVersionId);
         }
 
@@ -623,5 +626,103 @@ private async Task<bool> UserCanEditCatalogue(int catalogueId)
         {
             return await this.catalogueService.CanCurrentUserEditCatalogue(catalogueId);
         }
+
+        private void RemoveDeletedCaseFiles(CaseViewModel existingResource, CaseViewModel newResource)
+        {
+            try
+            {
+                var filePaths = new List<string>();
+                if (existingResource != null && existingResource.BlockCollection != null)
+                {
+                    var allBlocks = existingResource.BlockCollection.Blocks.ToList();
+                    var newBlocks = newResource.BlockCollection.Blocks.ToList();
+                    if (allBlocks.Any())
+                    {
+                        var existingAttachements = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null).ToList();
+                        if (existingAttachements.Any())
+                        {
+                            foreach (var oldblock in existingAttachements)
+                            {
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null && x.MediaBlock.Attachment.File?.FileId == oldblock.MediaBlock.Attachment?.File?.FileId);
+                                if (entry == null)
+                                {
+                                    filePaths.Add(oldblock.MediaBlock.Attachment?.File?.FilePath);
+                                }
+                            }
+                        }
+
+                        var existingVideos = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null).ToList();
+                        if (existingVideos.Any())
+                        {
+                            foreach (var oldblock in existingVideos)
+                            {
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null && x.MediaBlock.Video.VideoFile?.File?.FileId == oldblock.MediaBlock?.Video?.VideoFile?.File?.FileId);
+                                if (entry == null)
+                                {
+                                    filePaths.Add(oldblock.MediaBlock.Video?.VideoFile?.File?.FilePath);
+                                    if (oldblock.MediaBlock?.Video?.VideoFile?.TranscriptFile?.File?.FilePath != null)
+                                    {
+                                        filePaths.Add(oldblock.MediaBlock.Video?.VideoFile?.TranscriptFile?.File?.FilePath);
+                                    }
+                                }
+                            }
+                        }
+
+                        var existingImages = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null).ToList();
+                        if (existingImages.Any())
+                        {
+                            foreach (var oldblock in existingImages)
+                            {
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null && x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId);
+                                if (entry == null)
+                                {
+                                    filePaths.Add(oldblock?.MediaBlock?.Image?.File?.FilePath);
+                                }
+                            }
+                        }
+
+                        var existingImageCarousel = allBlocks.Where(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null).ToList();
+                        if (existingImageCarousel.Any())
+                        {
+                            foreach (var imageBlock in existingImageCarousel)
+                            {
+                                foreach (var oldblock in imageBlock?.ImageCarouselBlock?.ImageBlockCollection?.Blocks)
+                                {
+                                    var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks.Where(x => x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId).Any());
+                                    if (entry == null)
+                                    {
+                                        filePaths.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
+                                    }
+                                }
+                            }
+                        }
+
+                        var existingWholeSlideImages = allBlocks.Where(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Any()).ToList();
+                        if (existingWholeSlideImages.Any())
+                        {
+                            foreach (var wsi in existingWholeSlideImages)
+                            {
+                                foreach (var oldblock in wsi?.WholeSlideImageBlock?.WholeSlideImageBlockItems)
+                                {
+                                    var entry = newBlocks.FirstOrDefault(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Where(x => x.WholeSlideImage?.File?.FileId == oldblock.WholeSlideImage?.File?.FileId).Any());
+                                    if (entry == null)
+                                    {
+                                        filePaths.Add(oldblock.WholeSlideImage?.File?.FilePath);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (filePaths != null && filePaths.Any())
+                {
+                    _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, filePaths); });
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+        }
     }
 }
diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs
index d9a95f440..a2120a74d 100644
--- a/LearningHub.Nhs.WebUI/Services/FileService.cs
+++ b/LearningHub.Nhs.WebUI/Services/FileService.cs
@@ -7,11 +7,9 @@
     using System.Threading.Tasks;
     using Azure.Storage.Files.Shares;
     using Azure.Storage.Files.Shares.Models;
-    using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Interfaces;
-    using Microsoft.AspNetCore.Mvc.Filters;
     using Microsoft.AspNetCore.StaticFiles;
     using Microsoft.Extensions.Options;
 
@@ -89,7 +87,7 @@ private ShareClient InputArchiveShareClient
 
                     this.archiveShareClient = new ShareClient(this.settings.AzureSourceArchiveStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
 
-                    if (!this.shareClient.Exists())
+                    if (!this.archiveShareClient.Exists())
                     {
                         throw new Exception($"Unable to access azure file storage resource {this.settings.AzureFileStorageResourceShareName}");
                     }
@@ -130,6 +128,7 @@ public async Task DeleteChunkDirectory(string directoryRef, int chunks)
         public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName)
         {
             var directory = this.ShareClient.GetDirectoryClient(filePath);
+            var sourceDirectory = this.InputArchiveShareClient.GetDirectoryClient(filePath);
 
             if (await directory.ExistsAsync())
             {
@@ -140,6 +139,15 @@ public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, stri
                     return await file.DownloadAsync();
                 }
             }
+            else if (await sourceDirectory.ExistsAsync())
+            {
+                var file = sourceDirectory.GetFileClient(fileName);
+
+                if (await file.ExistsAsync())
+                {
+                    return await file.DownloadAsync();
+                }
+            }
 
             return null;
         }
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index f7d855edc..9ff98ef4a 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1471,6 +1471,73 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                         }
                     }
                 }
+                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Case)
+                {
+                    if (deletedResource)
+                    {
+                        if (resource != null)
+                        {
+                            var allBlocks = resource.CaseDetails.BlockCollection.Blocks.ToList();
+                            if (allBlocks.Any())
+                            {
+                                var existingAttachements = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null).ToList();
+                                if (existingAttachements.Any())
+                                {
+                                    foreach (var oldblock in existingAttachements)
+                                    {
+                                        retVal.Add(oldblock.MediaBlock.Attachment?.File?.FilePath);
+                                    }
+                                }
+
+                                var existingVideos = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null).ToList();
+                                if (existingVideos.Any())
+                                {
+                                    foreach (var oldblock in existingVideos)
+                                    {
+                                        retVal.Add(oldblock.MediaBlock.Video?.VideoFile?.File?.FilePath);
+                                        if (oldblock.MediaBlock?.Video?.VideoFile.TranscriptFile?.File.FilePath != null)
+                                        {
+                                            retVal.Add(oldblock.MediaBlock.Video?.VideoFile?.TranscriptFile?.File?.FilePath);
+                                        }
+                                    }
+                                }
+
+                                var existingImages = allBlocks.Where(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null).ToList();
+                                if (existingImages.Any())
+                                {
+                                    foreach (var oldblock in existingImages)
+                                    {
+                                        retVal.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
+                                    }
+                                }
+
+                                var existingImageCarousel = allBlocks.Where(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null).ToList();
+                                if (existingImageCarousel.Any())
+                                {
+                                    foreach (var imageBlock in existingImageCarousel)
+                                    {
+                                        foreach (var oldblock in imageBlock.ImageCarouselBlock.ImageBlockCollection.Blocks)
+                                        {
+                                            retVal.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
+                                        }
+                                    }
+                                }
+
+                                var existingWholeSlideImages = allBlocks.Where(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Any()).ToList();
+                                if (existingWholeSlideImages.Any())
+                                {
+                                    foreach (var wsi in existingWholeSlideImages)
+                                    {
+                                        foreach (var oldblock in wsi.WholeSlideImageBlock.WholeSlideImageBlockItems)
+                                        {
+                                            retVal.Add(oldblock.WholeSlideImage?.File?.FilePath);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
             }
 
             return retVal;

From 27b2cb97f394bac56b64376716cbb5f9a753b038 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Mon, 22 Apr 2024 11:21:03 +0100
Subject: [PATCH 13/13] Correct Skipped headiing issue for catalogue folders

---
 LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss    | 2 +-
 LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss   | 7 +++++++
 .../Views/Catalogue/_ContentStructure.cshtml              | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss
index bc8bac3c9..6378eae15 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss
@@ -29,7 +29,7 @@ a.cancel-link:visited {
     }
 }
 
-.folder-title {
+div.folder-title {
     font-weight: bold;
 }
 
diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
index 611b62efa..22ffd1a18 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
@@ -29,6 +29,13 @@ textarea {
     }
 }
 
+@media(min-width: 40.0625em) {
+    .folder-title {
+        font-size: 24px;
+        font-size: 1.5rem;
+    }
+}
+
 .folder-title_empty {
     display: flex;
 
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
index abab52181..a39cfebcd 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/_ContentStructure.cshtml
@@ -10,17 +10,17 @@
     {
       @if (item.IsEmptyFolder)
       {
-        <h3 class="folder-title">
+        <h2 class="folder-title">
           <img src="/images/folder-icon.svg" alt="folder icon" />
           <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-nodeId="@item.NodeId">@item.Name</a>
-        </h3>
+        </h2>
       }
       else
       {
-        <h3 class="folder-title_empty">
+        <h2 class="folder-title_empty">
           <img src="/images/folder-icon.svg" alt="folder icon" />
           @item.Name
-        </h3>
+        </h2>
       }
     }
         else