From 9c9b1a1fcef57b8dfbe1d7152fbd5d974caa502d Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Thu, 28 Mar 2024 08:46:04 +0000
Subject: [PATCH 01/64] TD-3703-Changes

---
 LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
index a721fcae6..886579ba4 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
@@ -13,11 +13,11 @@
 <div class="breadcrumbs display-desktop--hide nhsuk-u-padding-top-5 nhsuk-u-padding-bottom-6">
     @if (Model.ShowBackToParentOnMobile)
     {
-        @* "Back to parent" view *@
+        @* "parent View *@
         var parent = Model.Breadcrumbs.ElementAt(Model.Breadcrumbs.Count - 1);
 
         <i class="fa-solid fa-chevron-left nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>
-        <a href="@parent.Url">Back to parent</a>
+        <a href="@parent.Url">@parent.Url</a>
     }
     else
     {

From a157e64f2800b49587ca6a34d9b8070f9cb02991 Mon Sep 17 00:00:00 2001
From: Anju Jose <Anju.Jose@hee.nhs.uk>
Date: Thu, 28 Mar 2024 08:50:37 +0000
Subject: [PATCH 02/64] fixes

---
 LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
index 886579ba4..5c57374b5 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
@@ -13,7 +13,7 @@
 <div class="breadcrumbs display-desktop--hide nhsuk-u-padding-top-5 nhsuk-u-padding-bottom-6">
     @if (Model.ShowBackToParentOnMobile)
     {
-        @* "parent View *@
+        @* "parent view *@
         var parent = Model.Breadcrumbs.ElementAt(Model.Breadcrumbs.Count - 1);
 
         <i class="fa-solid fa-chevron-left nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>

From 21cbd8a1b4772375512b658986bbfbf2c3c4d6e9 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 9 Apr 2024 15:20:22 +0100
Subject: [PATCH 03/64] TD-3951:Missing back link names on few Bookmarks
 screens and issue when there is an error on few screens

---
 .../Views/Bookmark/Rename.cshtml              |   2 +-
 .../Views/Bookmark/Toggle.cshtml              | 222 +++++++++---------
 2 files changed, 115 insertions(+), 109 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Bookmark/Rename.cshtml b/LearningHub.Nhs.WebUI/Views/Bookmark/Rename.cshtml
index 182a537ca..2ab7ed9dc 100644
--- a/LearningHub.Nhs.WebUI/Views/Bookmark/Rename.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Bookmark/Rename.cshtml
@@ -30,7 +30,7 @@
                                        autocomplete="off"
                                        css-class=""
                                        required="true"
-                                       required-client-side-error-message="<a href='#Title'>You must enter a bookmark name</a>" />
+                                       required-client-side-error-message="You must enter a bookmark name" />
                     </div>
                 </div>
             </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Bookmark/Toggle.cshtml b/LearningHub.Nhs.WebUI/Views/Bookmark/Toggle.cshtml
index d06b16fdd..8f77215ae 100644
--- a/LearningHub.Nhs.WebUI/Views/Bookmark/Toggle.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Bookmark/Toggle.cshtml
@@ -1,136 +1,142 @@
 @using System.Text.RegularExpressions
 @model LearningHub.Nhs.WebUI.Models.Bookmark.EditBookmarkViewModel
 @{
-    var bookmarkType = (Model.BookmarkTypeId == 1) ? "Folder" : "Bookmark";
-    var titleAction = Model.Bookmarked ? "Delete" : "Add";
-    var buttonAction = Model.Bookmarked ? "Delete" : "Continue";
+  var bookmarkType = (Model.BookmarkTypeId == 1) ? "Folder" : "Bookmark";
+  var titleAction = Model.Bookmarked ? "Delete" : "Add";
+  var buttonAction = Model.Bookmarked ? "Delete" : "Continue";
 
-    ViewData["Title"] = $"{titleAction} {bookmarkType}";
+  ViewData["Title"] = $"{titleAction} {bookmarkType}";
 
-    // Prepare the parameters for the back-link component.
-    var backToText = "Back to: ";
-    var returnUrl = ViewBag.ReturnUrl.ToLower();
-    var controller = string.Empty;
-    var action = string.Empty;
-    var routeParams = new Dictionary<string, string?>();
+  // Prepare the parameters for the back-link component.
+  var backToText = "Back to: ";
+  var returnUrl = ViewBag.ReturnUrl.ToLower();
+  var controller = string.Empty;
+  var action = string.Empty;
+  var routeParams = new Dictionary<string, string?>();
 
-    if (returnUrl == "/")
+  if (returnUrl == "/")
+  {
+    backToText += "Learning Hub";
+    controller = "home";
+    action = "index";
+  }
+  else if (returnUrl.Contains("/bookmark"))
+  {
+    backToText += "My bookmarks";
+    controller = "bookmark";
+    action = "index";
+  }
+  else
+  {
+    var resourceMatches = Regex.Matches(returnUrl, @"^/resource/([0-9]+)(/item)?$");
+    var catalogueMatches = Regex.Matches(returnUrl, @"^/catalogue/(\w+)$");
+
+    if (resourceMatches.Count > 0)
     {
-        backToText += "Learning Hub";
-        controller = "home";
-        action = "index";
+      backToText += "Learning Resource";
+      controller = "resource";
+      action = "Index";
+      routeParams = new Dictionary<string, string?> { { "resourceReferenceId", resourceMatches[0].Groups[1].Value } };
     }
-    else if (returnUrl == "/bookmark")
+    else if (catalogueMatches.Count > 0)
     {
-        backToText += "My bookmarks";
-        controller = "bookmark";
-        action = "index";
+      backToText += "Catalogue";
+      controller = "catalogue";
+      action = "Index";
+      routeParams = new Dictionary<string, string?> { { "reference", catalogueMatches[0].Groups[1].Value } };
     }
     else
     {
-        var resourceMatches = Regex.Matches(returnUrl, @"^/resource/([0-9]+)(/item)?$");
-        var catalogueMatches = Regex.Matches(returnUrl, @"^/catalogue/(\w+)$");
-
-        if (resourceMatches.Count > 0)
-        {
-            backToText += "Learning Resource";
-            controller = "resource";
-            action = "Index";
-            routeParams = new Dictionary<string, string?> { { "resourceReferenceId", resourceMatches[0].Groups[1].Value } };
-        }
-        else if (catalogueMatches.Count > 0)
-        {
-            backToText += "Catalogue";
-            controller = "catalogue";
-            action = "Index";
-            routeParams = new Dictionary<string, string?> { { "reference", catalogueMatches[0].Groups[1].Value } };
-        }
+      backToText += "Learning Hub";
+      controller = "home";
+      action = "index";
     }
+  }
 }
 
 @section styles{
-    <link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/bookmark.css" asp-append-version="true" />
+  <link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/bookmark.css" asp-append-version="true" />
 }
 
 <div class="bg-white">
-    <div class="nhsuk-width-container app-width-container nhsuk-u-padding-bottom-9">
-        <vc:back-link asp-controller="@controller" asp-action="@action" asp-all-route-data="@routeParams" link-text="@backToText" />
+  <div class="nhsuk-width-container app-width-container nhsuk-u-padding-bottom-9">
+    <vc:back-link asp-controller="@controller" asp-action="@action" asp-all-route-data="@routeParams" link-text="@backToText" />
 
-        <form asp-controller="Bookmark" asp-action="BookmarkToggle" asp-route-returnUrl="@ViewBag.ReturnUrl" method="post">
+    <form asp-controller="Bookmark" asp-action="BookmarkToggle" asp-route-returnUrl="@ViewBag.ReturnUrl" method="post">
 
-            <vc:error-summary order-of-property-names="@(new[] { nameof(Model.Title) })" />
+      <vc:error-summary order-of-property-names="@(new[] { nameof(Model.Title) })" />
 
-            @if (Model.Bookmarked)
-            {
-                @if (Model.BookmarkTypeId == 1)
-                {
-                    <h1>Are you sure you want to delete this folder?</h1>
-                    <div class="nhsuk-inset-text">
-                        <p>All bookmarks contained within the folder will also be deleted. To save any bookmarks move them out of the folder.</p>
-                    </div>
-
-                    <div class="nhsuk-grid-row">
-                        <div class="nhsuk-grid-column-full">
-                            <div class="nhsuk-form-group">
-                                <label class="nhsuk-label nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-4">Folder</label>
-                                <div class="grey-bottom-border-panel">
-                                    <p class="nhsuk-u-margin-bottom-4">@Model.Title</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                }
-                else
-                {
-                    <h1>Are you sure you want to remove this bookmark?</h1>
-                    <div class="nhsuk-grid-row">
-                        <div class="nhsuk-grid-column-full">
-                            <div class="nhsuk-form-group">
-                                <label class="nhsuk-label nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-4">Bookmark</label>
-                                <div class="grey-bottom-border-panel">
-                                    <p class="nhsuk-u-margin-bottom-4">@Model.Title</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                }
-            }
-            else
-            {
-                <h1>Add @(Model.BookmarkTypeId == 1 ? "a folder" : "bookmark")</h1>
+      @if (Model.Bookmarked)
+      {
+        @if (Model.BookmarkTypeId == 1)
+        {
+          <h1>Are you sure you want to delete this folder?</h1>
+          <div class="nhsuk-inset-text">
+            <p>All bookmarks contained within the folder will also be deleted. To save any bookmarks move them out of the folder.</p>
+          </div>
 
-                <div class="nhsuk-grid-row">
-                    <div class="nhsuk-grid-column-two-thirds">
-                        <div class="nhsuk-form-group">
-                            <vc:text-input asp-for="Title"
-                                       label="Enter a @(bookmarkType.ToLower()) name"
-                                       populate-with-current-value="true"
-                                       type="text"
-                                       spell-check="false"
-                                       hint-text=""
-                                       autocomplete="off"
-                                       css-class=""
-                                       required="true"
-                                       required-client-side-error-message="@(Model.BookmarkTypeId == 1 ? "<a href='#Title'>You must enter a folder name</a>" : "<a href='#Title'>You must enter a bookmark name</a>")" />
-                        </div>
-                    </div>
+          <div class="nhsuk-grid-row">
+            <div class="nhsuk-grid-column-full">
+              <div class="nhsuk-form-group">
+                <label class="nhsuk-label nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-4">Folder</label>
+                <div class="grey-bottom-border-panel">
+                  <p class="nhsuk-u-margin-bottom-4">@Model.Title</p>
                 </div>
-            }
-
-            <div class="button-panel">
-                <button type="submit" class="nhsuk-button nhsuk-u-margin-bottom-0">@buttonAction</button>
-                <div class="nhsuk-u-margin-left-5 nhsuk-u-font-size-19">
-                    <a class="cancel-link" href="@ViewBag.ReturnUrl">Cancel</a>
+              </div>
+            </div>
+          </div>
+        }
+        else
+        {
+          <h1>Are you sure you want to remove this bookmark?</h1>
+          <div class="nhsuk-grid-row">
+            <div class="nhsuk-grid-column-full">
+              <div class="nhsuk-form-group">
+                <label class="nhsuk-label nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-4">Bookmark</label>
+                <div class="grey-bottom-border-panel">
+                  <p class="nhsuk-u-margin-bottom-4">@Model.Title</p>
                 </div>
+              </div>
             </div>
+          </div>
+        }
+      }
+      else
+      {
+        <h1>Add @(Model.BookmarkTypeId == 1 ? "a folder" : "bookmark")</h1>
+
+        <div class="nhsuk-grid-row">
+          <div class="nhsuk-grid-column-two-thirds">
+            <div class="nhsuk-form-group">
+              <vc:text-input asp-for="Title"
+                           label="Enter a @(bookmarkType.ToLower()) name"
+                           populate-with-current-value="true"
+                           type="text"
+                           spell-check="false"
+                           hint-text=""
+                           autocomplete="off"
+                           css-class=""
+                           required="true"
+                           required-client-side-error-message="@(Model.BookmarkTypeId == 1 ? "You must enter a folder name" : "You must enter a bookmark name")" />
+            </div>
+          </div>
+        </div>
+      }
+
+      <div class="button-panel">
+        <button type="submit" class="nhsuk-button nhsuk-u-margin-bottom-0">@buttonAction</button>
+        <div class="nhsuk-u-margin-left-5 nhsuk-u-font-size-19">
+          <a class="cancel-link" href="@ViewBag.ReturnUrl">Cancel</a>
+        </div>
+      </div>
 
-            <input type="hidden" asp-for="Id" />
-            <input type="hidden" asp-for="Title" data-val="false" />
-            <input type="hidden" asp-for="BookmarkTypeId" data-val="false" />
-            <input type="hidden" asp-for="Link" />
-            <input type="hidden" asp-for="Rri" />
-            <input type="hidden" asp-for="NodeId" />
-            <input type="hidden" asp-for="Bookmarked" data-val="false" />
-        </form>
-    </div>
+      <input type="hidden" asp-for="Id" />
+      <input type="hidden" asp-for="Title" data-val="false" />
+      <input type="hidden" asp-for="BookmarkTypeId" data-val="false" />
+      <input type="hidden" asp-for="Link" />
+      <input type="hidden" asp-for="Rri" />
+      <input type="hidden" asp-for="NodeId" />
+      <input type="hidden" asp-for="Bookmarked" data-val="false" />
+    </form>
+  </div>
 </div>
\ No newline at end of file

From 29446c29bd6dd4e22a0707b3a6e44774899a9a5f Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 10 Apr 2024 10:32:50 +0100
Subject: [PATCH 04/64] TD-4009: Google Tag Manager tracking for all Non Prod
 Environments

---
 .../_GoogleTagManagerNoScriptPartial.cshtml   |  4 +--
 .../Shared/_GoogleTagManagerPartial.cshtml    | 26 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml
index 0213d8aee..f090cb2a5 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml
@@ -1,6 +1,6 @@
 @inject LearningHub.Nhs.WebUI.Configuration.Settings settings
-
-@if (settings.GoogleTagManagerEnabled) 
+@inject Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnv
+@if (settings.GoogleTagManagerEnabled && hostingEnv.EnvironmentName == "Production")
 { 
 <!-- Google Tag Manager (noscript) -->
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=@settings.GoogleTagManagerContainerId"
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml
index 18286d7ab..051d3c5c7 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml
@@ -1,18 +1,20 @@
 @inject LearningHub.Nhs.WebUI.Configuration.Settings settings
+@inject Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnv
 @{
-    var detectCookieStatusBeforePageLoad = (string)TempData["ObtainUserConsentToTrackPriorToPageLoad"]; // Need to capture cookie status before page load to avoid inconsistencies.
+  var detectCookieStatusBeforePageLoad = (string)TempData["ObtainUserConsentToTrackPriorToPageLoad"]; // Need to capture cookie status before page load to avoid inconsistencies.
 }
 
-@if (detectCookieStatusBeforePageLoad == "true")  // [BY] When the user consent for first time load the follolwing JS. To avoid inconsistencies a temp varaible has been set when the user consent cookie choice
+@if (detectCookieStatusBeforePageLoad == "true" && settings.GoogleTagManagerEnabled && hostingEnv.EnvironmentName == "Production")  // [BY] When the user consent for first time load the follolwing JS. To avoid inconsistencies a temp varaible has been set when the user consent cookie choice
 {
-@if (settings.GoogleTagManagerEnabled) 
-{ 
-<!-- Google Tag Manager -->
-<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','@settings.GoogleTagManagerContainerId');</script>
-<!-- End Google Tag Manager -->
-}
+  <!-- Google Tag Manager -->
+  <script>
+    (function (w, d, s, l, i) {
+      w[l] = w[l] || []; w[l].push({
+        'gtm.start':
+          new Date().getTime(), event: 'gtm.js'
+      }); var f = d.getElementsByTagName(s)[0],
+        j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+          'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', '@settings.GoogleTagManagerContainerId');</script>
+  <!-- End Google Tag Manager -->
 }
\ No newline at end of file

From 90f59a72f1b09f94f613f7b7fa9e3f80eb856f93 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Wed, 10 Apr 2024 11:56:37 +0100
Subject: [PATCH 05/64] TD-2959:Added hyperlinks to the existing html for
 certificate pdf generation

---
 LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs    | 3 ++-
 LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs  | 5 +++++
 .../Views/MyLearning/LearningCertificate.cshtml              | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
index 1061fd44e..a3627ab1e 100644
--- a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
@@ -446,6 +446,7 @@ public async Task<IActionResult> DownloadCertificate(int resourceReferenceId, in
                 var nodePathNodes = await this.hierarchyService.GetNodePathNodes(resource.NodePathId);
                 var currentUser = await this.userService.GetUserByUserIdAsync((userId == 0) ? this.CurrentUserId : (int)userId);
                 var userEmployment = await this.userService.GetUserEmploymentByIdAsync(currentUser.PrimaryUserEmploymentId ?? 0);
+                var resourceItemUrl = this.Settings.LearningHubWebUiUrl.Trim() + "Resource/" + resourceReferenceId + "/Item";
                 if (activity.Item2.CertificateUrl != null)
                 {
                     var file = await this.fileService.DownloadFileAsync(this.filePath, activity.Item2.CertificateUrl);
@@ -456,7 +457,7 @@ public async Task<IActionResult> DownloadCertificate(int resourceReferenceId, in
                     }
                 }
 
-                certificateDetails = new CertificateDetails { AccessCount = activity.Item1, ProfessionalRegistrationNumber = userEmployment?.MedicalCouncilNo, NodeViewModels = nodePathNodes, UserViewModel = currentUser, ResourceItemViewModel = resource, ActivityDetailedItemViewModel = new ActivityDetailedItemViewModel(activity.Item2), DownloadCertificate = true, CertificateBase64Image = base64Image };
+                certificateDetails = new CertificateDetails { AccessCount = activity.Item1, ProfessionalRegistrationNumber = userEmployment?.MedicalCouncilNo, NodeViewModels = nodePathNodes, UserViewModel = currentUser, ResourceItemViewModel = resource, ActivityDetailedItemViewModel = new ActivityDetailedItemViewModel(activity.Item2), DownloadCertificate = true, CertificateBase64Image = base64Image, PdfResoureItemUrl = resourceItemUrl };
                 var renderedViewHTML = new List<string>();
                 certificateDetails.PageNo++;
                 renderedViewHTML.Add(RenderRazorViewToString(this, "LearningCertificate", certificateDetails));
diff --git a/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs b/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs
index f4b74519c..f2ee9043b 100644
--- a/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs
+++ b/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs
@@ -55,5 +55,10 @@ public class CertificateDetails
         /// Gets or sets PageNo.
         /// </summary>
         public int PageNo { get; set; }
+
+        /// <summary>
+        /// Gets or sets ResourseItem Url for certificate PDF Download.
+        /// </summary>
+        public string PdfResoureItemUrl { get; set; }
     }
 }
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml
index dbecd677b..7194b6c05 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml
@@ -1128,7 +1128,7 @@
                             <h2> @Model.UserViewModel.FirstName @Model.UserViewModel.LastName</h2>
                             <p class="nhsuk-body-l nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-3">has successfully completed the learning resource </p>
                             <h2 class="nhsuk-u-margin-bottom-9">
-                                @Model.ActivityDetailedItemViewModel.Title                             
+                                <a href="@Model.PdfResoureItemUrl" target="_blank">@Model.ActivityDetailedItemViewModel.Title</a>
                             </h2>
                             @if (resourceScore)
                             {
@@ -1192,7 +1192,7 @@
                                     <tr role="row" class="nhsuk-table__row">
                                         <td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 word-wrapper summarytabledetailscells">
                                             <span class="nhsuk-table-responsive__heading">Learning resource </span>
-                                            @Model.ActivityDetailedItemViewModel.Title
+                                            <a href="@Model.PdfResoureItemUrl" target="_blank">@Model.ActivityDetailedItemViewModel.Title</a>
                                         </td>
                                         <td role="cell" class="nhsuk-table__cell nhsuk-u-padding-left-3 nhsuk-u-padding-top-2 summarytabledetailscells">
                                             <span class="nhsuk-table-responsive__heading">No. Of Times Accessed </span> @Model.AccessCount

From 943443e1ea553839ed7be3ae79933083d1e4ffd7 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Thu, 11 Apr 2024 11:03:57 +0100
Subject: [PATCH 06/64] TD-4020: Edit Resource message update

---
 .../Scripts/vuesrc/mycontributions/gridcomponent.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue
index 422e88a9c..78bd5d506 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue
@@ -44,7 +44,7 @@
                         </div>
 
                         <div class="modal-body">
-                            You are about to make a change to this resource. If you continue, changes cannot be undone.
+                            You are about to make a change to this resource. Editing this page will create a new draft, nothing will change until this draft is published.
                         </div>
 
                         <div class="modal-footer">

From c3a0a9dfec2736abf4e441cdcfdf6f21b2337bd1 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Wed, 17 Apr 2024 10:10:54 +0100
Subject: [PATCH 07/64] TD-3311: Removed special characters in filename during
 file upload

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

diff --git a/LearningHub.Nhs.WebUI/Services/ContributeService.cs b/LearningHub.Nhs.WebUI/Services/ContributeService.cs
index 0936801ee..e73f495c3 100644
--- a/LearningHub.Nhs.WebUI/Services/ContributeService.cs
+++ b/LearningHub.Nhs.WebUI/Services/ContributeService.cs
@@ -6,6 +6,7 @@
     using System.Linq;
     using System.Net.Http;
     using System.Text;
+    using System.Text.RegularExpressions;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Common;
     using LearningHub.Nhs.Models.Enums;
@@ -1240,6 +1241,9 @@ public async Task<FileChunkUploadResult> UploadFileChunkAsync(int fileChunkDetai
             {
                 if (fileChunkDetailId == 0)
                 {
+                    // removing special characters in file name
+                    string fileNameUpdated = Regex.Replace(fileName, "[^a-zA-Z0-9.]", string.Empty);
+
                     // Store the chunk
                     var filelocation = string.Empty;
                     var directoryRef = "chunks_" + Guid.NewGuid().ToString();
@@ -1256,7 +1260,7 @@ public async Task<FileChunkUploadResult> UploadFileChunkAsync(int fileChunkDetai
                         FilePath = filelocation,
                         ChunkCount = chunkCount,
                         ResourceVersionId = (resourceVersionId == 0) ? (int?)null : resourceVersionId,
-                        FileName = fileName,
+                        FileName = fileNameUpdated,
                         FileSizeKb = (int)(fileSize / 1000),
                     });
                 }

From 9a53eed8becbadd64221f441e6b9b06fc8d5f3dd Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Tue, 7 May 2024 10:47:23 +0100
Subject: [PATCH 08/64] TD-3740: added latest version check in view progress
 link condition

---
 LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
index d23e0881e..a6b4652ed 100644
--- a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
+++ b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
@@ -256,7 +256,7 @@ public static bool CanViewPercentage(this ActivityDetailedItemViewModel activity
         /// <returns>The <see cref="bool"/>bool.</returns>
         public static bool CanViewProgress(this ActivityDetailedItemViewModel activityDetailedItemViewModel)
         {
-            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress)
+            if ((activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Video || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Audio) && activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.InProgress && activityDetailedItemViewModel.IsCurrentResourceVersion)
             {
                 return true;
             }

From b4cc20257fe7edea2111bd80f652353742cba9c5 Mon Sep 17 00:00:00 2001
From: Sarathlal Sarangadharan <Sarathlal.Sarangadharan@hee.nhs.uk>
Date: Thu, 9 May 2024 12:00:22 +0100
Subject: [PATCH 09/64] TD-3736: Performance improvent implemented in Admin UI.
 Used stored procedures to bind the data from DB.

---
 WebAPI/LearningHub.Nhs.Services/MyLearningService.cs  |  2 +-
 .../UserLearningRecordService.cs                      | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
index 9abbf2316..5689b1973 100644
--- a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
@@ -254,6 +254,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
                 };
 
                 var latestActivityCheck = await this.resourceActivityRepository.GetAllTheActivitiesFromSP(resourceActivity.CreateUserId, resourceActivity.ResourceVersionId);
+                var allAttempts = latestActivityCheck;
                 latestActivityCheck.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
                 if (latestActivityCheck.Any() && latestActivityCheck.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
                 {
@@ -351,7 +352,6 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
                         viewModel.CompletionPercentage = totalQuestions == 0 ? 0 : Convert.ToInt32(100 * completedQuestions / Convert.ToDecimal(totalQuestions));
                         viewModel.ScorePercentage = activity.Score.HasValue ? (int)Math.Round(activity.Score.Value, MidpointRounding.AwayFromZero) : 0;
 
-                        var allAttempts = await this.resourceActivityRepository.GetAllTheActivitiesFor(userId, resourceActivity.ResourceVersionId);
                         var currentAttempt = allAttempts.FindIndex(a => a.Id == resourceActivity.Id) + 1;
 
                         if (viewModel.CompletionPercentage == 100)
diff --git a/WebAPI/LearningHub.Nhs.Services/UserLearningRecordService.cs b/WebAPI/LearningHub.Nhs.Services/UserLearningRecordService.cs
index 80cd9a27c..6c82556d7 100644
--- a/WebAPI/LearningHub.Nhs.Services/UserLearningRecordService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/UserLearningRecordService.cs
@@ -111,19 +111,22 @@ public async Task<PagedResultSet<MyLearningDetailedItemViewModel>> GetUserLearni
                 var presetFilterCriteria = JsonConvert.DeserializeObject<List<PagingColumnFilter>>(presetFilter);
                 var userIdFilter = presetFilterCriteria.Where(f => f.Column == "userid").FirstOrDefault();
 
-                var activityQuery = this.resourceActivityRepository.GetByUserId(int.Parse(userIdFilter.Value));
+                MyLearningRequestModel requestModel = new MyLearningRequestModel();
+                requestModel.Skip = (page - 1) * pageSize;
+                requestModel.Take = pageSize;
+                var activityQuery = this.resourceActivityRepository.GetByUserIdFromSP(int.Parse(userIdFilter.Value), requestModel, this.settings.Value.DetailedMediaActivityRecordingStartDate).Result.OrderByDescending(r => r.ActivityStart).DistinctBy(l => l.Id);
                 MyLearningDetailedViewModel viewModel = new MyLearningDetailedViewModel()
                 {
-                    TotalCount = activityQuery.Count(),
+                    TotalCount = this.resourceActivityRepository.GetTotalCount(int.Parse(userIdFilter.Value), requestModel, this.settings.Value.DetailedMediaActivityRecordingStartDate),
                 };
 
-                var activityEntities = await activityQuery.Skip((page - 1) * pageSize).Take(pageSize).ToListAsync();
+                var activityEntities = activityQuery.ToList();
 
                 viewModel.Activities = await this.myLearningService.PopulateMyLearningDetailedItemViewModels(activityEntities, int.Parse(userIdFilter.Value));
                 if (userIdFilter != null)
                 {
                     result.Items = viewModel.Activities; /*this.mapper.Map<List<UserLearningRecordViewModel>>(viewModel.Activities);*/
-                    result.TotalItemCount = activityQuery.Count();
+                    result.TotalItemCount = viewModel.TotalCount;
                 }
 
                 return result;

From 007d3aa3f6aa805f923f8d4d348d29a051b242bc Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 10 May 2024 15:30:23 +0100
Subject: [PATCH 10/64] TD-3707: fixed question focus issue in assessments

---
 .../Scripts/vuesrc/resource/CaseOrAssessmentResource.vue    | 2 +-
 .../Scripts/vuesrc/resource/blocks/BlocksView.vue           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue
index e3f75c8d8..a7c20515c 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue
@@ -288,7 +288,7 @@
                 return questionBlockOrder - pageBreakOrder - 1;
             },
             setQuestionInFocus(pageIndex: number, value: number, remove: boolean) {
-                if ((remove && this.questionsInFocus[pageIndex] === value) || this.canContinue) {
+                if ((remove && this.questionsInFocus[pageIndex] === value)) {
                     this.questionsInFocus[pageIndex] = undefined;
                 } else {
                     this.questionsInFocus[pageIndex] = value;
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue
index 9ada7d1dc..80d065f7a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue
@@ -93,9 +93,9 @@
                 requestAnimationFrame(this.applyUpdates);
             },
             questionInFocus() {
-                const question = this.blocks[this.questionInFocus];
-                if (question && this.allQuestionsAnswered) {
-                    const element = document.getElementById(this.generateId(question.order - this.blocks[0].order));
+                const lastAnsweredIndex = this.blocks.findIndex(block => block.blockType === BlockTypeEnum.Question && this.pagesProgress[this.blocks.indexOf(block)]);
+                if (lastAnsweredIndex !== -1) {
+                    const element = document.getElementById(this.generateId(lastAnsweredIndex));
                     if (element) {
                         setTimeout(() => {
                             element.scrollIntoView({ behavior: "smooth" });

From d375c5e7e23f0de767845a6c6ec5faa89c05b1ce Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 21 May 2024 16:45:40 +0100
Subject: [PATCH 11/64] TD-3308: Keyword field only allows 50 chars which is
 problematic when adding multiple keywords at once

---
 .../Views/Catalogue/Edit.cshtml               | 743 +++++++++---------
 .../vuesrc/contribute/ContentCommon.vue       |   6 +-
 2 files changed, 379 insertions(+), 370 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index dddfe43ea..8f7833345 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -3,423 +3,432 @@
 @using LearningHub.Nhs.Models.Enums
 @using Newtonsoft.Json
 @{
-    var page = Model.CatalogueNodeVersionId == 0 ? CatalogueNavPage.Add : CatalogueNavPage.Edit;
-    ViewData["Title"] = page == CatalogueNavPage.Add ? "Add catalogue" : "Edit catalogue";
-    var baseUrl = _settings.Value.LearningHubUrl + "catalogue/";
-    var url = baseUrl + (Model.Url ?? "");
-    var aToZ = (int)CatalogueOrder.AlphabeticalAscending;
-    var keywords = Model.Keywords ?? new List<string>();
-    var Providers = Model.Providers;
-    var CatalogueNodeVersionProviderId = Model.CatalogueNodeVersionProvider?.ProviderId ?? 0;
-    var CatalogueNodeVersionProvider = Model.CatalogueNodeVersionProvider;
-    var action = page.ToString();
-    var keywordsJson = Html.Raw(JsonConvert.SerializeObject(keywords));
-    var imageBaseUrl = "/file/download/CatalogueImageDirectory/";
-    var lastModifiedDate = Model.LastModifiedDate?.ToString("dd MMM yyyy");
+  var page = Model.CatalogueNodeVersionId == 0 ? CatalogueNavPage.Add : CatalogueNavPage.Edit;
+  ViewData["Title"] = page == CatalogueNavPage.Add ? "Add catalogue" : "Edit catalogue";
+  var baseUrl = _settings.Value.LearningHubUrl + "catalogue/";
+  var url = baseUrl + (Model.Url ?? "");
+  var aToZ = (int)CatalogueOrder.AlphabeticalAscending;
+  var keywords = Model.Keywords ?? new List<string>();
+  var Providers = Model.Providers;
+  var CatalogueNodeVersionProviderId = Model.CatalogueNodeVersionProvider?.ProviderId ?? 0;
+  var CatalogueNodeVersionProvider = Model.CatalogueNodeVersionProvider;
+  var action = page.ToString();
+  var keywordsJson = Html.Raw(JsonConvert.SerializeObject(keywords));
+  var imageBaseUrl = "/file/download/CatalogueImageDirectory/";
+  var lastModifiedDate = Model.LastModifiedDate?.ToString("dd MMM yyyy");
 }
 @section SideMenu {
-    @{
-        await Html.RenderPartialAsync("_NavSection");
-    }
+  @{
+    await Html.RenderPartialAsync("_NavSection");
+  }
 }
 
 @if (!string.IsNullOrEmpty(ViewBag.ErrorMessage))
 {
-    <div class="alert alert-danger alert-dismissible fade show admin-alert mb-0 mt-5" role="alert">
-        @ViewBag.ErrorMessage
-        <div class="admin-validation-summary" asp-validation-summary="All"></div>
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-        </button>
-    </div>
+  <div class="alert alert-danger alert-dismissible fade show admin-alert mb-0 mt-5" role="alert">
+    @ViewBag.ErrorMessage
+    <div class="admin-validation-summary" asp-validation-summary="All"></div>
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
 }
 
 @if (page == CatalogueNavPage.Edit)
 {
-    <div class="row mt-5">
-        <div class="col-12">
-            <h1 class="ml-5" id="catalogue-name-header">@Model.Name</h1>
-        </div>
+  <div class="row mt-5">
+    <div class="col-12">
+      <h1 class="ml-5" id="catalogue-name-header">@Model.Name</h1>
     </div>
+  </div>
 }
 @{
-    await Html.RenderPartialAsync("_CatalogueNav.cshtml", new CatalogueNavViewModel { Page = page, CatalogueId = Model.CatalogueNodeVersionId });
+  await Html.RenderPartialAsync("_CatalogueNav.cshtml", new CatalogueNavViewModel { Page = page, CatalogueId = Model.CatalogueNodeVersionId });
 }
 <div class="ml-5" style="max-width: 800px;">
-    <form method="POST" enctype="multipart/form-data">
-        <input type="hidden" id="CatalogueNodeVersionId" name="CatalogueNodeVersionId" value="@Model.CatalogueNodeVersionId" />
-        <input type="hidden" id="NodeId" name="NodeId" value="@Model.NodeId" />
-        <input type="hidden" id="NodeVersionId" name="NodeVersionId" value="@Model.NodeVersionId" />
-        <input type="hidden" id="ResourceOrder" value="@aToZ" />
-        <div class="row mt-5">
-            <div class="col-12 d-flex flex-row">
-                <div id="catalogue-id-tag">
-                    @if (page == CatalogueNavPage.Edit)
-                    {
-                        var idString = Model.CatalogueNodeVersionId.ToString();
-                        var paddedIdString = idString.Length > 3 ? idString : idString.PadLeft(3, '0');
-                        <span>ID: @paddedIdString</span>
-                    }
-                    else
-                    {
-                        <span>NEW</span>
-                    }
-                </div>
-                @if (page == CatalogueNavPage.Add || Model.Hidden)
-                {
-                    <span class="hidden-badge hidden-badge-lg">Hidden</span>
-                }
-                @if (lastModifiedDate != null)
-                {
-                    <p class="catalogue-date-created">Last modified on: @lastModifiedDate</p>
-                }
-            </div>
+  <form method="POST" enctype="multipart/form-data">
+    <input type="hidden" id="CatalogueNodeVersionId" name="CatalogueNodeVersionId" value="@Model.CatalogueNodeVersionId" />
+    <input type="hidden" id="NodeId" name="NodeId" value="@Model.NodeId" />
+    <input type="hidden" id="NodeVersionId" name="NodeVersionId" value="@Model.NodeVersionId" />
+    <input type="hidden" id="ResourceOrder" value="@aToZ" />
+    <div class="row mt-5">
+      <div class="col-12 d-flex flex-row">
+        <div id="catalogue-id-tag">
+          @if (page == CatalogueNavPage.Edit)
+          {
+            var idString = Model.CatalogueNodeVersionId.ToString();
+            var paddedIdString = idString.Length > 3 ? idString : idString.PadLeft(3, '0');
+            <span>ID: @paddedIdString</span>
+          }
+          else
+          {
+            <span>NEW</span>
+          }
         </div>
-
-        @if (!ViewData.ModelState.IsValid)
+        @if (page == CatalogueNavPage.Add || Model.Hidden)
+        {
+          <span class="hidden-badge hidden-badge-lg">Hidden</span>
+        }
+        @if (lastModifiedDate != null)
         {
-            <div class="pt-4 field-validation-error">This form failed to save because there are errors below.</div>
+          <p class="catalogue-date-created">Last modified on: @lastModifiedDate</p>
         }
+      </div>
+    </div>
 
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <label for="Name">Catalogue name</label>
-                <p class="hint">You can enter a maximum of 255 characters including spaces</p>
-                <input asp-for="Name" class="form-control" />
-                <span asp-validation-for="Name"></span>
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <label for="Name">Catalogue url</label>
-                @if (page == CatalogueNavPage.Add)
-                {
-                    <input asp-for="Url" class="form-control" />
-                }
-                else
-                {
-                    <input asp-for="Url" class="form-control" readonly="readonly" />
-                }
-                <span asp-validation-for="Url"></span>
-            </div>
-            <div class="col-12">
-                @if (Model.Status == VersionStatusEnum.Published && !Model.Hidden)
-                {
-                    <a id="catalogue-url"></a>
-                }
-                else
-                {
-                    <p id="catalogue-url"></p>
-                }
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="BadgeImage" label="Badge (optional)" hint="Image must be 240px x 240px and in the following format: .png .jpg .gif .svg" value="@Model.BadgeUrl" existing-url="BadgeUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="CertificateImage" label="Certificate Image (optional)" hint="Image: must be 240px x 240px (aspect ratio 1:1) or 240px x 160px (aspect ratio 3:2);Format: .png .jpg .gif .svg;File: 50kB size limit;You do not need to include whitespace around the image (this will be added automatically);You can only upload one image" value="@Model.CertificateUrl" existing-url="CertificateUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
-                <span asp-validation-for="CertificateUrl"></span>
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="CardImage" label="Catalogue Card image (optional)" hint="Image must be 360px x 155px and in the following format: .png .jpg .gif .svg" value="@Model.CardImageUrl" existing-url="CardImageUrl" image-width="360" image-height="155" base-url="@imageBaseUrl" circle-crop="false" />
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="BannerImage" label="Banner image (optional)" hint="Image must be 1144px x 300px and in the following format: .png .jpg .gif .svg" existing-url="BannerUrl" value="@Model.BannerUrl" image-width="-1" image-height="-1" base-url="@imageBaseUrl" circle-crop="false" />
+    @if (!ViewData.ModelState.IsValid)
+    {
+      <div class="pt-4 field-validation-error">This form failed to save because there are errors below.</div>
+    }
+
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <label for="Name">Catalogue name</label>
+        <p class="hint">You can enter a maximum of 255 characters including spaces</p>
+        <input asp-for="Name" class="form-control" />
+        <span asp-validation-for="Name"></span>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <label for="Name">Catalogue url</label>
+        @if (page == CatalogueNavPage.Add)
+        {
+          <input asp-for="Url" class="form-control" />
+        }
+        else
+        {
+          <input asp-for="Url" class="form-control" readonly="readonly" />
+        }
+        <span asp-validation-for="Url"></span>
+      </div>
+      <div class="col-12">
+        @if (Model.Status == VersionStatusEnum.Published && !Model.Hidden)
+        {
+          <a id="catalogue-url"></a>
+        }
+        else
+        {
+          <p id="catalogue-url"></p>
+        }
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="BadgeImage" label="Badge (optional)" hint="Image must be 240px x 240px and in the following format: .png .jpg .gif .svg" value="@Model.BadgeUrl" existing-url="BadgeUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="CertificateImage" label="Certificate Image (optional)" hint="Image: must be 240px x 240px (aspect ratio 1:1) or 240px x 160px (aspect ratio 3:2);Format: .png .jpg .gif .svg;File: 50kB size limit;You do not need to include whitespace around the image (this will be added automatically);You can only upload one image" value="@Model.CertificateUrl" existing-url="CertificateUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
+        <span asp-validation-for="CertificateUrl"></span>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="CardImage" label="Catalogue Card image (optional)" hint="Image must be 360px x 155px and in the following format: .png .jpg .gif .svg" value="@Model.CardImageUrl" existing-url="CardImageUrl" image-width="360" image-height="155" base-url="@imageBaseUrl" circle-crop="false" />
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="BannerImage" label="Banner image (optional)" hint="Image must be 1144px x 300px and in the following format: .png .jpg .gif .svg" existing-url="BannerUrl" value="@Model.BannerUrl" image-width="-1" image-height="-1" base-url="@imageBaseUrl" circle-crop="false" />
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12">
+        <label for="Description">Description</label>
+        <textarea asp-for="Description" class="form-control"></textarea>
+        <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
+        <span asp-validation-for="Description"></span>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12">
+        <label for="Keywords">Keywords</label>
+        <p>
+          Add one or more relevant keywords to help learners find this catalogue, ensuring that the keyword is specifically related to the catalogue rather than the resources associated with it. A maximum of 5 keywords can be added. Enter one keyword and add it before entering another.
+        </p>
+        <div class="row">
+          <div class="col-12 input-group">
+            <input type="text" class="form-control" id="add-keyword-input" />
+            <div class="input-group-append">
+              <button type="button" class="btn btn-custom btn-custom-outline" id="add-keyword" disabled="disabled"><i class="fa fa-plus"></i>Add</button>
             </div>
+          </div>
         </div>
-        <div class="row mt-5">
-            <div class="col-12">
-                <label for="Description">Description</label>
-                <textarea asp-for="Description" class="form-control"></textarea>
-                <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
-                <span asp-validation-for="Description"></span>
-            </div>
+        <div class="row">
+          <div class="col-12">
+            <span asp-validation-for="Keywords"></span>
+            <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
+          </div>
         </div>
-        <div class="row mt-5">
-            <div class="col-12">
-                <label for="Keywords">Keywords</label>
-                <p>
-                    Add one or more relevant keywords to help learners find this catalogue, ensuring that the keyword is specifically related to the catalogue rather than the resources associated with it. A maximum of 5 keywords can be added. Enter one keyword and add it before entering another.
-                </p>
-                <div class="row">
-                    <div class="col-12 input-group">
-                        <input type="text" class="form-control" id="add-keyword-input" />
-                        <div class="input-group-append">
-                            <button type="button" class="btn btn-custom btn-custom-outline" id="add-keyword" disabled="disabled"><i class="fa fa-plus"></i>Add</button>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-12">
-                        <span asp-validation-for="Keywords"></span>
-                        <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
-                    </div>
-                </div>
 
+      </div>
+      <div class="col-12">
+        <p class="hint">You can enter a maximum of 50 characters per keyword</p>
+        <div class="keyword-list">
+          @{
+            var i = 0;
+          }
+          @foreach (var keyword in keywords)
+          {
+            <div class="keyword-tag">
+              <p>@keyword</p>
+              <i class="fa fa-times"></i>
+              <input type="hidden" name="Keywords[@i]" class="keyword-value" value="@keyword" />
             </div>
-            <div class="col-12">
-                <p class="hint">You can enter a maximum of 50 characters</p>
-                <div class="keyword-list">
-                    @{
-                        var i = 0;
-                    }
-                    @foreach (var keyword in keywords)
-                    {
-                        <div class="keyword-tag">
-                            <p>@keyword</p>
-                            <i class="fa fa-times"></i>
-                            <input type="hidden" name="Keywords[@i]" class="keyword-value" value="@keyword" />
-                        </div>
-                    }
-                </div>
-            </div>
+          }
         </div>
+      </div>
+    </div>
 
-        <div class="input-section mt-5">
+    <div class="input-section mt-5">
 
-            <div class="row">
-                <div class="col-12">
-                    <label>Catalogue access</label>
-                </div>
-            </div>
+      <div class="row">
+        <div class="col-12">
+          <label>Catalogue access</label>
+        </div>
+      </div>
 
-            <div class="row">
-                <div class="col-12">
-                    <div class="form-check form-check-inline">
-                        @if (!Model.RestrictedAccess)
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" checked="checked" />
-                        }
-                        else
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" />
-                        }
-                        <span>Unrestricted access (default)</span>
-                    </div>
-                    <div class="form-check form-check-inline ml-5">
-                        @if (Model.RestrictedAccess)
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" checked="checked" />
-                        }
-                        else
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" />
-                        }
-                        <span>Restricted access</span>
-                    </div>
-                </div>
-            </div>
-            @if (!Model.HasUserGroup)
+      <div class="row">
+        <div class="col-12">
+          <div class="form-check form-check-inline">
+            @if (!Model.RestrictedAccess)
+            {
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" checked="checked" />
+            }
+            else
+            {
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" />
+            }
+            <span>Unrestricted access (default)</span>
+          </div>
+          <div class="form-check form-check-inline ml-5">
+            @if (Model.RestrictedAccess)
+            {
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" checked="checked" />
+            }
+            else
             {
-                <div class="col-12 hint" id="has-no-user-group">
-                    <p>There are no user groups associated with this catalogue. You can add some in the User Groups tab.</p>
-                </div>
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" />
             }
+            <span>Restricted access</span>
+          </div>
         </div>
+      </div>
+      @if (!Model.HasUserGroup)
+      {
+        <div class="col-12 hint" id="has-no-user-group">
+          <p>There are no user groups associated with this catalogue. You can add some in the User Groups tab.</p>
+        </div>
+      }
+    </div>
 
-        <div class="input-section mt-5">
-
-            <div class="row">
-                <div class="col-12">
-                    <label>Content developed with</label>
-                    <p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
-                    <p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
-                    <p class="providertext">Developed with;</p>
-                </div>
-            </div>
+    <div class="input-section mt-5">
 
-            <div class="row">
-                <div class="col-12">
-                    @if (Providers != null && Providers.Count() > 0)
-                    {
-                        <div class="form-check form-check-vertical">
-                            @foreach (var provider in Providers)
-                            {
-                                <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="@provider.Id" @(CatalogueNodeVersionProviderId == @provider.Id ? "checked" : "") />
-                                <span class="span-provider">@provider.Name</span>
-                                <br />
-                            }
-                            <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="0" @(CatalogueNodeVersionProviderId == 0 ? "checked" : "") />
-                            <span class="span-provider">Not applicable</span>
-                        </div>
-                    }
-                </div>
-            </div>
+      <div class="row">
+        <div class="col-12">
+          <label>Content developed with</label>
+          <p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
+          <p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
+          <p class="providertext">Developed with;</p>
         </div>
-        <div class="row mt-5">
-            <div class="col-12">
-                @if (page == CatalogueNavPage.Add)
-                {
-                    <button type="submit" class="btn btn-custom-green" id="publish-catalogue">Save</button>
-                }
-                else
-                {
-                    <button type="submit" class="btn btn-custom-green" id="publish-changes-catalogue">Save</button>
-                }
+      </div>
+
+      <div class="row">
+        <div class="col-12">
+          @if (Providers != null && Providers.Count() > 0)
+          {
+            <div class="form-check form-check-vertical">
+              @foreach (var provider in Providers)
+              {
+                <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="@provider.Id" @(CatalogueNodeVersionProviderId == @provider.Id ? "checked" : "") />
+                <span class="span-provider">@provider.Name</span>
+                <br />
+              }
+              <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="0" @(CatalogueNodeVersionProviderId == 0 ? "checked" : "") />
+              <span class="span-provider">Not applicable</span>
             </div>
+          }
         </div>
-    </form>
-    <div style="height: 40px; width: 100%;"></div>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12">
+        @if (page == CatalogueNavPage.Add)
+        {
+          <button type="submit" class="btn btn-custom-green" id="publish-catalogue">Save</button>
+        }
+        else
+        {
+          <button type="submit" class="btn btn-custom-green" id="publish-changes-catalogue">Save</button>
+        }
+      </div>
+    </div>
+  </form>
+  <div style="height: 40px; width: 100%;"></div>
 </div>
 @section Scripts {
-    <script>
-        $(function () {
-            var baseUrl = '@baseUrl';
-            $('#publish-catalogue').on('click', function () {
-                var form = $(this).parents('form');
-                form.attr("action", "/Catalogue/PublishNew");
-            });
-            $('#publish-changes-catalogue').on('click', function () {
-                var form = $(this).parents('form');
-                form.attr("action", "/Catalogue/Edit");
-            });
+  <script>
+    $(function () {
+      var baseUrl = '@baseUrl';
+      $('#publish-catalogue').on('click', function () {
+        var form = $(this).parents('form');
+        form.attr("action", "/Catalogue/PublishNew");
+      });
+      $('#publish-changes-catalogue').on('click', function () {
+        var form = $(this).parents('form');
+        form.attr("action", "/Catalogue/Edit");
+      });
 
-            // user group text
-            function showHideUserGroupText() {
-                var ugText = $('#has-no-user-group');
-                var restrictedAccess = $('[name="RestrictedAccess"]:checked').val() === "true";
-                if (restrictedAccess) {
-                    ugText.show();
-                } else {
-                    ugText.hide();
-                }
-            }
-            showHideUserGroupText();
-            $('[name="RestrictedAccess"]').on('change', showHideUserGroupText);
-            //keyword
-            function removeKeyword() {
-                var $close = $(this);
-                var $keyword = $close.parent();
-                var value = $keyword.find('p').text();
-                var index = keywords.indexOf(value);
-                if (index === -1) {
-                    return;
-                }
-                keywords.splice(index, 1);
-                $('#Keywords').val(keywords);
-                $keyword.remove();
-                // reindex the keyword inputs
-                $('.keyword-value').each(function (i, x) {
-                    $(x).attr('name', "Keywords[" + i + "]");
-                });
-                if (keywords.length < 5) {
-                    $('#add-keyword').removeAttr('disabled');
-                    $('#add-keyword-input').removeAttr('disabled');
-                }
-            }
+      // user group text
+      function showHideUserGroupText() {
+        var ugText = $('#has-no-user-group');
+        var restrictedAccess = $('[name="RestrictedAccess"]:checked').val() === "true";
+        if (restrictedAccess) {
+          ugText.show();
+        } else {
+          ugText.hide();
+        }
+      }
+      showHideUserGroupText();
+      $('[name="RestrictedAccess"]').on('change', showHideUserGroupText);
+      //keyword
+      function removeKeyword() {
+        var $close = $(this);
+        var $keyword = $close.parent();
+        var value = $keyword.find('p').text();
+        var index = keywords.indexOf(value);
+        if (index === -1) {
+          return;
+        }
+        keywords.splice(index, 1);
+        $('#Keywords').val(keywords);
+        $keyword.remove();
+        // reindex the keyword inputs
+        $('.keyword-value').each(function (i, x) {
+          $(x).attr('name', "Keywords[" + i + "]");
+        });
+        if (keywords.length < 5) {
+          $('#add-keyword').removeAttr('disabled');
+          $('#add-keyword-input').removeAttr('disabled');
+        }
+      }
 
-            var keywords = @keywordsJson || [];
-            if (keywords.length > 4) {
-                $('#add-keyword').attr('disabled', 'disabled');
-                $('#add-keyword-input').attr('disabled', 'disabled');
-            }
-            $('#Keywords').val(keywords);
-            $('.keyword-tag>i.fa-times').on('click', removeKeyword);
+      var keywords = @keywordsJson || [];
+      if (keywords.length > 4) {
+        $('#add-keyword').attr('disabled', 'disabled');
+        $('#add-keyword-input').attr('disabled', 'disabled');
+      }
+      $('#Keywords').val(keywords);
+      $('.keyword-tag>i.fa-times').on('click', removeKeyword);
 
-            $('#add-keyword-input').on('input', function () {
-                var value = $(this).val();
-                var length = value.length;
-                if (length === 0 || length > 50) {
-                    $('#add-keyword').attr('disabled', 'disabled');
-                } else {
-                    $('#add-keyword').removeAttr('disabled');
-                }
-            });
+      $('#add-keyword-input').on('input', function () {
+        var value = $(this).val();
+        var length = value.length;
+        if (length === 0 || length > 50) {
+          $('#add-keyword').attr('disabled', 'disabled');
+        } else {
+          $('#add-keyword').removeAttr('disabled');
+        }
+      });
 
-            $('#add-keyword').on('click', function () {
-                var $keywordInput = $('#add-keyword-input');
-                var value = $keywordInput.val();
-                if (!value) {
-                    return;
-                }
-                value = value.trim();
-                if (keywords.indexOf(value) === -1) {
-                    keywords.push(value);
-                    $('#Keywords').val(keywords);
-                    var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
-                    tag.find('.fa-times').on('click', removeKeyword);
-                    $('.keyword-list').append(tag);
-                    $keywordInput.val("");
-                    // reindex the keyword inputs
-                    $('.keyword-value').each(function (i, x) {
-                        $(x).attr('name', "Keywords[" + i + "]");
-                    });
-                }
-                if (keywords.length > 4) {
-                    $('#add-keyword').attr('disabled', 'disabled');
-                    $('#add-keyword-input').attr('disabled', 'disabled');
-                }
-            });
+      $('#add-keyword').on('click', function () {
+        var $keywordInput = $('#add-keyword-input');
+        var value = $keywordInput.val();
+        if (!value) {
+          return;
+        }
 
-            // url
-            var oldUrl = "";
-            $('#Url').on('input', function () {
-                var value = this.value;
-                var whitelistRegex = /^[a-zA-Z0-9\-\s]{0,}$/;
-                if (!whitelistRegex.test(value)) {
-                    value = oldUrl;
-                }
-                this.value = value.replace(/[\s]/g, '-');
-                oldUrl = this.value;
-                var url = baseUrl + this.value;
-                var $catalogueUrl = $('#catalogue-url');
-                $catalogueUrl.text(url);
-                if ($catalogueUrl.is('a')) {
-                    $catalogueUrl.attr('href', url);
-                }
-            });
+        // Split the input value by commas and trim each keyword
+        var values = value.split(',').map(function (item) {
+          return item.trim();
+        });
 
-            $('#Url').trigger('input');
+        values.forEach(function (value) {
+          if (value && keywords.indexOf(value) === -1) {
+            keywords.push(value);
+            $('#Keywords').val(keywords);
+            var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
+            tag.find('.fa-times').on('click', removeKeyword);
+            $('.keyword-list').append(tag);
 
-            // name
-            $('#Name').on('change', function () {
-                var value = this.value;
-                var encodedValue = value;
-                var $catalogueNameHeader = $('#catalogue-name-header');
-                if ($catalogueNameHeader && $catalogueNameHeader.length) {
-                    $catalogueNameHeader.text(encodedValue);
-                }
+            // reindex the keyword inputs
+            $('.keyword-value').each(function (i, x) {
+              $(x).attr('name', "Keywords[" + i + "]");
             });
-            CKEDITOR.replace('Description',
-                {
-                    toolbar: [
-                        { name: 'undo', items: ['Undo', 'Redo'] },
-                        { name: 'bold', items: ['Bold', 'Italic'] },
-                        { name: 'list', items: ['NumberedList', 'BulletedList'] },
-                        { name: 'link', items: ['Link'] }
-                    ]
-                });
-            CKEDITOR.replace('Notes',
-                {
-                    toolbar: [
-                        { name: 'undo', items: ['Undo', 'Redo'] },
-                        { name: 'bold', items: ['Bold', 'Italic'] },
-                        { name: 'list', items: ['NumberedList', 'BulletedList'] },
-                        { name: 'link', items: ['Link'] }
-                    ]
-                });
+          }
+        });
 
-            CKEDITOR.on('instanceReady', function () {
-                var editor = CKEDITOR.instances['Description'];
+        $keywordInput.val(""); // Clear the input field after processing all keywords
 
-                editor.on('change', function () {
-                    var editorData = editor.getData();
-                    var data = $("<p></p>").html(editorData).text();
-                    var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, '');
-                });
+        if (keywords.length > 4) {
+          $('#add-keyword').attr('disabled', 'disabled');
+          $('#add-keyword-input').attr('disabled', 'disabled');
+        }
+      });
+      // url
+      var oldUrl = "";
+      $('#Url').on('input', function () {
+        var value = this.value;
+        var whitelistRegex = /^[a-zA-Z0-9\-\s]{0,}$/;
+        if (!whitelistRegex.test(value)) {
+          value = oldUrl;
+        }
+        this.value = value.replace(/[\s]/g, '-');
+        oldUrl = this.value;
+        var url = baseUrl + this.value;
+        var $catalogueUrl = $('#catalogue-url');
+        $catalogueUrl.text(url);
+        if ($catalogueUrl.is('a')) {
+          $catalogueUrl.attr('href', url);
+        }
+      });
 
-                editor.fire('change');
-            });
+      $('#Url').trigger('input');
 
+      // name
+      $('#Name').on('change', function () {
+        var value = this.value;
+        var encodedValue = value;
+        var $catalogueNameHeader = $('#catalogue-name-header');
+        if ($catalogueNameHeader && $catalogueNameHeader.length) {
+          $catalogueNameHeader.text(encodedValue);
+        }
+      });
+      CKEDITOR.replace('Description',
+        {
+          toolbar: [
+            { name: 'undo', items: ['Undo', 'Redo'] },
+            { name: 'bold', items: ['Bold', 'Italic'] },
+            { name: 'list', items: ['NumberedList', 'BulletedList'] },
+            { name: 'link', items: ['Link'] }
+          ]
         });
+      CKEDITOR.replace('Notes',
+        {
+          toolbar: [
+            { name: 'undo', items: ['Undo', 'Redo'] },
+            { name: 'bold', items: ['Bold', 'Italic'] },
+            { name: 'list', items: ['NumberedList', 'BulletedList'] },
+            { name: 'link', items: ['Link'] }
+          ]
+        });
+
+      CKEDITOR.on('instanceReady', function () {
+        var editor = CKEDITOR.instances['Description'];
+
+        editor.on('change', function () {
+          var editorData = editor.getData();
+          var data = $("<p></p>").html(editorData).text();
+          var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, '');
+        });
+
+        editor.fire('change');
+      });
+
+    });
 
-    </script>
-    <script src="~/js/imageInput.js"></script>
+  </script>
+  <script src="~/js/imageInput.js"></script>
 }
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 06d704f18..a935bc31a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -90,11 +90,11 @@
                     To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
                 </div>
                 <div class="col-12 mt-4 input-with-button">
-                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="50" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
+                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="2000" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
                     <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
                 </div>
                 <div class="col-12 footer-text">
-                    You can enter a maximum of 50 characters
+                    You can enter a maximum of 50 characters per keyword
                 </div>
             </div>
         </div>
@@ -529,7 +529,7 @@
                         if (!this.keywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                             for (var i = 0; i < allTrimmedKeyword.length; i++) {
                                 let item = allTrimmedKeyword[i];
-                                if (item.length > 0) {
+                                if (item.length > 0 && item.length <= 50) {
                                     let newkeywordObj = new KeywordModel();
                                     newkeywordObj.keyword = item;
                                     newkeywordObj.resourceVersionId = this.resourceDetail.resourceVersionId;

From 08c34805e0c7e1702cf97a07f38f07094cef4859 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 21 May 2024 16:52:51 +0100
Subject: [PATCH 12/64] TD-3308: Keyword field only allows 50 chars which is
 problematic when adding multiple keywords at once

---
 .../LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index 8f7833345..ba9f121fd 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -360,13 +360,6 @@
           }
         });
 
-        $keywordInput.val(""); // Clear the input field after processing all keywords
-
-        if (keywords.length > 4) {
-          $('#add-keyword').attr('disabled', 'disabled');
-          $('#add-keyword-input').attr('disabled', 'disabled');
-        }
-      });
       // url
       var oldUrl = "";
       $('#Url').on('input', function () {

From fe8affb3296f0fae1b6d8a57275e003fa98de262 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 21 May 2024 16:57:21 +0100
Subject: [PATCH 13/64] Revert "TD-3308: Keyword field only allows 50 chars
 which is problematic when adding multiple keywords at once"

This reverts commit 08c34805e0c7e1702cf97a07f38f07094cef4859.
---
 .../LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index ba9f121fd..8f7833345 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -360,6 +360,13 @@
           }
         });
 
+        $keywordInput.val(""); // Clear the input field after processing all keywords
+
+        if (keywords.length > 4) {
+          $('#add-keyword').attr('disabled', 'disabled');
+          $('#add-keyword-input').attr('disabled', 'disabled');
+        }
+      });
       // url
       var oldUrl = "";
       $('#Url').on('input', function () {

From 4ade7e6d5997a7951ab06e7a967f2bc86ba1bbe9 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 21 May 2024 16:57:48 +0100
Subject: [PATCH 14/64] Revert "TD-3308: Keyword field only allows 50 chars
 which is problematic when adding multiple keywords at once"

This reverts commit d375c5e7e23f0de767845a6c6ec5faa89c05b1ce.
---
 .../Views/Catalogue/Edit.cshtml               | 743 +++++++++---------
 .../vuesrc/contribute/ContentCommon.vue       |   6 +-
 2 files changed, 370 insertions(+), 379 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index 8f7833345..dddfe43ea 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -3,432 +3,423 @@
 @using LearningHub.Nhs.Models.Enums
 @using Newtonsoft.Json
 @{
-  var page = Model.CatalogueNodeVersionId == 0 ? CatalogueNavPage.Add : CatalogueNavPage.Edit;
-  ViewData["Title"] = page == CatalogueNavPage.Add ? "Add catalogue" : "Edit catalogue";
-  var baseUrl = _settings.Value.LearningHubUrl + "catalogue/";
-  var url = baseUrl + (Model.Url ?? "");
-  var aToZ = (int)CatalogueOrder.AlphabeticalAscending;
-  var keywords = Model.Keywords ?? new List<string>();
-  var Providers = Model.Providers;
-  var CatalogueNodeVersionProviderId = Model.CatalogueNodeVersionProvider?.ProviderId ?? 0;
-  var CatalogueNodeVersionProvider = Model.CatalogueNodeVersionProvider;
-  var action = page.ToString();
-  var keywordsJson = Html.Raw(JsonConvert.SerializeObject(keywords));
-  var imageBaseUrl = "/file/download/CatalogueImageDirectory/";
-  var lastModifiedDate = Model.LastModifiedDate?.ToString("dd MMM yyyy");
+    var page = Model.CatalogueNodeVersionId == 0 ? CatalogueNavPage.Add : CatalogueNavPage.Edit;
+    ViewData["Title"] = page == CatalogueNavPage.Add ? "Add catalogue" : "Edit catalogue";
+    var baseUrl = _settings.Value.LearningHubUrl + "catalogue/";
+    var url = baseUrl + (Model.Url ?? "");
+    var aToZ = (int)CatalogueOrder.AlphabeticalAscending;
+    var keywords = Model.Keywords ?? new List<string>();
+    var Providers = Model.Providers;
+    var CatalogueNodeVersionProviderId = Model.CatalogueNodeVersionProvider?.ProviderId ?? 0;
+    var CatalogueNodeVersionProvider = Model.CatalogueNodeVersionProvider;
+    var action = page.ToString();
+    var keywordsJson = Html.Raw(JsonConvert.SerializeObject(keywords));
+    var imageBaseUrl = "/file/download/CatalogueImageDirectory/";
+    var lastModifiedDate = Model.LastModifiedDate?.ToString("dd MMM yyyy");
 }
 @section SideMenu {
-  @{
-    await Html.RenderPartialAsync("_NavSection");
-  }
+    @{
+        await Html.RenderPartialAsync("_NavSection");
+    }
 }
 
 @if (!string.IsNullOrEmpty(ViewBag.ErrorMessage))
 {
-  <div class="alert alert-danger alert-dismissible fade show admin-alert mb-0 mt-5" role="alert">
-    @ViewBag.ErrorMessage
-    <div class="admin-validation-summary" asp-validation-summary="All"></div>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
+    <div class="alert alert-danger alert-dismissible fade show admin-alert mb-0 mt-5" role="alert">
+        @ViewBag.ErrorMessage
+        <div class="admin-validation-summary" asp-validation-summary="All"></div>
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+    </div>
 }
 
 @if (page == CatalogueNavPage.Edit)
 {
-  <div class="row mt-5">
-    <div class="col-12">
-      <h1 class="ml-5" id="catalogue-name-header">@Model.Name</h1>
+    <div class="row mt-5">
+        <div class="col-12">
+            <h1 class="ml-5" id="catalogue-name-header">@Model.Name</h1>
+        </div>
     </div>
-  </div>
 }
 @{
-  await Html.RenderPartialAsync("_CatalogueNav.cshtml", new CatalogueNavViewModel { Page = page, CatalogueId = Model.CatalogueNodeVersionId });
+    await Html.RenderPartialAsync("_CatalogueNav.cshtml", new CatalogueNavViewModel { Page = page, CatalogueId = Model.CatalogueNodeVersionId });
 }
 <div class="ml-5" style="max-width: 800px;">
-  <form method="POST" enctype="multipart/form-data">
-    <input type="hidden" id="CatalogueNodeVersionId" name="CatalogueNodeVersionId" value="@Model.CatalogueNodeVersionId" />
-    <input type="hidden" id="NodeId" name="NodeId" value="@Model.NodeId" />
-    <input type="hidden" id="NodeVersionId" name="NodeVersionId" value="@Model.NodeVersionId" />
-    <input type="hidden" id="ResourceOrder" value="@aToZ" />
-    <div class="row mt-5">
-      <div class="col-12 d-flex flex-row">
-        <div id="catalogue-id-tag">
-          @if (page == CatalogueNavPage.Edit)
-          {
-            var idString = Model.CatalogueNodeVersionId.ToString();
-            var paddedIdString = idString.Length > 3 ? idString : idString.PadLeft(3, '0');
-            <span>ID: @paddedIdString</span>
-          }
-          else
-          {
-            <span>NEW</span>
-          }
+    <form method="POST" enctype="multipart/form-data">
+        <input type="hidden" id="CatalogueNodeVersionId" name="CatalogueNodeVersionId" value="@Model.CatalogueNodeVersionId" />
+        <input type="hidden" id="NodeId" name="NodeId" value="@Model.NodeId" />
+        <input type="hidden" id="NodeVersionId" name="NodeVersionId" value="@Model.NodeVersionId" />
+        <input type="hidden" id="ResourceOrder" value="@aToZ" />
+        <div class="row mt-5">
+            <div class="col-12 d-flex flex-row">
+                <div id="catalogue-id-tag">
+                    @if (page == CatalogueNavPage.Edit)
+                    {
+                        var idString = Model.CatalogueNodeVersionId.ToString();
+                        var paddedIdString = idString.Length > 3 ? idString : idString.PadLeft(3, '0');
+                        <span>ID: @paddedIdString</span>
+                    }
+                    else
+                    {
+                        <span>NEW</span>
+                    }
+                </div>
+                @if (page == CatalogueNavPage.Add || Model.Hidden)
+                {
+                    <span class="hidden-badge hidden-badge-lg">Hidden</span>
+                }
+                @if (lastModifiedDate != null)
+                {
+                    <p class="catalogue-date-created">Last modified on: @lastModifiedDate</p>
+                }
+            </div>
         </div>
-        @if (page == CatalogueNavPage.Add || Model.Hidden)
-        {
-          <span class="hidden-badge hidden-badge-lg">Hidden</span>
-        }
-        @if (lastModifiedDate != null)
-        {
-          <p class="catalogue-date-created">Last modified on: @lastModifiedDate</p>
-        }
-      </div>
-    </div>
-
-    @if (!ViewData.ModelState.IsValid)
-    {
-      <div class="pt-4 field-validation-error">This form failed to save because there are errors below.</div>
-    }
 
-    <div class="row mt-5">
-      <div class="col-12 form-group">
-        <label for="Name">Catalogue name</label>
-        <p class="hint">You can enter a maximum of 255 characters including spaces</p>
-        <input asp-for="Name" class="form-control" />
-        <span asp-validation-for="Name"></span>
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12 form-group">
-        <label for="Name">Catalogue url</label>
-        @if (page == CatalogueNavPage.Add)
-        {
-          <input asp-for="Url" class="form-control" />
-        }
-        else
-        {
-          <input asp-for="Url" class="form-control" readonly="readonly" />
-        }
-        <span asp-validation-for="Url"></span>
-      </div>
-      <div class="col-12">
-        @if (Model.Status == VersionStatusEnum.Published && !Model.Hidden)
+        @if (!ViewData.ModelState.IsValid)
         {
-          <a id="catalogue-url"></a>
+            <div class="pt-4 field-validation-error">This form failed to save because there are errors below.</div>
         }
-        else
-        {
-          <p id="catalogue-url"></p>
-        }
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12 form-group">
-        <image-input for="BadgeImage" label="Badge (optional)" hint="Image must be 240px x 240px and in the following format: .png .jpg .gif .svg" value="@Model.BadgeUrl" existing-url="BadgeUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12 form-group">
-        <image-input for="CertificateImage" label="Certificate Image (optional)" hint="Image: must be 240px x 240px (aspect ratio 1:1) or 240px x 160px (aspect ratio 3:2);Format: .png .jpg .gif .svg;File: 50kB size limit;You do not need to include whitespace around the image (this will be added automatically);You can only upload one image" value="@Model.CertificateUrl" existing-url="CertificateUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
-        <span asp-validation-for="CertificateUrl"></span>
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12 form-group">
-        <image-input for="CardImage" label="Catalogue Card image (optional)" hint="Image must be 360px x 155px and in the following format: .png .jpg .gif .svg" value="@Model.CardImageUrl" existing-url="CardImageUrl" image-width="360" image-height="155" base-url="@imageBaseUrl" circle-crop="false" />
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12 form-group">
-        <image-input for="BannerImage" label="Banner image (optional)" hint="Image must be 1144px x 300px and in the following format: .png .jpg .gif .svg" existing-url="BannerUrl" value="@Model.BannerUrl" image-width="-1" image-height="-1" base-url="@imageBaseUrl" circle-crop="false" />
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12">
-        <label for="Description">Description</label>
-        <textarea asp-for="Description" class="form-control"></textarea>
-        <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
-        <span asp-validation-for="Description"></span>
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12">
-        <label for="Keywords">Keywords</label>
-        <p>
-          Add one or more relevant keywords to help learners find this catalogue, ensuring that the keyword is specifically related to the catalogue rather than the resources associated with it. A maximum of 5 keywords can be added. Enter one keyword and add it before entering another.
-        </p>
-        <div class="row">
-          <div class="col-12 input-group">
-            <input type="text" class="form-control" id="add-keyword-input" />
-            <div class="input-group-append">
-              <button type="button" class="btn btn-custom btn-custom-outline" id="add-keyword" disabled="disabled"><i class="fa fa-plus"></i>Add</button>
+
+        <div class="row mt-5">
+            <div class="col-12 form-group">
+                <label for="Name">Catalogue name</label>
+                <p class="hint">You can enter a maximum of 255 characters including spaces</p>
+                <input asp-for="Name" class="form-control" />
+                <span asp-validation-for="Name"></span>
             </div>
-          </div>
         </div>
-        <div class="row">
-          <div class="col-12">
-            <span asp-validation-for="Keywords"></span>
-            <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
-          </div>
+        <div class="row mt-5">
+            <div class="col-12 form-group">
+                <label for="Name">Catalogue url</label>
+                @if (page == CatalogueNavPage.Add)
+                {
+                    <input asp-for="Url" class="form-control" />
+                }
+                else
+                {
+                    <input asp-for="Url" class="form-control" readonly="readonly" />
+                }
+                <span asp-validation-for="Url"></span>
+            </div>
+            <div class="col-12">
+                @if (Model.Status == VersionStatusEnum.Published && !Model.Hidden)
+                {
+                    <a id="catalogue-url"></a>
+                }
+                else
+                {
+                    <p id="catalogue-url"></p>
+                }
+            </div>
         </div>
+        <div class="row mt-5">
+            <div class="col-12 form-group">
+                <image-input for="BadgeImage" label="Badge (optional)" hint="Image must be 240px x 240px and in the following format: .png .jpg .gif .svg" value="@Model.BadgeUrl" existing-url="BadgeUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
+            </div>
+        </div>
+        <div class="row mt-5">
+            <div class="col-12 form-group">
+                <image-input for="CertificateImage" label="Certificate Image (optional)" hint="Image: must be 240px x 240px (aspect ratio 1:1) or 240px x 160px (aspect ratio 3:2);Format: .png .jpg .gif .svg;File: 50kB size limit;You do not need to include whitespace around the image (this will be added automatically);You can only upload one image" value="@Model.CertificateUrl" existing-url="CertificateUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
+                <span asp-validation-for="CertificateUrl"></span>
+            </div>
+        </div>
+        <div class="row mt-5">
+            <div class="col-12 form-group">
+                <image-input for="CardImage" label="Catalogue Card image (optional)" hint="Image must be 360px x 155px and in the following format: .png .jpg .gif .svg" value="@Model.CardImageUrl" existing-url="CardImageUrl" image-width="360" image-height="155" base-url="@imageBaseUrl" circle-crop="false" />
+            </div>
+        </div>
+        <div class="row mt-5">
+            <div class="col-12 form-group">
+                <image-input for="BannerImage" label="Banner image (optional)" hint="Image must be 1144px x 300px and in the following format: .png .jpg .gif .svg" existing-url="BannerUrl" value="@Model.BannerUrl" image-width="-1" image-height="-1" base-url="@imageBaseUrl" circle-crop="false" />
+            </div>
+        </div>
+        <div class="row mt-5">
+            <div class="col-12">
+                <label for="Description">Description</label>
+                <textarea asp-for="Description" class="form-control"></textarea>
+                <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
+                <span asp-validation-for="Description"></span>
+            </div>
+        </div>
+        <div class="row mt-5">
+            <div class="col-12">
+                <label for="Keywords">Keywords</label>
+                <p>
+                    Add one or more relevant keywords to help learners find this catalogue, ensuring that the keyword is specifically related to the catalogue rather than the resources associated with it. A maximum of 5 keywords can be added. Enter one keyword and add it before entering another.
+                </p>
+                <div class="row">
+                    <div class="col-12 input-group">
+                        <input type="text" class="form-control" id="add-keyword-input" />
+                        <div class="input-group-append">
+                            <button type="button" class="btn btn-custom btn-custom-outline" id="add-keyword" disabled="disabled"><i class="fa fa-plus"></i>Add</button>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12">
+                        <span asp-validation-for="Keywords"></span>
+                        <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
+                    </div>
+                </div>
 
-      </div>
-      <div class="col-12">
-        <p class="hint">You can enter a maximum of 50 characters per keyword</p>
-        <div class="keyword-list">
-          @{
-            var i = 0;
-          }
-          @foreach (var keyword in keywords)
-          {
-            <div class="keyword-tag">
-              <p>@keyword</p>
-              <i class="fa fa-times"></i>
-              <input type="hidden" name="Keywords[@i]" class="keyword-value" value="@keyword" />
             </div>
-          }
+            <div class="col-12">
+                <p class="hint">You can enter a maximum of 50 characters</p>
+                <div class="keyword-list">
+                    @{
+                        var i = 0;
+                    }
+                    @foreach (var keyword in keywords)
+                    {
+                        <div class="keyword-tag">
+                            <p>@keyword</p>
+                            <i class="fa fa-times"></i>
+                            <input type="hidden" name="Keywords[@i]" class="keyword-value" value="@keyword" />
+                        </div>
+                    }
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
 
-    <div class="input-section mt-5">
+        <div class="input-section mt-5">
 
-      <div class="row">
-        <div class="col-12">
-          <label>Catalogue access</label>
-        </div>
-      </div>
+            <div class="row">
+                <div class="col-12">
+                    <label>Catalogue access</label>
+                </div>
+            </div>
 
-      <div class="row">
-        <div class="col-12">
-          <div class="form-check form-check-inline">
-            @if (!Model.RestrictedAccess)
-            {
-              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" checked="checked" />
-            }
-            else
-            {
-              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" />
-            }
-            <span>Unrestricted access (default)</span>
-          </div>
-          <div class="form-check form-check-inline ml-5">
-            @if (Model.RestrictedAccess)
-            {
-              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" checked="checked" />
-            }
-            else
+            <div class="row">
+                <div class="col-12">
+                    <div class="form-check form-check-inline">
+                        @if (!Model.RestrictedAccess)
+                        {
+                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" checked="checked" />
+                        }
+                        else
+                        {
+                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" />
+                        }
+                        <span>Unrestricted access (default)</span>
+                    </div>
+                    <div class="form-check form-check-inline ml-5">
+                        @if (Model.RestrictedAccess)
+                        {
+                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" checked="checked" />
+                        }
+                        else
+                        {
+                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" />
+                        }
+                        <span>Restricted access</span>
+                    </div>
+                </div>
+            </div>
+            @if (!Model.HasUserGroup)
             {
-              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" />
+                <div class="col-12 hint" id="has-no-user-group">
+                    <p>There are no user groups associated with this catalogue. You can add some in the User Groups tab.</p>
+                </div>
             }
-            <span>Restricted access</span>
-          </div>
         </div>
-      </div>
-      @if (!Model.HasUserGroup)
-      {
-        <div class="col-12 hint" id="has-no-user-group">
-          <p>There are no user groups associated with this catalogue. You can add some in the User Groups tab.</p>
-        </div>
-      }
-    </div>
 
-    <div class="input-section mt-5">
+        <div class="input-section mt-5">
 
-      <div class="row">
-        <div class="col-12">
-          <label>Content developed with</label>
-          <p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
-          <p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
-          <p class="providertext">Developed with;</p>
-        </div>
-      </div>
+            <div class="row">
+                <div class="col-12">
+                    <label>Content developed with</label>
+                    <p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
+                    <p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
+                    <p class="providertext">Developed with;</p>
+                </div>
+            </div>
 
-      <div class="row">
-        <div class="col-12">
-          @if (Providers != null && Providers.Count() > 0)
-          {
-            <div class="form-check form-check-vertical">
-              @foreach (var provider in Providers)
-              {
-                <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="@provider.Id" @(CatalogueNodeVersionProviderId == @provider.Id ? "checked" : "") />
-                <span class="span-provider">@provider.Name</span>
-                <br />
-              }
-              <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="0" @(CatalogueNodeVersionProviderId == 0 ? "checked" : "") />
-              <span class="span-provider">Not applicable</span>
+            <div class="row">
+                <div class="col-12">
+                    @if (Providers != null && Providers.Count() > 0)
+                    {
+                        <div class="form-check form-check-vertical">
+                            @foreach (var provider in Providers)
+                            {
+                                <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="@provider.Id" @(CatalogueNodeVersionProviderId == @provider.Id ? "checked" : "") />
+                                <span class="span-provider">@provider.Name</span>
+                                <br />
+                            }
+                            <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="0" @(CatalogueNodeVersionProviderId == 0 ? "checked" : "") />
+                            <span class="span-provider">Not applicable</span>
+                        </div>
+                    }
+                </div>
             </div>
-          }
         </div>
-      </div>
-    </div>
-    <div class="row mt-5">
-      <div class="col-12">
-        @if (page == CatalogueNavPage.Add)
-        {
-          <button type="submit" class="btn btn-custom-green" id="publish-catalogue">Save</button>
-        }
-        else
-        {
-          <button type="submit" class="btn btn-custom-green" id="publish-changes-catalogue">Save</button>
-        }
-      </div>
-    </div>
-  </form>
-  <div style="height: 40px; width: 100%;"></div>
+        <div class="row mt-5">
+            <div class="col-12">
+                @if (page == CatalogueNavPage.Add)
+                {
+                    <button type="submit" class="btn btn-custom-green" id="publish-catalogue">Save</button>
+                }
+                else
+                {
+                    <button type="submit" class="btn btn-custom-green" id="publish-changes-catalogue">Save</button>
+                }
+            </div>
+        </div>
+    </form>
+    <div style="height: 40px; width: 100%;"></div>
 </div>
 @section Scripts {
-  <script>
-    $(function () {
-      var baseUrl = '@baseUrl';
-      $('#publish-catalogue').on('click', function () {
-        var form = $(this).parents('form');
-        form.attr("action", "/Catalogue/PublishNew");
-      });
-      $('#publish-changes-catalogue').on('click', function () {
-        var form = $(this).parents('form');
-        form.attr("action", "/Catalogue/Edit");
-      });
-
-      // user group text
-      function showHideUserGroupText() {
-        var ugText = $('#has-no-user-group');
-        var restrictedAccess = $('[name="RestrictedAccess"]:checked').val() === "true";
-        if (restrictedAccess) {
-          ugText.show();
-        } else {
-          ugText.hide();
-        }
-      }
-      showHideUserGroupText();
-      $('[name="RestrictedAccess"]').on('change', showHideUserGroupText);
-      //keyword
-      function removeKeyword() {
-        var $close = $(this);
-        var $keyword = $close.parent();
-        var value = $keyword.find('p').text();
-        var index = keywords.indexOf(value);
-        if (index === -1) {
-          return;
-        }
-        keywords.splice(index, 1);
-        $('#Keywords').val(keywords);
-        $keyword.remove();
-        // reindex the keyword inputs
-        $('.keyword-value').each(function (i, x) {
-          $(x).attr('name', "Keywords[" + i + "]");
-        });
-        if (keywords.length < 5) {
-          $('#add-keyword').removeAttr('disabled');
-          $('#add-keyword-input').removeAttr('disabled');
-        }
-      }
-
-      var keywords = @keywordsJson || [];
-      if (keywords.length > 4) {
-        $('#add-keyword').attr('disabled', 'disabled');
-        $('#add-keyword-input').attr('disabled', 'disabled');
-      }
-      $('#Keywords').val(keywords);
-      $('.keyword-tag>i.fa-times').on('click', removeKeyword);
-
-      $('#add-keyword-input').on('input', function () {
-        var value = $(this).val();
-        var length = value.length;
-        if (length === 0 || length > 50) {
-          $('#add-keyword').attr('disabled', 'disabled');
-        } else {
-          $('#add-keyword').removeAttr('disabled');
-        }
-      });
-
-      $('#add-keyword').on('click', function () {
-        var $keywordInput = $('#add-keyword-input');
-        var value = $keywordInput.val();
-        if (!value) {
-          return;
-        }
+    <script>
+        $(function () {
+            var baseUrl = '@baseUrl';
+            $('#publish-catalogue').on('click', function () {
+                var form = $(this).parents('form');
+                form.attr("action", "/Catalogue/PublishNew");
+            });
+            $('#publish-changes-catalogue').on('click', function () {
+                var form = $(this).parents('form');
+                form.attr("action", "/Catalogue/Edit");
+            });
 
-        // Split the input value by commas and trim each keyword
-        var values = value.split(',').map(function (item) {
-          return item.trim();
-        });
+            // user group text
+            function showHideUserGroupText() {
+                var ugText = $('#has-no-user-group');
+                var restrictedAccess = $('[name="RestrictedAccess"]:checked').val() === "true";
+                if (restrictedAccess) {
+                    ugText.show();
+                } else {
+                    ugText.hide();
+                }
+            }
+            showHideUserGroupText();
+            $('[name="RestrictedAccess"]').on('change', showHideUserGroupText);
+            //keyword
+            function removeKeyword() {
+                var $close = $(this);
+                var $keyword = $close.parent();
+                var value = $keyword.find('p').text();
+                var index = keywords.indexOf(value);
+                if (index === -1) {
+                    return;
+                }
+                keywords.splice(index, 1);
+                $('#Keywords').val(keywords);
+                $keyword.remove();
+                // reindex the keyword inputs
+                $('.keyword-value').each(function (i, x) {
+                    $(x).attr('name', "Keywords[" + i + "]");
+                });
+                if (keywords.length < 5) {
+                    $('#add-keyword').removeAttr('disabled');
+                    $('#add-keyword-input').removeAttr('disabled');
+                }
+            }
 
-        values.forEach(function (value) {
-          if (value && keywords.indexOf(value) === -1) {
-            keywords.push(value);
+            var keywords = @keywordsJson || [];
+            if (keywords.length > 4) {
+                $('#add-keyword').attr('disabled', 'disabled');
+                $('#add-keyword-input').attr('disabled', 'disabled');
+            }
             $('#Keywords').val(keywords);
-            var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
-            tag.find('.fa-times').on('click', removeKeyword);
-            $('.keyword-list').append(tag);
+            $('.keyword-tag>i.fa-times').on('click', removeKeyword);
 
-            // reindex the keyword inputs
-            $('.keyword-value').each(function (i, x) {
-              $(x).attr('name', "Keywords[" + i + "]");
+            $('#add-keyword-input').on('input', function () {
+                var value = $(this).val();
+                var length = value.length;
+                if (length === 0 || length > 50) {
+                    $('#add-keyword').attr('disabled', 'disabled');
+                } else {
+                    $('#add-keyword').removeAttr('disabled');
+                }
             });
-          }
-        });
 
-        $keywordInput.val(""); // Clear the input field after processing all keywords
+            $('#add-keyword').on('click', function () {
+                var $keywordInput = $('#add-keyword-input');
+                var value = $keywordInput.val();
+                if (!value) {
+                    return;
+                }
+                value = value.trim();
+                if (keywords.indexOf(value) === -1) {
+                    keywords.push(value);
+                    $('#Keywords').val(keywords);
+                    var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
+                    tag.find('.fa-times').on('click', removeKeyword);
+                    $('.keyword-list').append(tag);
+                    $keywordInput.val("");
+                    // reindex the keyword inputs
+                    $('.keyword-value').each(function (i, x) {
+                        $(x).attr('name', "Keywords[" + i + "]");
+                    });
+                }
+                if (keywords.length > 4) {
+                    $('#add-keyword').attr('disabled', 'disabled');
+                    $('#add-keyword-input').attr('disabled', 'disabled');
+                }
+            });
 
-        if (keywords.length > 4) {
-          $('#add-keyword').attr('disabled', 'disabled');
-          $('#add-keyword-input').attr('disabled', 'disabled');
-        }
-      });
-      // url
-      var oldUrl = "";
-      $('#Url').on('input', function () {
-        var value = this.value;
-        var whitelistRegex = /^[a-zA-Z0-9\-\s]{0,}$/;
-        if (!whitelistRegex.test(value)) {
-          value = oldUrl;
-        }
-        this.value = value.replace(/[\s]/g, '-');
-        oldUrl = this.value;
-        var url = baseUrl + this.value;
-        var $catalogueUrl = $('#catalogue-url');
-        $catalogueUrl.text(url);
-        if ($catalogueUrl.is('a')) {
-          $catalogueUrl.attr('href', url);
-        }
-      });
+            // url
+            var oldUrl = "";
+            $('#Url').on('input', function () {
+                var value = this.value;
+                var whitelistRegex = /^[a-zA-Z0-9\-\s]{0,}$/;
+                if (!whitelistRegex.test(value)) {
+                    value = oldUrl;
+                }
+                this.value = value.replace(/[\s]/g, '-');
+                oldUrl = this.value;
+                var url = baseUrl + this.value;
+                var $catalogueUrl = $('#catalogue-url');
+                $catalogueUrl.text(url);
+                if ($catalogueUrl.is('a')) {
+                    $catalogueUrl.attr('href', url);
+                }
+            });
 
-      $('#Url').trigger('input');
+            $('#Url').trigger('input');
 
-      // name
-      $('#Name').on('change', function () {
-        var value = this.value;
-        var encodedValue = value;
-        var $catalogueNameHeader = $('#catalogue-name-header');
-        if ($catalogueNameHeader && $catalogueNameHeader.length) {
-          $catalogueNameHeader.text(encodedValue);
-        }
-      });
-      CKEDITOR.replace('Description',
-        {
-          toolbar: [
-            { name: 'undo', items: ['Undo', 'Redo'] },
-            { name: 'bold', items: ['Bold', 'Italic'] },
-            { name: 'list', items: ['NumberedList', 'BulletedList'] },
-            { name: 'link', items: ['Link'] }
-          ]
-        });
-      CKEDITOR.replace('Notes',
-        {
-          toolbar: [
-            { name: 'undo', items: ['Undo', 'Redo'] },
-            { name: 'bold', items: ['Bold', 'Italic'] },
-            { name: 'list', items: ['NumberedList', 'BulletedList'] },
-            { name: 'link', items: ['Link'] }
-          ]
-        });
+            // name
+            $('#Name').on('change', function () {
+                var value = this.value;
+                var encodedValue = value;
+                var $catalogueNameHeader = $('#catalogue-name-header');
+                if ($catalogueNameHeader && $catalogueNameHeader.length) {
+                    $catalogueNameHeader.text(encodedValue);
+                }
+            });
+            CKEDITOR.replace('Description',
+                {
+                    toolbar: [
+                        { name: 'undo', items: ['Undo', 'Redo'] },
+                        { name: 'bold', items: ['Bold', 'Italic'] },
+                        { name: 'list', items: ['NumberedList', 'BulletedList'] },
+                        { name: 'link', items: ['Link'] }
+                    ]
+                });
+            CKEDITOR.replace('Notes',
+                {
+                    toolbar: [
+                        { name: 'undo', items: ['Undo', 'Redo'] },
+                        { name: 'bold', items: ['Bold', 'Italic'] },
+                        { name: 'list', items: ['NumberedList', 'BulletedList'] },
+                        { name: 'link', items: ['Link'] }
+                    ]
+                });
 
-      CKEDITOR.on('instanceReady', function () {
-        var editor = CKEDITOR.instances['Description'];
+            CKEDITOR.on('instanceReady', function () {
+                var editor = CKEDITOR.instances['Description'];
 
-        editor.on('change', function () {
-          var editorData = editor.getData();
-          var data = $("<p></p>").html(editorData).text();
-          var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, '');
-        });
+                editor.on('change', function () {
+                    var editorData = editor.getData();
+                    var data = $("<p></p>").html(editorData).text();
+                    var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, '');
+                });
 
-        editor.fire('change');
-      });
+                editor.fire('change');
+            });
 
-    });
+        });
 
-  </script>
-  <script src="~/js/imageInput.js"></script>
+    </script>
+    <script src="~/js/imageInput.js"></script>
 }
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index a935bc31a..06d704f18 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -90,11 +90,11 @@
                     To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
                 </div>
                 <div class="col-12 mt-4 input-with-button">
-                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="2000" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
+                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="50" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
                     <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
                 </div>
                 <div class="col-12 footer-text">
-                    You can enter a maximum of 50 characters per keyword
+                    You can enter a maximum of 50 characters
                 </div>
             </div>
         </div>
@@ -529,7 +529,7 @@
                         if (!this.keywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                             for (var i = 0; i < allTrimmedKeyword.length; i++) {
                                 let item = allTrimmedKeyword[i];
-                                if (item.length > 0 && item.length <= 50) {
+                                if (item.length > 0) {
                                     let newkeywordObj = new KeywordModel();
                                     newkeywordObj.keyword = item;
                                     newkeywordObj.resourceVersionId = this.resourceDetail.resourceVersionId;

From 5b505c53bd55c05e6aaa8c5145bac5ed889ff5f1 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 21 May 2024 17:02:50 +0100
Subject: [PATCH 15/64] TD-3308: Keyword field only allows 50 chars which is
 problematic when adding multiple keywords at once

---
 .../Views/Catalogue/Edit.cshtml               | 48 ++++++++++---------
 .../vuesrc/contribute/ContentCommon.vue       |  6 +--
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index dddfe43ea..e9aa0ce69 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -165,7 +165,7 @@
 
             </div>
             <div class="col-12">
-                <p class="hint">You can enter a maximum of 50 characters</p>
+                <p class="hint">You can enter a maximum of 50 characters per keyword.</p>
                 <div class="keyword-list">
                     @{
                         var i = 0;
@@ -334,29 +334,31 @@
             });
 
             $('#add-keyword').on('click', function () {
-                var $keywordInput = $('#add-keyword-input');
-                var value = $keywordInput.val();
-                if (!value) {
-                    return;
-                }
-                value = value.trim();
-                if (keywords.indexOf(value) === -1) {
-                    keywords.push(value);
-                    $('#Keywords').val(keywords);
-                    var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
-                    tag.find('.fa-times').on('click', removeKeyword);
-                    $('.keyword-list').append(tag);
-                    $keywordInput.val("");
-                    // reindex the keyword inputs
-                    $('.keyword-value').each(function (i, x) {
-                        $(x).attr('name', "Keywords[" + i + "]");
-                    });
-                }
-                if (keywords.length > 4) {
-                    $('#add-keyword').attr('disabled', 'disabled');
-                    $('#add-keyword-input').attr('disabled', 'disabled');
+              var $keywordInput = $('#add-keyword-input');
+              var value = $keywordInput.val();
+              if (!value) {
+                return;
+              }
+
+              // Split the input value by commas and trim each keyword
+              var values = value.split(',').map(function (item) {
+                return item.trim();
+              });
+
+              values.forEach(function (value) {
+                if (value && keywords.indexOf(value) === -1) {
+                  keywords.push(value);
+                  $('#Keywords').val(keywords);
+                  var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
+                  tag.find('.fa-times').on('click', removeKeyword);
+                  $('.keyword-list').append(tag);
+
+                  // reindex the keyword inputs
+                  $('.keyword-value').each(function (i, x) {
+                    $(x).attr('name', "Keywords[" + i + "]");
+                  });
                 }
-            });
+              });
 
             // url
             var oldUrl = "";
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 06d704f18..70462257c 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -90,11 +90,11 @@
                     To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
                 </div>
                 <div class="col-12 mt-4 input-with-button">
-                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="50" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
+                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
                     <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
                 </div>
                 <div class="col-12 footer-text">
-                    You can enter a maximum of 50 characters
+                    You can enter a maximum of 50 characters per keyword
                 </div>
             </div>
         </div>
@@ -529,7 +529,7 @@
                         if (!this.keywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                             for (var i = 0; i < allTrimmedKeyword.length; i++) {
                                 let item = allTrimmedKeyword[i];
-                                if (item.length > 0) {
+                                if (item.length > 0 && item.length <= 50) {
                                     let newkeywordObj = new KeywordModel();
                                     newkeywordObj.keyword = item;
                                     newkeywordObj.resourceVersionId = this.resourceDetail.resourceVersionId;

From e3c06755d1a60bc497ca0e1567f013e2e671c52b Mon Sep 17 00:00:00 2001
From: Sarathlal Sarangadharan <Sarathlal.Sarangadharan@hee.nhs.uk>
Date: Fri, 31 May 2024 11:00:09 +0100
Subject: [PATCH 16/64] TD-4023: Considering only active users IN Catalogue
 access request

---
 .../Hub/RestrictedCatalogueGetAccessRequests.sql               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetAccessRequests.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetAccessRequests.sql
index 895771125..74d220c7e 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetAccessRequests.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetAccessRequests.sql	
@@ -7,6 +7,7 @@
 --
 -- 25-03-2021  Killian Davies	Initial Revision
 -- 08-02-2024  SA				Included Role details.
+-- 31-05-2024  SS				Considering only active users
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [hub].[RestrictedCatalogueGetAccessRequests] 
 (
@@ -38,7 +39,7 @@ BEGIN
 			hub.UserProfile up ON car.UserId = up.Id
 		WHERE
 			car.CatalogueNodeId = @catalogueNodeId
-			AND car.Deleted = 0
+			AND car.Deleted = 0 and up.Deleted=0
 	) AS T1
 	WHERE T1.[Sequence] = 1
 	AND ((@includeNew = 1 AND CatalogueAccessRequestStatus = 0)

From fcf584535bb264e4dde3b1481693bcd1ba2034fe Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 31 May 2024 14:08:18 +0100
Subject: [PATCH 17/64] TD-4205: Added user authentication check before
 recording Article/Image resource activity.

---
 LearningHub.Nhs.WebUI/Controllers/ResourceController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 7a1245acc..df997d690 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -180,7 +180,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
             }
 
             // For article/image resources, immediately record the resource activity for this user.
-            if ((resource.ResourceTypeEnum == ResourceTypeEnum.Article || resource.ResourceTypeEnum == ResourceTypeEnum.Image) && (!resource.SensitiveContent))
+            if ((resource.ResourceTypeEnum == ResourceTypeEnum.Article || resource.ResourceTypeEnum == ResourceTypeEnum.Image) && (!resource.SensitiveContent) && this.User.Identity.IsAuthenticated)
             {
                 var activity = new CreateResourceActivityViewModel()
                 {

From aedd97a2384bec39666dcffa29a4555c4445776f Mon Sep 17 00:00:00 2001
From: Sarathlal Sarangadharan <Sarathlal.Sarangadharan@hee.nhs.uk>
Date: Fri, 7 Jun 2024 09:31:47 +0100
Subject: [PATCH 18/64] TD-4204: Description for html resouce is enabled

---
 LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
index 21b717556..08e6b3e42 100644
--- a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
@@ -191,7 +191,7 @@
         }
 
         @* Description / Additional Information *@
-        @if (resourceItem.ResourceTypeEnum != ResourceTypeEnum.Case && resourceItem.ResourceTypeEnum != ResourceTypeEnum.Assessment && resourceItem.ResourceTypeEnum != ResourceTypeEnum.Html)
+        @if (resourceItem.ResourceTypeEnum != ResourceTypeEnum.Case && resourceItem.ResourceTypeEnum != ResourceTypeEnum.Assessment)
         {
             <div class="nhsuk-u-margin-bottom-7">
                 @if (resourceItem.ResourceTypeEnum != ResourceTypeEnum.Article || (resourceItem.Catalogue.RestrictedAccess && !Model.HasCatalogueAccess))

From 8e8cbcdea429537b8c7fa099d6f530546a47f830 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Sun, 16 Jun 2024 23:56:35 +0100
Subject: [PATCH 19/64] TD-4226 storage update

---
 .../Controllers/Api/ResourceController.cs     | 28 ++++++++++++++++
 .../Scripts/vuesrc/contribute/Content.vue     | 32 +++++++++++++++++++
 .../Scripts/vuesrc/data/resource.ts           | 27 +++++++++++++++-
 .../ResourceService.cs                        |  6 ++--
 4 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
index 7f0c1feee..048f1a426 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
@@ -1,6 +1,7 @@
 namespace LearningHub.Nhs.WebUI.Controllers.Api
 {
     using System;
+    using System.Collections.Generic;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
@@ -557,5 +558,32 @@ public async Task<ActionResult> DeleteResourceProviderAsync(int resourceVersionI
             var validationResult = await this.resourceService.DeleteAllResourceVersionProviderAsync(resourceVersionId);
             return this.Ok(validationResult);
         }
+
+        /// <summary>
+        /// The ArchiveResourceFile.
+        /// </summary>
+        /// <param name="filePaths">filePaths.</param>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        [HttpPost]
+        [Route("ArchiveResourceFile")]
+        public ActionResult ArchiveResourceFile(List<string> filePaths)
+        {
+            _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, filePaths); });
+            return this.Ok();
+        }
+
+        /// <summary>
+        /// The GetObsoleteResourceFile.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId.</param>
+        /// <param name="deletedResource">.</param>
+        /// <returns>The <see cref="T:Task{List{FileTypeViewModel}}"/>.</returns>
+        [HttpGet]
+        [Route("GetObsoleteResourceFile/{resourceVersionId}/{deletedResource}")]
+        public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, bool deletedResource)
+        {
+            var result = await this.resourceService.GetObsoleteResourceFile(resourceVersionId, deletedResource);
+            return result;
+        }
     }
 }
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
index a74f8443a..154d78e98 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
@@ -502,6 +502,8 @@
                 showError: false,
                 errorMessage: '',
                 contributeResourceAVFlag: true,
+                filePathBeforeFileChange: [] as string[],
+                filePathAfterFileChange: [] as string[]
             }
         },
         computed: {
@@ -837,6 +839,19 @@
                     if (uploadResult.resourceType === ResourceType.SCORM) {
                         this.$store.commit('populateScormDetails', uploadResult.resourceVersionId);
                     }
+
+                    if (this.filePathBeforeFileChange.length > 0) {
+                        this.getResourceFilePath('completed');
+                        if (this.filePathBeforeFileChange.length > 0 && this.filePathAfterFileChange.length > 0) {
+                            let filePaths = this.filePathBeforeFileChange.filter(item => !this.filePathAfterFileChange.includes(item));
+                            if (filePaths.length > 0) {
+                                resourceData.archiveResourceFile(filePaths);
+                                this.filePathBeforeFileChange.length = 0;
+                                this.filePathAfterFileChange.length = 0;
+                            }
+                        }
+                    }
+                   
                 } else {
                     this.fileUploadServerError = 'There was a problem uploading this file to the Learning Hub. Please try again and if it still does not upload, contact the support team.';
                     this.$store.commit('setSaveStatus', '');
@@ -894,6 +909,7 @@
             },
             fileChangedScorm() {
                 (this.$refs.fileUploadScorm as any).click();
+                this.getResourceFilePath('initialised');
             },
             childResourceFileChanged(newFile: File) {
                 this.uploadingFile = newFile;
@@ -943,6 +959,7 @@
             fileChanged() {
                 this.fileUploadRef.value = null;
                 this.fileUploadRef.click();
+                this.getResourceFilePath('initialised');
             },
             childFileUploadError(errorType: FileErrorTypeEnum, customError: string) {
                 this.fileErrorType = errorType;
@@ -1015,6 +1032,21 @@
                         break;
                 }
                 return errorTitle;
+            },
+            async getResourceFilePath(fileChangeStatus: string) {
+                let resource = this.$store.state.resourceDetail;
+                if (resource != null && resource.resourceVersionId > 0 &&(resource.resourceType != this.resourceType.CASE || resource.resourceType != this.resourceType.ASSESSMENT))
+                {
+                    await resourceData.getObsoleteResourceFile(resource.resourceVersionId).then(response => {
+                        if (fileChangeStatus == 'initialised') {
+                            this.filePathBeforeFileChange = response;
+                        }
+                        else if (fileChangeStatus == 'completed') {
+                            this.filePathAfterFileChange = response;
+                        }
+                    });
+                }
+
             }
         },
         validations: {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
index 738b53ca2..c29f48dd8 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
@@ -535,6 +535,29 @@ const getAVUnavailableView = async function (): Promise<string> {
         });
 };
 
+const getObsoleteResourceFile = async function (id: number): Promise<string[]> {
+    return await AxiosWrapper.axios.get<string[]>('/api/Resource/GetObsoleteResourceFile/' + id + '/' + true + `?timestamp=${new Date().getTime()}`)
+        .then(response => {
+            console.log(response.data);
+            return response.data;
+        })
+        .catch(e => {
+            console.log('getObsoleteResourceFiles:' + e);
+            throw e;
+        });
+};
+
+const archiveResourceFile = async function (filepaths: string[]): Promise<boolean> {
+    const params = {filePaths:filepaths};
+    return await AxiosWrapper.axios.post('/api/Resource/DuplicateBlocks', params).then(() => {
+        return true
+    }).catch(e => {
+            console.log('archiveResourceFile:' + e);
+            throw e;
+        });
+};
+
+
 export const resourceData = {
     getContributeConfiguration,
     getContributeSettings,
@@ -575,5 +598,7 @@ export const resourceData = {
     getMyContributions,
     getContributeAVResourceFlag,
     getDisplayAVResourceFlag,
-    getAVUnavailableView
+    getAVUnavailableView,
+    getObsoleteResourceFile,
+    archiveResourceFile
 };
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 6d6220122..9335b5f42 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1411,7 +1411,7 @@ where deletableCaseFiles.Contains(entry)
                     var rvs = await this.resourceVersionRepository.GetResourceVersionsAsync(resourceVersion.ResourceId);
                     rvs = rvs.Where(x => x.Id != resourceVersionId && x.PublicationId > 0).OrderByDescending(x => x.PublicationId).ToList();
                     var rv = rvs.FirstOrDefault();
-                    var extendedResourceVersion = await this.GetResourceVersionExtendedViewModelAsync(rv.Id);
+                    var extendedResourceVersion = rv != null ? await this.GetResourceVersionExtendedViewModelAsync(rv.Id) : null;
                     switch (resourceVersion.ResourceType)
                     {
                         case ResourceTypeEnum.Scorm:
@@ -1432,7 +1432,7 @@ where deletableCaseFiles.Contains(entry)
                             }
                             else if (rv == null && deletedResource)
                             {
-                                retVal.Add(scormResource.ContentFilePath);
+                                retVal.Add(scormResource?.File?.FilePath);
                             }
 
                             break;
@@ -1454,7 +1454,7 @@ where deletableCaseFiles.Contains(entry)
                             }
                             else if (rv == null && deletedResource)
                             {
-                                retVal.Add(htmlResource.ContentFilePath);
+                                retVal.Add(htmlResource?.File?.FilePath);
                             }
 
                             break;

From 66b060165a120ffb7048faf3a779638874851eb9 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 17 Jun 2024 09:08:05 +0100
Subject: [PATCH 20/64] TD-4054 archive extracted content folders for html and
 scorm resource.

---
 .../Configuration/WebSettings.cs              |  10 +
 .../Controllers/ResourceController.cs         |  14 +
 .../Interfaces/IFileService.cs                |  70 +--
 .../Services/FileService.cs                   | 451 ++++++++++++++----
 .../LearningHub.Nhs.AdminUI/appsettings.json  |   2 +
 5 files changed, 427 insertions(+), 120 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs
index ace067941..de59cc2a8 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs
@@ -77,6 +77,16 @@ public class WebSettings
         /// </summary>
         public string AzureFileStorageConnectionString { get; set; }
 
+        /// <summary>
+        /// Gets or sets the AzureSourceFileStorageConnectionString.
+        /// </summary>
+        public string AzureSourceArchiveStorageConnectionString { get; set; }
+
+        /// <summary>
+        /// Gets or sets the AzurePurgedFileStorageConnectionString.
+        /// </summary>
+        public string AzureContentArchiveStorageConnectionString { get; set; }
+
         /// <summary>
         /// Gets or sets the azure file storage resource share name.
         /// </summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
index e2c191f11..d81188aab 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
@@ -54,6 +54,11 @@ public class ResourceController : BaseController
         /// </summary>
         private IResourceService resourceService;
 
+        /// <summary>
+        /// Defines the _fileService.
+        /// </summary>
+        private IFileService fileService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceController"/> class.
         /// </summary>
@@ -61,6 +66,7 @@ public class ResourceController : BaseController
         /// <param name="config">The config<see cref="IOptions{WebSettings}"/>.</param>
         /// <param name="logger">The logger<see cref="ILogger{HomeController}"/>.</param>
         /// <param name="resourceService">The resourceService<see cref="IResourceService"/>.</param>
+        /// <param name="fileService">The fileService<see cref="IResourceService"/>.</param>
         /// /// <param name="websettings">The websettings<see cref="IOptions{WebSettings}"/>.</param>
         /// <param name="featureManager">The featureManager<see cref="IFeatureManager"/>.</param>
         public ResourceController(
@@ -68,6 +74,7 @@ public ResourceController(
             IOptions<WebSettings> config,
             ILogger<HomeController> logger,
             IResourceService resourceService,
+            IFileService fileService,
             IOptions<WebSettings> websettings,
             IFeatureManager featureManager)
         : base(hostingEnvironment)
@@ -76,6 +83,7 @@ public ResourceController(
             this.websettings = websettings;
             this.config = config.Value;
             this.resourceService = resourceService;
+            this.fileService = fileService;
             this.featureManager = featureManager;
         }
 
@@ -298,11 +306,17 @@ public async Task<IActionResult> TransferResourceOwnership(int resourceId, strin
         [HttpPost]
         public async Task<IActionResult> Unpublish(int resourceVersionId, string details)
         {
+            var associatedFile = await this.resourceService.GetResourceVersionExtendedViewModelAsync(resourceVersionId);
             var vr = await this.resourceService.UnpublishResourceVersionAsync(resourceVersionId, details);
             await this.resourceService.CreateResourceVersionEvent(resourceVersionId, Nhs.Models.Enums.ResourceVersionEventTypeEnum.UnpublishedByAdmin, "Unpublish using Admin UI", 0);
 
             if (vr.IsValid)
             {
+                if (associatedFile.ScormDetails != null || associatedFile.HtmlDetails != null)
+                {
+                    _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile, null); });
+                }
+
                 return this.Json(new
                 {
                     success = true,
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs
index 3d8a80b92..ef7ccfcde 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs
@@ -1,38 +1,48 @@
 namespace LearningHub.Nhs.AdminUI.Interfaces
 {
-  using System.IO;
-  using System.Threading.Tasks;
-  using Azure.Storage.Files.Shares.Models;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Threading.Tasks;
+    using Azure.Storage.Files.Shares.Models;
+    using LearningHub.Nhs.Models.Resource;
 
-  /// <summary>
-  /// Defines the <see cref="IFileService" />.
-  /// </summary>
-  public interface IFileService
-  {
     /// <summary>
-    /// The DeleteChunkDirectory.
+    /// Defines the <see cref="IFileService" />.
     /// </summary>
-    /// <param name="directoryRef">Directory ref.</param>
-    /// <param name="chunks">Chunks.</param>
-    /// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
-    Task DeleteChunkDirectory(string directoryRef, int chunks);
+    public interface IFileService
+    {
+        /// <summary>
+        /// The DeleteChunkDirectory.
+        /// </summary>
+        /// <param name="directoryRef">Directory ref.</param>
+        /// <param name="chunks">Chunks.</param>
+        /// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
+        Task DeleteChunkDirectory(string directoryRef, int chunks);
 
-    /// <summary>
-    /// The DownloadFileAsync.
-    /// </summary>
-    /// <param name="filePath">File path.</param>
-    /// <param name="fileName">File name.</param>
-    /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-    Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName);
+        /// <summary>
+        /// The DownloadFileAsync.
+        /// </summary>
+        /// <param name="filePath">File path.</param>
+        /// <param name="fileName">File name.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName);
 
-    /// <summary>
-    /// The ProcessFile.
-    /// </summary>
-    /// <param name="fileBytes">The fileBytes<see cref="Stream"/>.</param>
-    /// <param name="fileName">The fileName<see cref="string"/>.</param>
-    /// <param name="directoryRef">The directoryRef<see cref="string"/>.</param>
-    /// <param name="originalFileName">The originalFileName<see cref="string"/>.</param>
-    /// <returns>The <see cref="string"/>.</returns>
-    Task<string> ProcessFile(Stream fileBytes, string fileName, string directoryRef = "", string originalFileName = null);
-  }
+        /// <summary>
+        /// The ProcessFile.
+        /// </summary>
+        /// <param name="fileBytes">The fileBytes<see cref="Stream"/>.</param>
+        /// <param name="fileName">The fileName<see cref="string"/>.</param>
+        /// <param name="directoryRef">The directoryRef<see cref="string"/>.</param>
+        /// <param name="originalFileName">The originalFileName<see cref="string"/>.</param>
+        /// <returns>The <see cref="string"/>.</returns>
+        Task<string> ProcessFile(Stream fileBytes, string fileName, string directoryRef = "", string originalFileName = null);
+
+        /// <summary>
+        /// 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 = null, List<string> filePaths = null);
+    }
 }
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs
index 7998020b6..60a4e0781 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs
@@ -1,122 +1,393 @@
 namespace LearningHub.Nhs.AdminUI.Services
 {
-  using System;
-  using System.IO;
-  using System.Threading.Tasks;
-  using Azure.Storage.Files.Shares;
-  using Azure.Storage.Files.Shares.Models;
-  using LearningHub.Nhs.AdminUI.Configuration;
-  using LearningHub.Nhs.AdminUI.Interfaces;
-  using Microsoft.AspNetCore.StaticFiles;
-  using Microsoft.Extensions.Options;
-
-  /// <summary>
-  /// Defines the <see cref="FileService" />.
-  /// </summary>
-  public class FileService : IFileService
-  {
-    private readonly WebSettings settings;
-    private ShareClient shareClient;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Azure.Storage.Files.Shares;
+    using Azure.Storage.Files.Shares.Models;
+    using LearningHub.Nhs.AdminUI.Configuration;
+    using LearningHub.Nhs.AdminUI.Interfaces;
+    using LearningHub.Nhs.Models.Resource;
+    using Microsoft.AspNetCore.StaticFiles;
+    using Microsoft.Extensions.Options;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="FileService"/> class.
+    /// Defines the <see cref="FileService" />.
     /// </summary>
-    /// <param name="settings">Settings.</param>
-    public FileService(IOptions<WebSettings> settings)
+    public class FileService : IFileService
     {
-      this.settings = settings.Value;
-    }
+        private readonly WebSettings settings;
+        private ShareClient shareClient;
+        private ShareClient archiveShareClient;
+        private ShareClient contentArchiveShareClient;
 
-    private ShareClient ShareClient
-    {
-      get
-      {
-        if (this.shareClient == null)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FileService"/> class.
+        /// </summary>
+        /// <param name="settings">Settings.</param>
+        public FileService(IOptions<WebSettings> settings)
+        {
+            this.settings = settings.Value;
+        }
+
+        private ShareClient ShareClient
         {
-          var options = new ShareClientOptions();
-          options.Retry.MaxRetries = 3;
-          options.Retry.Delay = TimeSpan.FromSeconds(10);
+            get
+            {
+                if (this.shareClient == null)
+                {
+                    var options = new ShareClientOptions();
+                    options.Retry.MaxRetries = 3;
+                    options.Retry.Delay = TimeSpan.FromSeconds(10);
 
-          this.shareClient = new ShareClient(this.settings.AzureFileStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
+                    this.shareClient = new ShareClient(this.settings.AzureFileStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
 
-          if (!this.shareClient.Exists())
-          {
-            throw new Exception($"Unable to access azure file storage resource {this.settings.AzureFileStorageResourceShareName}");
-          }
+                    if (!this.shareClient.Exists())
+                    {
+                        throw new Exception($"Unable to access azure file storage resource {this.settings.AzureFileStorageResourceShareName}");
+                    }
+                }
+
+                return this.shareClient;
+            }
         }
 
-        return this.shareClient;
-      }
-    }
+        private ShareClient OutputArchiveShareClient
+        {
+            get
+            {
+                if (this.contentArchiveShareClient == null)
+                {
+                    var options = new ShareClientOptions();
+                    options.Retry.MaxRetries = 3;
+                    options.Retry.Delay = TimeSpan.FromSeconds(10);
 
-    /// <summary>
-    /// The DeleteChunkDirectory.
-    /// </summary>
-    /// <param name="directoryRef">The directoryRef<see cref="string"/>.</param>
-    /// <param name="chunks">The chunks<see cref="int"/>.</param>
-    /// <returns>The <see cref="Task"/>.</returns>
-    public async Task DeleteChunkDirectory(string directoryRef, int chunks)
-    {
-      var directory = this.ShareClient.GetDirectoryClient(directoryRef);
+                    this.contentArchiveShareClient = new ShareClient(this.settings.AzureContentArchiveStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
+
+                    if (!this.contentArchiveShareClient.Exists())
+                    {
+                        throw new Exception($"Unable to access azure content archive file storage resource {this.settings.AzureFileStorageResourceShareName}");
+                    }
+                }
+
+                return this.contentArchiveShareClient;
+            }
+        }
 
-      if (await directory.ExistsAsync())
-      {
-        for (int i = 0; i < chunks; i++)
+        private ShareClient InputArchiveShareClient
         {
-          var file = directory.GetFileClient("Chunk_" + i.ToString());
-          await file.DeleteIfExistsAsync();
+            get
+            {
+                if (this.archiveShareClient == null)
+                {
+                    var options = new ShareClientOptions();
+                    options.Retry.MaxRetries = 3;
+                    options.Retry.Delay = TimeSpan.FromSeconds(10);
+
+                    this.archiveShareClient = new ShareClient(this.settings.AzureSourceArchiveStorageConnectionString, this.settings.AzureFileStorageResourceShareName, options);
+
+                    if (!this.archiveShareClient.Exists())
+                    {
+                        throw new Exception($"Unable to access azure file storage resource {this.settings.AzureFileStorageResourceShareName}");
+                    }
+                }
+
+                return this.archiveShareClient;
+            }
         }
 
-        await directory.DeleteAsync();
-      }
-    }
+        /// <summary>
+        /// The DeleteChunkDirectory.
+        /// </summary>
+        /// <param name="directoryRef">The directoryRef<see cref="string"/>.</param>
+        /// <param name="chunks">The chunks<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task DeleteChunkDirectory(string directoryRef, int chunks)
+        {
+            var directory = this.ShareClient.GetDirectoryClient(directoryRef);
 
-    /// <summary>
-    /// The DownloadFileAsync.
-    /// </summary>
-    /// <param name="filePath">The filePath<see cref="string"/>.</param>
-    /// <param name="fileName">The fileName<see cref="string"/>.</param>
-    /// <returns>The <see cref="Task{CloudFile}"/>.</returns>
-    public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName)
-    {
-      var directory = this.ShareClient.GetDirectoryClient(filePath);
+            if (await directory.ExistsAsync())
+            {
+                for (int i = 0; i < chunks; i++)
+                {
+                    var file = directory.GetFileClient("Chunk_" + i.ToString());
+                    await file.DeleteIfExistsAsync();
+                }
 
-      if (await directory.ExistsAsync())
-      {
-        var file = directory.GetFileClient(fileName);
+                await directory.DeleteAsync();
+            }
+        }
 
-        if (await file.ExistsAsync())
+        /// <summary>
+        /// The DownloadFileAsync.
+        /// </summary>
+        /// <param name="filePath">The filePath<see cref="string"/>.</param>
+        /// <param name="fileName">The fileName<see cref="string"/>.</param>
+        /// <returns>The <see cref="Task{CloudFile}"/>.</returns>
+        public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName)
         {
-          return await file.DownloadAsync();
+            var directory = this.ShareClient.GetDirectoryClient(filePath);
+            var sourceDirectory = this.InputArchiveShareClient.GetDirectoryClient(filePath);
+
+            if (await directory.ExistsAsync())
+            {
+                var file = directory.GetFileClient(fileName);
+
+                if (await file.ExistsAsync())
+                {
+                    return await file.DownloadAsync();
+                }
+            }
+            else if (await sourceDirectory.ExistsAsync())
+            {
+                var file = sourceDirectory.GetFileClient(fileName);
+
+                if (await file.ExistsAsync())
+                {
+                    return await file.DownloadAsync();
+                }
+            }
+
+            return null;
         }
-      }
 
-      return null;
-    }
+        /// <inheritdoc/>
+        public async Task<string> ProcessFile(Stream fileBytes, string fileName, string directoryRef = "", string originalFileName = null)
+        {
+            if (directoryRef == string.Empty)
+            {
+                directoryRef = Guid.NewGuid().ToString();
+            }
 
-    /// <inheritdoc/>
-    public async Task<string> ProcessFile(Stream fileBytes, string fileName, string directoryRef = "", string originalFileName = null)
-    {
-      if (directoryRef == string.Empty)
-      {
-        directoryRef = Guid.NewGuid().ToString();
-      }
+            var directory = this.ShareClient.GetDirectoryClient(directoryRef);
+
+            await directory.CreateIfNotExistsAsync();
 
-      var directory = this.ShareClient.GetDirectoryClient(directoryRef);
+            var fileClient = directory.GetFileClient(fileName);
 
-      await directory.CreateIfNotExistsAsync();
+            if (!new FileExtensionContentTypeProvider().TryGetContentType(originalFileName ?? fileName, out string contentType))
+            {
+                contentType = "application/octet-stream";
+            }
 
-      var fileClient = directory.GetFileClient(fileName);
+            await fileClient.CreateAsync(fileBytes.Length, httpHeaders: new ShareFileHttpHeaders { ContentType = contentType });
+            await fileClient.UploadAsync(fileBytes);
 
-      if (!new FileExtensionContentTypeProvider().TryGetContentType(originalFileName ?? fileName, out string contentType))
-      {
-        contentType = "application/octet-stream";
-      }
+            return directoryRef;
+        }
+
+        /// <summary>
+        /// 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 = null, List<string> filePaths = null)
+        {
+            if (filePaths != null
+                && filePaths.Any())
+            {
+                await this.MoveInPutDirectoryToArchive(filePaths);
+                return;
+            }
 
-      await fileClient.CreateAsync(fileBytes.Length, httpHeaders: new ShareFileHttpHeaders { ContentType = contentType });
-      await fileClient.UploadAsync(fileBytes);
+            if (vm != null)
+            {
+                var allContentPath = new List<string>();
+                var allFilePath = new List<string>();
+                if (vm.ScormDetails != null && !string.IsNullOrWhiteSpace(vm.ScormDetails.ContentFilePath))
+                {
+                    allContentPath.Add(vm.ScormDetails.ContentFilePath);
+                }
+                else if (vm.HtmlDetails != null && !string.IsNullOrWhiteSpace(vm.HtmlDetails.ContentFilePath))
+                {
+                    allContentPath.Add(vm.HtmlDetails.ContentFilePath);
+                }
 
-      return directoryRef;
+                // audio and video to be added
+                await this.MoveInPutDirectoryToArchive(allFilePath);
+                await this.MoveOutPutDirectoryToArchive(allContentPath);
+            }
+        }
+
+        private static async Task WaitForCopyAsync(ShareFileClient fileClient)
+        {
+            // Wait for the copy operation to complete
+            ShareFileProperties copyInfo;
+            do
+            {
+                await Task.Delay(500); // Delay before checking the status again
+                copyInfo = await fileClient.GetPropertiesAsync().ConfigureAwait(false);
+            }
+            while (copyInfo.CopyStatus == CopyStatus.Pending);
+
+            if (copyInfo.CopyStatus != CopyStatus.Success)
+            {
+                throw new InvalidOperationException($"Copy failed: {copyInfo.CopyStatus}");
+            }
+        }
+
+        private async Task MoveOutPutDirectoryToArchive(List<string> allDirectoryRef)
+        {
+            try
+            {
+                if (allDirectoryRef.Any())
+                {
+                    foreach (var directoryRef in allDirectoryRef)
+                    {
+                        var directory = this.ShareClient.GetDirectoryClient(directoryRef);
+                        var archiveDirectory = this.OutputArchiveShareClient.GetDirectoryClient(directoryRef);
+
+                        await foreach (var fileItem in directory.GetFilesAndDirectoriesAsync())
+                        {
+                            var sourceFileClient = directory.GetFileClient(fileItem.Name);
+
+                            archiveDirectory.CreateIfNotExists();
+                            if (fileItem.IsDirectory)
+                            {
+                                if (await archiveDirectory.GetSubdirectoryClient(fileItem.Name).ExistsAsync() == false)
+                                {
+                                    archiveDirectory.CreateSubdirectory(fileItem.Name);
+                                }
+
+                                await this.MigrateSubdirectory(sourceFileClient.Path);
+                            }
+                            else
+                            {
+                                var destinationFileClient = archiveDirectory.GetFileClient(fileItem.Name);
+                                var uri = sourceFileClient.GenerateSasUri(Azure.Storage.Sas.ShareFileSasPermissions.Read, DateTime.UtcNow.AddHours(24));
+
+                                await destinationFileClient.StartCopyAsync(uri);
+
+                                await WaitForCopyAsync(destinationFileClient);
+                            }
+                        }
+
+                        if (await directory.ExistsAsync())
+                        {
+                            foreach (var fileItem in directory.GetFilesAndDirectories())
+                            {
+                                var sourceFileClient = directory.GetFileClient(fileItem.Name);
+                                if (fileItem.IsDirectory)
+                                {
+                                    await this.DeleteSubdirectory(sourceFileClient.Path);
+                                }
+                                else
+                                {
+                                    await sourceFileClient.DeleteIfExistsAsync();
+                                }
+                            }
+
+                            await directory.DeleteIfExistsAsync();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        private async Task MigrateSubdirectory(string pathDirectory)
+        {
+            var sourceDirectory = this.ShareClient.GetDirectoryClient(pathDirectory);
+            var archiveDirectory = this.OutputArchiveShareClient.GetDirectoryClient(pathDirectory);
+
+            await foreach (var fileDirectory in sourceDirectory.GetFilesAndDirectoriesAsync())
+            {
+                if (fileDirectory.IsDirectory)
+                {
+                    if (await archiveDirectory.GetSubdirectoryClient(fileDirectory.Name).ExistsAsync() == false)
+                    {
+                        archiveDirectory.CreateSubdirectory(fileDirectory.Name);
+                    }
+
+                    var sourceFileClient = sourceDirectory.GetFileClient(fileDirectory.Name);
+                    await this.MigrateSubdirectory(sourceFileClient.Path);
+                }
+                else
+                {
+                    var sourceFileClient = sourceDirectory.GetFileClient(fileDirectory.Name);
+                    var destinationFileClient = archiveDirectory.GetFileClient(fileDirectory.Name);
+                    var uri = sourceFileClient.GenerateSasUri(Azure.Storage.Sas.ShareFileSasPermissions.Read, DateTime.UtcNow.AddHours(24));
+                    await destinationFileClient.StartCopyAsync(uri);
+                    await WaitForCopyAsync(destinationFileClient);
+                }
+            }
+        }
+
+        private async Task DeleteSubdirectory(string pathDirectory)
+        {
+            var sourceDirectory = this.ShareClient.GetDirectoryClient(pathDirectory);
+
+            await foreach (var fileDirectory in sourceDirectory.GetFilesAndDirectoriesAsync())
+            {
+                if (fileDirectory.IsDirectory)
+                {
+                    var sourceFileClient = sourceDirectory.GetFileClient(fileDirectory.Name);
+                    await this.DeleteSubdirectory(sourceFileClient.Path);
+                    await sourceFileClient.DeleteIfExistsAsync();
+                }
+                else
+                {
+                    var sourceFileClient = sourceDirectory.GetFileClient(fileDirectory.Name);
+                    await sourceFileClient.DeleteIfExistsAsync();
+                }
+            }
+
+            await sourceDirectory.DeleteIfExistsAsync();
+        }
+
+        private async Task MoveInPutDirectoryToArchive(List<string> allDirectoryRef)
+        {
+            if (allDirectoryRef.Any())
+            {
+                foreach (var directoryRef in allDirectoryRef)
+                {
+                    var directory = this.ShareClient.GetDirectoryClient(directoryRef);
+                    var archiveDirectory = this.InputArchiveShareClient.GetDirectoryClient(directoryRef);
+                    if (!directory.Exists())
+                    {
+                        continue;
+                    }
+
+                    if (directory.Exists())
+                    {
+                        var inputCheck = directory.GetFilesAndDirectories();
+                        if (inputCheck.Count() > 1)
+                        {
+                            await this.MoveOutPutDirectoryToArchive(new List<string> { directoryRef });
+                            continue;
+                        }
+                    }
+
+                    await foreach (var fileItem in directory.GetFilesAndDirectoriesAsync())
+                    {
+                        var sourceFileClient = directory.GetFileClient(fileItem.Name);
+
+                        archiveDirectory.CreateIfNotExists();
+                        var destinationFileClient = archiveDirectory.GetFileClient(fileItem.Name);
+                        var uri = sourceFileClient.GenerateSasUri(Azure.Storage.Sas.ShareFileSasPermissions.Read, DateTime.UtcNow.AddHours(24));
+
+                        await destinationFileClient.StartCopyAsync(uri);
+
+                        await WaitForCopyAsync(destinationFileClient);
+                    }
+
+                    if (await directory.ExistsAsync())
+                    {
+                        foreach (var fileItem in directory.GetFilesAndDirectories())
+                        {
+                            var sourceFileClient = directory.GetFileClient(fileItem.Name);
+                            await sourceFileClient.DeleteIfExistsAsync();
+                        }
+
+                        await directory.DeleteAsync();
+                    }
+                }
+            }
+        }
     }
-  }
 }
\ No newline at end of file
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/appsettings.json b/AdminUI/LearningHub.Nhs.AdminUI/appsettings.json
index 4f68451d4..102dc3ba7 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/appsettings.json
+++ b/AdminUI/LearningHub.Nhs.AdminUI/appsettings.json
@@ -26,6 +26,8 @@
     "ClientId": "",
     "AuthTimeout": 20,
     "AzureFileStorageConnectionString": "",
+    "AzureSourceArchiveStorageConnectionString": "",
+    "AzureContentArchiveStorageConnectionString": "",
     "AzureFileStorageResourceShareName": "resourcesdev",
     "AzureMediaAadClientId": "",
     "AzureMediaAadSecret": "",

From c1050c67034109dec00bae0e236076741b2fa5f5 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 18 Jun 2024 16:27:42 +0100
Subject: [PATCH 21/64] TD-4212, TD-4231, TD-4257 - Error log issues

---
 .../Controllers/CatalogueController.cs        |  2 -
 .../Controllers/ResourceController.cs         |  4 +-
 .../Services/ResourceService.cs               | 25 +++---
 .../Controllers/HierarchyController.cs        |  4 +-
 .../Controllers/UserGroupController.cs        | 12 +--
 .../GetNodeContentsForCatalogueBrowse.sql     | 11 ++-
 .../Hub/RoleUserGroupGetByUserGroupId.sql     |  2 +-
 .../Hub/RoleUserGroupGetByUserId.sql          |  4 +-
 .../Resources/GetDashboardResources.sql       | 50 +++++------
 .../Views/RoleUserGroupView.sql               |  2 +-
 .../Hierarchy/INodeRepository.cs              |  2 +-
 .../IRoleUserGroupRepository.cs               |  4 +-
 .../Hierarchy/NodeRepository.cs               |  7 +-
 .../LearningHubDbContext.cs                   |  2 +
 .../ResourceVersionRatingRepository.cs        | 12 +--
 .../RoleUserGroupRepository.cs                |  8 +-
 .../IHierarchyService.cs                      |  2 +-
 .../IUserGroupService.cs                      |  4 +-
 .../CatalogueService.cs                       | 35 ++++----
 .../HierarchyService.cs                       |  4 +-
 .../LearningHub.Nhs.Services.csproj           |  2 +-
 .../MigrationService.cs                       |  2 +-
 .../LearningHub.Nhs.Services/RatingService.cs | 22 ++++-
 .../ResourceService.cs                        | 82 ++++++++++---------
 .../UserGroupService.cs                       |  8 +-
 25 files changed, 175 insertions(+), 137 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
index 67b4a5cb9..fb4d3def3 100644
--- a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs
@@ -190,8 +190,6 @@ public async Task<IActionResult> IndexAsync(string reference, string tab, int? n
             CatalogueAccessRequestViewModel catalogueAccessRequest = null;
             if (this.ViewBag.UserAuthenticated)
             {
-                var cacheKey = $"{this.CurrentUserId}:AllRolesWithPermissions";
-                await this.cacheService.RemoveAsync(cacheKey);
                 userGroups = await this.userGroupService.GetRoleUserGroupDetailAsync();
                 catalogueAccessRequest = await this.catalogueService.GetLatestCatalogueAccessRequestAsync(catalogue.NodeId);
             }
diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 7a1245acc..1a73a4130 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -123,7 +123,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
 
             var resource = await this.resourceService.GetItemByIdAsync(resourceReferenceId);
 
-            if (resource.Id == 0 || (resource.Catalogue != null && resource.Catalogue.Hidden))
+            if ((resource == null && resource.Id == 0) || (resource.Catalogue != null && resource.Catalogue.Hidden))
             {
                 this.ViewBag.SupportFormUrl = this.Settings.SupportUrls.SupportForm;
                 return this.View("Unavailable");
@@ -147,7 +147,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
             var hasCatalogueAccess = false;
             if (resource.Catalogue.RestrictedAccess && this.User.Identity.IsAuthenticated)
             {
-                var userGroups = await this.userGroupService.GetRoleUserGroupDetailForUserAsync(this.CurrentUserId);
+                var userGroups = await this.userGroupService.GetRoleUserGroupDetailAsync();
 
                 hasCatalogueAccess = userGroups.Any(x => x.CatalogueNodeId == resource.Catalogue.NodeId &&
                     (x.RoleEnum == RoleEnum.LocalAdmin || x.RoleEnum == RoleEnum.Editor || x.RoleEnum == RoleEnum.Reader)) || this.User.IsInRole("Administrator");
diff --git a/LearningHub.Nhs.WebUI/Services/ResourceService.cs b/LearningHub.Nhs.WebUI/Services/ResourceService.cs
index ade01a5f8..dfc5d4d17 100644
--- a/LearningHub.Nhs.WebUI/Services/ResourceService.cs
+++ b/LearningHub.Nhs.WebUI/Services/ResourceService.cs
@@ -418,18 +418,21 @@ public async Task<ResourceItemViewModel> GetItemByIdAsync(int id)
 
                 resourceItem = JsonConvert.DeserializeObject<ResourceItemViewModel>(result);
 
-                resourceItem.LicenseUrl = this.settings.ResourceLicenseUrl;
-
-                // if resource type is video, add azure media content protection authentication token
-                if (resourceItem.ResourceTypeEnum == ResourceTypeEnum.Video && resourceItem.VideoDetails != null && resourceItem.VideoDetails.ResourceAzureMediaAsset != null && !string.IsNullOrEmpty(resourceItem.VideoDetails.ResourceAzureMediaAsset.FilePath))
-                {
-                    resourceItem.VideoDetails.ResourceAzureMediaAsset.AuthenticationToken = await this.azureMediaService.GetContentAuthenticationTokenAsync(resourceItem.VideoDetails.ResourceAzureMediaAsset.FilePath);
-                }
-
-                // if resource type is audio, add azure media content protection authentication token
-                if (resourceItem.ResourceTypeEnum == ResourceTypeEnum.Audio && resourceItem.AudioDetails != null && resourceItem.AudioDetails.ResourceAzureMediaAsset != null && !string.IsNullOrEmpty(resourceItem.AudioDetails.ResourceAzureMediaAsset.FilePath))
+                if (resourceItem != null)
                 {
-                    resourceItem.AudioDetails.ResourceAzureMediaAsset.AuthenticationToken = await this.azureMediaService.GetContentAuthenticationTokenAsync(resourceItem.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                    resourceItem.LicenseUrl = this.settings.ResourceLicenseUrl;
+
+                    // if resource type is video, add azure media content protection authentication token
+                    if (resourceItem.ResourceTypeEnum == ResourceTypeEnum.Video && resourceItem.VideoDetails != null && resourceItem.VideoDetails.ResourceAzureMediaAsset != null && !string.IsNullOrEmpty(resourceItem.VideoDetails.ResourceAzureMediaAsset.FilePath))
+                    {
+                        resourceItem.VideoDetails.ResourceAzureMediaAsset.AuthenticationToken = await this.azureMediaService.GetContentAuthenticationTokenAsync(resourceItem.VideoDetails.ResourceAzureMediaAsset.FilePath);
+                    }
+
+                    // if resource type is audio, add azure media content protection authentication token
+                    if (resourceItem.ResourceTypeEnum == ResourceTypeEnum.Audio && resourceItem.AudioDetails != null && resourceItem.AudioDetails.ResourceAzureMediaAsset != null && !string.IsNullOrEmpty(resourceItem.AudioDetails.ResourceAzureMediaAsset.FilePath))
+                    {
+                        resourceItem.AudioDetails.ResourceAzureMediaAsset.AuthenticationToken = await this.azureMediaService.GetContentAuthenticationTokenAsync(resourceItem.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                    }
                 }
             }
             else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs
index fc7293109..ff6d5d560 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/HierarchyController.cs
@@ -41,9 +41,9 @@ public HierarchyController(IUserService userService, IHierarchyService hierarchy
         /// <returns>The node details.</returns>
         [HttpGet]
         [Route("GetNodeDetails/{nodeId}")]
-        public NodeViewModel GetNodeDetails(int nodeId)
+        public async Task<NodeViewModel> GetNodeDetails(int nodeId)
         {
-            var retVal = this.hierarchyService.GetNodeDetails(nodeId);
+            var retVal = await this.hierarchyService.GetNodeDetails(nodeId);
 
             return retVal;
         }
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs
index 51da87d5f..158692a23 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs
@@ -61,9 +61,9 @@ public async Task<IActionResult> GetUserGroupAdminDetailById(int id)
         /// <returns>The <see cref="Task"/>.</returns>
         [HttpGet]
         [Route("GetUserGroupAdminRoleDetailById/{id}")]
-        public IActionResult GetUserGroupAdminRoleDetailById(int id)
+        public async Task<IActionResult> GetUserGroupAdminRoleDetailById(int id)
         {
-            var retVal = this.userGroupService.GetUserGroupRoleDetailByUserGroupId(id);
+            var retVal = await this.userGroupService.GetUserGroupRoleDetailByUserGroupId(id);
 
             return this.Ok(retVal);
         }
@@ -75,9 +75,9 @@ public IActionResult GetUserGroupAdminRoleDetailById(int id)
         /// <returns>The <see cref="Task"/>.</returns>
         [HttpGet]
         [Route("GetUserGroupRoleDetailByUserId/{userId}")]
-        public IActionResult GetRoleUserGroupDetailByUserId(int userId)
+        public async Task<IActionResult> GetRoleUserGroupDetailByUserId(int userId)
         {
-            var retVal = this.userGroupService.GetRoleUserGroupDetailByUserId(userId);
+            var retVal = await this.userGroupService.GetRoleUserGroupDetailByUserId(userId);
 
             return this.Ok(retVal);
         }
@@ -88,9 +88,9 @@ public IActionResult GetRoleUserGroupDetailByUserId(int userId)
         /// <returns>The <see cref="Task"/>.</returns>
         [HttpGet]
         [Route("GetUserGroupRoleDetail")]
-        public IActionResult GetRoleUserGroupDetail()
+        public async Task<IActionResult> GetRoleUserGroupDetail()
         {
-            var retVal = this.userGroupService.GetRoleUserGroupDetailByUserId(this.CurrentUserId);
+            var retVal = await this.userGroupService.GetRoleUserGroupDetailByUserId(this.CurrentUserId);
 
             return this.Ok(retVal);
         }
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql
index 6c2c4fb8d..d3b4ff170 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql	
@@ -13,6 +13,7 @@
 -- 11-05-2023  RS   Removed Description and AuthoredBy as no longer required for screen.
 -- 15-05-2023  RS   Added AuthoredBy back in following design decision change.
 -- 23-06-2023  RS   Removed AverageRating and RatingCount as not required from this proc. That data comes separately from RatingService.
+-- 05-06-2023  SA   Modified the sp to fix the sql timeout issues.
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [hierarchy].[GetNodeContentsForCatalogueBrowse]
 (
@@ -23,6 +24,14 @@ AS
 
 BEGIN
 
+    IF @NodeId IS NULL
+    BEGIN
+        RAISERROR('NodeId cannot be null', 16, 1)
+        RETURN
+    END
+
+	;WITH CTENode AS(SELECT DISTINCT NodeId FROM hierarchy.NodeResourceLookup WHERE Deleted = 0)
+
 	SELECT 
 		ROW_NUMBER() OVER(ORDER BY DisplayOrder) AS Id,
 		[Name],
@@ -64,7 +73,7 @@ BEGIN
 		INNER JOIN
 			hierarchy.FolderNodeVersion fnv ON fnv.NodeVersionId = nv.Id
 		INNER JOIN -- Exclude folders with no published resources.
-			(SELECT DISTINCT NodeId FROM hierarchy.NodeResourceLookup WHERE Deleted = 0) nrl ON cn.Id = nrl.NodeId
+			CTENode nrl ON cn.Id = nrl.NodeId
 		WHERE
 			nl.ParentNodeId = @NodeId 
 			AND nl.Deleted = 0
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql
index 6972d468a..bcfc1aa4e 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 21-01-2021  Killian Davies	Initial Revision
+-- 05-06-2023  SA   Modified the sp to fix the sql timeout issues.
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [hub].[RoleUserGroupGetByUserGroupId]
 (
@@ -17,7 +18,6 @@ AS
 BEGIN
 
 	SELECT
-		CAST([Sequence] AS int) AS [Key],
 		RoleUserGroupId,
 		UserGroupId,
 		UserGroupName,
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql
index d906976cf..ff05f806c 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 21-01-2021  Killian Davies	Initial Revision
+-- 05-06-2023  SA   Modified the sp to fix the sql timeout issues.
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [hub].[RoleUserGroupGetByUserId]
 (
@@ -16,8 +17,7 @@ AS
 
 BEGIN
 
-	SELECT
-		CAST([Sequence] AS int) AS [Key],
+	SELECT	
 		RoleUserGroupId,
 		rug.UserGroupId,
 		UserGroupName,
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql
index 1618e5af4..b889ab6a7 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
@@ -19,6 +19,7 @@
 -- 27 Feb 2024  SS  Fixed missing In progress resources in the My Accessed Learning tray issue
 -- 2 May 2024   SA  Fixed the issue on showing statuses on 'My accessed Learning' for resource type file
 -- 13 May 2024  SA  TD-4115
+-- 31 May 2024  SA  Query optimization to resolve the timeout issues
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetDashboardResources]
@@ -83,8 +84,8 @@ BEGIN
 			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
 			,ub.Id AS BookMarkId
 			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
+			,rvrs.AverageRating
+			,rvrs.RatingCount
 		FROM @Resources tr
 		JOIN resources.Resource r ON r.id = tr.ResourceId
 		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
@@ -101,7 +102,6 @@ BEGIN
 		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
 						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
 						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
 		WHERE rv.VersionStatusId = 2	
 		ORDER BY tr.ResourceActivityCount DESC, rv.Title
 		OFFSET @OffsetRows ROWS
@@ -136,8 +136,8 @@ BEGIN
 			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
 			,ub.Id AS BookMarkId
 			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
+			,rvrs.AverageRating
+			,rvrs.RatingCount
 		INTO #ratedresources
 		FROM Resources.Resource r
 		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId	AND rv.Deleted = 0
@@ -154,7 +154,6 @@ BEGIN
 		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
 						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
 						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		INNER JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
 		WHERE rv.VersionStatusId = 2	
 		ORDER BY rvrs.AverageRating DESC, rvrs.RatingCount DESC, rv.Title
 
@@ -192,8 +191,8 @@ BEGIN
 			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
 			,ub.Id AS BookMarkId
 			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
+			,rvrs.AverageRating
+			,rvrs.RatingCount
 			INTO #recentresources
 		FROM Resources.Resource r
 		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
@@ -211,7 +210,6 @@ BEGIN
 		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
 						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
 						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		INNER JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
 		WHERE rv.VersionStatusId = 2
 		ORDER BY p.CreateDate DESC
 		
@@ -227,7 +225,7 @@ BEGIN
 	INSERT INTO @MyActivity					
 			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
 				FROM 
-				(SELECT a.* FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
+				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
 				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
 				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
 				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
@@ -239,9 +237,8 @@ BEGIN
 					 (r.ResourceTypeId IN (1, 5, 8, 9,10, 12) AND ra.ActivityStatusId <> 3)
 				    OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
 					OR  (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
-					OR (r.ResourceTypeId IN (9) AND ra.ActivityStatusId NOT IN (3))
-					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (7))) 
-					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 1) AND ra.ActivityStatusId IN (7)) 
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId = 7)) 
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 1) AND ra.ActivityStatusId = 7) 
 					)		
 				GROUP BY ra.ResourceId	
 				ORDER BY ResourceActivityId DESC
@@ -271,8 +268,8 @@ BEGIN
 			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
 			,ub.Id AS BookMarkId
 			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
+			,rvrs.AverageRating
+			,rvrs.RatingCount
 		FROM @MyActivity ma 		
 		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
 		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
@@ -291,7 +288,6 @@ BEGIN
 		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
 						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
 						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
 		ORDER BY ma.ResourceActivityId DESC
 		OFFSET @OffsetRows ROWS
 		FETCH NEXT @FetchRows ROWS ONLY	
@@ -303,7 +299,7 @@ BEGIN
 	INSERT INTO @MyActivity		
 			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
 				FROM
-				(SELECT a.* FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId ) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra					
+				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId ) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra					
 				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
 				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
 				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
@@ -312,10 +308,10 @@ BEGIN
 				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
 				WHERE ra.UserId = @UserId
 				AND (					
-					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId IN (3) AND ((mar.Id IS NOT NULL AND mar.PercentComplete = 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
+					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 AND ((mar.Id IS NOT NULL AND mar.PercentComplete = 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
 					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
 					OR (r.ResourceTypeId = 11 AND ara.Score >= arv.PassMark OR ra.ActivityStatusId IN( 3, 5))
-					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId IN (3)))		
+					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
 				GROUP BY ra.ResourceId
 				ORDER BY ResourceActivityId DESC
 
@@ -344,8 +340,8 @@ BEGIN
 			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
 			,ub.Id AS BookMarkId
 			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
+			,rvrs.AverageRating
+			,rvrs.RatingCount
 		FROM @MyActivity ma 		
 		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
 		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
@@ -364,7 +360,6 @@ BEGIN
 		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
 						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
 						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
 		ORDER BY ma.ResourceActivityId DESC, rv.Title
 		OFFSET @OffsetRows ROWS
 		FETCH NEXT @FetchRows ROWS ONLY	
@@ -385,11 +380,11 @@ BEGIN
 				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
 				WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1
 				AND (					
-					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId IN (3) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
+					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
 					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
 					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)))
 					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5)))
-					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId IN (3)))		
+					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
 				GROUP BY ra.ResourceId
 				ORDER BY ResourceActivityId DESC
 
@@ -418,8 +413,8 @@ BEGIN
 			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
 			,ub.Id AS BookMarkId
 			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
+			,rvrs.AverageRating
+			,rvrs.RatingCount
 		FROM @MyActivity ma 		
 		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
 		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
@@ -437,8 +432,7 @@ BEGIN
 				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
 		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
 						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id			
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId		
 		ORDER BY ma.ResourceActivityId DESC, rv.Title
 		OFFSET @OffsetRows ROWS
 		FETCH NEXT @FetchRows ROWS ONLY	
diff --git a/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql b/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql
index d56b1d8ee..f6dac03ec 100644
--- a/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql
@@ -7,13 +7,13 @@
 -- Modification History
 --
 -- 11-01-2021  Killian Davies	Initial Revision
+-- 05-06-2023  SA   Modified the sp to fix the sql timeout issues.
 -------------------------------------------------------------------------------
 CREATE VIEW [hub].[RoleUserGroupView]
 
 AS
 
 SELECT 
-	ROW_NUMBER() OVER(ORDER BY rug.Id) AS [Sequence],
 	rug.Id AS RoleUserGroupId,
 	ug.Id AS UserGroupId,
 	ug.[Name] AS UserGroupName,
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Hierarchy/INodeRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/Hierarchy/INodeRepository.cs
index a6a4ff91c..28b3a2d80 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/Hierarchy/INodeRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/Hierarchy/INodeRepository.cs
@@ -22,7 +22,7 @@ public interface INodeRepository : IGenericRepository<Node>
         /// </summary>
         /// <param name="nodeId">The node id.</param>
         /// <returns>The node details.</returns>
-        NodeViewModel GetNodeDetails(int nodeId);
+        Task<NodeViewModel> GetNodeDetails(int nodeId);
 
         /// <summary>
         /// Gets the contents of a node for the catalogue landing page - i.e. published folders and published resources only.
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/IRoleUserGroupRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/IRoleUserGroupRepository.cs
index 421f18dda..0a807c18d 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/IRoleUserGroupRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/IRoleUserGroupRepository.cs
@@ -47,13 +47,13 @@ public interface IRoleUserGroupRepository : IGenericRepository<RoleUserGroup>
         /// </summary>
         /// <param name="userGroupId">The userGroupId.</param>
         /// <returns>A list of RoleUserGroupViewModel.</returns>
-        List<RoleUserGroupViewModel> GetRoleUserGroupViewModelsByUserGroupId(int userGroupId);
+        Task<List<RoleUserGroupViewModel>> GetRoleUserGroupViewModelsByUserGroupId(int userGroupId);
 
         /// <summary>
         /// Get list of RoleUserGroupViewModel for a supplied User Group.
         /// </summary>
         /// <param name="userId">The userGroupId.</param>
         /// <returns>A list of RoleUserGroupViewModel.</returns>
-        List<RoleUserGroupViewModel> GetRoleUserGroupViewModelsByUserId(int userId);
+        Task<List<RoleUserGroupViewModel>> GetRoleUserGroupViewModelsByUserId(int userId);
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Repository/Hierarchy/NodeRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Hierarchy/NodeRepository.cs
index 2e3177eca..000feb742 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Hierarchy/NodeRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Hierarchy/NodeRepository.cs
@@ -41,12 +41,13 @@ public async Task<Node> GetByIdAsync(int id)
         /// </summary>
         /// <param name="nodeId">The node id.</param>
         /// <returns>The node details.</returns>
-        public NodeViewModel GetNodeDetails(int nodeId)
+        public async Task<NodeViewModel> GetNodeDetails(int nodeId)
         {
             var param0 = new SqlParameter("@p0", SqlDbType.Int) { Value = nodeId };
 
-            var retVal = this.DbContext.NodeViewModel.FromSqlRaw("hierarchy.GetNodeDetails @p0", param0).AsEnumerable().FirstOrDefault();
-            return retVal;
+            var retVal = await this.DbContext.NodeViewModel.FromSqlRaw("hierarchy.GetNodeDetails @p0", param0).AsNoTracking().ToListAsync();
+            NodeViewModel nodeViewModel = retVal.FirstOrDefault();
+            return nodeViewModel;
         }
 
         /// <summary>
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs b/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
index ef4775cd8..8d685dbd1 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
@@ -782,6 +782,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             {
                 mapping.Map(modelBuilder);
             }
+
+            modelBuilder.Entity<RoleUserGroupViewModel>().HasNoKey();
         }
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRatingRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRatingRepository.cs
index 0dc1ffbcc..388383615 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRatingRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRatingRepository.cs
@@ -31,7 +31,7 @@ public ResourceVersionRatingRepository(LearningHubDbContext dbContext, ITimezone
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<ResourceVersionRating> GetUsersPreviousRatingForSameMajorVersionAsync(int resourceVersionId, int userId)
         {
-            var minorVersionIds = this.GetAllResourceVersionIdsForSameMajorVersion(resourceVersionId);
+            var minorVersionIds = await this.GetAllResourceVersionIdsForSameMajorVersion(resourceVersionId);
 
             return await this.DbContext.ResourceVersionRating.FirstOrDefaultAsync(x => minorVersionIds.Contains(x.ResourceVersionId) && x.UserId == userId && !x.Deleted);
         }
@@ -43,7 +43,7 @@ public async Task<ResourceVersionRating> GetUsersPreviousRatingForSameMajorVersi
         /// <returns>An array of integers, which are the count for each star value, starting at 1 star and ending with 5 stars.</returns>
         public async Task<int[]> GetRatingCountsForResourceVersionAsync(int resourceVersionId)
         {
-            var minorVersionIds = this.GetAllResourceVersionIdsForSameMajorVersion(resourceVersionId);
+            var minorVersionIds = await this.GetAllResourceVersionIdsForSameMajorVersion(resourceVersionId);
 
             var allMajorVersionRatings = this.DbContext.ResourceVersionRating.Where(x => minorVersionIds.Contains(x.ResourceVersionId));
 
@@ -63,12 +63,12 @@ public async Task<int[]> GetRatingCountsForResourceVersionAsync(int resourceVers
         /// </summary>
         /// <param name="resourceVersionId">The resource version id.</param>
         /// <returns>A list of resoruce verison ids.</returns>
-        private List<int> GetAllResourceVersionIdsForSameMajorVersion(int resourceVersionId)
+        private async Task<List<int>> GetAllResourceVersionIdsForSameMajorVersion(int resourceVersionId)
         {
-            var majorVersionInfo = this.DbContext.ResourceVersion.Where(x => x.Id == resourceVersionId).Select(x => new { ResourceId = x.ResourceId, MajorVersion = x.MajorVersion }).FirstOrDefault();
+            var majorVersionInfo = await this.DbContext.ResourceVersion.Where(x => x.Id == resourceVersionId).Select(x => new { ResourceId = x.ResourceId, MajorVersion = x.MajorVersion }).FirstOrDefaultAsync();
 
-            var minorVersionIds = this.DbContext.ResourceVersion
-                .Where(x => x.ResourceId == majorVersionInfo.ResourceId && x.MajorVersion == majorVersionInfo.MajorVersion).Select(x => x.Id).ToList();
+            var minorVersionIds = await this.DbContext.ResourceVersion
+                .Where(x => x.ResourceId == majorVersionInfo.ResourceId && x.MajorVersion == majorVersionInfo.MajorVersion).Select(x => x.Id).ToListAsync();
 
             return minorVersionIds;
         }
diff --git a/WebAPI/LearningHub.Nhs.Repository/RoleUserGroupRepository.cs b/WebAPI/LearningHub.Nhs.Repository/RoleUserGroupRepository.cs
index 7579f5a57..906c335cc 100644
--- a/WebAPI/LearningHub.Nhs.Repository/RoleUserGroupRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/RoleUserGroupRepository.cs
@@ -96,11 +96,11 @@ public async Task<List<RoleUserGroup>> GetByRoleIdCatalogueIdWithUsers(int roleI
         /// </summary>
         /// <param name="userGroupId">The userGroupId.</param>
         /// <returns>A list of RoleUserGroupViewModel.</returns>
-        public List<RoleUserGroupViewModel> GetRoleUserGroupViewModelsByUserGroupId(int userGroupId)
+        public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupViewModelsByUserGroupId(int userGroupId)
         {
             var param0 = new SqlParameter("@userGroupId", SqlDbType.Int) { Value = userGroupId };
 
-            var vm = this.DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserGroupId @userGroupId", param0).ToList();
+            var vm = await this.DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserGroupId @userGroupId", param0).AsNoTracking().ToListAsync();
             return vm;
         }
 
@@ -109,11 +109,11 @@ public List<RoleUserGroupViewModel> GetRoleUserGroupViewModelsByUserGroupId(int
         /// </summary>
         /// <param name="userId">The userGroupId.</param>
         /// <returns>A list of RoleUserGroupViewModel.</returns>
-        public List<RoleUserGroupViewModel> GetRoleUserGroupViewModelsByUserId(int userId)
+        public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupViewModelsByUserId(int userId)
         {
             var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
 
-            var vm = this.DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserId @userId", param0).ToList();
+            var vm = await this.DbContext.RoleUserGroupViewModel.FromSqlRaw("hub.RoleUserGroupGetByUserId @userId", param0).AsNoTracking().ToListAsync();
             return vm;
         }
     }
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IHierarchyService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IHierarchyService.cs
index 5cf2a1d15..7f996ee27 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IHierarchyService.cs
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/IHierarchyService.cs
@@ -15,7 +15,7 @@ public interface IHierarchyService
         /// </summary>
         /// <param name="nodeId">The node id.</param>
         /// <returns>The node details.</returns>
-        NodeViewModel GetNodeDetails(int nodeId);
+        Task<NodeViewModel> GetNodeDetails(int nodeId);
 
         /// <summary>
         /// Gets the basic details of all Nodes in a particular NodePath.
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IUserGroupService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IUserGroupService.cs
index 338238c4c..01aac8335 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IUserGroupService.cs
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/IUserGroupService.cs
@@ -48,14 +48,14 @@ public interface IUserGroupService
         /// </summary>
         /// <param name="userGroupId">The user group id.</param>
         /// <returns>The list of <see cref="RoleUserGroupViewModel"/>.</returns>
-        List<RoleUserGroupViewModel> GetUserGroupRoleDetailByUserGroupId(int userGroupId);
+        Task<List<RoleUserGroupViewModel>> GetUserGroupRoleDetailByUserGroupId(int userGroupId);
 
         /// <summary>
         /// Returns a list of role user group detail view models for the supplied user id.
         /// </summary>
         /// <param name="userId">The user group id.</param>
         /// <returns>The list of <see cref="RoleUserGroupViewModel"/>.</returns>
-        List<RoleUserGroupViewModel> GetRoleUserGroupDetailByUserId(int userId);
+        Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailByUserId(int userId);
 
         /// <summary>
         /// Create a user group.
diff --git a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
index d19885181..a074e2b99 100644
--- a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
@@ -926,24 +926,27 @@ public async Task<CatalogueAccessRequestViewModel> AccessRequestAsync(int userId
         {
             var catalogueAccessRequest = this.catalogueAccessRequestRepository.GetAll().Include(x => x.UserProfile).SingleOrDefault(x => x.Id == catalogueAccessRequestId);
             string lastResponseMessage = null;
-            if (catalogueAccessRequest.Status == (int)CatalogueAccessRequestStatus.Pending)
+            if (catalogueAccessRequest != null)
             {
-                // Check for a previous access request which failed
-                // Will have the same userId and catalogueNodeId, not the same accessRequestId, a rejected status and a completed date.
-                var prevFailedRequest = this.catalogueAccessRequestRepository.GetAll()
-                    .Where(x => x.UserId == catalogueAccessRequest.UserId && x.CatalogueNodeId == catalogueAccessRequest.CatalogueNodeId)
-                    .Where(x => x.Id != catalogueAccessRequest.Id)
-                    .Where(x => x.Status == (int)CatalogueAccessRequestStatus.Rejected && x.CompletedDate.HasValue)
-                    .OrderByDescending(x => x.CompletedDate.Value)
-                    .FirstOrDefault();
-                lastResponseMessage = prevFailedRequest?.ResponseMessage;
-            }
+                if (catalogueAccessRequest.Status == (int)CatalogueAccessRequestStatus.Pending)
+                {
+                    // Check for a previous access request which failed
+                    // Will have the same userId and catalogueNodeId, not the same accessRequestId, a rejected status and a completed date.
+                    var prevFailedRequest = this.catalogueAccessRequestRepository.GetAll()
+                        .Where(x => x.UserId == catalogueAccessRequest.UserId && x.CatalogueNodeId == catalogueAccessRequest.CatalogueNodeId)
+                        .Where(x => x.Id != catalogueAccessRequest.Id)
+                        .Where(x => x.Status == (int)CatalogueAccessRequestStatus.Rejected && x.CompletedDate.HasValue)
+                        .OrderByDescending(x => x.CompletedDate.Value)
+                        .FirstOrDefault();
+                    lastResponseMessage = prevFailedRequest?.ResponseMessage;
+                }
 
-            var catalogue = this.catalogueNodeVersionRepository.GetBasicCatalogue(catalogueAccessRequest.CatalogueNodeId);
-            var canEdit = await this.IsUserLocalAdminAsync(userId, catalogue.NodeVersion.NodeId);
-            if (!canEdit)
-            {
-                throw new Exception($"User '{userId}' does not have access to manage catalogue '{catalogue.Url}'");
+                var catalogue = this.catalogueNodeVersionRepository.GetBasicCatalogue(catalogueAccessRequest.CatalogueNodeId);
+                var canEdit = await this.IsUserLocalAdminAsync(userId, catalogue.NodeVersion.NodeId);
+                if (!canEdit)
+                {
+                    throw new Exception($"User '{userId}' does not have access to manage catalogue '{catalogue.Url}'");
+                }
             }
 
             var vm = this.mapper.Map<CatalogueAccessRequestViewModel>(catalogueAccessRequest);
diff --git a/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs b/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
index 4a422e983..5a2d6734d 100644
--- a/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
@@ -212,9 +212,9 @@ public HierarchyService(
         /// </summary>
         /// <param name="nodeId">The node id.</param>
         /// <returns>The node details.</returns>
-        public NodeViewModel GetNodeDetails(int nodeId)
+        public async Task<NodeViewModel> GetNodeDetails(int nodeId)
         {
-            var retVal = this.nodeRepository.GetNodeDetails(nodeId);
+            var retVal = await this.nodeRepository.GetNodeDetails(nodeId);
 
             return retVal;
         }
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index 1323eff8b..cde7e952e 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/LearningHub.Nhs.Services/MigrationService.cs b/WebAPI/LearningHub.Nhs.Services/MigrationService.cs
index 471c4027c..ce61082af 100644
--- a/WebAPI/LearningHub.Nhs.Services/MigrationService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/MigrationService.cs
@@ -182,7 +182,7 @@ public MigrationService(
         public async Task<IEnumerable<MigrationSourceViewModel>> GetMigrationSourcesAsync()
         {
             var migrationSources = await this.migrationSourceRepository.GetAll().ToListAsync();
-            return this.mapper.Map<List<MigrationSourceViewModel>>(migrationSources).AsEnumerable();
+            return this.mapper.Map<List<MigrationSourceViewModel>>(migrationSources ?? new List<MigrationSource>()).AsEnumerable();
         }
 
         /// <summary>
diff --git a/WebAPI/LearningHub.Nhs.Services/RatingService.cs b/WebAPI/LearningHub.Nhs.Services/RatingService.cs
index 7a40a44ac..ead13ade2 100644
--- a/WebAPI/LearningHub.Nhs.Services/RatingService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/RatingService.cs
@@ -116,8 +116,28 @@ public RatingService(
         public async Task<RatingSummaryViewModel> GetRatingSummary(int userId, int entityVersionId)
         {
             var ratingSummary = await this.resourceVersionRatingSummaryRepository.GetByResourceVersionIdAsync(entityVersionId);
+            RatingSummaryViewModel ratingSummaryViewModel;
 
-            var ratingSummaryViewModel = this.mapper.Map<RatingSummaryViewModel>(ratingSummary);
+            if (ratingSummary != null)
+            {
+                ratingSummaryViewModel = this.mapper.Map<RatingSummaryViewModel>(ratingSummary);
+            }
+            else
+            {
+                ratingSummaryViewModel = new RatingSummaryViewModel
+                {
+                    AverageRating = 0,
+                    RatingCount = 0,
+                    Rating1StarPercent = 0,
+                    Rating2StarPercent = 0,
+                    Rating3StarPercent = 0,
+                    Rating4StarPercent = 0,
+                    Rating5StarPercent = 0,
+                    UserIsContributor = false,
+                    UserCanRate = false,
+                    UserRating = 0,
+                };
+            }
 
             if (ratingSummaryViewModel.RatingCount > 0)
             {
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index e040a21c8..a298de4a8 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1477,38 +1477,38 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                     var assessmentContentFiles = new List<string>();
 
                     if (resource.AssessmentDetails is { EndGuidance: { } } && resource.AssessmentDetails.EndGuidance.Blocks != null)
+                    {
+                        if (deletedResource)
                         {
-                            if (deletedResource)
-                            {
-                                endGuidanceFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.EndGuidance, resource.AssessmentDetails.EndGuidance);
-                            }
-                            else
-                            {
-                                endGuidanceFiles = this.CheckBlockFile(resource.AssessmentDetails.EndGuidance, extendedResourceVersion.AssessmentDetails.EndGuidance);
-                            }
+                            endGuidanceFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.EndGuidance, resource.AssessmentDetails.EndGuidance);
+                        }
+                        else
+                        {
+                            endGuidanceFiles = this.CheckBlockFile(resource.AssessmentDetails.EndGuidance, extendedResourceVersion.AssessmentDetails.EndGuidance);
+                        }
 
-                            if (endGuidanceFiles.Any())
-                            {
-                                retVal.AddRange(endGuidanceFiles);
-                            }
+                        if (endGuidanceFiles.Any())
+                        {
+                            retVal.AddRange(endGuidanceFiles);
                         }
+                    }
 
                     if (resource.AssessmentDetails is { AssessmentContent: { } } && resource.AssessmentDetails.AssessmentContent.Blocks != null)
+                    {
+                        if (deletedResource)
                         {
-                            if (deletedResource)
-                            {
-                                assessmentContentFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.AssessmentContent, resource.AssessmentDetails.AssessmentContent);
-                            }
-                            else
-                            {
-                                assessmentContentFiles = this.CheckBlockFile(resource.AssessmentDetails.AssessmentContent, extendedResourceVersion.AssessmentDetails.AssessmentContent);
-                            }
+                            assessmentContentFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.AssessmentContent, resource.AssessmentDetails.AssessmentContent);
+                        }
+                        else
+                        {
+                            assessmentContentFiles = this.CheckBlockFile(resource.AssessmentDetails.AssessmentContent, extendedResourceVersion.AssessmentDetails.AssessmentContent);
+                        }
 
-                            if (assessmentContentFiles.Any())
-                            {
-                                retVal.AddRange(assessmentContentFiles);
-                            }
+                        if (assessmentContentFiles.Any())
+                        {
+                            retVal.AddRange(assessmentContentFiles);
                         }
+                    }
                 }
                 else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Case)
                 {
@@ -1532,11 +1532,11 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
             {
                 if (resource.ResourceTypeEnum == ResourceTypeEnum.Scorm)
                 {
-                      retVal.Add(resource.ScormDetails.ContentFilePath);
+                    retVal.Add(resource.ScormDetails.ContentFilePath);
                 }
                 else if (resource.ResourceTypeEnum == ResourceTypeEnum.Html)
                 {
-                      retVal.Add(resource.HtmlDetails.ContentFilePath);
+                    retVal.Add(resource.HtmlDetails.ContentFilePath);
                 }
                 else if (resource.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
                 {
@@ -1551,7 +1551,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                     retVal.Add(resource.AudioDetails?.File?.FilePath);
                     if (resource.AudioDetails?.ResourceAzureMediaAsset?.FilePath != null)
                     {
-                            retVal.Add(resource.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                        retVal.Add(resource.AudioDetails.ResourceAzureMediaAsset.FilePath);
                     }
                 }
                 else if (resource.ResourceTypeEnum == ResourceTypeEnum.Video)
@@ -1559,20 +1559,20 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                     retVal.Add(resource.VideoDetails?.File?.FilePath);
                     if (resource.VideoDetails?.ResourceAzureMediaAsset?.FilePath != null)
                     {
-                         retVal.Add(resource.VideoDetails.ResourceAzureMediaAsset.FilePath);
+                        retVal.Add(resource.VideoDetails.ResourceAzureMediaAsset.FilePath);
                     }
                 }
                 else if (resource.ResourceTypeEnum == ResourceTypeEnum.Article)
                 {
-                        var inputResourceFiles = resource.ArticleDetails.Files.ToList();
-                        if (inputResourceFiles.Any())
+                    var inputResourceFiles = resource.ArticleDetails.Files.ToList();
+                    if (inputResourceFiles.Any())
+                    {
+                        foreach (var file in inputResourceFiles)
                         {
-                            foreach (var file in inputResourceFiles)
-                            {
-                                    retVal.Add(file.FilePath);
-                            }
+                            retVal.Add(file.FilePath);
                         }
                     }
+                }
                 else if (resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
                 {
                     if (deletedResource)
@@ -1960,6 +1960,11 @@ public async Task<ResourceItemViewModel> GetResourceItemViewModelAsync(int resou
 
                 var erv = await this.GetResourceVersionExtendedViewModelAsync(rv.Id, userId);
 
+                if (erv == null)
+                {
+                    return null;
+                }
+
                 var retVal = new ResourceItemViewModel(erv);
                 retVal.Id = resourceReferenceId;
                 var bookmark = this.bookmarkRepository.GetAll().Where(b => b.ResourceReferenceId == resourceReferenceId && b.UserId == userId).FirstOrDefault();
@@ -4471,11 +4476,14 @@ private async Task<bool> UserCanEditResourceVersion(int userId, int resourceVers
             {
                 return true;
             }
-            else
+
+            var resourceVersion = await this.GetResourceVersionByIdAsync(resourceVersionId);
+            if (resourceVersion == null)
             {
-                var resourceVersion = await this.GetResourceVersionByIdAsync(resourceVersionId);
-                return await this.catalogueService.CanUserEditCatalogueAsync(currentUserId, (int)resourceVersion.ResourceCatalogueId);
+                return false;
             }
+
+            return await this.catalogueService.CanUserEditCatalogueAsync(currentUserId, (int)resourceVersion.ResourceCatalogueId);
         }
 
         private async Task<bool> IsAudioVideoResource(int resourceVersionId, ResourceTypeEnum resourceType)
diff --git a/WebAPI/LearningHub.Nhs.Services/UserGroupService.cs b/WebAPI/LearningHub.Nhs.Services/UserGroupService.cs
index 985289733..40666f502 100644
--- a/WebAPI/LearningHub.Nhs.Services/UserGroupService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/UserGroupService.cs
@@ -197,9 +197,9 @@ public async Task<UserGroupAdminDetailViewModel> GetUserGroupAdminDetailByIdAsyn
         /// </summary>
         /// <param name="userGroupId">The user group id.</param>
         /// <returns>The list of <see cref="RoleUserGroupViewModel"/>.</returns>
-        public List<RoleUserGroupViewModel> GetUserGroupRoleDetailByUserGroupId(int userGroupId)
+        public async Task<List<RoleUserGroupViewModel>> GetUserGroupRoleDetailByUserGroupId(int userGroupId)
         {
-            var vm = this.roleUserGroupRepository.GetRoleUserGroupViewModelsByUserGroupId(userGroupId);
+            var vm = await this.roleUserGroupRepository.GetRoleUserGroupViewModelsByUserGroupId(userGroupId);
 
             return vm;
         }
@@ -209,9 +209,9 @@ public List<RoleUserGroupViewModel> GetUserGroupRoleDetailByUserGroupId(int user
         /// </summary>
         /// <param name="userId">The user group id.</param>
         /// <returns>The list of <see cref="RoleUserGroupViewModel"/>.</returns>
-        public List<RoleUserGroupViewModel> GetRoleUserGroupDetailByUserId(int userId)
+        public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailByUserId(int userId)
         {
-            var vm = this.roleUserGroupRepository.GetRoleUserGroupViewModelsByUserId(userId);
+            var vm = await this.roleUserGroupRepository.GetRoleUserGroupViewModelsByUserId(userId);
 
             return vm;
         }

From 99872a38f2d27f3a41b887b2b7ab47a7a59df855 Mon Sep 17 00:00:00 2001
From: Anju Jose <Anju.Jose@hee.nhs.uk>
Date: Tue, 25 Jun 2024 11:10:29 +0100
Subject: [PATCH 22/64] changes

---
 LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
index 74be1bf26..9127917d3 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
@@ -610,7 +610,6 @@ export const resourceData = {
     getDisplayAVResourceFlag,
     getAVUnavailableView,
     getObsoleteResourceFile,
-    archiveResourceFile
-    getAVUnavailableView,
+    archiveResourceFile,
     getMKPlayerKey
 };
\ No newline at end of file

From 809431f9c851b53d343106a3b179f949df8ea85e Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Tue, 25 Jun 2024 11:19:25 +0100
Subject: [PATCH 23/64] td-3694

---
 .../Views/User/_UserLearningRecord.cshtml                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
index 7dafcfd9b..2057d1a2b 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
@@ -36,7 +36,7 @@
         <tr>
           <td>
             <span class="nhsuk-u-text-align-left table-content-spacing">
-              @if (userLearningRecord.IsCurrentResourceVersion && userLearningRecord.ResourceReferenceId > 0 && userLearningRecord.VersionStatusId != (int?)VersionStatusEnum.Unpublished)
+              @if (userLearningRecord.ResourceReferenceId > 0 && userLearningRecord.VersionStatusId != (int?)VersionStatusEnum.Unpublished)
               {
                 <span>
                   <a class="learning-td" href="@resourceUrl/@userLearningRecord.ResourceReferenceId" target="_blank">@userLearningRecord.Title</a><br />

From ccfd1e8d805b0dd70b642d9c197f1a815ec79cc4 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Tue, 25 Jun 2024 15:32:39 +0100
Subject: [PATCH 24/64] TD-4271 dashboard service optimisation.

---
 .../Controllers/HomeController.cs             |  22 +++-
 .../LearningHub.Nhs.Database.sqlproj          |   7 ++
 .../Scripts/TD-4271_Dasboard_Index.sql        |  18 +++
 .../GetMyCertificatesDashboardResources.sql   | 101 +++++++++++++++++
 .../GetMyInProgressDashboardResources.sql     | 105 ++++++++++++++++++
 ...GetMyRecentCompletedDashboardResources.sql | 101 +++++++++++++++++
 .../GetPopularDashboardResources.sql          |  96 ++++++++++++++++
 .../Resources/GetRatedDashboardResources.sql  |  86 ++++++++++++++
 .../Resources/GetRecentDashboardResources.sql |  84 ++++++++++++++
 .../Resources/ResourceVersionRepository.cs    |  32 +++++-
 .../ResourceService.cs                        |   1 +
 11 files changed, 641 insertions(+), 12 deletions(-)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql

diff --git a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs
index f524fe458..e575f13c5 100644
--- a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs
@@ -203,11 +203,17 @@ public async Task<IActionResult> Index(string myLearningDashboard = "my-in-progr
                 this.Logger.LogInformation("User is authenticated: User is {fullname} and userId is: {lhuserid}", this.User.Identity.GetCurrentName(), this.User.Identity.GetCurrentUserId());
                 if (this.User.IsInRole("Administrator") || this.User.IsInRole("BlueUser") || this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser"))
                 {
+                    var learningTask = this.dashboardService.GetMyAccessLearningsAsync(myLearningDashboard, 1);
+                    var resourcesTask = this.dashboardService.GetResourcesAsync(resourceDashboard, 1);
+                    var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashboard, 1);
+
+                    await Task.WhenAll(learningTask, resourcesTask, cataloguesTask);
+
                     var model = new DashboardViewModel()
                     {
-                        MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashboard, 1),
-                        Resources = await this.dashboardService.GetResourcesAsync(resourceDashboard, 1),
-                        Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashboard, 1),
+                        MyLearnings = await learningTask,
+                        Resources = await resourcesTask,
+                        Catalogues = await cataloguesTask,
                     };
 
                     if (!string.IsNullOrEmpty(this.Request.Query["preview"]) && Convert.ToBoolean(this.Request.Query["preview"]))
@@ -271,9 +277,13 @@ public async Task<IActionResult> LoadPage(string dashBoardTray = "my-learning",
                 }
                 else
                 {
-                    model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, dashBoardTray == "my-learning" ? pageNumber : 1);
-                    model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, dashBoardTray == "resources" ? pageNumber : 1);
-                    model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, dashBoardTray == "catalogues" ? pageNumber : 1);
+                    var learningTask = this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, dashBoardTray == "my-learning" ? pageNumber : 1);
+                    var resourcesTask = this.dashboardService.GetResourcesAsync(resourceDashBoard, dashBoardTray == "resources" ? pageNumber : 1);
+                    var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashBoard, dashBoardTray == "catalogues" ? pageNumber : 1);
+                    await Task.WhenAll(learningTask, resourcesTask, cataloguesTask);
+                    model.MyLearnings = await learningTask;
+                    model.Resources = await resourcesTask;
+                    model.Catalogues = await cataloguesTask;
                     return this.View("Dashboard", model);
                 }
             }
diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index 2613eb68c..78a7f9aa2 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -200,6 +200,9 @@
     <None Include="Scripts\Pre-Deploy\Scripts\TD-807_AlterTable_HierarchyEditNodeResourceLookup.sql" />
     <None Include="Scripts\Pre-Deploy\Scripts\TD-887_PreLoginLandingPageChanges.sql" />
     <None Include="Scripts\Pre-Deploy\Scripts\TD-2902 Add resource types to Content Server.sql" />
+    <Build Include="Stored Procedures\Resources\GetRecentDashboardResources.sql" />
+    <Build Include="Stored Procedures\Resources\GetMyInProgressDashboardResources.sql" />
+    <Build Include="Stored Procedures\Resources\GetMyRecentCompletedDashboardResources.sql" />
   </ItemGroup>
   <ItemGroup>
     <RefactorLog Include="LearningHub.Nhs.Database.refactorlog" />
@@ -514,6 +517,10 @@
     <Build Include="Stored Procedures\Activity\GetUserLearningActivitiesCount.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\TD-2929_ActivityStatusUpdates.sql" />
     <Build Include="Stored Procedures\Resources\BlockCollectionFileSearch.sql" />
+    <Build Include="Stored Procedures\Resources\GetPopularDashboardResources.sql" />
+    <Build Include="Stored Procedures\Resources\GetRatedDashboardResources.sql" />
+    <Build Include="Stored Procedures\Resources\GetMyCertificatesDashboardResources.sql" />
+    <Build Include="Scripts\Pre-Deploy\Scripts\TD-4271_Dasboard_Index.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql
new file mode 100644
index 000000000..fa8cbe9a3
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql
@@ -0,0 +1,18 @@
+
+CREATE INDEX IX_Resource_CurrentResourceVersionId ON resources.Resource (CurrentResourceVersionId)
+GO
+------------------------------
+CREATE INDEX IX_Resource_ResourceTypeId ON resources.Resource (ResourceTypeId)
+GO
+------------------------------
+CREATE INDEX IX_ResourceVersion_ResourceId ON resources.ResourceVersion (ResourceId)
+GO
+-----------------------------
+CREATE INDEX IX_ResourceActivity_UserId_ActivityStatusId ON activity.ResourceActivity (UserId, ActivityStatusId)
+GO
+-------------------------------
+CREATE INDEX IX_NodePath_CatalogueNodeId_Deleted ON hierarchy.NodePath (CatalogueNodeId, Deleted)
+GO
+-------------------------------
+CREATE INDEX IX_UserBookmark_UserId_ResourceReferenceId_Deleted ON hub.UserBookmark (UserId, ResourceReferenceId, Deleted)
+GO
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql
new file mode 100644
index 000000000..b75e45860
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql	
@@ -0,0 +1,101 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetMyCertificatesDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+    INSERT INTO @MyActivity					
+        SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+            FROM
+            activity.ResourceActivity ra				
+            JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+            JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+            LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+            LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = ra.Id
+            LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
+            LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+            WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1
+            AND (					
+                    (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
+                OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
+                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)))
+                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5,7)))
+                OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
+            GROUP BY ra.ResourceId
+            ORDER BY ResourceActivityId DESC
+
+    SELECT r.Id AS ResourceId
+    ,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+        FROM [resources].[ResourceReference] rr
+        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+        ) AS ResourceReferenceID
+    ,r.CurrentResourceVersionId AS ResourceVersionId
+    ,r.ResourceTypeId AS ResourceTypeId
+    ,rv.Title
+    ,rv.Description
+    ,CASE 
+        WHEN r.ResourceTypeId = 7	THEN				 
+            (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+        WHEN r.ResourceTypeId = 2	THEN				 
+        (SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+        ELSE 
+        NULL
+        END  AS DurationInMilliseconds
+    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+    ,cnv.Url AS Url
+    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+    ,cnv.RestrictedAccess
+    ,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+    ,ub.Id AS BookMarkId
+    ,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+    ,rvrs.AverageRating
+    ,rvrs.RatingCount
+FROM @MyActivity ma 		
+JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
+JOIN Resources.Resource r ON r.Id = rv.ResourceId
+JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+        FROM [resources].[ResourceReference] rr
+        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+                FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+                WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId		
+ORDER BY ma.ResourceActivityId DESC, rv.Title
+OFFSET @OffsetRows ROWS
+FETCH NEXT @FetchRows ROWS ONLY	
+
+    SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
new file mode 100644
index 000000000..22709e898
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
@@ -0,0 +1,105 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetMyInProgressDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+
+	INSERT INTO @MyActivity					
+			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+				FROM 
+				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
+				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+				WHERE ra.UserId = @UserId
+				AND (
+					 (r.ResourceTypeId IN (1, 5, 8, 9,10, 12) AND ra.ActivityStatusId <> 3)
+				    OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
+					OR  (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId = 7)) 
+
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 1) AND ra.ActivityStatusId = 7) 
+					)		
+				GROUP BY ra.ResourceId	
+				ORDER BY ResourceActivityId DESC
+				
+	SELECT ma.ResourceActivityId, r.Id AS ResourceId
+		,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+			) AS ResourceReferenceID
+		,r.CurrentResourceVersionId AS ResourceVersionId
+		,r.ResourceTypeId AS ResourceTypeId			
+		,rv.Title
+		,rv.Description
+		,CASE 
+			WHEN r.ResourceTypeId = 7	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			WHEN r.ResourceTypeId = 2	THEN				 
+			(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			ELSE 
+			NULL
+			END  AS DurationInMilliseconds
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+		,cnv.Url AS Url
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+		,cnv.RestrictedAccess
+		,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+		,ub.Id AS BookMarkId
+		,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+		,rvrs.AverageRating
+		,rvrs.RatingCount
+	FROM @MyActivity ma 		
+	JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+	JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+	JOIN Resources.Resource r ON r.Id = rv.ResourceId
+	JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+	JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+	JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+	JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+	JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+	JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+	JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+	LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+	LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+					FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+					WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+	ORDER BY ma.ResourceActivityId DESC
+	OFFSET @OffsetRows ROWS
+	FETCH NEXT @FetchRows ROWS ONLY	
+
+	SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+	
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql
new file mode 100644
index 000000000..686ef7efe
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql	
@@ -0,0 +1,101 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetMyRecentCompletedDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+	
+	INSERT INTO @MyActivity		
+			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+				FROM
+				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId ) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra					
+				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+				WHERE ra.UserId = @UserId
+				AND (					
+					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 AND ((mar.Id IS NOT NULL AND mar.PercentComplete = 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
+					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
+					OR (r.ResourceTypeId = 11 AND ara.Score >= arv.PassMark OR ra.ActivityStatusId IN( 3, 5))
+					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
+				GROUP BY ra.ResourceId
+				ORDER BY ResourceActivityId DESC
+
+	SELECT r.Id AS ResourceId
+	,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+		FROM [resources].[ResourceReference] rr
+		JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+		WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+		) AS ResourceReferenceID
+	,r.CurrentResourceVersionId AS ResourceVersionId
+	,r.ResourceTypeId AS ResourceTypeId
+	,rv.Title
+	,rv.Description
+	,CASE 
+		WHEN r.ResourceTypeId = 7	THEN				 
+			(SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+		WHEN r.ResourceTypeId = 2	THEN				 
+		(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+		ELSE 
+		NULL
+		END  AS DurationInMilliseconds
+	,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+	,cnv.Url AS Url
+	,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+	,cnv.RestrictedAccess
+	,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+	,ub.Id AS BookMarkId
+	,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+	,rvrs.AverageRating
+	,rvrs.RatingCount
+FROM @MyActivity ma 		
+JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+JOIN Resources.Resource r ON r.Id = rv.ResourceId
+JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+		FROM [resources].[ResourceReference] rr
+		JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+		WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+				FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+				WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+ORDER BY ma.ResourceActivityId DESC, rv.Title
+OFFSET @OffsetRows ROWS
+FETCH NEXT @FetchRows ROWS ONLY	
+
+    SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+	
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql
new file mode 100644
index 000000000..f35761471
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql	
@@ -0,0 +1,96 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetPopularDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+
+	INSERT INTO @Resources	
+			SELECT TOP (@MaxRows) ra.ResourceId
+			,Count(ra.ResourceVersionId) ResourceActivityCount 
+			FROM resources.Resource r					
+			JOIN resources.ResourceVersion rv On rv.id = r.CurrentResourceVersionId AND rv.VersionStatusId = 2
+			JOIN activity.ResourceActivity ra ON ra.ResourceId = r.Id	
+			JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+			JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+			JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+			JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+			JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+			GROUP BY  ra.ResourceId
+			ORDER BY ResourceActivityCount DESC					
+	SELECT 
+		tr.ResourceId
+		,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+			) AS ResourceReferenceID
+		,r.CurrentResourceVersionId AS ResourceVersionId
+		,r.ResourceTypeId AS ResourceTypeId
+		,rv.Title
+		,rv.Description
+		,CASE 
+			WHEN r.ResourceTypeId = 7	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			WHEN r.ResourceTypeId = 2	THEN				 
+			(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			ELSE 
+			NULL
+			END  AS DurationInMilliseconds
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+		,cnv.Url AS Url
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+		,cnv.RestrictedAccess
+		,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+		,ub.Id AS BookMarkId
+		,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+		,rvrs.AverageRating
+		,rvrs.RatingCount
+	FROM @Resources tr
+	JOIN resources.Resource r ON r.id = tr.ResourceId
+	JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
+	JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.Deleted = 0
+	JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+	JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+	JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+	JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+	JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+	LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+	LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+					FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+					WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+	WHERE rv.VersionStatusId = 2	
+	ORDER BY tr.ResourceActivityCount DESC, rv.Title
+	OFFSET @OffsetRows ROWS
+	FETCH NEXT @FetchRows ROWS ONLY	
+
+	SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @Resources
+
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql
new file mode 100644
index 000000000..2e2539044
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql	
@@ -0,0 +1,86 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetRatedDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+	
+	SELECT TOP(@MaxRows) r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rvrs.AverageRating
+			,rvrs.RatingCount
+		INTO #ratedresources
+		FROM Resources.Resource r
+		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId	AND rv.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.RatingCount > 0	
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		WHERE rv.VersionStatusId = 2	
+		ORDER BY rvrs.AverageRating DESC, rvrs.RatingCount DESC, rv.Title
+
+	SELECT rr.* FROM #ratedresources rr
+		ORDER BY rr.AverageRating DESC, rr.RatingCount DESC, rr.Title
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY	
+
+	SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #ratedresources
+
+
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql
new file mode 100644
index 000000000..8aa063b42
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql	
@@ -0,0 +1,84 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetRecentDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+	SELECT TOP(@MaxRows) r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rvrs.AverageRating
+			,rvrs.RatingCount
+			INTO #recentresources
+		FROM Resources.Resource r
+		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
+		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		WHERE rv.VersionStatusId = 2
+		ORDER BY p.CreateDate DESC
+		
+	SELECT rr.* FROM #recentresources rr		
+	ORDER BY rr.ResourceVersionId DESC
+	OFFSET @OffsetRows ROWS
+	FETCH NEXT @FetchRows ROWS ONLY
+
+	SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #recentresources
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
index 10bf4cddf..48d7bc0df 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
@@ -639,14 +639,34 @@ public List<ResourceContributionDto> GetContributions(int userId, ResourceContri
         /// <returns>resources.</returns>
         public (int resourceCount, List<DashboardResourceDto> resources) GetResources(string dashboardType, int pageNumber, int userId)
         {
-            var param0 = new SqlParameter("@dashboardType", SqlDbType.NVarChar, 30) { Value = dashboardType };
-            var param1 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
-            var param2 = new SqlParameter("@pageNumber", SqlDbType.Int) { Value = pageNumber };
-            var param3 = new SqlParameter("@totalRows", SqlDbType.Int) { Direction = ParameterDirection.Output };
+            var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
+            var param1 = new SqlParameter("@pageNumber", SqlDbType.Int) { Value = pageNumber };
+            var param2 = new SqlParameter("@totalRows", SqlDbType.Int) { Direction = ParameterDirection.Output };
 
-            var dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetDashboardResources @dashboardType, @userId, @pageNumber, @totalRows output", param0, param1, param2, param3).ToList();
+            var dashboardResources = new List<DashboardResourceDto>();
+            switch (dashboardType)
+            {
+                case "my-certificates":
+                    dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetMyCertificatesDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
+                    break;
+                case "my-recent-completed":
+                    dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetMyRecentCompletedDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
+                    break;
+                case "my-in-progress":
+                    dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetMyInProgressDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
+                    break;
+                case "recent-resources":
+                    dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetRecentDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
+                    break;
+                case "rated-resources":
+                    dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetRatedDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
+                    break;
+                case "popular-resources":
+                    dashboardResources = this.DbContext.DashboardResourceDto.FromSqlRaw("resources.GetPopularDashboardResources @userId, @pageNumber, @totalRows output", param0, param1, param2).ToList();
+                    break;
+            }
 
-            return (resourceCount: (int)param3.Value, resources: dashboardResources);
+            return (resourceCount: (int)param2.Value, resources: dashboardResources);
         }
 
         /// <summary>
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 1d2469e88..808bd8448 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1434,6 +1434,7 @@ where deletableCaseFiles.Contains(entry)
                             {
                                 retVal.Add(scormResource?.File?.FilePath);
                             }
+
                             break;
                         case ResourceTypeEnum.Html:
                             var htmlResource = await this.GetHtmlDetailsByIdAsync(resourceVersionId);

From 2bb7a7b16b347b6fa1101251155ad17d79cff444 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 26 Jun 2024 12:31:23 +0100
Subject: [PATCH 25/64] removed manual Index for dashboard SP

---
 .../LearningHub.Nhs.Database.sqlproj           |  1 -
 .../Scripts/TD-4271_Dasboard_Index.sql         | 18 ------------------
 2 files changed, 19 deletions(-)
 delete mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index 78a7f9aa2..13479c06e 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -520,7 +520,6 @@
     <Build Include="Stored Procedures\Resources\GetPopularDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetRatedDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyCertificatesDashboardResources.sql" />
-    <Build Include="Scripts\Pre-Deploy\Scripts\TD-4271_Dasboard_Index.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql
deleted file mode 100644
index fa8cbe9a3..000000000
--- a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-4271_Dasboard_Index.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-
-CREATE INDEX IX_Resource_CurrentResourceVersionId ON resources.Resource (CurrentResourceVersionId)
-GO
-------------------------------
-CREATE INDEX IX_Resource_ResourceTypeId ON resources.Resource (ResourceTypeId)
-GO
-------------------------------
-CREATE INDEX IX_ResourceVersion_ResourceId ON resources.ResourceVersion (ResourceId)
-GO
------------------------------
-CREATE INDEX IX_ResourceActivity_UserId_ActivityStatusId ON activity.ResourceActivity (UserId, ActivityStatusId)
-GO
--------------------------------
-CREATE INDEX IX_NodePath_CatalogueNodeId_Deleted ON hierarchy.NodePath (CatalogueNodeId, Deleted)
-GO
--------------------------------
-CREATE INDEX IX_UserBookmark_UserId_ResourceReferenceId_Deleted ON hub.UserBookmark (UserId, ResourceReferenceId, Deleted)
-GO

From a18bdda4fdbee5048fc5218c46455ba18b554f4d Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 27 Jun 2024 09:06:01 +0100
Subject: [PATCH 26/64] TD-4270 Archive Log Db

---
 .../LearningHub.Nhs.Database.sqlproj          |  1 +
 .../Scripts/TD-4270_Archive_LogDb.sql         | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index 2613eb68c..ff5bcd5aa 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -514,6 +514,7 @@
     <Build Include="Stored Procedures\Activity\GetUserLearningActivitiesCount.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\TD-2929_ActivityStatusUpdates.sql" />
     <Build Include="Stored Procedures\Resources\BlockCollectionFileSearch.sql" />
+    <Build Include="Scripts\Post-Deploy\Scripts\TD-4270_Archive_LogDb.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
new file mode 100644
index 000000000..9272b0f02
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
@@ -0,0 +1,21 @@
+-- Define the date 6 months ago
+DECLARE @SixMonthsAgo DATE = DATEADD(MONTH, -6, GETDATE());
+
+
+IF NOT EXISTS (SELECT * FROM sys.tables WHERE name = 'LogArchive' AND schema_id = SCHEMA_ID('hub'))
+BEGIN
+    SELECT TOP (0) *
+    INTO hub.LogArchive
+    FROM hub.Log;
+END
+
+
+INSERT INTO hub.LogArchive ([Application], [Logged], [Level], [Message], [Logger], [Callsite], [Exception], [UserId], [Username])
+SELECT [Application], [Logged], [Level], [Message], [Logger], [Callsite], [Exception], [UserId], [Username]
+FROM hub.Log
+WHERE [Logged] < @SixMonthsAgo;
+
+
+DELETE FROM hub.Log WHERE [Logged] < @SixMonthsAgo;
+
+

From 465f1f5db2eed49c919bee9a7a04312fcdb33242 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 27 Jun 2024 11:31:38 +0100
Subject: [PATCH 27/64] TD-4273 cache  RoleUserGroupDetailForUser data

---
 .../Services/UserGroupService.cs              | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs
index ae5b4dd80..6790a3143 100644
--- a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs
+++ b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs
@@ -51,12 +51,34 @@ public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailAsync()
 
         /// <inheritdoc />
         public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailForUserAsync(int userId)
+        {
+            var cacheKey = $"{userId}:AllRolesWithPermissions";
+            return await this.cacheService.GetOrFetchAsync(cacheKey, () => this.FetchRoleUserGroupDetailForUserAsync(userId));
+        }
+
+        /// <inheritdoc />
+        public async Task<bool> UserHasPermissionAsync(string permissionCode)
+        {
+            var userGroupsTask = this.GetRoleUserGroupDetailAsync();
+            var rolesTask = this.roleService.GetRolesAsync();
+
+            await Task.WhenAll(userGroupsTask, rolesTask);
+
+            var userRoles = userGroupsTask.Result.Select(t => t.RoleId).Distinct();
+
+            return rolesTask.Result
+                        .Where(r => userRoles.Contains(r.RoleId))
+                        .SelectMany(r => r.Permissions)
+                        .Any(p => p == permissionCode);
+        }
+
+        private async Task<List<RoleUserGroupViewModel>> FetchRoleUserGroupDetailAsync()
         {
             List<RoleUserGroupViewModel> viewmodel = null;
 
             var client = await this.LearningHubHttpClient.GetClientAsync();
 
-            var request = $"UserGroup/GetUserGroupRoleDetailByUserId/{userId}";
+            var request = $"UserGroup/GetUserGroupRoleDetail";
             var response = await client.GetAsync(request).ConfigureAwait(false);
 
             if (response.IsSuccessStatusCode)
@@ -74,29 +96,13 @@ public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailForUserAsy
             return viewmodel;
         }
 
-        /// <inheritdoc />
-        public async Task<bool> UserHasPermissionAsync(string permissionCode)
-        {
-            var userGroupsTask = this.GetRoleUserGroupDetailAsync();
-            var rolesTask = this.roleService.GetRolesAsync();
-
-            await Task.WhenAll(userGroupsTask, rolesTask);
-
-            var userRoles = userGroupsTask.Result.Select(t => t.RoleId).Distinct();
-
-            return rolesTask.Result
-                        .Where(r => userRoles.Contains(r.RoleId))
-                        .SelectMany(r => r.Permissions)
-                        .Any(p => p == permissionCode);
-        }
-
-        private async Task<List<RoleUserGroupViewModel>> FetchRoleUserGroupDetailAsync()
+        private async Task<List<RoleUserGroupViewModel>> FetchRoleUserGroupDetailForUserAsync(int userId)
         {
             List<RoleUserGroupViewModel> viewmodel = null;
 
             var client = await this.LearningHubHttpClient.GetClientAsync();
 
-            var request = $"UserGroup/GetUserGroupRoleDetail";
+            var request = $"UserGroup/GetUserGroupRoleDetailByUserId/{userId}";
             var response = await client.GetAsync(request).ConfigureAwait(false);
 
             if (response.IsSuccessStatusCode)

From f069fc2a5d3c4e293bb3d3ec9eb100a58a598b2d Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 27 Jun 2024 11:36:11 +0100
Subject: [PATCH 28/64] LogDb script update

---
 .../Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
index 9272b0f02..f7f1a1caf 100644
--- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
@@ -1,5 +1,7 @@
 -- Define the date 6 months ago
-DECLARE @SixMonthsAgo DATE = DATEADD(MONTH, -6, GETDATE());
+DECLARE @SixMonthsAgo DATE;
+SET @SixMonthsAgo = DATEADD(MONTH, -6, GETDATE());
+GO
 
 
 IF NOT EXISTS (SELECT * FROM sys.tables WHERE name = 'LogArchive' AND schema_id = SCHEMA_ID('hub'))
@@ -8,14 +10,17 @@ BEGIN
     INTO hub.LogArchive
     FROM hub.Log;
 END
+GO
 
 
 INSERT INTO hub.LogArchive ([Application], [Logged], [Level], [Message], [Logger], [Callsite], [Exception], [UserId], [Username])
 SELECT [Application], [Logged], [Level], [Message], [Logger], [Callsite], [Exception], [UserId], [Username]
 FROM hub.Log
 WHERE [Logged] < @SixMonthsAgo;
+GO
 
 
 DELETE FROM hub.Log WHERE [Logged] < @SixMonthsAgo;
+GO
 
 

From 164e4e23da9a78475b82c7b9cc107497481b9474 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 27 Jun 2024 12:58:20 +0100
Subject: [PATCH 29/64] TD-4285: My Learning Dashboard Tray showing Wrong
 Counts

---
 .../Hub/RoleUserGroupGetByUserGroupId.sql     |  1 +
 .../Hub/RoleUserGroupGetByUserId.sql          |  1 +
 .../GetMyInProgressDashboardResources.sql     | 21 ++++++++++++++++++-
 .../Views/RoleUserGroupView.sql               |  1 +
 .../LearningHubDbContext.cs                   |  2 --
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql
index bcfc1aa4e..4f65b529c 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserGroupId.sql	
@@ -18,6 +18,7 @@ AS
 BEGIN
 
 	SELECT
+	    CAST([Sequence] AS int) AS [Key],
 		RoleUserGroupId,
 		UserGroupId,
 		UserGroupName,
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql
index ff05f806c..09b16949d 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RoleUserGroupGetByUserId.sql	
@@ -18,6 +18,7 @@ AS
 BEGIN
 
 	SELECT	
+	    CAST([Sequence] AS int) AS [Key],
 		RoleUserGroupId,
 		rug.UserGroupId,
 		UserGroupName,
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
index 22709e898..350a4f4f6 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024	SA My Learning Dashboard Tray showing Wrong Counts
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetMyInProgressDashboardResources]
@@ -100,6 +101,24 @@ BEGIN
 	OFFSET @OffsetRows ROWS
 	FETCH NEXT @FetchRows ROWS ONLY	
 
-	SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+	SELECT @TotalRecords = CASE WHEN COUNT(ma.ResourceActivityId)  > 12 THEN @MaxRows ELSE COUNT(*) END 
+	FROM @MyActivity ma 		
+	JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+	JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+	JOIN Resources.Resource r ON r.Id = rv.ResourceId
+	JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+	JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+	JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+	JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+	JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+	JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+	JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+	LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+	LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+					FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+					WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
 	
 END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql b/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql
index f6dac03ec..b76083d5f 100644
--- a/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Views/RoleUserGroupView.sql
@@ -14,6 +14,7 @@ CREATE VIEW [hub].[RoleUserGroupView]
 AS
 
 SELECT 
+    ROW_NUMBER() OVER(ORDER BY rug.Id) AS [Sequence],
 	rug.Id AS RoleUserGroupId,
 	ug.Id AS UserGroupId,
 	ug.[Name] AS UserGroupName,
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs b/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
index 8d685dbd1..ef4775cd8 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
@@ -782,8 +782,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             {
                 mapping.Map(modelBuilder);
             }
-
-            modelBuilder.Entity<RoleUserGroupViewModel>().HasNoKey();
         }
     }
 }

From 6e62d21a287c38e7290f9bbeff0db4850a00be4d Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 27 Jun 2024 14:03:06 +0100
Subject: [PATCH 30/64] Removed unused temp tables

---
 .../GetMyInProgressDashboardResources.sql     |  4 +---
 ...GetMyRecentCompletedDashboardResources.sql | 22 +++++++++++++++++--
 .../GetPopularDashboardResources.sql          |  2 +-
 .../Resources/GetRatedDashboardResources.sql  |  5 +----
 .../Resources/GetRecentDashboardResources.sql |  4 +---
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
index 350a4f4f6..7464de6e3 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
@@ -26,9 +26,7 @@ BEGIN
 	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
 	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
 
-	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
-	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
-
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);  
 
 	INSERT INTO @MyActivity					
 			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql
index 686ef7efe..cb12b2a10 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetMyRecentCompletedDashboardResources]
@@ -26,7 +27,6 @@ BEGIN
 	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
 
 	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
-	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
 	
 	INSERT INTO @MyActivity		
 			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
@@ -96,6 +96,24 @@ ORDER BY ma.ResourceActivityId DESC, rv.Title
 OFFSET @OffsetRows ROWS
 FETCH NEXT @FetchRows ROWS ONLY	
 
-    SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+SELECT @TotalRecords = CASE WHEN COUNT(ma.ResourceActivityId)  > 12 THEN @MaxRows ELSE COUNT(*) END 
+FROM @MyActivity ma 		
+JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+JOIN Resources.Resource r ON r.Id = rv.ResourceId
+JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+		FROM [resources].[ResourceReference] rr
+		JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+		WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+				FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+				WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
 	
 END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql
index f35761471..c9904f0fc 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetPopularDashboardResources]
@@ -25,7 +26,6 @@ BEGIN
 	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
 	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
 
-	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
 	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
 
 
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql
index 2e2539044..56b994092 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetRatedDashboardResources]
@@ -25,10 +26,6 @@ BEGIN
 	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
 	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
 
-	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
-	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
-
-	
 	SELECT TOP(@MaxRows) r.Id AS ResourceId
 			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
 				FROM [resources].[ResourceReference] rr
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql
index 8aa063b42..5ba8fdd4a 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetRecentDashboardResources]
@@ -25,9 +26,6 @@ BEGIN
 	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
 	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
 
-	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
-	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
-
 	SELECT TOP(@MaxRows) r.Id AS ResourceId
 			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
 				FROM [resources].[ResourceReference] rr

From e1ec6ee1b4cd7cead18870b1424e8bcd2270a182 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 2 Jul 2024 15:04:15 +0100
Subject: [PATCH 31/64] TD-4330: Resource links in search results direct to
 error page

---
 .../Views/Search/_ResourceSearchResult.cshtml        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
index f5eac8b6c..415e9d550 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
@@ -14,15 +14,21 @@
   var index = pagingModel.CurrentPage * pagingModel.PageSize;
   var searchString = HttpUtility.UrlEncode(Model.SearchString);
   var searchSignal = resourceResult.Feedback?.FeedbackAction?.Payload?.SearchSignal;
-
+  int qVectorIndex = searchSignal.Query?.IndexOf("q_vector") ?? -1;
+  var searchSignalQuery = searchSignal?.Query;
+  // Check if "q_vector" is found in the string. if Yes, Remove "q_vector" and everything after it
+  if (qVectorIndex != -1)
+  {
+    searchSignalQuery = searchSignal?.Query.Substring(0, qVectorIndex);
+  }
   string GetUrl(int resourceReferenceId, int itemIndex, int nodePathId)
   {
     string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString());
-    string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(searchSignal?.Query));
+    string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(searchSignalQuery));
 
     return $@"/search/record-resource-click?url=/Resource/{resourceReferenceId}&nodePathId={nodePathId}&itemIndex={itemIndex}
 &pageIndex={pagingModel.CurrentPage}&totalNumberOfHits={resourceResult.TotalHits}&searchText={searchString}&resourceReferenceId={resourceReferenceId}
-&groupId={groupId}&searchId={searchSignal?.SearchId}&timeOfSearch={searchSignal?.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(searchSignal?.UserQuery)}&query={searchSignalQueryEncoded}";
+&groupId={groupId}&searchId={searchSignal?.SearchId}&timeOfSearch={searchSignal?.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(searchSignal.UserQuery)}&query={searchSignalQueryEncoded}";
   }
 
   bool showCatalogueFieldsInResources = ViewBag.ShowCatalogueFieldsInResources == null || ViewBag.ShowCatalogueFieldsInResources == true;

From 982c6803d9197775448717510c0005f7c3c1f470 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 8 Jul 2024 10:53:07 +0100
Subject: [PATCH 32/64] TD-4335: CKEditor 4.14.0 version is not secure-Error
 Massage in Production

---
 .../Scripts/vuesrc/ckeditorwithhint.vue                      | 5 ++++-
 .../Scripts/vuesrc/content-structure/contentStructure.vue    | 5 ++++-
 .../Scripts/vuesrc/content/pageImageSection.vue              | 1 +
 .../Scripts/vuesrc/content/pageVideoSection.vue              | 1 +
 LearningHub.Nhs.WebUI/Scripts/vuesrc/ckeditorwithhint.vue    | 5 ++++-
 .../vuesrc/content-structure-admin/contentStructure.vue      | 5 ++++-
 .../vuesrc/contribute-resource/ContributeTextBlock.vue       | 2 +-
 .../Scripts/vuesrc/contribute/ContentArticle.vue             | 5 ++++-
 .../Scripts/vuesrc/contribute/ContentCommon.vue              | 2 +-
 9 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue
index a31005950..824b025cd 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue
@@ -23,7 +23,10 @@
         },
         data() {
             return {
-                editorConfig: { toolbar: CKEditorToolbar.default },
+                editorConfig: {
+                    toolbar: CKEditorToolbar.default,
+                    versionCheck: false
+                },
                 description: this.initialValue,
                 hint: `You have ${this.maxLength} characters remaining`,
                 valid: getRemainingCharactersFromHtml(this.maxLength, this.initialValue) >= 0,
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue
index c16eb9d59..6b9041142 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue
@@ -169,7 +169,10 @@ export default Vue.extend({
             isReady: false,
             EditModeEnum: EditModeEnum,
             HierarchyEditStatusEnum: HierarchyEditStatusEnum,
-            editorConfig: { toolbar: CKEditorToolbar.default },
+            editorConfig: {
+                toolbar: CKEditorToolbar.default,
+                versionCheck: false
+            },
             deleteFolderName: '',
             editFolderStructureButtonText: '',
             editFolderStructureButtonDisabled: true,
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageImageSection.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageImageSection.vue
index 432da81ae..ee6f0334f 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageImageSection.vue
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageImageSection.vue
@@ -257,6 +257,7 @@
                 SectionLayoutType: SectionLayoutType,
                 editorConfig: {
                     toolbar: CKEditorToolbar.landingPages,
+                    versionCheck: false,
                     stylesSet: 'landing-pages-image-text'
                 },
 
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageVideoSection.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageVideoSection.vue
index 74e0ab031..77d38adb6 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageVideoSection.vue
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageVideoSection.vue
@@ -263,6 +263,7 @@ Vue.use(Vuelidate as any);
                 SectionLayoutType: SectionLayoutType,
                 editorConfig: {
                     toolbar: CKEditorToolbar.landingPages,
+                    versionCheck: false,
                     stylesSet: 'landing-pages-video-text'
                 },
 
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/ckeditorwithhint.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/ckeditorwithhint.vue
index ba9d1610b..80415a53d 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/ckeditorwithhint.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/ckeditorwithhint.vue
@@ -23,7 +23,10 @@
         },
         data() {
             return {
-                editorConfig: { toolbar: CKEditorToolbar.default },
+                editorConfig: {
+                    toolbar: CKEditorToolbar.default,
+                    versionCheck: false
+                },
                 description: this.initialValue,
                 hint: `You have ${this.maxLength} characters remaining`,
                 valid: getRemainingCharactersFromHtml(this.maxLength, this.initialValue) >= 0,
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue
index 3e20cfaa2..c632aeff0 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue
@@ -176,7 +176,10 @@
                 isReady: false,
                 EditModeEnum: EditModeEnum,
                 HierarchyEditStatusEnum: HierarchyEditStatusEnum,
-                editorConfig: { toolbar: CKEditorToolbar.default },
+                editorConfig: {
+                    toolbar: CKEditorToolbar.default,
+                    versionCheck: false
+                },
                 deleteFolderName: '',
                 editFolderStructureButtonText: '',
                 editFolderStructureButtonDisabled: true,
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTextBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTextBlock.vue
index f548aa11e..fc49403dd 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTextBlock.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTextBlock.vue
@@ -32,7 +32,7 @@
         data() {
             return {
                 textBlockContent: this.textBlock.content,
-                ckEditorConfig: { toolbar: CKEditorToolbar.default },
+                ckEditorConfig: { toolbar: CKEditorToolbar.default, versionCheck: false },
                 prevHeight: undefined,
             };
         },
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentArticle.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentArticle.vue
index c4f10aae7..14b529e10 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentArticle.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentArticle.vue
@@ -75,7 +75,10 @@
         data() {
             return {
                 articleContent: '',
-                editorConfig: { toolbar: CKEditorToolbar.default },
+                editorConfig: {                
+                    toolbar: CKEditorToolbar.default,
+                     versionCheck: false
+                },
                 localArticleDetail: new ArticleResourceModel(),
                 uploadingFile: null as File,
                 changeingFileId: 0
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 06d704f18..e210dd4a3 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -282,7 +282,7 @@
                 currentUserAuthor: false,
                 certificateEnabled: null,
                 newKeyword: '',
-                editorConfig: { toolbar: CKEditorToolbar.default },
+                editorConfig: { toolbar: CKEditorToolbar.default, versionCheck: false },
                 ResourceType,
                 resourceProviderId: null,
             };

From e1b3167053260b212ccdc8cc967c6ac0427fc2a5 Mon Sep 17 00:00:00 2001
From: binon <Binon.Yesudhas@hee.nhs.uk>
Date: Mon, 8 Jul 2024 11:03:05 +0100
Subject: [PATCH 33/64] Checking in landing page and testing whether the
 subtitel works

---
 .../Views/Home/_CmsVideo.cshtml               |  177 +-
 .../wwwroot/css/mkplayer-ui.css               | 1873 +++++++++++++++++
 2 files changed, 1922 insertions(+), 128 deletions(-)
 create mode 100644 LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css

diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml
index 8bcb5ada1..577ddfc93 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml
@@ -1,10 +1,13 @@
 @using LearningHub.Nhs.Models.Content
 @model PageSectionDetailViewModel
 @{
-    string mkPlayerLicence = (string) ViewData["mkPlayerLicenceKey"];
+    string mkPlayerLicence = (string)ViewData["mkPlayerLicenceKey"];
+    var scheme = Context?.Request?.Scheme ?? "undefined"; 
+    var host = Context?.Request?.Host; 
+    var path = Context?.Request?.Path ?? "undefined"; 
+    var requestURL = $"{scheme}://{host}{path}";
 }
 
-@* <link href="~/css/mkplayer-ui.css" rel="stylesheet" asp-append-version="true" /> *@
 <script type="text/javascript" src="~/js/mkplayer.js" asp-append-version="true"></script>
 
 @* @if (Model != null)
@@ -50,7 +53,7 @@
 } *@
 <div class="video-container" id="@($"{"videoContainer"}{Model.Id}")"></div>
 
-<script>
+<script type="text/javascript">
 
     var model = @Json.Serialize(Model);
     // 1. Grab the video container
@@ -59,142 +62,65 @@
     // 2. Prepare the player configuration
     var playerConfig = {
         key: "@mkPlayerLicence",
-        ui: false,
+        ui: true,
         theme: "dark",
         playback: {
             muted: false,
             autoplay: false,
             preferredTech: [{ player: 'html5', streaming: 'hls' }]
-        },
-
-        // Subscribe to player events
-        events: {
-            [mkplayer.MKPlayerEvent.Error]: (event) => {
-                console.log("Encountered player error: ", JSON.stringify(event));
-            },
-            [mkplayer.MKPlayerEvent.TimeChanged]: (event) => {
-                console.log("Current player position: ", event.time);
-            },
-            [mkplayer.MKPlayerEvent.Muted]: (data) => {
-                console.log("Audio muted!")
-            },
-            [mkplayer.MKPlayerEvent.Unmuted]: onUnmute,
-
-            [mkplayer.MKPlayerEvent.Ready]: () => {
-
-                // debugger;
-                //var caption = model.videoAsset.closedCaptionsFile.fileName;
-
-                // var subtitleTrack = {
-                //     id: "@($"{"subid"}{Model.Id}")",
-                //     lang: "en",
-                //     label: "Custom Subtitle",
-                //     url: "https://bitdash-a.akamaihd.net/content/sintel/subtitles/subtitles_en.vtt",
-                //     kind: "subtitle"
-                // };
-                // player.addSubtitle(subtitleTrack);
-            },
-            [mkplayer.MKPlayerEvent.SubtitleAdded]: () => {
-                //  player.enableSubtitle("@($"{"subid"}{Model.Id}")");
-            },
-            [mkplayer.MKPlayerEvent.playbackSpeed]: (data) => {
-                alert("Video playback quality changed to: ");
-            },
-        }
+        }        
     };
 
     // 3. Initialize the player with video container and player configuration
     var player = new mkplayer.MKPlayer(videoContainer, playerConfig);
 
-    player.on("loaded", () => {
-        playerElement.addEventListener("mousemove", () => {
-        });
-    });
-
-    player.on(mkplayer.MKPlayerEvent.SourceLoaded, (event) => {
-        console.log("Source loaded successfully!");
-    });
-
-    player.on(mkplayer.MKPlayerEvent.Ready, (event) => {
-
-        const videoElement = document.getElementById("@($"{"bitmovinplayer-video-videoContainer"}{Model.Id}")");
-        if (videoElement) {
-            videoElement.controls = true;
-           // debugger;
-            // Check if captions available
-            if (model.videoAsset.closedCaptionsFile) {
-                const captionsInfo = model.videoAsset.closedCaptionsFile;
-                if (captionsInfo.filePath) {
-                    const trackElement = document.createElement('track');
-                  //  const srcPath = "/file/download?filePath=" + captionsInfo.filePath + "&fileName=" + captionsInfo.fileName;
-                    const srcPath = "/file/download/" + captionsInfo.filePath + "/" + captionsInfo.fileName;
-                    trackElement.kind = 'captions'; // Or 'subtitles' or 'descriptions' depending on your track type
-                    trackElement.label = captionsInfo.language || 'english';
-                    trackElement.srclang = captionsInfo.language || 'en'; 
-                   // trackElement.src = "/api/resource/DownloadResource?filePath=396eb836-5cf5-4255-b33f-66a31fdbef39&amp;fileName=samplecaption.vtt";
-                   // trackElement.src = "https://bitdash-a.akamaihd.net/content/sintel/subtitles/subtitles_en.vtt";
-                   trackElement.src =   srcPath;
-                    
-
-                    // Append the track to the video element
-                    videoElement.appendChild(trackElement);
-
-                    // Add event listener to TextTrackList for when a new text track is added
-                    // videoElement.textTracks.addEventListener('addtrack', function (event) {
-                    //     let track = event.track;
-                    //     console.log('Track added:', track);
-
-                    //     if (track.kind === 'subtitles' || track.kind === 'captions') {
-                    //         track.mode = 'showing'; // Automatically show captions
-                    //         console.log('Track showing:', track);
-                    //     }
-                    // });
-
-                    // trackElement.addEventListener('load', function () {
-                    //     debugger;
-                    //     this.track.mode = 'showing'; // Automatically show captions
-                    //     alert('Track loaded and showing:', this.track);
-                    // });
-
-                    // Manually check and set track mode after a slight delay
-                    // setTimeout(() => {                       
-                    //     var textTracks = videoElement.textTracks;
-                    //     for (let i = 0; i < textTracks.length; i++) {
-                    //         if ((textTracks[i].kind === 'subtitles' || textTracks[i].kind === 'captions') && textTracks[i].src === srcPath) {
-                    //             textTracks[i].mode = 'showing';
-                    //             debugger;
-                    //             console.log('Track set to showing:', textTracks[i]);
-                    //         }
-                    //     }
-                    // }, 1000);
-
-                    // Ensure the track is loaded and ready
-                    // trackElement.addEventListener('load', function () {
-                    //     debugger;
-                    //     this.mode = 'showing'; // Automatically show captions
-                    // });
-
-                }
-            }
-        }
-
-        // document.getElementById("@($"{"bitmovinplayer-video-videoContainer"}{Model.Id}")").controls = true;
-        // console.log("Player is ready for playback!");
-    });
+    // [BY] Commenting and leaving this code here for future reference : When we set UI:false, we need to manually add controls
+    // -----------------------------------------------------------------------------------------------------------------------
+    // player.on(mkplayer.MKPlayerEvent.Ready, (event) => {        
+    //     const videoElement = document.getElementById("@($"{"bitmovinplayer-video-videoContainer"}{Model.Id}")");
+    //     if (videoElement) {
+    //         videoElement.controls = true;
+
+    //         // Check if captions available
+    //         if (model.videoAsset.closedCaptionsFile) {
+    //             const captionsInfo = model.videoAsset.closedCaptionsFile;
+    //             if (captionsInfo.filePath) {
+    //                 const trackElement = document.createElement('track');
+    //                 const srcPath = "/file/download/" + captionsInfo.filePath + "/" + captionsInfo.fileName;
+    //                 trackElement.kind = 'captions'; // Or 'subtitles' or 'descriptions' depending on your track type
+    //                 trackElement.label = captionsInfo.language || 'english';
+    //                 trackElement.srclang = captionsInfo.language || 'en';
+    //                 trackElement.src = srcPath;
+
+    //                 // Append the track to the video element
+    //                 videoElement.appendChild(trackElement);
+    //             }
+    //         }
+    //     }
+    // });
+    // -----------------------------------------------------------------------------------------------------------------------
 
     var url = model.videoAsset.azureMediaAsset.locatorUri;
     url = url.substring(0, url.lastIndexOf("manifest")) + "manifest(format=m3u8-cmaf,encryption=cbc)";
 
+    var subtitleTrack = null;
+    if (model.videoAsset.closedCaptionsFile) {
+        const captionsInfo = model.videoAsset.closedCaptionsFile;
+        var srcPath = "file/download/" + captionsInfo.filePath + "/" + captionsInfo.fileName;
+        srcPath = '@requestURL' + srcPath;
+       
+        subtitleTrack = {
+            id: "subtitle",
+            lang: "en",
+            label: "english",
+            url: srcPath,
+            kind: "subtitle"
+        };
+    }
+
     var sourceConfig = {
         hls: url,
-        // Custom subtitle track
-        // subtitleTracks: [{
-        //     id: "sub1",
-        //     lang: "en",
-        //     label: "Custom Subtitle",
-        //     url: "https://bitdash-a.akamaihd.net/content/sintel/subtitles/subtitles_en.vtt",
-        //     kind: "subtitle"
-        // }],
+        subtitleTracks: [subtitleTrack],
         drm: {
             clearkey: {
                 LA_URL: "HLS_AES",
@@ -207,16 +133,11 @@
 
     player.load(sourceConfig)
         .then(() => {
-            // you can also get notified when subscribed to `SourceLoaded` event.
             console.log("Source loaded successfull!");
         })
         .catch((error) => {
             console.error("An error occurred while loading the source!");
         });
-
-    function onUnmute(data) {
-        console.log("Audio unmuted!");
-    }
 </script>
 
 <style>
diff --git a/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css
new file mode 100644
index 000000000..e058edfef
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css
@@ -0,0 +1,1873 @@
+@charset "UTF-8";
+/**************************************************************************** 
+ * Copyright (C) 2023, Bitmovin, Inc., All Rights Reserved 
+ * 
+ * This source code and its use and distribution, is subject to the terms 
+ * and conditions of the applicable license agreement. 
+ * 
+ * Bitmovin Player Version 8.119.0 
+ * 
+ ****************************************************************************/
+.bmpui-ui-subtitle-overlay.bmpui-cea608 .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-fontfamily-monospacedserif .bmpui-ui-subtitle-label {
+    font-family: Courier New,Courier,Nimbus Mono L,Cutive Mono,monospace
+}
+
+.bmpui-ui-airplaytogglebutton, .bmpui-ui-audiotracksettingstogglebutton, .bmpui-ui-buffering-overlay, .bmpui-ui-button, .bmpui-ui-cast-status-overlay, .bmpui-ui-casttogglebutton, .bmpui-ui-clickoverlay, .bmpui-ui-closebutton, .bmpui-ui-component, .bmpui-ui-container, .bmpui-ui-controlbar, .bmpui-ui-errormessage-overlay, .bmpui-ui-fullscreentogglebutton, .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-hugereplaybutton, .bmpui-ui-label, .bmpui-ui-listbox, .bmpui-ui-listbox .bmpui-ui-listbox-button, .bmpui-ui-piptogglebutton, .bmpui-ui-playbacktimelabel, .bmpui-ui-playbacktoggle-overlay, .bmpui-ui-playbacktogglebutton, .bmpui-ui-recommendation-overlay, .bmpui-ui-replaybutton, .bmpui-ui-seekbar, .bmpui-ui-seekbar-label, .bmpui-ui-selectbox, .bmpui-ui-settings-panel, .bmpui-ui-settingspanelpagebackbutton, .bmpui-ui-settingspanelpageopenbutton, .bmpui-ui-settingstogglebutton, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-label-ad-message, .bmpui-ui-spacer, .bmpui-ui-subtitlesettingsresetbutton, .bmpui-ui-subtitlesettingstogglebutton, .bmpui-ui-titlebar, .bmpui-ui-uicontainer, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, .bmpui-ui-volumecontrolbutton, .bmpui-ui-volumeslider, .bmpui-ui-volumetogglebutton, .bmpui-ui-vrtogglebutton, .bmpui-ui-watermark { /*! placeholder to avoid removal of empty selector */
+    outline: 0
+}
+
+    .bmpui-ui-buffering-overlay, .bmpui-ui-cast-status-overlay, .bmpui-ui-container, .bmpui-ui-controlbar, .bmpui-ui-errormessage-overlay, .bmpui-ui-listbox, .bmpui-ui-playbacktoggle-overlay, .bmpui-ui-recommendation-overlay, .bmpui-ui-seekbar-label, .bmpui-ui-settings-panel, .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, .bmpui-ui-titlebar, .bmpui-ui-uicontainer, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, .bmpui-ui-volumecontrolbutton {
+        font-size: 1em
+    }
+
+.bmpui-ui-uicontainer {
+    height: 100%;
+    left: 0;
+    margin: 0;
+    overflow: hidden;
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    width: 100%
+}
+
+    .bmpui-ui-uicontainer * {
+        pointer-events: auto
+    }
+
+    .bmpui-hidden.bmpui-ui-airplaytogglebutton, .bmpui-hidden.bmpui-ui-audiotracksettingstogglebutton, .bmpui-hidden.bmpui-ui-button, .bmpui-hidden.bmpui-ui-casttogglebutton, .bmpui-hidden.bmpui-ui-clickoverlay, .bmpui-hidden.bmpui-ui-closebutton, .bmpui-hidden.bmpui-ui-fullscreentogglebutton, .bmpui-hidden.bmpui-ui-hugeplaybacktogglebutton, .bmpui-hidden.bmpui-ui-hugereplaybutton, .bmpui-hidden.bmpui-ui-label, .bmpui-hidden.bmpui-ui-piptogglebutton, .bmpui-hidden.bmpui-ui-playbacktimelabel, .bmpui-hidden.bmpui-ui-playbacktogglebutton, .bmpui-hidden.bmpui-ui-replaybutton, .bmpui-hidden.bmpui-ui-seekbar, .bmpui-hidden.bmpui-ui-settingspanelpagebackbutton, .bmpui-hidden.bmpui-ui-settingspanelpageopenbutton, .bmpui-hidden.bmpui-ui-settingstogglebutton, .bmpui-hidden.bmpui-ui-subtitlesettingsresetbutton, .bmpui-hidden.bmpui-ui-subtitlesettingstogglebutton, .bmpui-hidden.bmpui-ui-volumeslider, .bmpui-hidden.bmpui-ui-volumetogglebutton, .bmpui-hidden.bmpui-ui-vrtogglebutton, .bmpui-hidden.bmpui-ui-watermark, .bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-bottom > .bmpui-container-wrapper > .bmpui-hidden, .bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-top > .bmpui-container-wrapper > .bmpui-hidden, .bmpui-ui-buffering-overlay.bmpui-hidden .bmpui-ui-buffering-overlay-indicator, .bmpui-ui-errormessage-overlay.bmpui-hidden, .bmpui-ui-listbox .bmpui-hidden.bmpui-ui-listbox-button, .bmpui-ui-settings-panel-page, .bmpui-ui-settings-panel-page .bmpui-ui-settings-panel-item.bmpui-hidden, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-hidden.bmpui-ui-button-ad-skip, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-hidden.bmpui-ui-label-ad-message, .bmpui-ui-skin-ads.bmpui-player-state-playing .bmpui-ui-playbacktoggle-overlay, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-buffering-overlay-indicator, .bmpui-ui-skin-smallscreen .bmpui-ui-watermark, .bmpui-ui-skin-smallscreen.bmpui-no-flexbox .bmpui-ui-titlebar > .bmpui-container-wrapper > .bmpui-hidden, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay.bmpui-hidden, .bmpui-ui-uicontainer.bmpui-hidden, .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-titlebar .bmpui-label-metadata-description, .bmpui-ui-uicontainer.bmpui-player-state-finished .bmpui-ui-controlbar, .bmpui-ui-uicontainer.bmpui-player-state-finished .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-player-state-idle .bmpui-ui-controlbar, .bmpui-ui-uicontainer.bmpui-player-state-idle .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-player-state-idle .bmpui-ui-titlebar, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-bufferlevel {
+        display: none
+    }
+
+    .bmpui-ui-uicontainer.bmpui-player-state-playing.bmpui-controls-hidden * {
+        cursor: none
+    }
+
+    .bmpui-ui-uicontainer.bmpui-controls-shown .bmpui-ui-hugeplaybacktogglebutton:focus {
+        -webkit-box-shadow: inset -4px -3px 2px 9px #1b7fcc;
+        box-shadow: inset -4px -3px 2px 9px #1b7fcc
+    }
+
+        .bmpui-ui-uicontainer.bmpui-controls-shown .bmpui-ui-hugeplaybacktogglebutton:focus:not(.bmpui-focus-visible) {
+            -webkit-box-shadow: none;
+            box-shadow: none
+        }
+
+    .bmpui-ui-uicontainer.bmpui-no-flexbox {
+        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=")
+    }
+
+        .bmpui-ui-uicontainer.bmpui-no-flexbox.bmpui-fullscreen {
+            left: 0;
+            position: fixed;
+            top: 0;
+            z-index: 999999
+        }
+
+.bmpui-ui-controlbar {
+    background: -webkit-gradient(linear,left top,left bottom,from(transparent),to(rgba(0,0,0,.7)));
+    background: linear-gradient(180deg,transparent,rgba(0,0,0,.7));
+    bottom: 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    line-height: 1em;
+    opacity: 1;
+    padding: 1em 1em .5em;
+    position: absolute;
+    -webkit-transition: opacity .3s,visibility;
+    transition: opacity .3s,visibility;
+    width: 100%
+}
+
+    .bmpui-ui-controlbar.bmpui-hidden, .bmpui-ui-titlebar.bmpui-hidden {
+        opacity: 0;
+        -webkit-transition: opacity .3s;
+        transition: opacity .3s
+    }
+
+    .bmpui-ui-controlbar .bmpui-controlbar-bottom > .bmpui-container-wrapper, .bmpui-ui-controlbar .bmpui-controlbar-top > .bmpui-container-wrapper {
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        margin: .5em 0
+    }
+
+    .bmpui-ui-controlbar .bmpui-controlbar-top .bmpui-ui-label {
+        font-size: .9em
+    }
+
+    .bmpui-ui-controlbar .bmpui-controlbar-top > .bmpui-container-wrapper > *, .bmpui-ui-settings-panel > .bmpui-container-wrapper > * {
+        margin: 0 .5em
+    }
+
+    .bmpui-ui-controlbar .bmpui-controlbar-bottom {
+        white-space: nowrap
+    }
+
+        .bmpui-ui-controlbar .bmpui-controlbar-bottom > .bmpui-container-wrapper .bmpui-ui-volumeslider {
+            margin: auto .5em;
+            width: 5em
+        }
+
+.bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-bottom > .bmpui-container-wrapper, .bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-top > .bmpui-container-wrapper {
+    border-spacing: .5em 0;
+    display: table
+}
+
+    .bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-bottom > .bmpui-container-wrapper > *, .bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-top > .bmpui-container-wrapper > * {
+        display: table-cell;
+        vertical-align: middle
+    }
+
+    .bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-bottom > .bmpui-container-wrapper .bmpui-ui-volumeslider, .bmpui-no-flexbox .bmpui-ui-controlbar .bmpui-controlbar-top > .bmpui-container-wrapper .bmpui-ui-volumeslider {
+        width: 10%
+    }
+
+.bmpui-ui-airplaytogglebutton, .bmpui-ui-audiotracksettingstogglebutton, .bmpui-ui-button, .bmpui-ui-casttogglebutton, .bmpui-ui-clickoverlay, .bmpui-ui-closebutton, .bmpui-ui-fullscreentogglebutton, .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-hugereplaybutton, .bmpui-ui-listbox .bmpui-ui-listbox-button, .bmpui-ui-piptogglebutton, .bmpui-ui-playbacktogglebutton, .bmpui-ui-replaybutton, .bmpui-ui-settingspanelpagebackbutton, .bmpui-ui-settingspanelpageopenbutton, .bmpui-ui-settingstogglebutton, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip, .bmpui-ui-subtitlesettingsresetbutton, .bmpui-ui-subtitlesettingstogglebutton, .bmpui-ui-volumetogglebutton, .bmpui-ui-vrtogglebutton, .bmpui-ui-watermark {
+    background-color: transparent;
+    background-origin: content-box;
+    background-position: 50%;
+    background-repeat: no-repeat;
+    background-size: 1.5em;
+    border: 0;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
+    cursor: pointer;
+    font-size: 1em;
+    height: 1.5em;
+    min-width: 1.5em;
+    padding: .25em
+}
+
+    .bmpui-ui-airplaytogglebutton .bmpui-label, .bmpui-ui-audiotracksettingstogglebutton .bmpui-label, .bmpui-ui-button .bmpui-label, .bmpui-ui-casttogglebutton .bmpui-label, .bmpui-ui-clickoverlay .bmpui-label, .bmpui-ui-closebutton .bmpui-label, .bmpui-ui-fullscreentogglebutton .bmpui-label, .bmpui-ui-hugeplaybacktogglebutton .bmpui-label, .bmpui-ui-hugereplaybutton .bmpui-label, .bmpui-ui-listbox .bmpui-ui-listbox-button .bmpui-label, .bmpui-ui-piptogglebutton .bmpui-label, .bmpui-ui-playbacktogglebutton .bmpui-label, .bmpui-ui-replaybutton .bmpui-label, .bmpui-ui-settingspanelpagebackbutton .bmpui-label, .bmpui-ui-settingspanelpageopenbutton .bmpui-label, .bmpui-ui-settingstogglebutton .bmpui-label, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip .bmpui-label, .bmpui-ui-subtitlesettingsresetbutton .bmpui-label, .bmpui-ui-subtitlesettingstogglebutton .bmpui-label, .bmpui-ui-volumetogglebutton .bmpui-label, .bmpui-ui-vrtogglebutton .bmpui-label, .bmpui-ui-watermark .bmpui-label {
+        color: #fff;
+        display: none
+    }
+
+.bmpui-disabled.bmpui-ui-airplaytogglebutton, .bmpui-disabled.bmpui-ui-audiotracksettingstogglebutton, .bmpui-disabled.bmpui-ui-button, .bmpui-disabled.bmpui-ui-casttogglebutton, .bmpui-disabled.bmpui-ui-clickoverlay, .bmpui-disabled.bmpui-ui-closebutton, .bmpui-disabled.bmpui-ui-fullscreentogglebutton, .bmpui-disabled.bmpui-ui-hugeplaybacktogglebutton, .bmpui-disabled.bmpui-ui-hugereplaybutton, .bmpui-disabled.bmpui-ui-piptogglebutton, .bmpui-disabled.bmpui-ui-playbacktogglebutton, .bmpui-disabled.bmpui-ui-replaybutton, .bmpui-disabled.bmpui-ui-settingspanelpagebackbutton, .bmpui-disabled.bmpui-ui-settingspanelpageopenbutton, .bmpui-disabled.bmpui-ui-settingstogglebutton, .bmpui-disabled.bmpui-ui-subtitlesettingsresetbutton, .bmpui-disabled.bmpui-ui-subtitlesettingstogglebutton, .bmpui-disabled.bmpui-ui-volumetogglebutton, .bmpui-disabled.bmpui-ui-vrtogglebutton, .bmpui-disabled.bmpui-ui-watermark, .bmpui-ui-listbox .bmpui-disabled.bmpui-ui-listbox-button, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-disabled.bmpui-ui-button-ad-skip {
+    cursor: default
+}
+
+    .bmpui-disabled.bmpui-ui-airplaytogglebutton, .bmpui-disabled.bmpui-ui-airplaytogglebutton > *, .bmpui-disabled.bmpui-ui-audiotracksettingstogglebutton, .bmpui-disabled.bmpui-ui-audiotracksettingstogglebutton > *, .bmpui-disabled.bmpui-ui-button, .bmpui-disabled.bmpui-ui-button > *, .bmpui-disabled.bmpui-ui-casttogglebutton, .bmpui-disabled.bmpui-ui-casttogglebutton > *, .bmpui-disabled.bmpui-ui-clickoverlay, .bmpui-disabled.bmpui-ui-clickoverlay > *, .bmpui-disabled.bmpui-ui-closebutton, .bmpui-disabled.bmpui-ui-closebutton > *, .bmpui-disabled.bmpui-ui-fullscreentogglebutton, .bmpui-disabled.bmpui-ui-fullscreentogglebutton > *, .bmpui-disabled.bmpui-ui-hugeplaybacktogglebutton, .bmpui-disabled.bmpui-ui-hugeplaybacktogglebutton > *, .bmpui-disabled.bmpui-ui-hugereplaybutton, .bmpui-disabled.bmpui-ui-hugereplaybutton > *, .bmpui-disabled.bmpui-ui-piptogglebutton, .bmpui-disabled.bmpui-ui-piptogglebutton > *, .bmpui-disabled.bmpui-ui-playbacktogglebutton, .bmpui-disabled.bmpui-ui-playbacktogglebutton > *, .bmpui-disabled.bmpui-ui-replaybutton, .bmpui-disabled.bmpui-ui-replaybutton > *, .bmpui-disabled.bmpui-ui-settingspanelpagebackbutton, .bmpui-disabled.bmpui-ui-settingspanelpagebackbutton > *, .bmpui-disabled.bmpui-ui-settingspanelpageopenbutton, .bmpui-disabled.bmpui-ui-settingspanelpageopenbutton > *, .bmpui-disabled.bmpui-ui-settingstogglebutton, .bmpui-disabled.bmpui-ui-settingstogglebutton > *, .bmpui-disabled.bmpui-ui-subtitlesettingsresetbutton, .bmpui-disabled.bmpui-ui-subtitlesettingsresetbutton > *, .bmpui-disabled.bmpui-ui-subtitlesettingstogglebutton, .bmpui-disabled.bmpui-ui-subtitlesettingstogglebutton > *, .bmpui-disabled.bmpui-ui-volumetogglebutton, .bmpui-disabled.bmpui-ui-volumetogglebutton > *, .bmpui-disabled.bmpui-ui-vrtogglebutton, .bmpui-disabled.bmpui-ui-vrtogglebutton > *, .bmpui-disabled.bmpui-ui-watermark, .bmpui-disabled.bmpui-ui-watermark > *, .bmpui-ui-cast-status-overlay .bmpui-ui-cast-status-label *, .bmpui-ui-listbox .bmpui-disabled.bmpui-ui-listbox-button, .bmpui-ui-listbox .bmpui-disabled.bmpui-ui-listbox-button > *, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-disabled.bmpui-ui-button-ad-skip, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-disabled.bmpui-ui-button-ad-skip > *, .bmpui-ui-titlebar > .bmpui-container-wrapper .bmpui-label-metadata {
+        pointer-events: none
+    }
+
+        .bmpui-disabled.bmpui-ui-airplaytogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-audiotracksettingstogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-button .bmpui-label:hover, .bmpui-disabled.bmpui-ui-casttogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-clickoverlay .bmpui-label:hover, .bmpui-disabled.bmpui-ui-closebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-fullscreentogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-hugeplaybacktogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-hugereplaybutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-piptogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-playbacktogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-replaybutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-settingspanelpagebackbutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-settingspanelpageopenbutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-settingstogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-subtitlesettingsresetbutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-subtitlesettingstogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-volumetogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-vrtogglebutton .bmpui-label:hover, .bmpui-disabled.bmpui-ui-watermark .bmpui-label:hover, .bmpui-ui-listbox .bmpui-disabled.bmpui-ui-listbox-button .bmpui-label:hover, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-disabled.bmpui-ui-button-ad-skip .bmpui-label:hover {
+            text-decoration: none
+        }
+
+.bmpui-ui-airplaytogglebutton:focus, .bmpui-ui-audiotracksettingstogglebutton:focus, .bmpui-ui-button:focus, .bmpui-ui-casttogglebutton:focus, .bmpui-ui-clickoverlay:focus, .bmpui-ui-closebutton:focus, .bmpui-ui-fullscreentogglebutton:focus, .bmpui-ui-hugeplaybacktogglebutton:focus, .bmpui-ui-hugereplaybutton:focus, .bmpui-ui-listbox .bmpui-ui-listbox-button:focus, .bmpui-ui-piptogglebutton:focus, .bmpui-ui-playbacktogglebutton:focus, .bmpui-ui-replaybutton:focus, .bmpui-ui-seekbar:focus, .bmpui-ui-selectbox:focus, .bmpui-ui-settingspanelpagebackbutton:focus, .bmpui-ui-settingspanelpageopenbutton:focus, .bmpui-ui-settingstogglebutton:focus, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip:focus, .bmpui-ui-subtitlesettingsresetbutton:focus, .bmpui-ui-subtitlesettingstogglebutton:focus, .bmpui-ui-volumeslider:focus, .bmpui-ui-volumetogglebutton:focus, .bmpui-ui-vrtogglebutton:focus, .bmpui-ui-watermark:focus {
+    -webkit-box-shadow: 0 0 0 2px rgba(27,127,204,.8);
+    box-shadow: 0 0 0 2px rgba(27,127,204,.8);
+    outline: 0
+}
+
+    .bmpui-ui-airplaytogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-audiotracksettingstogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-button:focus:not(.bmpui-focus-visible), .bmpui-ui-casttogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-clickoverlay:focus:not(.bmpui-focus-visible), .bmpui-ui-closebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-fullscreentogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-hugeplaybacktogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-hugereplaybutton:focus:not(.bmpui-focus-visible), .bmpui-ui-listbox .bmpui-ui-listbox-button:focus:not(.bmpui-focus-visible), .bmpui-ui-piptogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-playbacktogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-replaybutton:focus:not(.bmpui-focus-visible), .bmpui-ui-seekbar:focus:not(.bmpui-focus-visible), .bmpui-ui-selectbox:focus:not(.bmpui-focus-visible), .bmpui-ui-settingspanelpagebackbutton:focus:not(.bmpui-focus-visible), .bmpui-ui-settingspanelpageopenbutton:focus:not(.bmpui-focus-visible), .bmpui-ui-settingstogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip:focus:not(.bmpui-focus-visible), .bmpui-ui-subtitlesettingsresetbutton:focus:not(.bmpui-focus-visible), .bmpui-ui-subtitlesettingstogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-volumeslider:focus:not(.bmpui-focus-visible), .bmpui-ui-volumetogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-vrtogglebutton:focus:not(.bmpui-focus-visible), .bmpui-ui-watermark:focus:not(.bmpui-focus-visible) {
+        -webkit-box-shadow: none;
+        box-shadow: none;
+        outline: 0
+    }
+
+.bmpui-ui-playbacktogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cpath d='M23.3 15.2 9.8 5.6c-.3-.2-.7-.3-1-.1-.3.2-.5.5-.5.8v19.3c0 .4.2.7.6.9.1.1.3.1.4.1.2 0 .4-.1.6-.2l13.4-9.7c.3-.2.4-.5.4-.8-.1-.2-.2-.6-.4-.7zm-13 8.4V8.4L21 16l-10.7 7.6z' style='fill:%23fff'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-airplaytogglebutton:hover, .bmpui-ui-audiotracksettingstogglebutton:hover, .bmpui-ui-casttogglebutton:hover, .bmpui-ui-fullscreentogglebutton:hover, .bmpui-ui-piptogglebutton:hover, .bmpui-ui-playbacktogglebutton:hover, .bmpui-ui-replaybutton:hover, .bmpui-ui-settingspanelpageopenbutton:hover, .bmpui-ui-settingstogglebutton:hover, .bmpui-ui-subtitlesettingstogglebutton:hover, .bmpui-ui-volumetogglebutton:hover, .bmpui-ui-vrtogglebutton:hover {
+        -webkit-filter: drop-shadow(0 0 1px #fff);
+        filter: drop-shadow(0 0 1px #fff)
+    }
+
+    .bmpui-ui-playbacktogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M11.3 5.4H8.9c-1.3 0-2.4 1.1-2.4 2.4v16.5c0 1.3 1.1 2.4 2.4 2.4h2.4c1.3 0 2.4-1.1 2.4-2.4V7.7c-.1-1.3-1.1-2.3-2.4-2.3zm0 18.9H8.9V7.7h2.4v16.6z' id='Rectangle_2_copy'/%3E%3Cpath class='st0' d='M23.1 5.4h-2.4c-1.3 0-2.4 1.1-2.4 2.4v16.5c0 1.3 1.1 2.4 2.4 2.4h2.4c1.3 0 2.4-1.1 2.4-2.4V7.7c-.1-1.3-1.1-2.3-2.4-2.3zm0 18.9h-2.4V7.7h2.4v16.6z' id='Rectangle_2_copy_2'/%3E%3C/svg%3E")
+    }
+
+        .bmpui-ui-playbacktogglebutton.bmpui-on.bmpui-stoptoggle {
+            background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cpath d='M24.3 5.4H7.7c-1.3 0-2.4 1.1-2.4 2.4v16.5c0 1.3 1.1 2.4 2.4 2.4h16.5c1.3 0 2.4-1.1 2.4-2.4V7.7c0-1.3-1-2.3-2.3-2.3zm0 18.9H7.7V7.7h16.5v16.6z' style='fill:%23fff'/%3E%3C/svg%3E")
+        }
+
+.bmpui-ui-fullscreentogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M4.7 7.7h4.7V5.4H4.7c-1.3 0-2.4 1.1-2.4 2.4v4.7h2.4V7.7z' id='Rectangle_6'/%3E%3Cpath class='st0' d='M4.7 19.5H2.4v4.7c0 1.3 1.1 2.4 2.4 2.4h4.7v-2.4H4.7v-4.7z' id='Rectangle_6_copy'/%3E%3Cpath class='st0' d='M27.3 5.4h-4.7v2.4h4.7v4.7h2.4V7.7c-.1-1.3-1.1-2.3-2.4-2.3z' id='Rectangle_6_copy_2'/%3E%3Cpath class='st0' d='M27.3 24.3h-4.7v2.4h4.7c1.3 0 2.4-1.1 2.4-2.4v-4.7h-2.4v4.7z' id='Rectangle_6_copy_3'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-fullscreentogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st1{fill:%231fabe2}%3C/style%3E%3Cpath class='st1' d='M4.7 7.7h22.5v16.5H4.7z' id='Rectangle_19' style='opacity:.302'/%3E%3Cpath class='st1' d='M4.7 7.7h4.7V5.4H4.7c-1.3 0-2.4 1.1-2.4 2.4v4.7h2.4V7.7z' id='Rectangle_6_1_'/%3E%3Cpath class='st1' d='M4.7 19.5H2.4v4.7c0 1.3 1.1 2.4 2.4 2.4h4.7v-2.4H4.7v-4.7z' id='Rectangle_6_copy_1_'/%3E%3Cpath class='st1' d='M27.3 5.4h-4.7v2.4h4.7v4.7h2.4V7.7c-.1-1.3-1.1-2.3-2.4-2.3z' id='Rectangle_6_copy_2_1_'/%3E%3Cpath class='st1' d='M27.3 24.3h-4.7v2.4h4.7c1.3 0 2.4-1.1 2.4-2.4v-4.7h-2.4v4.7z' id='Rectangle_6_copy_3_1_'/%3E%3C/svg%3E")
+    }
+
+.bmpui-ui-vrtogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M29 5.4H3C1.7 5.4.6 6.5.6 7.8v16.5c0 1.3 1.1 2.4 2.4 2.4h9.4v-2.4H3V7.7h26v16.5h-9.4v2.4H29c1.3 0 2.4-1.1 2.4-2.4V7.7c0-1.3-1.1-2.3-2.4-2.3z' id='Rectangle_9'/%3E%3Cpath class='st0' d='M10.1 11.3c-2.6 0-4.7 2.1-4.7 4.7s2.1 4.7 4.7 4.7 4.7-2.1 4.7-4.7-2.1-4.7-4.7-4.7zm0 7.1c-1.3 0-2.4-1.1-2.4-2.4s1.1-2.4 2.4-2.4 2.4 1.1 2.4 2.4-1.1 2.4-2.4 2.4z' id='v'/%3E%3Cpath class='st0' d='M21.9 11.3c-2.6 0-4.7 2.1-4.7 4.7s2.1 4.7 4.7 4.7 4.7-2.1 4.7-4.7-2.1-4.7-4.7-4.7zm0 7.1c-1.3 0-2.4-1.1-2.4-2.4s1.1-2.4 2.4-2.4 2.4 1.1 2.4 2.4-1.1 2.4-2.4 2.4z' id='v_copy'/%3E%3Cpath class='st0' d='M16 23.1c2 0 3.5 1.5 3.5 3.5h2.4c0-3.3-2.6-5.9-5.9-5.9s-5.9 2.6-5.9 5.9h2.4c0-2 1.5-3.5 3.5-3.5z' id='Rectangle_10'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-vrtogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st1{fill:%231fabe2}%3C/style%3E%3Cpath class='st1' d='M3 7.7v16.5h10.6v-2.4h4.7v2.4H29V7.7H3zm4.7 11.8v-7.1h5.9v7.1H7.7zm17.7 0h-7.1v-7.1h7.1v7.1z' id='Rectangle_25' style='opacity:.302'/%3E%3Cpath class='st1' d='M21.9 20.7c2.6 0 4.7-2.1 4.7-4.7s-2.1-4.7-4.7-4.7-4.7 2.1-4.7 4.7 2.1 4.7 4.7 4.7zm0-7.1c1.3 0 2.4 1.1 2.4 2.4s-1.1 2.4-2.4 2.4-2.4-1.1-2.4-2.4 1.1-2.4 2.4-2.4zm-11.8 7.1c2.6 0 4.7-2.1 4.7-4.7s-2.1-4.7-4.7-4.7-4.7 2.1-4.7 4.7 2.1 4.7 4.7 4.7zm0-7.1c1.3 0 2.4 1.1 2.4 2.4s-1.1 2.4-2.4 2.4-2.4-1.1-2.4-2.4 1.1-2.4 2.4-2.4zM29 5.4H3C1.7 5.4.6 6.5.6 7.8v16.5c0 1.3 1.1 2.4 2.4 2.4h9.4c0-2 1.5-3.5 3.5-3.5s3.5 1.5 3.5 3.5H29c1.3 0 2.4-1.1 2.4-2.4V7.7c0-1.3-1.1-2.3-2.4-2.3zm0 18.9h-7.6c-.9-2.1-3-3.5-5.4-3.5s-4.5 1.4-5.4 3.5H3V7.7h26v16.6z' id='Rectangle_10_1_'/%3E%3C/svg%3E")
+    }
+
+.bmpui-ui-volumetogglebutton.bmpui-muted, .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="0"] {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M12.2 13.1H6.4c-1.1 0-1.9.9-1.9 1.9v2c0 1.1.9 1.9 1.9 1.9h5.8c1.1 0 1.9-.9 1.9-1.9v-2c0-1-.9-1.9-1.9-1.9zm0 3.9H6.4v-2h5.8v2z' id='Rectangle_2_copy_4'/%3E%3Cpath class='st0' d='M18.1 11.9c-.4.4-.4 1 0 1.4l6.8 6.8c.4.4 1 .4 1.4 0s.4-1 0-1.4l-6.8-6.8c-.4-.4-1-.4-1.4 0z' id='Rounded_Rectangle_3'/%3E%3Cpath class='st0' d='M26.3 11.9c-.4-.4-1-.4-1.4 0l-6.8 6.8c-.4.4-.4 1 0 1.4s1 .4 1.4 0l6.8-6.8c.4-.4.4-1 0-1.4z' id='Rounded_Rectangle_3_1_'/%3E%3Cpath class='st0' d='M17.9 21.7v2l-9.6-7v2.5l10 7.1c.2.1.4.2.6.2s.3 0 .5-.1c.3-.2.6-.5.6-.9v-3.9l-2.1.1zM17.9 10.3H20v-4c-.1-.4-.3-.7-.7-.9-.3-.2-.8-.1-1.1.1l-9.9 7.1v2.5l9.6-6.9v2.1z'/%3E%3C/svg%3E")
+}
+
+.bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="1"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="2"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="3"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="4"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="5"] {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M19.3 5.5c-.3-.2-.8-.1-1.1.1l-9.9 7.1v2.5l9.6-6.9v15.4l-9.6-7v2.5l10 7.1c.2.1.4.2.6.2s.3 0 .5-.1c.3-.2.6-.5.6-.9V6.3c-.1-.3-.3-.6-.7-.8z' id='Rectangle_4'/%3E%3Cpath class='st0' d='M12.2 13.1H6.4c-1.1 0-1.9.9-1.9 1.9v2c0 1.1.9 1.9 1.9 1.9h5.8c1.1 0 1.9-.9 1.9-1.9v-2c0-1-.9-1.9-1.9-1.9zm0 3.9H6.4v-2h5.8v2z' id='Rectangle_2_copy_4'/%3E%3Cpath class='st0' d='M23.7 12.1c-.6 0-1 .4-1 1v5.8c0 .6.4 1 1 1s1-.4 1-1v-5.8c0-.6-.4-1-1-1z' id='Rounded_Rectangle_4'/%3E%3C/svg%3E")
+}
+
+.bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="10"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="6"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="7"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="8"], .bmpui-ui-volumetogglebutton.bmpui-unmuted[data-bmpui-volume-level-tens="9"] {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M19.3 5.5c-.3-.2-.8-.1-1.1.1l-9.9 7.1v2.5l9.6-6.9v15.4l-9.6-7v2.5l10 7.1c.2.1.4.2.6.2s.3 0 .5-.1c.3-.2.6-.5.6-.9V6.3c-.1-.3-.3-.6-.7-.8z' id='Rectangle_4'/%3E%3Cpath class='st0' d='M12.2 13.1H6.4c-1.1 0-1.9.9-1.9 1.9v2c0 1.1.9 1.9 1.9 1.9h5.8c1.1 0 1.9-.9 1.9-1.9v-2c0-1-.9-1.9-1.9-1.9zm0 3.9H6.4v-2h5.8v2z' id='Rectangle_2_copy_4'/%3E%3Cpath class='st0' d='M27.6 10.2c-.6 0-1 .4-1 1v9.7c0 .6.4 1 1 1s1-.4 1-1v-9.7c0-.6-.4-1-1-1z' id='Rounded_Rectangle_3'/%3E%3Cpath class='st0' d='M23.7 12.1c-.6 0-1 .4-1 1v5.8c0 .6.4 1 1 1s1-.4 1-1v-5.8c0-.6-.4-1-1-1z' id='Rounded_Rectangle_4'/%3E%3C/svg%3E")
+}
+
+.bmpui-ui-watermark {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 68 68' style='enable-background:new 0 0 68 68' xml:space='preserve'%3E%3Cpath d='M63.3 32.5 24.3 5v13.4l20.4 14.5c.8.6.8 1.8 0 2.4L24.3 49.6V63l39-27.5c.9-.8.9-2.2 0-3zm-25.3 0L12.8 14.7V25l11.1 7.9c.8.6.8 1.8 0 2.4L12.8 43v10.3L38 35.5c1-.8 1-2.2 0-3zm-20.8.1L4 23.2v6.5l4.5 3.2c.8.6.8 1.8 0 2.4L4 38.4v6.5l13.2-9.4c1-.8 1-2.2 0-2.9z' style='fill-rule:evenodd;clip-rule:evenodd;fill:%231fabe2'/%3E%3C/svg%3E");
+    background-size: initial;
+    height: 4em;
+    margin: 2em;
+    opacity: .8;
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 4em
+}
+
+.bmpui-ui-settingspanelpageopenbutton, .bmpui-ui-settingstogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cpath d='m25.6 13.8-1.4-.3c-.2-.5-.4-1-.6-1.4l.9-1.3c.4-.5.3-1.3-.1-1.7L23 7.7c-.3-.3-.6-.4-1-.4-.3 0-.6.1-.8.3l-1.2.9c-.5-.3-1-.5-1.5-.6l-.3-1.4c0-.6-.6-1.1-1.3-1.1H15c-.7 0-1.2.5-1.3 1.1L13.5 8c-.5.2-1 .4-1.4.6l-1.3-.9c-.2-.2-.5-.3-.8-.3-.4 0-.7.1-1 .4L7.8 9.1c-.5.5-.5 1.2-.1 1.7l.9 1.3c-.3.5-.5 1-.6 1.4l-1.4.3c-.7 0-1.2.6-1.2 1.3V17c0 .7.5 1.2 1.1 1.3l1.5.2c.2.5.4 1 .6 1.4l-.9 1.3c-.4.5-.3 1.3.1 1.7l1.4 1.4c.3.3.6.4 1 .4.3 0 .6-.1.8-.3l1.3-.9c.5.2 1 .4 1.4.6l.3 1.4c.1.7.7 1.1 1.3 1.1H17c.7 0 1.2-.5 1.3-1.1l.3-1.4c.5-.2 1-.4 1.4-.6l1.3.9c.2.2.5.3.8.3.4 0 .7-.1 1-.4l1.4-1.4c.5-.5.5-1.2.1-1.7L23.5 20c.3-.5.5-1 .6-1.4l1.4-.3c.7-.1 1.1-.7 1.1-1.3v-2c0-.5-.5-1.1-1-1.2zm-1 3.1c0 .1 0 .1 0 0l-1.8.4c-.2 0-.4.2-.4.4-.2.6-.4 1.2-.7 1.6-.1.2-.1.4 0 .6l1 1.4v.1l-1.2 1.2h-.2l-1.4-1c-.2-.1-.4-.1-.6 0-.5.3-1.1.6-1.6.7-.2.1-.4.2-.4.4l-.3 1.8c0 .1-.1.1-.1.1h-1.7c-.1 0-.1 0-.1-.1l-.3-1.7c0-.2-.2-.4-.4-.4-.6-.2-1.2-.4-1.6-.7-.1 0-.2-.1-.3-.1-.1 0-.2 0-.3.1l-1.4 1h-.2l-1.2-1.2v-.1l1-1.4c.1-.2.1-.4 0-.6-.4-.4-.7-1-.8-1.6-.1-.2-.2-.4-.4-.4L7.5 17c-.1 0-.1-.1-.1-.1v-1.7c0-.1 0-.1.1-.1l1.7-.2c.2 0 .4-.2.5-.4.2-.6.4-1.2.7-1.6.1-.2.1-.4 0-.6l-1-1.4v-.1l1.2-1.2h.2l1.4 1c.2.1.4.1.6 0 .5-.3 1.1-.6 1.6-.7.2-.1.4-.2.4-.4l.2-2c0-.1.1-.1.1-.1h1.7c.1 0 .1 0 .1.1l.2 1.7c0 .2.2.4.4.5.6.2 1.2.4 1.7.7.2.1.4.1.6 0l1.4-1h.2l1.2 1.2v.1l-1 1.4c-.1.2-.1.4 0 .6.3.5.6 1.1.7 1.6.1.2.2.4.4.4l1.6.3c.1 0 .1.1.1.1v1.8h.2zM16 11.5c-2.5 0-4.5 2-4.5 4.5s2 4.5 4.5 4.5 4.5-2 4.5-4.5-2-4.5-4.5-4.5zm0 7.3c-1.5 0-2.8-1.3-2.8-2.8s1.3-2.8 2.8-2.8 2.8 1.3 2.8 2.8-1.3 2.8-2.8 2.8z' style='fill:%23fff'/%3E%3C/svg%3E")
+}
+
+.bmpui-ui-watermark:hover {
+    opacity: 1
+}
+
+.bmpui-ui-hugeplaybacktogglebutton {
+    cursor: default;
+    height: 8em;
+    outline: 0;
+    overflow: hidden;
+    width: 8em
+}
+
+@-webkit-keyframes fade-out {
+    0% {
+        opacity: 1;
+        visibility: visible
+    }
+
+    to {
+        opacity: 0;
+        -webkit-transform: scale(2);
+        transform: scale(2);
+        visibility: hidden
+    }
+}
+
+@keyframes fade-out {
+    0% {
+        opacity: 1;
+        visibility: visible
+    }
+
+    to {
+        opacity: 0;
+        -webkit-transform: scale(2);
+        transform: scale(2);
+        visibility: hidden
+    }
+}
+
+@-webkit-keyframes fade-in {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(2);
+        transform: scale(2);
+        visibility: visible
+    }
+
+    to {
+        opacity: 1
+    }
+}
+
+@keyframes fade-in {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(2);
+        transform: scale(2);
+        visibility: visible
+    }
+
+    to {
+        opacity: 1
+    }
+}
+
+@-webkit-keyframes breathe {
+    30% {
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1)
+    }
+
+    60% {
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+}
+
+@keyframes breathe {
+    30% {
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1)
+    }
+
+    60% {
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+}
+
+.bmpui-ui-hugeplaybacktogglebutton .bmpui-image {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 140 140' style='enable-background:new 0 0 140 140' xml:space='preserve'%3E%3Cpath d='M70 5C34.1 5 5 34.1 5 70s29.1 65 65 65 65-29.1 65-65S105.9 5 70 5zm0 127c-34.2 0-62-27.8-62-62S35.8 8 70 8s62 27.8 62 62-27.8 62-62 62z' style='opacity:.6;fill-rule:evenodd;clip-rule:evenodd;fill:%23fff'/%3E%3Cpath d='M89.2 68.5 63.1 50.4c-.6-.4-1.4-.5-2-.1-.6.3-1.1 1-1.1 1.7v36.2c0 .7.4 1.4 1.1 1.7.3.1.6.2.9.2.4 0 .8-.1 1.1-.4l26.1-18.1c.5-.4.8-.9.8-1.5 0-.7-.3-1.3-.8-1.6zM63.9 84.4V55.6L84.7 70 63.9 84.4z' style='fill-rule:evenodd;clip-rule:evenodd;fill:%23fff'/%3E%3C/svg%3E");
+    background-position: 50%;
+    background-repeat: no-repeat;
+    background-size: 7em;
+    height: 100%;
+    width: 100%
+}
+
+    .bmpui-ui-hugeplaybacktogglebutton .bmpui-image:hover {
+        -webkit-animation: 3s ease-in-out infinite breathe;
+        animation: 3s ease-in-out infinite breathe
+    }
+
+.bmpui-ui-hugeplaybacktogglebutton.bmpui-on .bmpui-image {
+    -webkit-animation: .3s cubic-bezier(.55,.055,.675,.19) fade-out;
+    animation: .3s cubic-bezier(.55,.055,.675,.19) fade-out;
+    -webkit-transition: visibility 0s .3s;
+    transition: visibility 0s .3s;
+    visibility: hidden
+}
+
+.bmpui-ui-hugeplaybacktogglebutton.bmpui-off .bmpui-image {
+    -webkit-animation: .3s cubic-bezier(.55,.055,.675,.19) fade-in;
+    animation: .3s cubic-bezier(.55,.055,.675,.19) fade-in;
+    visibility: visible
+}
+
+.bmpui-ui-hugeplaybacktogglebutton.bmpui-no-transition-animations.bmpui-off .bmpui-image, .bmpui-ui-hugeplaybacktogglebutton.bmpui-no-transition-animations.bmpui-on .bmpui-image, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-hugeplaybacktogglebutton.bmpui-off .bmpui-image, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-hugeplaybacktogglebutton.bmpui-on .bmpui-image {
+    -webkit-animation: none;
+    animation: none;
+    -webkit-transition: none;
+    transition: none
+}
+
+.bmpui-ui-label, .bmpui-ui-playbacktimelabel, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-label-ad-message {
+    cursor: default;
+    white-space: nowrap
+}
+
+.bmpui-ui-settings-panel {
+    background-color: hsla(0,0%,7%,.85);
+    bottom: 5em;
+    opacity: 1;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    right: 2em;
+    -webkit-transition: opacity .3s,visibility,height .35s cubic-bezier(.4, 0, .2, 1),width .35s cubic-bezier(.4, 0, .2, 1);
+    transition: opacity .3s,visibility,height .35s cubic-bezier(.4, 0, .2, 1),width .35s cubic-bezier(.4, 0, .2, 1);
+    visibility: visible
+}
+
+.bmpui-hidden.bmpui-ui-settings-panel, .bmpui-ui-cast-status-overlay.bmpui-hidden, .bmpui-ui-seekbar-label.bmpui-hidden {
+    opacity: 0;
+    -webkit-transition: opacity .3s,visibility .3s;
+    transition: opacity .3s,visibility .3s;
+    visibility: hidden
+}
+
+.bmpui-ui-cast-status-overlay, .bmpui-ui-seekbar-label {
+    opacity: 1;
+    -webkit-transition: opacity .3s,visibility;
+    visibility: visible
+}
+
+.bmpui-ui-settings-panel > .bmpui-container-wrapper {
+    margin: .5em;
+    overflow-y: auto
+}
+
+.bmpui-container-wrapper > .bmpui-ui-settings-panel {
+    margin: 0
+}
+
+.bmpui-active.bmpui-ui-settings-panel-page, .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay p {
+    display: block
+}
+
+.bmpui-ui-settings-panel-page .bmpui-container-wrapper > .bmpui-ui-label {
+    display: inline-block;
+    font-size: .8em;
+    width: 45%
+}
+
+.bmpui-ui-settings-panel-page .bmpui-container-wrapper > .bmpui-ui-selectbox {
+    margin-left: 10%;
+    width: 45%
+}
+
+.bmpui-ui-settings-panel-page .bmpui-ui-settings-panel-item {
+    border-bottom: 1px solid hsla(0,0%,60%,.3);
+    padding: .5em 0;
+    white-space: nowrap
+}
+
+    .bmpui-ui-listbox .bmpui-ui-listbox-button:last-child, .bmpui-ui-settings-panel-page .bmpui-ui-settings-panel-item.bmpui-last {
+        border-bottom: 0
+    }
+
+.bmpui-ui-settingspanelpageopenbutton {
+    max-height: .8em;
+    padding: .3em 0;
+    vertical-align: bottom
+}
+
+.bmpui-on.bmpui-ui-settingspanelpageopenbutton, .bmpui-ui-settingstogglebutton.bmpui-on {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st1{fill:%231fabe2}%3C/style%3E%3Cpath class='st1' d='M23.6 12.9c-.5-1.1-.7-2.2-1.4-3-.9-.9-2.2-1.2-3.3-1.6-1-.4-1.7-1-2.9-1s-2.1.7-3.2 1.1c-1.1.5-2.1.7-3 1.4-.9.8-1 1.8-1.4 2.9-.4 1.1-1.1 2-1.1 3.3s.6 2 1 3.1c.5 1.1.8 2.3 1.6 3.1.8.8 1.8 1 2.9 1.4 1.1.4 2 1.1 3.2 1.1s2.3-.7 3.4-1.2c1.1-.4 1.9-.6 2.8-1.4.9-.9 1.1-1.9 1.4-3.1.4-1 1.2-2 1.2-3.1-.1-1.1-.8-2-1.2-3zm-7.6 7c-2.1 0-3.9-1.7-3.9-3.9s1.7-3.9 3.9-3.9 3.9 1.7 3.9 3.9-1.8 3.9-3.9 3.9z' id='Ellipse_1_copy' style='opacity:.302'/%3E%3Cpath class='st1' d='m25.6 13.8-1.4-.3c-.2-.5-.4-1-.6-1.4l.9-1.3c.4-.5.3-1.3-.1-1.7L23 7.7c-.3-.3-.6-.4-1-.4-.3 0-.6.1-.8.3l-1.2.9c-.5-.3-1-.5-1.5-.6l-.3-1.4c0-.6-.6-1.1-1.3-1.1H15c-.7 0-1.2.5-1.3 1.1L13.5 8c-.5.2-1 .4-1.4.6l-1.3-.9c-.2-.2-.5-.3-.8-.3-.4 0-.7.1-1 .4L7.8 9.1c-.5.5-.5 1.2-.1 1.7l.9 1.3c-.3.5-.5 1-.6 1.4l-1.4.3c-.7 0-1.2.6-1.2 1.3V17c0 .7.5 1.2 1.1 1.3l1.5.2c.2.5.4 1 .6 1.4l-.9 1.3c-.4.5-.3 1.3.1 1.7l1.4 1.4c.3.3.6.4 1 .4.3 0 .6-.1.8-.3l1.3-.9c.5.2 1 .4 1.4.6l.3 1.4c.1.7.7 1.1 1.3 1.1H17c.7 0 1.2-.5 1.3-1.1l.3-1.4c.5-.2 1-.4 1.4-.6l1.3.9c.2.2.5.3.8.3.4 0 .7-.1 1-.4l1.4-1.4c.5-.5.5-1.2.1-1.7L23.5 20c.3-.5.5-1 .6-1.4l1.4-.3c.7-.1 1.1-.7 1.1-1.3v-2c0-.5-.5-1.1-1-1.2zm-1 3.1c0 .1 0 .1 0 0l-1.8.4c-.2 0-.4.2-.4.4-.2.6-.4 1.2-.7 1.6-.1.2-.1.4 0 .6l1 1.4v.1l-1.2 1.2h-.2l-1.4-1c-.2-.1-.4-.1-.6 0-.5.3-1.1.6-1.6.7-.2.1-.4.2-.4.4l-.3 1.8c0 .1-.1.1-.1.1h-1.7c-.1 0-.1 0-.1-.1l-.3-1.7c0-.2-.2-.4-.4-.4-.6-.2-1.2-.4-1.6-.7-.1 0-.2-.1-.3-.1-.1 0-.2 0-.3.1l-1.4 1h-.2l-1.2-1.2v-.1l1-1.4c.1-.2.1-.4 0-.6-.4-.4-.7-1-.8-1.6-.1-.2-.2-.4-.4-.4L7.5 17c-.1 0-.1-.1-.1-.1v-1.7c0-.1 0-.1.1-.1l1.7-.2c.2 0 .4-.2.5-.4.2-.6.4-1.2.7-1.6.1-.2.1-.4 0-.6l-1-1.4v-.1l1.2-1.2h.2l1.4 1c.2.1.4.1.6 0 .5-.3 1.1-.6 1.6-.7.2-.1.4-.2.4-.4l.2-2c0-.1.1-.1.1-.1h1.7c.1 0 .1 0 .1.1l.2 1.7c0 .2.2.4.4.5.6.2 1.2.4 1.7.7.2.1.4.1.6 0l1.4-1h.2l1.2 1.2v.1l-1 1.4c-.1.2-.1.4 0 .6.3.5.6 1.1.7 1.6.1.2.2.4.4.4l1.6.3c.1 0 .1.1.1.1v1.8h.2zM16 11.5c-2.5 0-4.5 2-4.5 4.5s2 4.5 4.5 4.5 4.5-2 4.5-4.5-2-4.5-4.5-4.5zm0 7.3c-1.5 0-2.8-1.3-2.8-2.8s1.3-2.8 2.8-2.8 2.8 1.3 2.8 2.8-1.3 2.8-2.8 2.8z' id='Shape_4_1_'/%3E%3C/svg%3E")
+}
+
+.bmpui-ui-settingspanelpagebackbutton {
+    font-size: .8em;
+    position: relative;
+    width: 8em
+}
+
+    .bmpui-ui-settingspanelpagebackbutton .bmpui-label, .bmpui-ui-subtitlesettingsresetbutton .bmpui-label {
+        display: inline-block
+    }
+
+        .bmpui-ui-settingspanelpagebackbutton .bmpui-label:before {
+            border-bottom: .2em solid #fff;
+            border-left: .2em solid #fff;
+            content: "";
+            height: .6em;
+            margin-left: -.8em;
+            position: absolute;
+            top: .6em;
+            -webkit-transform: rotate(45deg);
+            transform: rotate(45deg);
+            width: .6em
+        }
+
+.bmpui-on.bmpui-ui-audiotracksettingstogglebutton:hover, .bmpui-on.bmpui-ui-settingstogglebutton:hover, .bmpui-on.bmpui-ui-subtitlesettingstogglebutton:hover {
+    -webkit-filter: drop-shadow(0 0 1px #1fabe2);
+    filter: drop-shadow(0 0 1px #1fabe2)
+}
+
+.bmpui-ui-selectbox {
+    background-color: transparent;
+    border: 0;
+    color: #1fabe2;
+    cursor: pointer;
+    font-size: .8em;
+    padding: .3em
+}
+
+    .bmpui-ui-selectbox option {
+        color: #999
+    }
+
+        .bmpui-ui-selectbox option:checked {
+            color: #1fabe2
+        }
+
+.bmpui-ui-listbox .bmpui-ui-listbox-button {
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    display: block;
+    font-size: .8em;
+    height: 100%;
+    min-width: 10em;
+    padding: .5em;
+    width: 100%
+}
+
+    .bmpui-ui-listbox .bmpui-ui-listbox-button .bmpui-label, .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip .bmpui-label {
+        display: inherit
+    }
+
+    .bmpui-ui-listbox .bmpui-ui-listbox-button.bmpui-selected {
+        background-color: rgba(31,171,226,.7)
+    }
+
+    .bmpui-ui-listbox .bmpui-ui-listbox-button:hover {
+        background-color: rgba(31,171,226,.85)
+    }
+
+.bmpui-ui-seekbar-label {
+    bottom: 100%;
+    left: 0;
+    margin-bottom: 1em;
+    pointer-events: none;
+    position: absolute;
+    text-align: center;
+    transition: opacity .3s,visibility
+}
+
+    .bmpui-ui-seekbar-label > .bmpui-container-wrapper {
+        margin-left: -50%;
+        margin-right: 50%;
+        position: relative
+    }
+
+    .bmpui-ui-seekbar-label .bmpui-seekbar-label-inner {
+        border-bottom: .2em solid #fff
+    }
+
+        .bmpui-ui-seekbar-label .bmpui-seekbar-label-inner:after {
+            border: .5em solid transparent;
+            border-top-color: #fff;
+            content: " ";
+            height: 0;
+            left: 50%;
+            margin-left: -.5em;
+            pointer-events: none;
+            position: absolute;
+            top: 100%;
+            width: 0
+        }
+
+        .bmpui-ui-seekbar-label .bmpui-seekbar-label-inner > .bmpui-container-wrapper {
+            position: relative
+        }
+
+            .bmpui-ui-seekbar-label .bmpui-seekbar-label-inner > .bmpui-container-wrapper .bmpui-seekbar-thumbnail {
+                width: 6em
+            }
+
+            .bmpui-ui-seekbar-label .bmpui-seekbar-label-inner > .bmpui-container-wrapper .bmpui-seekbar-label-metadata {
+                background: -webkit-gradient(linear,left top,left bottom,from(transparent),to(rgba(0,0,0,.7)));
+                background: linear-gradient(180deg,transparent,rgba(0,0,0,.7));
+                bottom: 0;
+                -webkit-box-sizing: border-box;
+                box-sizing: border-box;
+                display: block;
+                padding: .5em;
+                position: absolute;
+                width: 100%
+            }
+
+                .bmpui-ui-seekbar-label .bmpui-seekbar-label-inner > .bmpui-container-wrapper .bmpui-seekbar-label-metadata .bmpui-seekbar-label-time {
+                    display: block;
+                    line-height: .8em
+                }
+
+                .bmpui-ui-seekbar-label .bmpui-seekbar-label-inner > .bmpui-container-wrapper .bmpui-seekbar-label-metadata .bmpui-seekbar-label-title {
+                    display: block;
+                    margin-bottom: .3em;
+                    white-space: normal
+                }
+
+.bmpui-ui-seekbar, .bmpui-ui-volumeslider {
+    cursor: pointer;
+    font-size: 1em;
+    height: 1em;
+    position: relative;
+    width: 100%
+}
+
+    .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-backdrop, .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-markers, .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-markers > .bmpui-seekbar-marker, .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-playbackposition, .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-playbackposition-marker, .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-seekposition, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-backdrop, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-markers, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-markers > .bmpui-seekbar-marker, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition-marker, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-seekposition {
+        bottom: 0;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        height: .3125em;
+        left: 0;
+        margin: auto;
+        position: absolute;
+        right: auto;
+        top: 0;
+        -ms-transform-origin: 0 0;
+        -webkit-transform-origin: 0 0;
+        transform-origin: 0 0;
+        width: 100%
+    }
+
+    .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-backdrop, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-backdrop {
+        background-color: hsla(0,0%,100%,.2);
+        margin: auto 0;
+        width: 100%
+    }
+
+    .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-bufferlevel {
+        background-color: #fff;
+        margin: auto 0;
+        -webkit-transition: -webkit-transform .3s linear,_ .3s linear;
+        transition: transform .3s linear,-webkit-transform .3s linear
+    }
+
+    .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-seekposition, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-seekposition {
+        background-color: hsla(0,0%,100%,.2);
+        margin: auto 0
+    }
+
+    .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-playbackposition, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition {
+        background-color: #004f88;
+        margin: auto 0;
+        -webkit-transition: -webkit-transform .1s linear,_ .1s linear;
+        transition: transform .1s linear,-webkit-transform .1s linear
+    }
+
+    .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-playbackposition-marker, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition-marker {
+        background-color: #004f88;
+        border: .1875em solid #004f88;
+        border-radius: 50%;
+        height: .9375em;
+        left: -.46875em;
+        width: .9375em
+    }
+
+    .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-markers, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-markers {
+        height: .5625em
+    }
+
+        .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-markers > .bmpui-seekbar-marker, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-markers > .bmpui-seekbar-marker {
+            background-color: #fff;
+            height: 100%;
+            text-align: center;
+            -webkit-transition-duration: 1s;
+            transition-duration: 1s;
+            -webkit-transition-property: -webkit-transform;
+            transition-property: transform,-webkit-transform;
+            -webkit-transition-timing-function: linear;
+            transition-timing-function: linear;
+            width: 2px
+        }
+
+            .bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-markers > .bmpui-seekbar-marker > .bmpui-seekbar-marker-image, .bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-markers > .bmpui-seekbar-marker > .bmpui-seekbar-marker-image {
+                height: 1.25em;
+                position: absolute;
+                -webkit-transform: translate(-50%,calc(-100% - .2em));
+                transform: translate(-50%,calc(-100% - .2em))
+            }
+
+.bmpui-seeking.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-seeking.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-playbackposition, .bmpui-seeking.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-seeking.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-seekbar-bufferlevel, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-seekbar-playbackposition, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-buffering-overlay, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-controlbar, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-titlebar {
+    -webkit-transition: none;
+    transition: none
+}
+
+.bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar {
+    height: 100%;
+    width: auto
+}
+
+    .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-backdrop, .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-playbackposition, .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-seekposition, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-backdrop, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-seekposition {
+        right: 0;
+        top: auto
+    }
+
+        .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-playbackposition .bmpui-seekbar-playbackposition-marker, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition .bmpui-seekbar-playbackposition-marker {
+            height: 1em;
+            top: -.5em;
+            width: 100%
+        }
+
+    .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-backdrop, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-backdrop {
+        height: 100%;
+        margin: 0 auto;
+        width: auto
+    }
+
+    .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-vertical.bmpui-ui-seekbar .bmpui-seekbar .bmpui-seekbar-seekposition, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-bufferlevel, .bmpui-vertical.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-seekposition {
+        margin: 0 auto
+    }
+
+.bmpui-ui-volumeslider .bmpui-seekbar .bmpui-seekbar-playbackposition-marker {
+    background-color: #1fabe2;
+    border: 0;
+    height: .6875em;
+    left: -.34375em;
+    width: .6875em
+}
+
+.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay {
+    bottom: 0;
+    font-size: 1.2em;
+    left: 0;
+    pointer-events: none;
+    position: absolute;
+    right: 0;
+    text-align: center;
+    top: 0;
+    -webkit-transition: bottom .15s ease-out;
+    transition: bottom .15s ease-out
+}
+
+    .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay * {
+        all: unset
+    }
+
+    .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay .bmpui-subtitle-region-container {
+        position: absolute
+    }
+
+        .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay .bmpui-subtitle-region-container.bmpui-subtitle-position-default {
+            bottom: 2em;
+            left: 3em;
+            right: 3em;
+            top: auto
+        }
+
+        .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay .bmpui-subtitle-region-container.bmpui-subtitle-position-bottom > div {
+            bottom: 0;
+            position: absolute;
+            width: 100%
+        }
+
+    .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay .bmpui-ui-subtitle-label {
+        color: #fff;
+        height: -webkit-fit-content;
+        height: -moz-fit-content;
+        height: fit-content;
+        text-shadow: -1px -1px 0 #000,0 -1px 0 #000,1px -1px 0 #000,-1px 0 0 #000,1px 0 0 #000,-1px 1px 0 #000,0 1px 0 #000,1px 1px 0 #000
+    }
+
+        .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay .bmpui-ui-subtitle-label:nth-child(1n-1):after {
+            content: "\a";
+            height: 0;
+            white-space: pre-line;
+            width: 0
+        }
+
+    .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay.bmpui-controlbar-visible {
+        bottom: 5em;
+        -webkit-transition: bottom .15s ease-in;
+        transition: bottom .15s ease-in
+    }
+
+.bmpui-ui-subtitle-overlay.bmpui-cea608 {
+    bottom: 2em;
+    left: 3em;
+    right: 3em;
+    top: 2em
+}
+
+    .bmpui-ui-subtitle-overlay.bmpui-cea608 .bmpui-subtitle-region-container.bmpui-subtitle-position-default {
+        bottom: 0;
+        left: 0;
+        right: 0;
+        top: 0
+    }
+
+    .bmpui-ui-subtitle-overlay.bmpui-cea608 .bmpui-ui-subtitle-label {
+        line-height: 1em;
+        position: absolute;
+        text-transform: uppercase
+    }
+
+        .bmpui-ui-subtitle-overlay.bmpui-cea608 .bmpui-ui-subtitle-label:nth-child(1n-1):after {
+            content: normal;
+            white-space: normal
+        }
+
+    .bmpui-ui-subtitle-overlay.bmpui-cea608.bmpui-controlbar-visible {
+        bottom: 2em;
+        -webkit-transition: none;
+        transition: none
+    }
+
+.bmpui-ui-volumecontrolbutton {
+    line-height: 0;
+    position: relative
+}
+
+    .bmpui-ui-volumecontrolbutton .bmpui-ui-volumeslider {
+        background-color: #111;
+        bottom: 100%;
+        height: 6em;
+        max-height: 6em;
+        position: absolute;
+        -webkit-transition: max-height .15s ease-in;
+        transition: max-height .15s ease-in;
+        width: 1.5em
+    }
+
+        .bmpui-ui-volumecontrolbutton .bmpui-ui-volumeslider.bmpui-hidden {
+            max-height: 0;
+            -webkit-transition: max-height .15s ease-out;
+            transition: max-height .15s ease-out
+        }
+
+        .bmpui-ui-volumecontrolbutton .bmpui-ui-volumeslider .bmpui-seekbar {
+            bottom: .5em;
+            height: auto;
+            left: .3em;
+            overflow: hidden;
+            position: absolute;
+            right: .3em;
+            top: .5em;
+            width: auto
+        }
+
+.bmpui-ui-casttogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M27.7 5.4H6.4c-1.2 0-2.1 1-2.1 2.1v2.1h2.1V7.5h21.3v12.8h-8.5v2.1h8.5c1.2 0 2.1-1 2.1-2.1V7.5c0-1.2-.9-2.1-2.1-2.1z' id='Rectangle_9_copy'/%3E%3Cpath class='st0' d='M2.2 12.8v2.1c6.5 0 11.7 5.2 11.7 11.7H16C16 19 9.8 12.8 2.2 12.8zm0 5.3v2.1c3.5 0 6.4 2.9 6.4 6.4h2.1c0-4.6-3.8-8.5-8.5-8.5zm0 5.3v3.2h3.2c0-1.8-1.4-3.2-3.2-3.2z' id='Rectangle_12'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-casttogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st1{fill:%231fabe2}%3C/style%3E%3Cpath class='st1' d='M6.4 7.5v3.3c5.3.6 9.7 4.5 11.2 9.5h10.1V7.5H6.4z' id='Ellipse_1' style='opacity:.302'/%3E%3Cpath class='st1' d='M2.2 23.4v3.2h3.2c0-1.8-1.4-3.2-3.2-3.2zm0-5.3v2.1c3.5 0 6.4 2.9 6.4 6.4h2.1c0-4.6-3.8-8.5-8.5-8.5zm0-5.3v2.1c6.5 0 11.7 5.2 11.7 11.7H16C16 19 9.8 12.8 2.2 12.8zm25.5-7.4H6.4c-1.2 0-2.1 1-2.1 2.1v2.1h2.1V7.5h21.3v12.8h-8.5v2.1h8.5c1.2 0 2.1-1 2.1-2.1V7.5c0-1.2-.9-2.1-2.1-2.1z' id='Rectangle_12_2_'/%3E%3C/svg%3E")
+    }
+
+.bmpui-ui-cast-status-overlay {
+    background: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M27.7 5.4H6.4c-1.2 0-2.1 1-2.1 2.1v2.1h2.1V7.5h21.3v12.8h-8.5v2.1h8.5c1.2 0 2.1-1 2.1-2.1V7.5c0-1.2-.9-2.1-2.1-2.1z' id='Rectangle_9_copy'/%3E%3Cpath class='st0' d='M2.2 12.8v2.1c6.5 0 11.7 5.2 11.7 11.7H16C16 19 9.8 12.8 2.2 12.8zm0 5.3v2.1c3.5 0 6.4 2.9 6.4 6.4h2.1c0-4.6-3.8-8.5-8.5-8.5zm0 5.3v3.2h3.2c0-1.8-1.4-3.2-3.2-3.2z' id='Rectangle_12'/%3E%3C/svg%3E") 50%/7em 7em no-repeat #111;
+    height: 100%;
+    left: 0;
+    margin: 0;
+    position: absolute;
+    top: 0;
+    transition: opacity .3s,visibility;
+    width: 100%
+}
+
+    .bmpui-ui-cast-status-overlay .bmpui-ui-cast-status-label {
+        color: #fff;
+        font-size: 1.2em;
+        left: 0;
+        margin: 0 2em;
+        pointer-events: none;
+        position: absolute;
+        right: 0;
+        text-align: center;
+        top: 65%
+    }
+
+.bmpui-ui-errormessage-overlay {
+    background-color: #111;
+    height: 100%;
+    left: 0;
+    margin: 0;
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    width: 100%
+}
+
+    .bmpui-ui-errormessage-overlay .bmpui-ui-errormessage-label {
+        color: #fff;
+        font-size: 1.2em;
+        left: 3em;
+        position: absolute;
+        right: 3em;
+        text-align: center;
+        top: 50%;
+        -ms-transform: translateY(-50%);
+        -webkit-transform: translateY(-50%);
+        transform: translateY(-50%);
+        -webkit-user-select: text;
+        -moz-user-select: text;
+        -ms-user-select: text;
+        user-select: text;
+        white-space: pre-line
+    }
+
+        .bmpui-ui-errormessage-overlay .bmpui-ui-errormessage-label ul {
+            color: #999;
+            font-size: .9em;
+            padding: 0
+        }
+
+            .bmpui-ui-errormessage-overlay .bmpui-ui-errormessage-label ul li {
+                list-style: none
+            }
+
+    .bmpui-ui-errormessage-overlay .bmpui-ui-tvnoisecanvas {
+        -webkit-filter: blur(4px);
+        filter: blur(4px);
+        height: 100%;
+        left: 0;
+        margin: 0;
+        position: absolute;
+        top: 0;
+        width: 100%
+    }
+
+.bmpui-ui-titlebar {
+    background: -webkit-gradient(linear,left bottom,left top,from(transparent),to(rgba(0,0,0,.7)));
+    background: linear-gradient(0deg,transparent,rgba(0,0,0,.7));
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    opacity: 1;
+    padding: .5em 1em 1em;
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    -webkit-transition: opacity .3s,visibility;
+    transition: opacity .3s,visibility;
+    width: 100%
+}
+
+.bmpui-ui-buffering-overlay, .bmpui-ui-recommendation-overlay {
+    display: table;
+    background-color: rgba(8,43,57,.7);
+    left: 0;
+    margin: 0;
+    opacity: 1;
+    top: 0;
+    visibility: visible
+}
+
+.bmpui-ui-titlebar > .bmpui-container-wrapper {
+    padding: .5em;
+    pointer-events: none
+}
+
+    .bmpui-ui-titlebar > .bmpui-container-wrapper .bmpui-label-metadata-title {
+        cursor: default;
+        display: block;
+        font-size: 1.2em;
+        text-shadow: 0 0 5px #000;
+        white-space: normal
+    }
+
+    .bmpui-ui-titlebar > .bmpui-container-wrapper .bmpui-label-metadata-description {
+        color: #e6e6e6;
+        cursor: default;
+        display: block;
+        text-shadow: 0 0 5px #000;
+        white-space: normal
+    }
+
+.bmpui-ui-recommendation-overlay {
+    height: 100%;
+    position: absolute;
+    -webkit-transition: opacity .6s,visibility;
+    transition: opacity .6s,visibility;
+    width: 100%
+}
+
+    .bmpui-ui-buffering-overlay > .bmpui-container-wrapper, .bmpui-ui-recommendation-overlay > .bmpui-container-wrapper {
+        display: table-cell;
+        text-align: center;
+        vertical-align: middle;
+        padding: 3em
+    }
+
+    .bmpui-ui-buffering-overlay.bmpui-hidden, .bmpui-ui-recommendation-overlay.bmpui-hidden {
+        opacity: 0;
+        -webkit-transition: opacity .6s,visibility .6s;
+        transition: opacity .6s,visibility .6s;
+        visibility: hidden
+    }
+
+    .bmpui-ui-buffering-overlay a, .bmpui-ui-buffering-overlay a:hover, .bmpui-ui-buffering-overlay a:visited, .bmpui-ui-recommendation-overlay a, .bmpui-ui-recommendation-overlay a:hover, .bmpui-ui-recommendation-overlay a:visited, .bmpui-ui-subtitle-overlay.bmpui-fontcolor-white100 .bmpui-ui-subtitle-label {
+        color: #fff
+    }
+
+    .bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-hugereplaybutton {
+        bottom: 2em;
+        left: 2em;
+        position: absolute
+    }
+
+    .bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-recommendation-item {
+        background-position: 50%;
+        background-size: cover;
+        display: inline-block;
+        font-size: .7em;
+        height: 9em;
+        margin: .3em .6em;
+        overflow: hidden;
+        position: relative;
+        text-align: left;
+        text-shadow: 0 0 3px #111;
+        -webkit-transform: scale(1);
+        transform: scale(1);
+        -webkit-transition: -webkit-transform .15s ease-out;
+        transition: transform .15s ease-out;
+        transition: transform .15s ease-out,-webkit-transform .15s ease-out;
+        width: 16em
+    }
+
+        .bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-recommendation-item .bmpui-background {
+            background: -webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(transparent),to(rgba(0,0,0,.7)));
+            background: linear-gradient(180deg,transparent,transparent,rgba(0,0,0,.7));
+            height: 100%;
+            position: absolute;
+            top: 20%;
+            -webkit-transition: top .15s ease-out;
+            transition: top .15s ease-out;
+            width: 100%
+        }
+
+.bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-hugeplaybacktogglebutton .bmpui-image, .bmpui-ui-skin-smallscreen.bmpui-remote-control .bmpui-ui-hugeplaybacktogglebutton.bmpui-on .bmpui-image {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M11.3 5.4H8.9c-1.3 0-2.4 1.1-2.4 2.4v16.5c0 1.3 1.1 2.4 2.4 2.4h2.4c1.3 0 2.4-1.1 2.4-2.4V7.7c-.1-1.3-1.1-2.3-2.4-2.3zm0 18.9H8.9V7.7h2.4v16.6z' id='Rectangle_2_copy'/%3E%3Cpath class='st0' d='M23.1 5.4h-2.4c-1.3 0-2.4 1.1-2.4 2.4v16.5c0 1.3 1.1 2.4 2.4 2.4h2.4c1.3 0 2.4-1.1 2.4-2.4V7.7c-.1-1.3-1.1-2.3-2.4-2.3zm0 18.9h-2.4V7.7h2.4v16.6z' id='Rectangle_2_copy_2'/%3E%3C/svg%3E")
+}
+
+.bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-recommendation-item .bmpui-title {
+    bottom: 3em;
+    left: 1em;
+    position: absolute;
+    right: 1em
+}
+
+    .bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-recommendation-item .bmpui-title .bmpui-innertitle {
+        font-size: 1.2em;
+        white-space: normal;
+        word-break: break-all
+    }
+
+.bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-recommendation-item .bmpui-duration {
+    bottom: 1em;
+    left: 1em;
+    position: absolute
+}
+
+.bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-recommendation-item:hover {
+    outline: #1fabe2 solid 2px;
+    -webkit-transform: scale(1.05);
+    transform: scale(1.05);
+    -webkit-transition: -webkit-transform .15s ease-in;
+    transition: transform .15s ease-in;
+    transition: transform .15s ease-in,-webkit-transform .15s ease-in
+}
+
+    .bmpui-ui-recommendation-overlay.bmpui-recommendations .bmpui-ui-recommendation-item:hover .bmpui-background {
+        top: 0;
+        -webkit-transition: top .15s ease-in;
+        transition: top .15s ease-in
+    }
+
+.bmpui-ui-clickoverlay, .bmpui-ui-playbacktoggle-overlay .bmpui-ui-hugeplaybacktogglebutton {
+    height: 100%;
+    left: 0;
+    margin: 0;
+    position: absolute;
+    top: 0;
+    width: 100%
+}
+
+.bmpui-ui-hugereplaybutton {
+    height: 5em;
+    outline: 0;
+    width: 5em
+}
+
+    .bmpui-ui-hugereplaybutton .bmpui-image {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 80 80' style='enable-background:new 0 0 80 80' xml:space='preserve'%3E%3Cstyle%3E.st1{fill:%231fabe2}%3C/style%3E%3Cpath d='M40 73.5c-18.5 0-33.5-15-33.5-33.5S21.5 6.5 40 6.5s33.5 15 33.5 33.5-15 33.5-33.5 33.5z' style='opacity:.3;fill:%231fabe2'/%3E%3Cpath class='st1' d='M40 5C20.7 5 5 20.7 5 40s15.7 35 35 35 35-15.7 35-35S59.3 5 40 5zm0 67C22.3 72 8 57.7 8 40S22.3 8 40 8s32 14.3 32 32-14.3 32-32 32z' id='Ellipse_3_copy_2'/%3E%3Cpath class='st1' d='M54 40.3V40h-.1c-.2-.6-.8-1-1.4-1s-1.2.4-1.4 1H51c0 6.1-4.9 11-11 11s-11-4.9-11-11 4.9-11 11-11c.7 0 1.4.1 2 .2v3.3c0 .2.1.3.3.4.1 0 .2.1.3.1s.2 0 .3-.1l7.8-4.5c.2-.1.2-.2.2-.4s-.1-.3-.2-.4l-7.8-4.5c-.2-.1-.4-.1-.6 0-.2.1-.3.2-.3.4v2.7c-.7-.1-1.3-.2-2-.2-7.7 0-14 6.3-14 14s6.3 14 14 14c7.4 0 13.5-5.8 14-13.2v-.5z' id='Ellipse_3'/%3E%3C/svg%3E");
+        background-position: 50%;
+        background-repeat: no-repeat;
+        background-size: 5em;
+        height: 100%;
+        width: 100%
+    }
+
+@-webkit-keyframes spin {
+    50% {
+        -webkit-transform: rotate(180deg) scale(1.1);
+        transform: rotate(180deg) scale(1.1)
+    }
+
+    to {
+        -webkit-transform: rotate(1turn) scale(1);
+        transform: rotate(1turn) scale(1)
+    }
+}
+
+@keyframes spin {
+    50% {
+        -webkit-transform: rotate(180deg) scale(1.1);
+        transform: rotate(180deg) scale(1.1)
+    }
+
+    to {
+        -webkit-transform: rotate(1turn) scale(1);
+        transform: rotate(1turn) scale(1)
+    }
+}
+
+.bmpui-ui-hugereplaybutton .bmpui-image:hover {
+    -webkit-animation: .5s ease-in spin;
+    animation: .5s ease-in spin
+}
+
+.bmpui-ui-replaybutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cpath d='M22.8 9.1c-3.8-3.9-10.1-4-14.1-.2V7.1c0-.6-.4-1-1-1s-1 .4-1 1v4.5c0 .6.4 1 1 1h4.5c.6 0 1-.4 1-1s-.4-1-1-1H9.8c1.6-1.6 3.7-2.5 5.9-2.5 4.4 0 8 3.7 8 8.1s-3.7 8-8.1 8c-3.5 0-6.5-2.3-7.6-5.4-.1-.4-.5-.8-.9-.8-.5 0-1 .4-1 1 0 .1 0 .2.1.3.5 1.3 1.2 2.5 2.2 3.5 3.8 4 10.1 4.1 14.1.3 4-3.6 4.1-9.9.3-14z' style='fill:%23fff'/%3E%3C/svg%3E")
+}
+
+.bmpui-ui-playbacktimelabel {
+    text-transform: uppercase
+}
+
+    .bmpui-ui-playbacktimelabel.bmpui-ui-playbacktimelabel-live {
+        cursor: pointer
+    }
+
+        .bmpui-ui-playbacktimelabel.bmpui-ui-playbacktimelabel-live:before {
+            color: #999;
+            content: "●";
+            padding-right: .2em
+        }
+
+        .bmpui-ui-playbacktimelabel.bmpui-ui-playbacktimelabel-live.bmpui-ui-playbacktimelabel-live-edge:before, .bmpui-ui-subtitle-overlay.bmpui-fontcolor-red100 .bmpui-ui-subtitle-label {
+            color: red
+        }
+
+.bmpui-ui-buffering-overlay {
+    height: 100%;
+    position: absolute;
+    -webkit-transition: opacity .6s,visibility;
+    transition: opacity .6s,visibility;
+    width: 100%
+}
+
+    .bmpui-ui-buffering-overlay .bmpui-ui-buffering-overlay-indicator {
+        -webkit-animation: 2s ease-in infinite fancy;
+        animation: 2s ease-in infinite fancy;
+        background: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st1{fill-rule:evenodd;clip-rule:evenodd;fill:%23004F88}%3C/style%3E%3Cpath class='st1' d='M8 8h16v16H8z' id='Rectangle_3_copy_3' style='opacity:.302'/%3E%3Cpath class='st1' d='M23 7H9c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V9c0-1.1-.9-2-2-2zm0 16H9V9h14v14z' id='Rectangle_2_copy_13'/%3E%3C/svg%3E") 50% no-repeat;
+        display: inline-block;
+        height: 2em;
+        margin: .2em;
+        width: 2em
+    }
+
+@-webkit-keyframes fancy {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+
+    20%,30% {
+        opacity: 1
+    }
+
+    50% {
+        opacity: 0;
+        -webkit-transform: scale(2);
+        transform: scale(2)
+    }
+
+    to {
+        opacity: 0;
+        -webkit-transform: scale(3);
+        transform: scale(3)
+    }
+}
+
+@keyframes fancy {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+
+    20%,30% {
+        opacity: 1
+    }
+
+    50% {
+        opacity: 0;
+        -webkit-transform: scale(2);
+        transform: scale(2)
+    }
+
+    to {
+        opacity: 0;
+        -webkit-transform: scale(3);
+        transform: scale(3)
+    }
+}
+
+.bmpui-ui-buffering-overlay .bmpui-ui-buffering-overlay-indicator:first-child {
+    -webkit-animation-delay: 0s;
+    animation-delay: 0s
+}
+
+.bmpui-ui-buffering-overlay .bmpui-ui-buffering-overlay-indicator:nth-child(2) {
+    -webkit-animation-delay: .2s;
+    animation-delay: .2s
+}
+
+.bmpui-ui-buffering-overlay .bmpui-ui-buffering-overlay-indicator:nth-child(3) {
+    -webkit-animation-delay: .4s;
+    animation-delay: .4s
+}
+
+.bmpui-ui-closebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M26 6c-.9-.9-2.2-.9-3.1 0L6 22.8c-.9.9-.9 2.2 0 3.1.9.9 2.2.9 3.1 0L26 9.2c.9-.9.9-2.3 0-3.2z' id='Rounded_Rectangle_6'/%3E%3Cpath class='st0' d='M26 22.8 9.2 6c-.9-.9-2.2-.9-3.1 0s-.9 2.2 0 3.1L23 26c.9.9 2.2.9 3.1 0 .8-.9.8-2.3-.1-3.2z' id='Rounded_Rectangle_6_copy'/%3E%3C/svg%3E")
+}
+
+@-webkit-keyframes pulsate {
+    20%,60% {
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1)
+    }
+
+    40%,80% {
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+}
+
+@keyframes pulsate {
+    20%,60% {
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1)
+    }
+
+    40%,80% {
+        -webkit-transform: scale(1);
+        transform: scale(1)
+    }
+}
+
+.bmpui-ui-closebutton:hover {
+    -webkit-animation: 1s pulsate;
+    animation: 1s pulsate;
+    -webkit-filter: drop-shadow(0 0 1px #fff);
+    filter: drop-shadow(0 0 1px #fff)
+}
+
+.bmpui-ui-airplaytogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M27.1 5.3H4.9c-1.3 0-2.4 1.1-2.4 2.4v11.9c0 1.3 1.1 2.4 2.4 2.4h3.6v-2.4H4.9V7.7H27v11.9h-3.6V22H27c1.3 0 2.4-1.1 2.4-2.4V7.7c0-1.3-1-2.4-2.3-2.4z' id='Rectangle_8'/%3E%3Cpath class='st0' d='M22.9 24.8 17 16.5c-.2-.2-.6-.5-1-.5s-.7.2-1 .5l-5.9 8.3c-.2.4-.2.8-.1 1.2.2.4.6.6 1.1.6H22c.5 0 .8-.2 1.1-.6.1-.1.1-.2.1-.5-.1-.2-.2-.5-.3-.7zm-10.6-.5 3.7-5.1 3.7 5.1h-7.4z' id='Shape_5'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-airplaytogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{opacity:.302}.st1{fill:%231fabe2}%3C/style%3E%3Cg id='Rectangle_17' class='st0'%3E%3Cpath class='st1' d='M4.9 7.7H27v11.9H4.9z'/%3E%3C/g%3E%3Cg id='Rectangle_18' class='st0'%3E%3Cpath class='st1' d='M18.4 19.6h-4.8l-2.4 4.7h9.6z'/%3E%3C/g%3E%3Cpath class='st1' d='M27.1 5.3H4.9c-1.3 0-2.4 1.1-2.4 2.4v11.9c0 1.3 1.1 2.4 2.4 2.4h3.6v-2.4H4.9V7.7H27v11.9h-3.6V22H27c1.3 0 2.4-1.1 2.4-2.4V7.7c0-1.3-1-2.4-2.3-2.4zM17 16.5c-.2-.2-.6-.5-1-.5s-.7.2-1 .5l-5.9 8.3c-.2.4-.2.8-.1 1.2.2.4.6.6 1.1.6H22c.5 0 .8-.2 1.1-.6.1-.1.1-.2.1-.5 0-.2-.1-.5-.2-.7l-6-8.3zm-4.7 7.8 3.7-5.1 3.7 5.1h-7.4z' id='Shape_5_1_'/%3E%3C/svg%3E")
+    }
+
+.bmpui-ui-piptogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st0{fill-rule:evenodd;clip-rule:evenodd;fill:%23fff}%3C/style%3E%3Cpath class='st0' d='M5 8.3h19.8v5.5H27V8.3c0-1.2-1-2.2-2.2-2.2H5c-1.2 0-2.2 1-2.2 2.2v12.1c0 1.2 1 2.2 2.2 2.2h7.7v-2.2H5V8.3zm9.9 7.7v9.9h14.3V16H14.9z' id='Rectangle_512'/%3E%3Cpath class='st0' d='M12.7 10.5H7.2V16h2.2v-3.3h3.3z' id='Rectangle_513'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-piptogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cstyle%3E.st1{fill-rule:evenodd;clip-rule:evenodd;fill:%231fabe2}%3C/style%3E%3Cpath class='st1' d='M5 8.3h19.8v12.1H5z' id='Rectangle_515_2_' style='opacity:.302'/%3E%3Cpath class='st1' d='M5 8.3h19.8v5.5H27V8.3c0-1.2-1-2.2-2.2-2.2H5c-1.2 0-2.2 1-2.2 2.2v12.1c0 1.2 1 2.2 2.2 2.2h7.7v-2.2H5V8.3zm9.9 7.7v9.9h14.3V16H14.9z' id='Rectangle_512_12_'/%3E%3Cpath class='st1' d='M12.7 10.5H7.2V16h2.2v-3.3h3.3z' id='Rectangle_513_12_'/%3E%3C/svg%3E")
+    }
+
+.bmpui-ui-spacer {
+    height: 100%;
+    width: 100%
+}
+
+.bmpui-ui-subtitlesettingsresetbutton {
+    font-size: .8em;
+    width: 12em
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-white75 .bmpui-ui-subtitle-label {
+    color: hsla(0,0%,100%,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-white50 .bmpui-ui-subtitle-label {
+    color: hsla(0,0%,100%,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-white25 .bmpui-ui-subtitle-label {
+    color: hsla(0,0%,100%,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-black100 .bmpui-ui-subtitle-label {
+    color: #000
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-black75 .bmpui-ui-subtitle-label {
+    color: rgba(0,0,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-black50 .bmpui-ui-subtitle-label {
+    color: rgba(0,0,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-black25 .bmpui-ui-subtitle-label {
+    color: rgba(0,0,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-red75 .bmpui-ui-subtitle-label {
+    color: rgba(255,0,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-red50 .bmpui-ui-subtitle-label {
+    color: rgba(255,0,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-red25 .bmpui-ui-subtitle-label {
+    color: rgba(255,0,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-green100 .bmpui-ui-subtitle-label {
+    color: #0f0
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-green75 .bmpui-ui-subtitle-label {
+    color: rgba(0,255,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-green50 .bmpui-ui-subtitle-label {
+    color: rgba(0,255,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-green25 .bmpui-ui-subtitle-label {
+    color: rgba(0,255,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-blue100 .bmpui-ui-subtitle-label {
+    color: #00f
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-blue75 .bmpui-ui-subtitle-label {
+    color: rgba(0,0,255,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-blue50 .bmpui-ui-subtitle-label {
+    color: rgba(0,0,255,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-blue25 .bmpui-ui-subtitle-label {
+    color: rgba(0,0,255,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-cyan100 .bmpui-ui-subtitle-label {
+    color: #0ff
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-cyan75 .bmpui-ui-subtitle-label {
+    color: rgba(0,255,255,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-cyan50 .bmpui-ui-subtitle-label {
+    color: rgba(0,255,255,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-cyan25 .bmpui-ui-subtitle-label {
+    color: rgba(0,255,255,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-yellow100 .bmpui-ui-subtitle-label {
+    color: #ff0
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-yellow75 .bmpui-ui-subtitle-label {
+    color: rgba(255,255,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-yellow50 .bmpui-ui-subtitle-label {
+    color: rgba(255,255,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-yellow25 .bmpui-ui-subtitle-label {
+    color: rgba(255,255,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-magenta100 .bmpui-ui-subtitle-label {
+    color: #f0f
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-magenta75 .bmpui-ui-subtitle-label {
+    color: rgba(255,0,255,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-magenta50 .bmpui-ui-subtitle-label {
+    color: rgba(255,0,255,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontcolor-magenta25 .bmpui-ui-subtitle-label {
+    color: rgba(255,0,255,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-white100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-white100 .bmpui-subtitle-region-container {
+    background-color: #fff
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-white75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-white75 .bmpui-subtitle-region-container {
+    background-color: hsla(0,0%,100%,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-white50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-white50 .bmpui-subtitle-region-container {
+    background-color: hsla(0,0%,100%,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-white25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-white25 .bmpui-subtitle-region-container {
+    background-color: hsla(0,0%,100%,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-black100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-black100 .bmpui-subtitle-region-container {
+    background-color: #000
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-black75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-black75 .bmpui-subtitle-region-container {
+    background-color: rgba(0,0,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-black50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-black50 .bmpui-subtitle-region-container {
+    background-color: rgba(0,0,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-black25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-black25 .bmpui-subtitle-region-container {
+    background-color: rgba(0,0,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-red100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-red100 .bmpui-subtitle-region-container {
+    background-color: red
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-red75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-red75 .bmpui-subtitle-region-container {
+    background-color: rgba(255,0,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-red50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-red50 .bmpui-subtitle-region-container {
+    background-color: rgba(255,0,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-red25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-red25 .bmpui-subtitle-region-container {
+    background-color: rgba(255,0,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-green100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-green100 .bmpui-subtitle-region-container {
+    background-color: #0f0
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-green75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-green75 .bmpui-subtitle-region-container {
+    background-color: rgba(0,255,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-green50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-green50 .bmpui-subtitle-region-container {
+    background-color: rgba(0,255,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-green25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-green25 .bmpui-subtitle-region-container {
+    background-color: rgba(0,255,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-blue100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-blue100 .bmpui-subtitle-region-container {
+    background-color: #00f
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-blue75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-blue75 .bmpui-subtitle-region-container {
+    background-color: rgba(0,0,255,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-blue50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-blue50 .bmpui-subtitle-region-container {
+    background-color: rgba(0,0,255,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-blue25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-blue25 .bmpui-subtitle-region-container {
+    background-color: rgba(0,0,255,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-cyan100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-cyan100 .bmpui-subtitle-region-container {
+    background-color: #0ff
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-cyan75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-cyan75 .bmpui-subtitle-region-container {
+    background-color: rgba(0,255,255,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-cyan50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-cyan50 .bmpui-subtitle-region-container {
+    background-color: rgba(0,255,255,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-cyan25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-cyan25 .bmpui-subtitle-region-container {
+    background-color: rgba(0,255,255,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-yellow100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-yellow100 .bmpui-subtitle-region-container {
+    background-color: #ff0
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-yellow75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-yellow75 .bmpui-subtitle-region-container {
+    background-color: rgba(255,255,0,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-yellow50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-yellow50 .bmpui-subtitle-region-container {
+    background-color: rgba(255,255,0,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-yellow25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-yellow25 .bmpui-subtitle-region-container {
+    background-color: rgba(255,255,0,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-magenta100 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-magenta100 .bmpui-subtitle-region-container {
+    background-color: #f0f
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-magenta75 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-magenta75 .bmpui-subtitle-region-container {
+    background-color: rgba(255,0,255,.75)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-magenta50 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-magenta50 .bmpui-subtitle-region-container {
+    background-color: rgba(255,0,255,.5)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-bgcolor-magenta25 .bmpui-subtitle-region-container .bmpui-ui-subtitle-label, .bmpui-ui-subtitle-overlay.bmpui-windowcolor-magenta25 .bmpui-subtitle-region-container {
+    background-color: rgba(255,0,255,.25)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontsize-50 .bmpui-ui-subtitle-label {
+    font-size: .5em
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontsize-75 .bmpui-ui-subtitle-label {
+    font-size: .75em
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontsize-150 .bmpui-ui-subtitle-label {
+    font-size: 1.5em
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontsize-200 .bmpui-ui-subtitle-label {
+    font-size: 2em
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontsize-300 .bmpui-ui-subtitle-label {
+    font-size: 3em
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontsize-400 .bmpui-ui-subtitle-label {
+    font-size: 4em
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-characteredge-none .bmpui-ui-subtitle-label {
+    text-shadow: none
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-characteredge-raised .bmpui-ui-subtitle-label {
+    text-shadow: 0 0 4px rgba(0,0,0,.9),0 1px 4px rgba(0,0,0,.9),0 2px 4px rgba(0,0,0,.9)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-characteredge-depressed .bmpui-ui-subtitle-label {
+    text-shadow: rgba(0,0,0,.8) 0 -2px 1px
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-characteredge-uniform .bmpui-ui-subtitle-label {
+    text-shadow: -2px 0 1px rgba(0,0,0,.8),2px 0 1px rgba(0,0,0,.8),0 -2px 1px rgba(0,0,0,.8),0 2px 1px rgba(0,0,0,.8),-1px 1px 1px rgba(0,0,0,.8),1px 1px 1px rgba(0,0,0,.8),1px -1px 1px rgba(0,0,0,.8),1px 1px 1px rgba(0,0,0,.8)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-characteredge-dropshadowed .bmpui-ui-subtitle-label {
+    text-shadow: 0 2px 1px rgba(0,0,0,.8)
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontfamily-proportionalserif .bmpui-ui-subtitle-label {
+    font-family: Times New Roman,Times,Georgia,Cambria,"PT Serif Caption",serif
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontfamily-monospacedsansserif .bmpui-ui-subtitle-label {
+    font-family: Deja Vu Sans Mono,Lucida Console,Monaco,Consolas,PT Mono,monospace
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontfamily-proportionalsansserif .bmpui-ui-subtitle-label {
+    font-family: Roboto,Arial Unicode Ms,Arial,Helvetica,Verdana,PT Sans Caption,sans-serif
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontfamily-casual .bmpui-ui-subtitle-label {
+    font-family: Comic Sans MS,Impact,Handlee,fantasy
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontfamily-cursive .bmpui-ui-subtitle-label {
+    font-family: Monotype Corsiva,URW Chancery L,Apple Chancery,Dancing Script,cursive;
+    font-style: italic
+}
+
+.bmpui-ui-subtitle-overlay.bmpui-fontfamily-smallcapital .bmpui-ui-subtitle-label {
+    font-variant: small-caps
+}
+
+.bmpui-ui-subtitlesettingstogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E.cls-1{fill:%23fff}%3C/style%3E%3C/defs%3E%3Cpath class='cls-1' d='m19.74 26.6-3.56-3.14h-11a2.77 2.77 0 0 1-2.64-2.87V8.15A2.74 2.74 0 0 1 5.22 5.3h21.57a2.75 2.75 0 0 1 2.63 2.85v12.42a2.76 2.76 0 0 1-2.63 2.85h-3.73ZM4.89 7.7v13.44h12l2.82 2.63 2.54-2.65H27V7.7Z'/%3E%3Cpath class='cls-1' d='M7.48 15.78H12a.89.89 0 0 1 .92.86v1.85a.89.89 0 0 1-.92.86H7.48a.89.89 0 0 1-.92-.86v-1.85a.89.89 0 0 1 .92-.86ZM15.07 15.78h5a.88.88 0 0 1 .91.86v1.85a.89.89 0 0 1-.91.86h-5a.89.89 0 0 1-.92-.86v-1.85a.89.89 0 0 1 .92-.86ZM23 15.78h1.08a.89.89 0 0 1 .92.86v1.85a.89.89 0 0 1-.91.86h-1.03a.89.89 0 0 1-.91-.86v-1.85a.86.86 0 0 1 .85-.86Z'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-subtitlesettingstogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E.cls-2{fill:%2343ace5}%3C/style%3E%3C/defs%3E%3Cpath style='opacity:.3;isolation:isolate;fill:%2343ace5' d='M28.02 6.56v15.3h-6L20.3 25.3l-4.93-3.14H3.87V6.56h24.15z'/%3E%3Cpath class='cls-2' d='m19.74 26.6-3.56-3.14h-11a2.77 2.77 0 0 1-2.64-2.87V8.15A2.74 2.74 0 0 1 5.22 5.3h21.57a2.75 2.75 0 0 1 2.63 2.85v12.42a2.76 2.76 0 0 1-2.63 2.85h-3.73ZM4.89 7.7v13.44h12l2.82 2.63 2.54-2.65H27V7.7Z'/%3E%3Cpath class='cls-2' d='M7.48 15.78H12a.89.89 0 0 1 .92.86v1.85a.89.89 0 0 1-.92.86H7.48a.89.89 0 0 1-.92-.86v-1.85a.89.89 0 0 1 .92-.86ZM15.07 15.78h5a.88.88 0 0 1 .91.86v1.85a.89.89 0 0 1-.91.86h-5a.89.89 0 0 1-.92-.86v-1.85a.89.89 0 0 1 .92-.86ZM23 15.78h1.08a.89.89 0 0 1 .92.86v1.85a.89.89 0 0 1-.91.86h-1.03a.89.89 0 0 1-.91-.86v-1.85a.86.86 0 0 1 .85-.86Z'/%3E%3C/svg%3E")
+    }
+
+.bmpui-ui-audiotracksettingstogglebutton {
+    background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E.cls-1{fill:%23fff}%3C/style%3E%3C/defs%3E%3Cpath class='cls-1' d='M15.91 18.82a.62.62 0 0 1-.35.56.61.61 0 0 1-.65-.09l-3.32-2.79H9.81a.6.6 0 0 1-.6-.6v-2.43a.62.62 0 0 1 .6-.62h1.78l3.32-2.79a.63.63 0 0 1 .87.1.65.65 0 0 1 .13.38Zm2.34-.93h-.05a.64.64 0 0 1-.43-.18l-.08-.08a.6.6 0 0 1-.06-.79 3.54 3.54 0 0 0-.09-4.33.61.61 0 0 1 0-.82l.08-.08a.61.61 0 0 1 .46-.18.67.67 0 0 1 .45.22 4.89 4.89 0 0 1 .13 6 .61.61 0 0 1-.45.24Zm2.51 1.86a.58.58 0 0 1-.44.21.63.63 0 0 1-.43-.17l-.08-.09a.61.61 0 0 1 0-.82 6.5 6.5 0 0 0-.1-8.46.6.6 0 0 1 0-.83V9.5a.56.56 0 0 1 .44-.17.57.57 0 0 1 .44.2 7.8 7.8 0 0 1 .13 10.24Z'/%3E%3Cpath class='cls-1' d='m19.69 26.65-3.56-3.14h-11a2.77 2.77 0 0 1-2.64-2.87V8.2a2.74 2.74 0 0 1 2.68-2.85h21.57a2.75 2.75 0 0 1 2.63 2.85v12.42a2.76 2.76 0 0 1-2.63 2.85H23ZM4.84 7.75v13.44h12l2.82 2.63 2.54-2.65h4.71V7.75Z'/%3E%3C/svg%3E")
+}
+
+    .bmpui-ui-audiotracksettingstogglebutton.bmpui-on {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E.cls-2{fill:%2343ace5}%3C/style%3E%3C/defs%3E%3Cpath style='opacity:.3;isolation:isolate;fill:%2343ace5' d='M28.02 6.56v15.3h-6L20.3 25.3l-4.93-3.14H3.87V6.56h24.15z'/%3E%3Cpath class='cls-2' d='M15.9 18.93a.62.62 0 0 1-.35.55.6.6 0 0 1-.64-.08l-3.33-2.79H9.81A.61.61 0 0 1 9.2 16v-2.43a.62.62 0 0 1 .61-.57h1.77l3.33-2.79a.61.61 0 0 1 .86.1.62.62 0 0 1 .13.37Zm2.34-.93a.63.63 0 0 1-.43-.17l-.08-.09a.61.61 0 0 1-.06-.79 3.53 3.53 0 0 0-.09-4.32.64.64 0 0 1 0-.82l.08-.09a.6.6 0 0 1 .46-.17.67.67 0 0 1 .45.22 4.88 4.88 0 0 1 .13 6 .61.61 0 0 1-.45.24Zm2.51 1.87a.66.66 0 0 1-.44.21.6.6 0 0 1-.43-.18l-.08-.08a.61.61 0 0 1 0-.82 6.52 6.52 0 0 0-.1-8.47.6.6 0 0 1 0-.83v-.09a.62.62 0 0 1 .44-.18.58.58 0 0 1 .44.21 7.79 7.79 0 0 1 .13 10.23Z'/%3E%3Cpath class='cls-2' d='m19.68 26.76-3.56-3.15h-11a2.74 2.74 0 0 1-2.63-2.86V8.31a2.74 2.74 0 0 1 2.67-2.85h21.57a2.75 2.75 0 0 1 2.63 2.85v12.41a2.75 2.75 0 0 1-2.63 2.85H23ZM4.83 7.86V21.3h12l2.83 2.63 2.53-2.65h4.71V7.86Z'/%3E%3C/svg%3E")
+    }
+
+.bmpui-ui-skin-ads .bmpui-ui-ads-status {
+    background-color: rgba(0,0,0,.7);
+    left: 1.5em;
+    padding: .5em 1.5em;
+    position: absolute;
+    top: 1em
+}
+
+    .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-label-ad-message {
+        color: #999;
+        white-space: normal
+    }
+
+    .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip .bmpui-label:hover {
+        text-decoration: underline
+    }
+
+    .bmpui-ui-skin-ads .bmpui-ui-ads-status .bmpui-ui-button-ad-skip:before {
+        color: #1fabe2;
+        content: "●";
+        padding-left: .5em;
+        padding-right: .5em
+    }
+
+.bmpui-ui-skin-ads.bmpui-ui-skin-smallscreen .bmpui-ui-ads-status {
+    bottom: 0;
+    left: 0;
+    padding: 1em 1.5em;
+    top: auto;
+    width: 100%
+}
+
+.bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-controlbar, .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-titlebar {
+    background: hsla(0,0%,7%,.85);
+    padding: .3em .5em
+}
+
+.bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-controlbar {
+    bottom: 10%;
+    left: 10%;
+    right: 10%;
+    width: auto
+}
+
+.bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-titlebar {
+    left: 10%;
+    right: 10%;
+    top: 10%;
+    width: auto
+}
+
+.bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-watermark {
+    margin: 0;
+    right: 10%;
+    top: 10%
+}
+
+.bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay {
+    bottom: 10%
+}
+
+    .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay.bmpui-controlbar-visible {
+        bottom: 20%
+    }
+
+    .bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay .bmpui-ui-subtitle-label {
+        background-color: rgba(0,0,0,.5);
+        -webkit-box-decoration-break: clone;
+        box-decoration-break: clone;
+        display: -webkit-inline-box;
+        display: -ms-inline-flexbox;
+        display: inline-flex;
+        line-height: 2em;
+        padding: .3em .5em;
+        text-shadow: none
+    }
+
+.bmpui-ui-skin-cast-receiver.bmpui-ui-uicontainer .bmpui-ui-hugeplaybacktogglebutton .bmpui-image {
+    opacity: .7
+}
+
+.bmpui-ui-skin-smallscreen {
+    font-size: 1.2em
+}
+
+    .bmpui-ui-skin-smallscreen .bmpui-ui-settings-panel {
+        display: table;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        height: 100%;
+        left: 0;
+        margin: 0;
+        position: absolute;
+        top: 0;
+        width: 100%
+    }
+
+        .bmpui-ui-skin-smallscreen .bmpui-ui-settings-panel > .bmpui-container-wrapper {
+            display: table-cell;
+            text-align: center;
+            vertical-align: middle;
+            margin: auto
+        }
+
+        .bmpui-ui-skin-smallscreen .bmpui-ui-settings-panel .bmpui-ui-settings-panel-page {
+            min-width: 15em
+        }
+
+        .bmpui-ui-skin-smallscreen .bmpui-ui-settings-panel .bmpui-ui-settings-panel-item {
+            text-align: left
+        }
+
+        .bmpui-ui-skin-smallscreen .bmpui-ui-settings-panel .bmpui-ui-closebutton {
+            margin: 2em;
+            position: absolute;
+            right: 0;
+            top: 0
+        }
+
+    .bmpui-ui-skin-smallscreen .bmpui-ui-titlebar > .bmpui-container-wrapper {
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex
+    }
+
+        .bmpui-ui-skin-smallscreen .bmpui-ui-titlebar > .bmpui-container-wrapper .bmpui-ui-label {
+            -webkit-box-align: center;
+            -ms-flex-align: center;
+            align-items: center;
+            display: -webkit-inline-box;
+            display: -ms-inline-flexbox;
+            display: inline-flex;
+            font-size: 1em
+        }
+
+        .bmpui-ui-skin-smallscreen .bmpui-ui-titlebar > .bmpui-container-wrapper .bmpui-label-metadata-title, .bmpui-ui-skin-smallscreen.bmpui-no-flexbox .bmpui-ui-titlebar > .bmpui-container-wrapper .bmpui-label-metadata-title {
+            width: 100%
+        }
+
+    .bmpui-ui-skin-smallscreen .bmpui-ui-cast-status-overlay {
+        background: #111
+    }
+
+        .bmpui-ui-skin-smallscreen .bmpui-ui-cast-status-overlay .bmpui-ui-cast-status-label {
+            top: 30%
+        }
+
+    .bmpui-ui-skin-smallscreen .bmpui-ui-hugeplaybacktogglebutton .bmpui-image {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32' style='enable-background:new 0 0 32 32' xml:space='preserve'%3E%3Cpath d='M23.3 15.2 9.8 5.6c-.3-.2-.7-.3-1-.1-.3.2-.5.5-.5.8v19.3c0 .4.2.7.6.9.1.1.3.1.4.1.2 0 .4-.1.6-.2l13.4-9.7c.3-.2.4-.5.4-.8-.1-.2-.2-.6-.4-.7zm-13 8.4V8.4L21 16l-10.7 7.6z' style='fill:%23fff'/%3E%3C/svg%3E");
+        background-size: 4em
+    }
+
+    .bmpui-ui-skin-smallscreen.bmpui-remote-control .bmpui-ui-hugeplaybacktogglebutton.bmpui-on .bmpui-image {
+        -webkit-animation: none;
+        animation: none;
+        visibility: visible
+    }
+
+    .bmpui-ui-skin-smallscreen.bmpui-remote-control .bmpui-ui-hugeplaybacktogglebutton.bmpui-off .bmpui-image {
+        -webkit-animation: none;
+        animation: none
+    }
+
+    .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-400 .bmpui-ui-buffering-overlay, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-400 .bmpui-ui-cast-status-overlay, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-400 .bmpui-ui-errormessage-overlay, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-400 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-400 .bmpui-ui-hugereplaybutton, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-400 .bmpui-ui-settings-panel, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-400 .bmpui-ui-subtitle-overlay {
+        font-size: .6em
+    }
+
+    .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-600 .bmpui-ui-buffering-overlay, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-600 .bmpui-ui-cast-status-overlay, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-600 .bmpui-ui-errormessage-overlay, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-600 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-600 .bmpui-ui-hugereplaybutton, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-600 .bmpui-ui-settings-panel, .bmpui-ui-skin-smallscreen.bmpui-layout-max-width-600 .bmpui-ui-subtitle-overlay {
+        font-size: .8em
+    }
+
+    .bmpui-ui-skin-smallscreen.bmpui-no-flexbox .bmpui-ui-titlebar > .bmpui-container-wrapper {
+        border-spacing: .5em 0;
+        display: table;
+        width: 100%
+    }
+
+        .bmpui-ui-skin-smallscreen.bmpui-no-flexbox .bmpui-ui-titlebar > .bmpui-container-wrapper > * {
+            display: table-cell;
+            vertical-align: middle;
+            width: 1em
+        }
+
+.bmpui-ui-skin-tv {
+    font-size: 2vh
+}
+
+    .bmpui-ui-skin-tv .bmpui-ui-titlebar > .bmpui-container-wrapper {
+        margin: 2% 2% 2vh;
+        width: 96%
+    }
+
+    .bmpui-ui-skin-tv .bmpui-ui-titlebar-top {
+        margin-bottom: 1vh
+    }
+
+        .bmpui-ui-skin-tv .bmpui-ui-titlebar-top > .bmpui-container-wrapper {
+            -webkit-box-align: center;
+            -ms-flex-align: center;
+            -webkit-box-pack: end;
+            -ms-flex-pack: end;
+            align-items: center;
+            display: -webkit-inline-box;
+            display: -ms-inline-flexbox;
+            display: inline-flex;
+            font-size: 3.5vh;
+            justify-content: flex-end;
+            width: 100%
+        }
+
+            .bmpui-ui-skin-tv .bmpui-ui-titlebar-top > .bmpui-container-wrapper .bmpui-label-metadata-title {
+                font-size: 3.5vh;
+                margin-right: auto
+            }
+
+    .bmpui-ui-skin-tv .bmpui-ui-hugeplaybacktogglebutton > .bmpui-image {
+        background-size: 20vh
+    }
+
+    .bmpui-ui-skin-tv .bmpui-ui-titlebar-bottom > .bmpui-container-wrapper {
+        -webkit-box-align: start;
+        -ms-flex-align: start;
+        -webkit-box-pack: justify;
+        -ms-flex-pack: justify;
+        align-items: flex-start;
+        display: -webkit-inline-box;
+        display: -ms-inline-flexbox;
+        display: inline-flex;
+        font-size: 3.5vh;
+        justify-content: space-between;
+        position: relative;
+        width: 100%
+    }
+
+    .bmpui-ui-skin-tv .bmpui-ui-titlebar-bottom .bmpui-label-metadata-description {
+        font-size: 2vh;
+        line-height: 2em;
+        width: 66%
+    }
+
+    .bmpui-ui-skin-tv .bmpui-ui-titlebar-bottom .bmpui-ui-settings-panel {
+        font-size: 3vh;
+        right: 0;
+        top: 0
+    }
+
+    .bmpui-ui-skin-tv .bmpui-ui-audiotracksettingstogglebutton, .bmpui-ui-skin-tv .bmpui-ui-subtitlesettingstogglebutton {
+        font-size: 5vh
+    }
+
+    .bmpui-ui-skin-tv .bmpui-ui-controlbar {
+        font-size: 3vh
+    }
+
+        .bmpui-ui-skin-tv .bmpui-ui-controlbar > .bmpui-container-wrapper {
+            margin: 2% 0;
+            width: 99%
+        }
+
+    .bmpui-ui-skin-tv .bmpui-ui-playbacktimelabel {
+        font-size: 2.5vh
+    }
+
+    .bmpui-ui-skin-tv :focus {
+        border: 0;
+        -webkit-box-shadow: 0 0 0 2px rgba(27,127,204,.8);
+        box-shadow: 0 0 0 2px rgba(27,127,204,.8);
+        -webkit-filter: drop-shadow(0 0 .3em #1fabe2);
+        filter: drop-shadow(0 0 .3em #1fabe2);
+        outline: 0;
+        -webkit-transition: .05s ease-in-out;
+        transition: .05s ease-in-out
+    }
+
+.bmpui-ui-uicontainer {
+    color: #fff;
+    font-family: sans-serif;
+    font-size: 1em;
+    text-align: left;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none
+}
+
+    .bmpui-ui-uicontainer .bmpui-text-right {
+        text-align: right
+    }
+
+    .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-watermark, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-watermark {
+        font-size: .7em
+    }

From 60327e81d663278cd5c3ea256182cc9b7b85f7d9 Mon Sep 17 00:00:00 2001
From: binon <Binon.Yesudhas@hee.nhs.uk>
Date: Mon, 8 Jul 2024 13:48:53 +0100
Subject: [PATCH 34/64] Missed layout page

---
 .../Views/Shared/Tenant/LearningHub/_Layout.cshtml               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index dbacc093d..146164a7e 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -21,6 +21,7 @@
     <link rel="manifest" href="~/site.webmanifest.json">
     <link href="~/css/nhsuk/common.css" rel="stylesheet" asp-append-version="true" />
     <link href="~/css/nhsuk/layout.css" rel="stylesheet" asp-append-version="true" />
+    <link href="~/css/mkplayer-ui.css" rel="stylesheet" asp-append-version="true" />
     <noscript>
         <link href="~/css/no-js/no-js.css" rel="stylesheet" asp-append-version="true" />
     </noscript>

From 871fe424451888d42c7df4f81f0b2f509098dbc5 Mon Sep 17 00:00:00 2001
From: binon <binon_prabu@yahoo.com>
Date: Mon, 8 Jul 2024 14:32:45 +0100
Subject: [PATCH 35/64] Update continuous-integration-workflow.yml

---
 .github/workflows/continuous-integration-workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index ec0ed2d5f..027e35695 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Use Node 12.19 with Yarn
         uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '18'
           npm: '6.14.8'
 
       - name: Typescript install WebUI

From 2a8d63a4bef63eb092b547be1f73186040f50e3e Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Thu, 11 Jul 2024 15:30:03 +0100
Subject: [PATCH 36/64] Update continuous-integration-workflow.yml

---
 .github/workflows/continuous-integration-workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index ec0ed2d5f..027e35695 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Use Node 12.19 with Yarn
         uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '18'
           npm: '6.14.8'
 
       - name: Typescript install WebUI

From 5f4f49f91ef035e017d7b6b250800098e17cbe30 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 15 Jul 2024 14:52:26 +0100
Subject: [PATCH 37/64] TD-4362: Session LMS error

---
 .../Controllers/Api/ScormController.cs        |  8 ++--
 .../Resources/IResourceVersionRepository.cs   | 14 ++++++
 .../Resources/ResourceVersionRepository.cs    | 43 +++++++++++++++++++
 .../ActivityService.cs                        |  2 +-
 4 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
index ba9ed57f3..6a8f7d699 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs
@@ -335,10 +335,10 @@ private async Task<SCO> GetSco(int resourceReferenceId)
             // 1. StudentDataMasteryScore, StudentDataMaxTimeAllowed, StudentDataTimeLimitAction, Credit
             sco.Credit = "credit";
             sco.CommentsFromLms = ScormContansts.CommentsFromLMS;
-            sco.LaunchData = rv.ScormDetails.ScormManifest.LaunchData ?? ScormContansts.LaunchData;
-            sco.StudentDataMasteryScore = rv.ScormDetails.ScormManifest.MasteryScore ?? ScormContansts.StudentDataMasteryScore;
-            sco.StudentDataMaxTimeAllowed = rv.ScormDetails.ScormManifest.MaxTimeAllowed ?? ScormContansts.StudentDataMaxTimeAllowed;
-            sco.StudentDataTimeLimitAction = rv.ScormDetails.ScormManifest.TimeLimitAction ?? ScormContansts.StudentDataTimeLimitAction;
+            sco.LaunchData = rv?.ScormDetails?.ScormManifest?.LaunchData ?? ScormContansts.LaunchData;
+            sco.StudentDataMasteryScore = rv?.ScormDetails?.ScormManifest?.MasteryScore ?? ScormContansts.StudentDataMasteryScore;
+            sco.StudentDataMaxTimeAllowed = rv?.ScormDetails?.ScormManifest?.MaxTimeAllowed ?? ScormContansts.StudentDataMaxTimeAllowed;
+            sco.StudentDataTimeLimitAction = rv?.ScormDetails?.ScormManifest?.TimeLimitAction ?? ScormContansts.StudentDataTimeLimitAction;
 
             // 2. LessonLocation, ScoreRaw, SuspendData, Entry
             // If previous Scorm Activity was "incomplete" then offer pick-up from previous lesson location.
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs
index 00cbff4d7..2a96c845e 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs
@@ -59,6 +59,13 @@ public interface IResourceVersionRepository : IGenericRepository<ResourceVersion
         /// <returns>The <see cref="Task"/>.</returns>
         Task<ResourceVersion> GetCurrentForResourceAsync(int resourceId);
 
+        /// <summary>
+        /// The get current resource for resourceid async.
+        /// </summary>
+        /// <param name="resourceId">The resource Id.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<ResourceVersion> GetCurrentResourceDetailsAsync(int resourceId);
+
         /// <summary>
         /// The get current published for resource async.
         /// </summary>
@@ -73,6 +80,13 @@ public interface IResourceVersionRepository : IGenericRepository<ResourceVersion
         /// <returns>The <see cref="Task"/>.</returns>
         Task<ResourceVersion> GetCurrentForResourceReferenceIdAsync(int resourceReferenceId);
 
+        /// <summary>
+        /// The get current resource for resource reference id async.
+        /// </summary>
+        /// <param name="resourceReferenceId">The resource reference id.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<ResourceVersion> GetCurrentResourceForResourceReferenceIdAsync(int resourceReferenceId);
+
         /// <summary>
         /// The get current published for resource reference id async.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
index 10bf4cddf..477a4c416 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
@@ -160,6 +160,30 @@ public async Task<ResourceVersion> GetCurrentForResourceAsync(int resourceId)
                                                  && !r.Deleted);
         }
 
+        /// <summary>
+        /// The get current for resource async.
+        /// </summary>
+        /// <param name="resourceId">The resource id.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<ResourceVersion> GetCurrentResourceDetailsAsync(int resourceId)
+        {
+            return await this.DbContext.ResourceVersion.AsNoTracking()
+                       .Include(r => r.Resource)
+                       .Include(r => r.Publication).AsNoTracking()
+                       .Include(r => r.ResourceVersionKeyword).AsNoTracking()
+                       .Include(r => r.ResourceVersionAuthor).AsNoTracking()
+                       .Include(r => r.ResourceVersionFlag).AsNoTracking()
+                       .Include(r => r.ResourceVersionEvent).AsNoTracking()
+                       .Include(r => r.ResourceLicence).AsNoTracking()
+                       .Include(r => r.CreateUser).AsNoTracking()
+                       .Include(r => r.ResourceVersionProvider).ThenInclude(r => r.Provider).AsNoTracking()
+                       .OrderByDescending(r => r.Id)
+                       .FirstOrDefaultAsync(r => r.ResourceId == resourceId
+                                                 && r.VersionStatusEnum != VersionStatusEnum.FailedToPublish
+                                                 && r.VersionStatusEnum != VersionStatusEnum.Draft
+                                                 && !r.Deleted);
+        }
+
         /// <summary>
         /// The get current published for resource async.
         /// </summary>
@@ -233,6 +257,25 @@ public async Task<ResourceVersion> GetCurrentForResourceReferenceIdAsync(int res
             return retVal;
         }
 
+        /// <summary>
+        /// The get current for resource reference id async.
+        /// </summary>
+        /// <param name="resourceReferenceId">The resource reference id.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<ResourceVersion> GetCurrentResourceForResourceReferenceIdAsync(int resourceReferenceId)
+        {
+            ResourceVersion retVal = null;
+
+            var or = this.DbContext.ResourceReference.OrderByDescending(r => r.Id).FirstOrDefault(x => x.OriginalResourceReferenceId == resourceReferenceId);
+
+            if (or != null)
+            {
+                retVal = await this.GetCurrentResourceDetailsAsync(or.ResourceId);
+            }
+
+            return retVal;
+        }
+
         /// <summary>
         /// The get current published for resource reference id async.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.Services/ActivityService.cs b/WebAPI/LearningHub.Nhs.Services/ActivityService.cs
index e8e9972b3..19c98e376 100644
--- a/WebAPI/LearningHub.Nhs.Services/ActivityService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ActivityService.cs
@@ -438,7 +438,7 @@ public async Task<ScormActivityViewModel> LaunchScormActivity(int currentUserId,
             var scormActivitySummary = this.scormActivityRepository.GetScormActivitySummary(currentUserId, launchScormActivityViewModel.ResourceReferenceId);
             var scormActivityId = this.scormActivityRepository.Create(currentUserId, launchScormActivityViewModel.ResourceReferenceId);
 
-            var resourceVersion = await this.resourceVersionRepository.GetCurrentForResourceReferenceIdAsync(launchScormActivityViewModel.ResourceReferenceId);
+            var resourceVersion = await this.resourceVersionRepository.GetCurrentResourceForResourceReferenceIdAsync(launchScormActivityViewModel.ResourceReferenceId);
             var activeContent = new ActiveContentViewModel()
             {
                 ScormActivityId = scormActivityId,

From 9565b5798983868b9181ca82f3aeaa5325c9602d Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 15 Jul 2024 17:32:35 +0100
Subject: [PATCH 38/64] LH Model update

---
 AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj  | 2 +-
 LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj              | 2 +-
 WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj           | 2 +-
 .../LearningHub.Nhs.Api.Shared.csproj                           | 2 +-
 .../LearningHub.Nhs.Api.UnitTests.csproj                        | 2 +-
 .../LearningHub.Nhs.Repository.Interface.csproj                 | 2 +-
 .../LearningHub.Nhs.Repository.csproj                           | 2 +-
 .../LearningHub.Nhs.Services.Interface.csproj                   | 2 +-
 .../LearningHub.Nhs.Services.UnitTests.csproj                   | 2 +-
 .../LearningHub.Nhs.Migration.ConsoleApp.csproj                 | 2 +-
 .../LearningHub.Nhs.Migration.Interface.csproj                  | 2 +-
 .../LearningHub.Nhs.Migration.Models.csproj                     | 2 +-
 .../LearningHub.Nhs.Migration.Staging.Repository.csproj         | 2 +-
 .../LearningHub.Nhs.Migration.UnitTests.csproj                  | 2 +-
 .../LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj  | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 7bef84029..87d033c41 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -89,7 +89,7 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index acea5791b..d94046f5e 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -108,7 +108,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 120f41ef6..306a1d96b 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -27,7 +27,7 @@
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
 	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index 7f4998158..cb4ee1d13 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index 9cbb1fe4e..fcb18f40b 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index 3793e6980..265a6732b 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index 073c1995f..dcae43e50 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index e40618911..805eb0bf0 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index 58581b46c..bd60bf209 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index 588f60cd9..114fef270 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index df3a5bef3..e864135b8 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index 27645a969..a19a496c8 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index 3cb7eb534..e969bef6b 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index 1d70a4338..a700f45a8 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index c9abd00e0..3a3ab4459 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentValidation" Version="10.3.4" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 5705e2bca9746d4d750960937a4849df58a9820a Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 16 Jul 2024 10:38:54 +0100
Subject: [PATCH 39/64] TD-4252: elearning resource is marked completed when
 the elearning resource is downloaded

---
 .../Controllers/Api/ResourceController.cs                | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
index 048f1a426..f69b8d0f2 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
@@ -97,15 +97,6 @@ public async Task<IActionResult> DownloadResourceAndRecordActivity(int resourceV
             var file = await this.fileService.DownloadFileAsync(filePath, fileName);
             if (file != null)
             {
-                var activity = new CreateResourceActivityViewModel()
-                {
-                    ResourceVersionId = resourceVersionId,
-                    NodePathId = nodePathId,
-                    ActivityStart = DateTime.UtcNow, // TODO: What about user's timezone offset when Javascript is disabled? Needs JavaScript.
-                    ActivityStatus = ActivityStatusEnum.Completed,
-                };
-                await this.activityService.CreateResourceActivityAsync(activity);
-
                 return this.File(file.Content, file.ContentType, fileName);
             }
             else

From 45708e16915e6338deb894c5c7a4ea335e958a55 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 16 Jul 2024 16:18:27 +0100
Subject: [PATCH 40/64] TD-3308 : Fixed the issue with the javascript
 formatting.

---
 .../Views/Catalogue/Edit.cshtml               | 749 +++++++++---------
 1 file changed, 383 insertions(+), 366 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index e9aa0ce69..e0e81edcf 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -3,425 +3,442 @@
 @using LearningHub.Nhs.Models.Enums
 @using Newtonsoft.Json
 @{
-    var page = Model.CatalogueNodeVersionId == 0 ? CatalogueNavPage.Add : CatalogueNavPage.Edit;
-    ViewData["Title"] = page == CatalogueNavPage.Add ? "Add catalogue" : "Edit catalogue";
-    var baseUrl = _settings.Value.LearningHubUrl + "catalogue/";
-    var url = baseUrl + (Model.Url ?? "");
-    var aToZ = (int)CatalogueOrder.AlphabeticalAscending;
-    var keywords = Model.Keywords ?? new List<string>();
-    var Providers = Model.Providers;
-    var CatalogueNodeVersionProviderId = Model.CatalogueNodeVersionProvider?.ProviderId ?? 0;
-    var CatalogueNodeVersionProvider = Model.CatalogueNodeVersionProvider;
-    var action = page.ToString();
-    var keywordsJson = Html.Raw(JsonConvert.SerializeObject(keywords));
-    var imageBaseUrl = "/file/download/CatalogueImageDirectory/";
-    var lastModifiedDate = Model.LastModifiedDate?.ToString("dd MMM yyyy");
+  var page = Model.CatalogueNodeVersionId == 0 ? CatalogueNavPage.Add : CatalogueNavPage.Edit;
+  ViewData["Title"] = page == CatalogueNavPage.Add ? "Add catalogue" : "Edit catalogue";
+  var baseUrl = _settings.Value.LearningHubUrl + "catalogue/";
+  var url = baseUrl + (Model.Url ?? "");
+  var aToZ = (int)CatalogueOrder.AlphabeticalAscending;
+  var keywords = Model.Keywords ?? new List<string>();
+  var Providers = Model.Providers;
+  var CatalogueNodeVersionProviderId = Model.CatalogueNodeVersionProvider?.ProviderId ?? 0;
+  var CatalogueNodeVersionProvider = Model.CatalogueNodeVersionProvider;
+  var action = page.ToString();
+  var keywordsJson = Html.Raw(JsonConvert.SerializeObject(keywords));
+  var imageBaseUrl = "/file/download/CatalogueImageDirectory/";
+  var lastModifiedDate = Model.LastModifiedDate?.ToString("dd MMM yyyy");
 }
 @section SideMenu {
-    @{
-        await Html.RenderPartialAsync("_NavSection");
-    }
+  @{
+    await Html.RenderPartialAsync("_NavSection");
+  }
 }
 
 @if (!string.IsNullOrEmpty(ViewBag.ErrorMessage))
 {
-    <div class="alert alert-danger alert-dismissible fade show admin-alert mb-0 mt-5" role="alert">
-        @ViewBag.ErrorMessage
-        <div class="admin-validation-summary" asp-validation-summary="All"></div>
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-        </button>
-    </div>
+  <div class="alert alert-danger alert-dismissible fade show admin-alert mb-0 mt-5" role="alert">
+    @ViewBag.ErrorMessage
+    <div class="admin-validation-summary" asp-validation-summary="All"></div>
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
 }
 
 @if (page == CatalogueNavPage.Edit)
 {
-    <div class="row mt-5">
-        <div class="col-12">
-            <h1 class="ml-5" id="catalogue-name-header">@Model.Name</h1>
-        </div>
+  <div class="row mt-5">
+    <div class="col-12">
+      <h1 class="ml-5" id="catalogue-name-header">@Model.Name</h1>
     </div>
+  </div>
 }
 @{
-    await Html.RenderPartialAsync("_CatalogueNav.cshtml", new CatalogueNavViewModel { Page = page, CatalogueId = Model.CatalogueNodeVersionId });
+  await Html.RenderPartialAsync("_CatalogueNav.cshtml", new CatalogueNavViewModel { Page = page, CatalogueId = Model.CatalogueNodeVersionId });
 }
 <div class="ml-5" style="max-width: 800px;">
-    <form method="POST" enctype="multipart/form-data">
-        <input type="hidden" id="CatalogueNodeVersionId" name="CatalogueNodeVersionId" value="@Model.CatalogueNodeVersionId" />
-        <input type="hidden" id="NodeId" name="NodeId" value="@Model.NodeId" />
-        <input type="hidden" id="NodeVersionId" name="NodeVersionId" value="@Model.NodeVersionId" />
-        <input type="hidden" id="ResourceOrder" value="@aToZ" />
-        <div class="row mt-5">
-            <div class="col-12 d-flex flex-row">
-                <div id="catalogue-id-tag">
-                    @if (page == CatalogueNavPage.Edit)
-                    {
-                        var idString = Model.CatalogueNodeVersionId.ToString();
-                        var paddedIdString = idString.Length > 3 ? idString : idString.PadLeft(3, '0');
-                        <span>ID: @paddedIdString</span>
-                    }
-                    else
-                    {
-                        <span>NEW</span>
-                    }
-                </div>
-                @if (page == CatalogueNavPage.Add || Model.Hidden)
-                {
-                    <span class="hidden-badge hidden-badge-lg">Hidden</span>
-                }
-                @if (lastModifiedDate != null)
-                {
-                    <p class="catalogue-date-created">Last modified on: @lastModifiedDate</p>
-                }
-            </div>
+  <form method="POST" enctype="multipart/form-data">
+    <input type="hidden" id="CatalogueNodeVersionId" name="CatalogueNodeVersionId" value="@Model.CatalogueNodeVersionId" />
+    <input type="hidden" id="NodeId" name="NodeId" value="@Model.NodeId" />
+    <input type="hidden" id="NodeVersionId" name="NodeVersionId" value="@Model.NodeVersionId" />
+    <input type="hidden" id="ResourceOrder" value="@aToZ" />
+    <div class="row mt-5">
+      <div class="col-12 d-flex flex-row">
+        <div id="catalogue-id-tag">
+          @if (page == CatalogueNavPage.Edit)
+          {
+            var idString = Model.CatalogueNodeVersionId.ToString();
+            var paddedIdString = idString.Length > 3 ? idString : idString.PadLeft(3, '0');
+            <span>ID: @paddedIdString</span>
+          }
+          else
+          {
+            <span>NEW</span>
+          }
         </div>
-
-        @if (!ViewData.ModelState.IsValid)
+        @if (page == CatalogueNavPage.Add || Model.Hidden)
+        {
+          <span class="hidden-badge hidden-badge-lg">Hidden</span>
+        }
+        @if (lastModifiedDate != null)
         {
-            <div class="pt-4 field-validation-error">This form failed to save because there are errors below.</div>
+          <p class="catalogue-date-created">Last modified on: @lastModifiedDate</p>
         }
+      </div>
+    </div>
 
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <label for="Name">Catalogue name</label>
-                <p class="hint">You can enter a maximum of 255 characters including spaces</p>
-                <input asp-for="Name" class="form-control" />
-                <span asp-validation-for="Name"></span>
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <label for="Name">Catalogue url</label>
-                @if (page == CatalogueNavPage.Add)
-                {
-                    <input asp-for="Url" class="form-control" />
-                }
-                else
-                {
-                    <input asp-for="Url" class="form-control" readonly="readonly" />
-                }
-                <span asp-validation-for="Url"></span>
-            </div>
-            <div class="col-12">
-                @if (Model.Status == VersionStatusEnum.Published && !Model.Hidden)
-                {
-                    <a id="catalogue-url"></a>
-                }
-                else
-                {
-                    <p id="catalogue-url"></p>
-                }
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="BadgeImage" label="Badge (optional)" hint="Image must be 240px x 240px and in the following format: .png .jpg .gif .svg" value="@Model.BadgeUrl" existing-url="BadgeUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="CertificateImage" label="Certificate Image (optional)" hint="Image: must be 240px x 240px (aspect ratio 1:1) or 240px x 160px (aspect ratio 3:2);Format: .png .jpg .gif .svg;File: 50kB size limit;You do not need to include whitespace around the image (this will be added automatically);You can only upload one image" value="@Model.CertificateUrl" existing-url="CertificateUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
-                <span asp-validation-for="CertificateUrl"></span>
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="CardImage" label="Catalogue Card image (optional)" hint="Image must be 360px x 155px and in the following format: .png .jpg .gif .svg" value="@Model.CardImageUrl" existing-url="CardImageUrl" image-width="360" image-height="155" base-url="@imageBaseUrl" circle-crop="false" />
-            </div>
-        </div>
-        <div class="row mt-5">
-            <div class="col-12 form-group">
-                <image-input for="BannerImage" label="Banner image (optional)" hint="Image must be 1144px x 300px and in the following format: .png .jpg .gif .svg" existing-url="BannerUrl" value="@Model.BannerUrl" image-width="-1" image-height="-1" base-url="@imageBaseUrl" circle-crop="false" />
+    @if (!ViewData.ModelState.IsValid)
+    {
+      <div class="pt-4 field-validation-error">This form failed to save because there are errors below.</div>
+    }
+
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <label for="Name">Catalogue name</label>
+        <p class="hint">You can enter a maximum of 255 characters including spaces</p>
+        <input asp-for="Name" class="form-control" />
+        <span asp-validation-for="Name"></span>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <label for="Name">Catalogue url</label>
+        @if (page == CatalogueNavPage.Add)
+        {
+          <input asp-for="Url" class="form-control" />
+        }
+        else
+        {
+          <input asp-for="Url" class="form-control" readonly="readonly" />
+        }
+        <span asp-validation-for="Url"></span>
+      </div>
+      <div class="col-12">
+        @if (Model.Status == VersionStatusEnum.Published && !Model.Hidden)
+        {
+          <a id="catalogue-url"></a>
+        }
+        else
+        {
+          <p id="catalogue-url"></p>
+        }
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="BadgeImage" label="Badge (optional)" hint="Image must be 240px x 240px and in the following format: .png .jpg .gif .svg" value="@Model.BadgeUrl" existing-url="BadgeUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="CertificateImage" label="Certificate Image (optional)" hint="Image: must be 240px x 240px (aspect ratio 1:1) or 240px x 160px (aspect ratio 3:2);Format: .png .jpg .gif .svg;File: 50kB size limit;You do not need to include whitespace around the image (this will be added automatically);You can only upload one image" value="@Model.CertificateUrl" existing-url="CertificateUrl" image-width="240" image-height="240" base-url="@imageBaseUrl" circle-crop="false" />
+        <span asp-validation-for="CertificateUrl"></span>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="CardImage" label="Catalogue Card image (optional)" hint="Image must be 360px x 155px and in the following format: .png .jpg .gif .svg" value="@Model.CardImageUrl" existing-url="CardImageUrl" image-width="360" image-height="155" base-url="@imageBaseUrl" circle-crop="false" />
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12 form-group">
+        <image-input for="BannerImage" label="Banner image (optional)" hint="Image must be 1144px x 300px and in the following format: .png .jpg .gif .svg" existing-url="BannerUrl" value="@Model.BannerUrl" image-width="-1" image-height="-1" base-url="@imageBaseUrl" circle-crop="false" />
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12">
+        <label for="Description">Description</label>
+        <textarea asp-for="Description" class="form-control"></textarea>
+        <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
+        <span asp-validation-for="Description"></span>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12">
+        <label for="Keywords">Keywords</label>
+        <p>
+          Add one or more relevant keywords to help learners find this catalogue, ensuring that the keyword is specifically related to the catalogue rather than the resources associated with it. A maximum of 5 keywords can be added. Enter one keyword and add it before entering another.
+        </p>
+        <div class="row">
+          <div class="col-12 input-group">
+            <input type="text" class="form-control" id="add-keyword-input" />
+            <div class="input-group-append">
+              <button type="button" class="btn btn-custom btn-custom-outline" id="add-keyword" disabled="disabled"><i class="fa fa-plus"></i>Add</button>
             </div>
+          </div>
         </div>
-        <div class="row mt-5">
-            <div class="col-12">
-                <label for="Description">Description</label>
-                <textarea asp-for="Description" class="form-control"></textarea>
-                <small id="with-hint-info" class="pt-2">Only the first 3,000 characters of the description will be used by search</small>
-                <span asp-validation-for="Description"></span>
-            </div>
+        <div class="row">
+          <div class="col-12">
+            <span asp-validation-for="Keywords"></span>
+            <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
+          </div>
         </div>
-        <div class="row mt-5">
-            <div class="col-12">
-                <label for="Keywords">Keywords</label>
-                <p>
-                    Add one or more relevant keywords to help learners find this catalogue, ensuring that the keyword is specifically related to the catalogue rather than the resources associated with it. A maximum of 5 keywords can be added. Enter one keyword and add it before entering another.
-                </p>
-                <div class="row">
-                    <div class="col-12 input-group">
-                        <input type="text" class="form-control" id="add-keyword-input" />
-                        <div class="input-group-append">
-                            <button type="button" class="btn btn-custom btn-custom-outline" id="add-keyword" disabled="disabled"><i class="fa fa-plus"></i>Add</button>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-12">
-                        <span asp-validation-for="Keywords"></span>
-                        <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
-                    </div>
-                </div>
 
+      </div>
+      <div class="col-12">
+        <p class="hint">You can enter a maximum of 50 characters per keyword.</p>
+        <div class="keyword-list">
+          @{
+            var i = 0;
+          }
+          @foreach (var keyword in keywords)
+          {
+            <div class="keyword-tag">
+              <p>@keyword</p>
+              <i class="fa fa-times"></i>
+              <input type="hidden" name="Keywords[@i]" class="keyword-value" value="@keyword" />
             </div>
-            <div class="col-12">
-                <p class="hint">You can enter a maximum of 50 characters per keyword.</p>
-                <div class="keyword-list">
-                    @{
-                        var i = 0;
-                    }
-                    @foreach (var keyword in keywords)
-                    {
-                        <div class="keyword-tag">
-                            <p>@keyword</p>
-                            <i class="fa fa-times"></i>
-                            <input type="hidden" name="Keywords[@i]" class="keyword-value" value="@keyword" />
-                        </div>
-                    }
-                </div>
-            </div>
+          }
         </div>
+      </div>
+    </div>
 
-        <div class="input-section mt-5">
+    <div class="input-section mt-5">
 
-            <div class="row">
-                <div class="col-12">
-                    <label>Catalogue access</label>
-                </div>
-            </div>
+      <div class="row">
+        <div class="col-12">
+          <label>Catalogue access</label>
+        </div>
+      </div>
 
-            <div class="row">
-                <div class="col-12">
-                    <div class="form-check form-check-inline">
-                        @if (!Model.RestrictedAccess)
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" checked="checked" />
-                        }
-                        else
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" />
-                        }
-                        <span>Unrestricted access (default)</span>
-                    </div>
-                    <div class="form-check form-check-inline ml-5">
-                        @if (Model.RestrictedAccess)
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" checked="checked" />
-                        }
-                        else
-                        {
-                            <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" />
-                        }
-                        <span>Restricted access</span>
-                    </div>
-                </div>
-            </div>
-            @if (!Model.HasUserGroup)
+      <div class="row">
+        <div class="col-12">
+          <div class="form-check form-check-inline">
+            @if (!Model.RestrictedAccess)
             {
-                <div class="col-12 hint" id="has-no-user-group">
-                    <p>There are no user groups associated with this catalogue. You can add some in the User Groups tab.</p>
-                </div>
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" checked="checked" />
             }
+            else
+            {
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="false" />
+            }
+            <span>Unrestricted access (default)</span>
+          </div>
+          <div class="form-check form-check-inline ml-5">
+            @if (Model.RestrictedAccess)
+            {
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" checked="checked" />
+            }
+            else
+            {
+              <input type="radio" class="form-check-input radio-lg" name="RestrictedAccess" value="true" />
+            }
+            <span>Restricted access</span>
+          </div>
         </div>
+      </div>
+      @if (!Model.HasUserGroup)
+      {
+        <div class="col-12 hint" id="has-no-user-group">
+          <p>There are no user groups associated with this catalogue. You can add some in the User Groups tab.</p>
+        </div>
+      }
+    </div>
 
-        <div class="input-section mt-5">
-
-            <div class="row">
-                <div class="col-12">
-                    <label>Content developed with</label>
-                    <p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
-                    <p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
-                    <p class="providertext">Developed with;</p>
-                </div>
-            </div>
+    <div class="input-section mt-5">
 
-            <div class="row">
-                <div class="col-12">
-                    @if (Providers != null && Providers.Count() > 0)
-                    {
-                        <div class="form-check form-check-vertical">
-                            @foreach (var provider in Providers)
-                            {
-                                <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="@provider.Id" @(CatalogueNodeVersionProviderId == @provider.Id ? "checked" : "") />
-                                <span class="span-provider">@provider.Name</span>
-                                <br />
-                            }
-                            <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="0" @(CatalogueNodeVersionProviderId == 0 ? "checked" : "") />
-                            <span class="span-provider">Not applicable</span>
-                        </div>
-                    }
-                </div>
-            </div>
+      <div class="row">
+        <div class="col-12">
+          <label>Content developed with</label>
+          <p class="providertext">When applicable please select the provider of this content. This will allow a contributor to flag content from a specific provider. </p>
+          <p class="providertext">This will enable learners to search for content produced by organisations and help separate learning resources from community contributions. </p>
+          <p class="providertext">Developed with;</p>
         </div>
-        <div class="row mt-5">
-            <div class="col-12">
-                @if (page == CatalogueNavPage.Add)
-                {
-                    <button type="submit" class="btn btn-custom-green" id="publish-catalogue">Save</button>
-                }
-                else
-                {
-                    <button type="submit" class="btn btn-custom-green" id="publish-changes-catalogue">Save</button>
-                }
+      </div>
+
+      <div class="row">
+        <div class="col-12">
+          @if (Providers != null && Providers.Count() > 0)
+          {
+            <div class="form-check form-check-vertical">
+              @foreach (var provider in Providers)
+              {
+                <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="@provider.Id" @(CatalogueNodeVersionProviderId == @provider.Id ? "checked" : "") />
+                <span class="span-provider">@provider.Name</span>
+                <br />
+              }
+              <input type="radio" class="form-check-input-provider radio-lg" name="CatalogueNodeVersionProvider.ProviderId" value="0" @(CatalogueNodeVersionProviderId == 0 ? "checked" : "") />
+              <span class="span-provider">Not applicable</span>
             </div>
+          }
         </div>
-    </form>
-    <div style="height: 40px; width: 100%;"></div>
+      </div>
+    </div>
+    <div class="row mt-5">
+      <div class="col-12">
+        @if (page == CatalogueNavPage.Add)
+        {
+          <button type="submit" class="btn btn-custom-green" id="publish-catalogue">Save</button>
+        }
+        else
+        {
+          <button type="submit" class="btn btn-custom-green" id="publish-changes-catalogue">Save</button>
+        }
+      </div>
+    </div>
+  </form>
+  <div style="height: 40px; width: 100%;"></div>
 </div>
 @section Scripts {
-    <script>
-        $(function () {
-            var baseUrl = '@baseUrl';
-            $('#publish-catalogue').on('click', function () {
-                var form = $(this).parents('form');
-                form.attr("action", "/Catalogue/PublishNew");
-            });
-            $('#publish-changes-catalogue').on('click', function () {
-                var form = $(this).parents('form');
-                form.attr("action", "/Catalogue/Edit");
-            });
+  <script>
+    $(function () {
+      var baseUrl = '@baseUrl';
+      $('#publish-catalogue').on('click', function () {
+        var form = $(this).parents('form');
+        form.attr("action", "/Catalogue/PublishNew");
+      });
+      $('#publish-changes-catalogue').on('click', function () {
+        var form = $(this).parents('form');
+        form.attr("action", "/Catalogue/Edit");
+      });
 
-            // user group text
-            function showHideUserGroupText() {
-                var ugText = $('#has-no-user-group');
-                var restrictedAccess = $('[name="RestrictedAccess"]:checked').val() === "true";
-                if (restrictedAccess) {
-                    ugText.show();
-                } else {
-                    ugText.hide();
-                }
-            }
-            showHideUserGroupText();
-            $('[name="RestrictedAccess"]').on('change', showHideUserGroupText);
-            //keyword
-            function removeKeyword() {
-                var $close = $(this);
-                var $keyword = $close.parent();
-                var value = $keyword.find('p').text();
-                var index = keywords.indexOf(value);
-                if (index === -1) {
-                    return;
-                }
-                keywords.splice(index, 1);
-                $('#Keywords').val(keywords);
-                $keyword.remove();
-                // reindex the keyword inputs
-                $('.keyword-value').each(function (i, x) {
-                    $(x).attr('name', "Keywords[" + i + "]");
-                });
-                if (keywords.length < 5) {
-                    $('#add-keyword').removeAttr('disabled');
-                    $('#add-keyword-input').removeAttr('disabled');
-                }
-            }
+      // user group text
+      function showHideUserGroupText() {
+        var ugText = $('#has-no-user-group');
+        var restrictedAccess = $('[name="RestrictedAccess"]:checked').val() === "true";
+        if (restrictedAccess) {
+          ugText.show();
+        } else {
+          ugText.hide();
+        }
+      }
+      showHideUserGroupText();
+      $('[name="RestrictedAccess"]').on('change', showHideUserGroupText);
+      //keyword
+      function removeKeyword() {
+        var $close = $(this);
+        var $keyword = $close.parent();
+        var value = $keyword.find('p').text();
+        var index = keywords.indexOf(value);
+        if (index === -1) {
+          return;
+        }
+        keywords.splice(index, 1);
+        $('#Keywords').val(keywords);
+        $keyword.remove();
+        // reindex the keyword inputs
+        $('.keyword-value').each(function (i, x) {
+          $(x).attr('name', "Keywords[" + i + "]");
+        });
+        if (keywords.length < 5) {
+          $('#add-keyword').removeAttr('disabled');
+          $('#add-keyword-input').removeAttr('disabled');
+        }
+      }
 
-            var keywords = @keywordsJson || [];
-            if (keywords.length > 4) {
-                $('#add-keyword').attr('disabled', 'disabled');
-                $('#add-keyword-input').attr('disabled', 'disabled');
-            }
-            $('#Keywords').val(keywords);
-            $('.keyword-tag>i.fa-times').on('click', removeKeyword);
+      var keywords = @keywordsJson || [];
+      if (keywords.length > 4) {
+        $('#add-keyword').attr('disabled', 'disabled');
+        $('#add-keyword-input').attr('disabled', 'disabled');
+      }
+      $('#Keywords').val(keywords);
+      $('.keyword-tag>i.fa-times').on('click', removeKeyword);
 
-            $('#add-keyword-input').on('input', function () {
-                var value = $(this).val();
-                var length = value.length;
-                if (length === 0 || length > 50) {
-                    $('#add-keyword').attr('disabled', 'disabled');
-                } else {
-                    $('#add-keyword').removeAttr('disabled');
-                }
-            });
+      $('#add-keyword-input').on('input', function () {
+        var value = $(this).val();
+        var valuesArray = value.split(',');
 
-            $('#add-keyword').on('click', function () {
-              var $keywordInput = $('#add-keyword-input');
-              var value = $keywordInput.val();
-              if (!value) {
-                return;
-              }
+        var disableButton = false;
 
-              // Split the input value by commas and trim each keyword
-              var values = value.split(',').map(function (item) {
-                return item.trim();
-              });
+        for (var i = 0; i < valuesArray.length; i++) {
+          if (valuesArray[i].trim().length === 0 || valuesArray[i].trim().length > 50) {
+            disableButton = true;
+            break;
+          }
+        }
 
-              values.forEach(function (value) {
-                if (value && keywords.indexOf(value) === -1) {
-                  keywords.push(value);
-                  $('#Keywords').val(keywords);
-                  var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
-                  tag.find('.fa-times').on('click', removeKeyword);
-                  $('.keyword-list').append(tag);
+        if (disableButton) {
+          $('#add-keyword').attr('disabled', 'disabled');
+        } else {
+          $('#add-keyword').removeAttr('disabled');
+        }
+      });
 
-                  // reindex the keyword inputs
-                  $('.keyword-value').each(function (i, x) {
-                    $(x).attr('name', "Keywords[" + i + "]");
-                  });
-                }
-              });
+      $('#add-keyword').on('click', function () {
+        var $keywordInput = $('#add-keyword-input');
+        var value = $keywordInput.val();
+        if (!value) {
+          return;
+        }
 
-            // url
-            var oldUrl = "";
-            $('#Url').on('input', function () {
-                var value = this.value;
-                var whitelistRegex = /^[a-zA-Z0-9\-\s]{0,}$/;
-                if (!whitelistRegex.test(value)) {
-                    value = oldUrl;
-                }
-                this.value = value.replace(/[\s]/g, '-');
-                oldUrl = this.value;
-                var url = baseUrl + this.value;
-                var $catalogueUrl = $('#catalogue-url');
-                $catalogueUrl.text(url);
-                if ($catalogueUrl.is('a')) {
-                    $catalogueUrl.attr('href', url);
-                }
-            });
+        // Split the input value by commas and trim each keyword
+        var values = value.split(',').map(function (item) {
+          return item.trim();
+        });
 
-            $('#Url').trigger('input');
+        values.forEach(function (value) {
+          if (value && keywords.indexOf(value) === -1) {
+            keywords.push(value);
+            $('#Keywords').val(keywords);
+            var tag = $('<div class="keyword-tag"><p>' + value + '</p><i class="fa fa-times"></i><input class="keyword-value" type="hidden" value="' + value + '" /></div>');
+            tag.find('.fa-times').on('click', removeKeyword);
+            $('.keyword-list').append(tag);
 
-            // name
-            $('#Name').on('change', function () {
-                var value = this.value;
-                var encodedValue = value;
-                var $catalogueNameHeader = $('#catalogue-name-header');
-                if ($catalogueNameHeader && $catalogueNameHeader.length) {
-                    $catalogueNameHeader.text(encodedValue);
-                }
+            // reindex the keyword inputs
+            $('.keyword-value').each(function (i, x) {
+              $(x).attr('name', "Keywords[" + i + "]");
             });
-            CKEDITOR.replace('Description',
-                {
-                    toolbar: [
-                        { name: 'undo', items: ['Undo', 'Redo'] },
-                        { name: 'bold', items: ['Bold', 'Italic'] },
-                        { name: 'list', items: ['NumberedList', 'BulletedList'] },
-                        { name: 'link', items: ['Link'] }
-                    ]
-                });
-            CKEDITOR.replace('Notes',
-                {
-                    toolbar: [
-                        { name: 'undo', items: ['Undo', 'Redo'] },
-                        { name: 'bold', items: ['Bold', 'Italic'] },
-                        { name: 'list', items: ['NumberedList', 'BulletedList'] },
-                        { name: 'link', items: ['Link'] }
-                    ]
-                });
+          }
+        });
 
-            CKEDITOR.on('instanceReady', function () {
-                var editor = CKEDITOR.instances['Description'];
+        $keywordInput.val("");      
+        if (keywords.length > 4) {
+          $('#add-keyword').attr('disabled', 'disabled');
+          $('#add-keyword-input').attr('disabled', 'disabled');
+        }
+      });
 
-                editor.on('change', function () {
-                    var editorData = editor.getData();
-                    var data = $("<p></p>").html(editorData).text();
-                    var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, '');
-                });
+      // url
+      var oldUrl = "";
+      $('#Url').on('input', function () {
+        var value = this.value;
+        var whitelistRegex = /^[a-zA-Z0-9\-\s]{0,}$/;
+        if (!whitelistRegex.test(value)) {
+          value = oldUrl;
+        }
+        this.value = value.replace(/[\s]/g, '-');
+        oldUrl = this.value;
+        var url = baseUrl + this.value;
+        var $catalogueUrl = $('#catalogue-url');
+        $catalogueUrl.text(url);
+        if ($catalogueUrl.is('a')) {
+          $catalogueUrl.attr('href', url);
+        }
+      });
 
-                editor.fire('change');
-            });
+      $('#Url').trigger('input');
 
+      // name
+      $('#Name').on('change', function () {
+        var value = this.value;
+        var encodedValue = value;
+        var $catalogueNameHeader = $('#catalogue-name-header');
+        if ($catalogueNameHeader && $catalogueNameHeader.length) {
+          $catalogueNameHeader.text(encodedValue);
+        }
+      });
+      CKEDITOR.replace('Description',
+        {
+          toolbar: [
+            { name: 'undo', items: ['Undo', 'Redo'] },
+            { name: 'bold', items: ['Bold', 'Italic'] },
+            { name: 'list', items: ['NumberedList', 'BulletedList'] },
+            { name: 'link', items: ['Link'] }
+          ]
         });
+      CKEDITOR.replace('Notes',
+        {
+          toolbar: [
+            { name: 'undo', items: ['Undo', 'Redo'] },
+            { name: 'bold', items: ['Bold', 'Italic'] },
+            { name: 'list', items: ['NumberedList', 'BulletedList'] },
+            { name: 'link', items: ['Link'] }
+          ]
+        });
+
+      CKEDITOR.on('instanceReady', function () {
+        var editor = CKEDITOR.instances['Description'];
+
+        editor.on('change', function () {
+          var editorData = editor.getData();
+          var data = $("<p></p>").html(editorData).text();
+          var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, '');
+        });
+
+        editor.fire('change');
+      });
+
+    });
 
-    </script>
-    <script src="~/js/imageInput.js"></script>
+  </script>
+  <script src="~/js/imageInput.js"></script>
 }
\ No newline at end of file

From 2572120c143beab931f1a98e67a5c6c7f2c57a69 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 17 Jul 2024 09:15:42 +0100
Subject: [PATCH 41/64] TD-3951: Corrected the error messages

---
 LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs b/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs
index 8472ceb4a..18801abeb 100644
--- a/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs
+++ b/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs
@@ -30,7 +30,7 @@ public class EditBookmarkViewModel
         /// <summary>
         /// Gets or sets Title.
         /// </summary>
-        [Required(AllowEmptyStrings = false, ErrorMessage = "You must edit bookmark name")]
+        [Required(AllowEmptyStrings = false, ErrorMessage = "You must enter a bookmark name")]
         [MinLength(2, ErrorMessage = "The bookmark name must be at least 2 characters")]
         [MaxLength(60, ErrorMessage = "The bookmark name must be no more than 60 characters")]
         public string Title { get; set; }

From 54af04a56888d7395e686185ed98675b2eadc84d Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 17 Jul 2024 11:14:57 +0100
Subject: [PATCH 42/64] archive script update

---
 .../Scripts/TD-4270_Archive_LogDb.sql            | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
index f7f1a1caf..29a6a66bf 100644
--- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4270_Archive_LogDb.sql
@@ -1,8 +1,4 @@
--- Define the date 6 months ago
-DECLARE @SixMonthsAgo DATE;
-SET @SixMonthsAgo = DATEADD(MONTH, -6, GETDATE());
-GO
-
+
 
 IF NOT EXISTS (SELECT * FROM sys.tables WHERE name = 'LogArchive' AND schema_id = SCHEMA_ID('hub'))
 BEGIN
@@ -12,15 +8,15 @@ BEGIN
 END
 GO
 
-
+DECLARE @SixMonthsAgo DATE;
+SET @SixMonthsAgo = DATEADD(MONTH, -6, GETDATE());
 INSERT INTO hub.LogArchive ([Application], [Logged], [Level], [Message], [Logger], [Callsite], [Exception], [UserId], [Username])
 SELECT [Application], [Logged], [Level], [Message], [Logger], [Callsite], [Exception], [UserId], [Username]
 FROM hub.Log
 WHERE [Logged] < @SixMonthsAgo;
 GO
 
-
+DECLARE @SixMonthsAgo DATE;
+SET @SixMonthsAgo = DATEADD(MONTH, -6, GETDATE());
 DELETE FROM hub.Log WHERE [Logged] < @SixMonthsAgo;
-GO
-
-
+GO
\ No newline at end of file

From b032442e6d6507ebae32723d9fae7c04c81d4717 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 17 Jul 2024 13:12:23 +0100
Subject: [PATCH 43/64] disable script build for TD-4211

---
 .../LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index ee8b76bbf..f513b6ec7 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -518,7 +518,7 @@
     <None Include="Scripts\Post-Deploy\Scripts\TD-2929_ActivityStatusUpdates.sql" />
     <Build Include="Stored Procedures\Resources\BlockCollectionFileSearch.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\TD-4031_AMStoMKIOMigration.sql" />
-    <Build Include="Scripts\Post-Deploy\Scripts\TD-4270_Archive_LogDb.sql" />
+    <None Include="Scripts\Post-Deploy\Scripts\TD-4270_Archive_LogDb.sql" />
     <Build Include="Stored Procedures\Resources\GetPopularDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetRatedDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyCertificatesDashboardResources.sql" />

From ba6c4655f1cbaacacb536588cd74c53b0331718e Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 18 Jul 2024 17:33:05 +0100
Subject: [PATCH 44/64] TD-3951: Bookmark screen error messages

---
 .../Controllers/BookmarkController.cs                  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs b/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs
index b38881542..0d699fe4d 100644
--- a/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs
@@ -276,6 +276,16 @@ public async Task<IActionResult> BookmarkToggle(EditBookmarkViewModel bookmark,
         {
             if (!this.ModelState.IsValid)
             {
+                this.ModelState.Remove(nameof(bookmark.Title));
+                if (bookmark.BookmarkTypeId == 1)
+                {
+                    this.ModelState.AddModelError(nameof(bookmark.Title), "You must enter a folder name");
+                }
+                else
+                {
+                    this.ModelState.AddModelError(nameof(bookmark.Title), "You must enter a bookmark name");
+                }
+
                 this.ViewBag.ReturnUrl = returnUrl;
                 return this.View("Toggle", bookmark);
             }

From 5ff66dd2eb2e331edd04eba342216eada92fb01a Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Tue, 23 Jul 2024 11:02:43 +0100
Subject: [PATCH 45/64] TD-3707: Fixed issue on first question expanding after
 all questions answered.

---
 .../Scripts/vuesrc/resource/blocks/BlocksView.vue           | 1 +
 .../Scripts/vuesrc/resource/blocks/QuestionBlock.vue        | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue
index 80d065f7a..895642d01 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue
@@ -35,6 +35,7 @@
                            :firstUnansweredQuestion="pagesProgress.map((e, i) => i < questionInFocus || e).findIndex(p => !p) === index"
                            :isQuestionInFocus="questionInFocus === index"
                            :answerInOrder="answerInOrder"
+                           :allQuestAnswered="allQuestionsAnswered"
                            @updateQuestionProgress="isComplete => pushUpdate(index, isComplete)"
                            @nextPage="$emit('nextPage')"
                            @submitAssessmentAnswers="answers => $emit(`submitAssessmentAnswers`, answers, block.blockRef)"
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue
index 20945e6f2..1b63cd809 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue
@@ -179,7 +179,8 @@
             isQuestionInFocus: { type: Boolean, default: false },
             firstUnansweredQuestion: Boolean,
             matchQuestionsState: { type: Array } as PropOptions<MatchQuestionState[]>,
-            answerInOrder: Boolean
+            answerInOrder: Boolean,
+            allQuestAnswered: { type: Boolean, default: false }
         },
         components: {
             MatchGameSubmissionView,
@@ -268,6 +269,9 @@
             },
             isQuestionInFocus(value) {
                 this.isOpen = value;
+                if (this.allQuestAnswered) {
+                    this.isOpen = false;
+                }
             }
         },
         methods: {

From 30e58444d8657c2a75039da5bebf88b0a49756c5 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 23 Jul 2024 11:23:48 +0100
Subject: [PATCH 46/64] TD-3308 : Added additional error message on the
 contribute screen

---
 .../Scripts/vuesrc/contribute/ContentCommon.vue      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 622e1ad4d..3741814d3 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -86,6 +86,12 @@
                 <div class="col-12 mb-0 error-text" v-if="keywordError">
                     <span class="text-danger">This keyword has already been added.</span>
                 </div>
+                <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
+                    <span class="text-danger">
+                        Each keyword must be no longer than 50 characters.
+                    </span>
+                </div>
+
                 <div class="col-12">
                     To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
                 </div>
@@ -285,6 +291,7 @@
                 editorConfig: { toolbar: CKEditorToolbar.default, versionCheck: false },
                 ResourceType,
                 resourceProviderId: null,
+                keywordLengthExceeded: false,
             };
         },
         computed: {
@@ -477,6 +484,7 @@
                 },
                 keywordChange() {
                     this.keywordError = false;
+                    this.keywordLengthExceeded = false;
                 },
                 resetSelectedLicence() {
                     this.resourceLicenceId = 0;
@@ -547,6 +555,10 @@
                                         break;
                                     }
                                 }
+                                else {
+                                    this.keywordLengthExceeded = true;
+                                    break;
+                                }
                             }
                         }
                         else {

From 34d90a3d10cb01d361e05d7b09a6a2fc16c731ad Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Tue, 23 Jul 2024 16:08:13 +0100
Subject: [PATCH 47/64] TD-4421:Fixed issue on recording resource activity for
 Files when downloaded.

---
 .../Controllers/Api/ResourceController.cs                 | 8 ++++++++
 LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
index f69b8d0f2..0616474ff 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
@@ -97,6 +97,14 @@ public async Task<IActionResult> DownloadResourceAndRecordActivity(int resourceV
             var file = await this.fileService.DownloadFileAsync(filePath, fileName);
             if (file != null)
             {
+                var activity = new CreateResourceActivityViewModel()
+                {
+                    ResourceVersionId = resourceVersionId,
+                    NodePathId = nodePathId,
+                    ActivityStart = DateTime.UtcNow, // TODO: What about user's timezone offset when Javascript is disabled? Needs JavaScript.
+                    ActivityStatus = ActivityStatusEnum.Completed,
+                };
+                await this.activityService.CreateResourceActivityAsync(activity);
                 return this.File(file.Content, file.ContentType, fileName);
             }
             else
diff --git a/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml b/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
index cf63994c4..e63ea67ac 100644
--- a/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Resource/Resource.cshtml
@@ -235,7 +235,7 @@
 
                         @{
                             var file = resource.ScormDetails.File;
-                            var downloadAndRecordLink = $"/api/resource/DownloadResourceAndRecordActivity?resourceVersionId={resource.ResourceVersionId}&nodePathId={resource.NodePathId}&filePath={file.FilePath}&fileName={Uri.EscapeDataString(file.FileName)}";
+                            var downloadAndRecordLink = $"/api/resource/DownloadResource?filePath={file.FilePath}&fileName={Uri.EscapeDataString(file.FileName)}";
                         }
                         @if (!(User.IsInRole("BasicUser") && resource.ResourceAccessibilityEnum == ResourceAccessibilityEnum.FullAccess))
                         {

From ae669c21a22400c8b142fa05bc59c800a53e3b05 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 24 Jul 2024 10:28:54 +0100
Subject: [PATCH 48/64] TD-4420: Issue viewing the resource when republished
 the HTML resource second time

---
 .../Controllers/ResourceController.cs               | 13 ++++++++++---
 .../Views/Resource/_ResourceItem.cshtml             |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index a68c74c4d..7775ec6cd 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -437,12 +437,13 @@ public async Task<IActionResult> UnpublishConfirm(ResourceUnpublishConfirmViewMo
         /// View HTML resource content.
         /// </summary>
         /// <param name="resourceReferenceId">Resource reference id.</param>
+        /// <param name="currentResourceVersionId">Resource version id.</param>
         /// <param name="path">Html resource content relative path.</param>
         /// <returns>The file content.</returns>
         [HttpGet]
         [Authorize]
-        [Route("resource/html/{resourceReferenceId}/{*path}")]
-        public async Task<IActionResult> HtmlResourceContent(int resourceReferenceId, string path)
+        [Route("resource/html/{resourceReferenceId}/{CurrentResourceVersionId}/{*path}")]
+        public async Task<IActionResult> HtmlResourceContent(int resourceReferenceId, int currentResourceVersionId, string path)
         {
             if (resourceReferenceId == 0 || string.IsNullOrWhiteSpace(path))
             {
@@ -452,8 +453,14 @@ public async Task<IActionResult> HtmlResourceContent(int resourceReferenceId, st
             var userId = this.User.Identity.GetCurrentUserId();
             var cacheKey = $"HtmlContent:{userId}:{resourceReferenceId}";
             var (cacheExists, cacheValue) = await this.cacheService.TryGetAsync<string>(cacheKey);
+            var oldresourceVersionId = 0;
+            if (cacheExists)
+            {
+                var cachesplits = cacheValue.Split(":");
+                oldresourceVersionId = int.Parse(cachesplits[0]);
+            }
 
-            if (!cacheExists)
+            if (!cacheExists || (oldresourceVersionId != currentResourceVersionId))
             {
                 var resource = await this.resourceService.GetItemByIdAsync(resourceReferenceId);
 
diff --git a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
index 08e6b3e42..0913435ff 100644
--- a/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml
@@ -112,7 +112,7 @@
                 {
                     <div id="resourcePg" class="nhsuk-card nhsuk-bg-light-blue">
                         <div class="nhsuk-card__content">
-                            <a v-on:click=checkUserCertificateAvailability(@resourceItem.Id) href="@($"{Context.Request.Scheme}://{Context.Request.Host}/resource/html/{resourceItem.Id}/index.html")"
+                            <a v-on:click=checkUserCertificateAvailability(@resourceItem.Id) href="@($"{Context.Request.Scheme}://{Context.Request.Host}/resource/html/{resourceItem.Id}/{resourceItem.ResourceVersionId}/index.html")"
                                onclick="@($"window.open(this.href, 'scormDebugWindow', 'status=no,location=no,toolbar=no,menubar=no,dependent=no,width={resourceItem.HtmlDetails.PopupWidth},height={resourceItem.HtmlDetails.PopupHeight}'); return false;")">
                                 <button class="nhsuk-button">
                                     Launch HTML resource

From 837e77d54a0a24678016d4bd7fa915f8e45243f0 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Wed, 24 Jul 2024 11:46:17 +0100
Subject: [PATCH 49/64] mobileview url fix

---
 .../Views/Shared/_Breadcrumbs.cshtml                | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
index 5c57374b5..054f80d79 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
@@ -15,9 +15,16 @@
     {
         @* "parent view *@
         var parent = Model.Breadcrumbs.ElementAt(Model.Breadcrumbs.Count - 1);
-
-        <i class="fa-solid fa-chevron-left nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>
-        <a href="@parent.Url">@parent.Url</a>
+        if (Model.Breadcrumbs.Count > 2)
+        {
+            <i class="fa-solid fa-chevron-left nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>
+            <a href="@parent.Url">@parent.Url</a>
+        }
+        else
+        {
+            <i class="fa-solid fa-chevron-left nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>
+            <a href="@parent.Url">@parent.Title</a>
+        }
     }
     else
     {

From b480d2e21c078fbbff892386288dc71ec1cd73c1 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 24 Jul 2024 18:12:40 +0100
Subject: [PATCH 50/64] TD-3308: Added validation for case and assessment
 contribution page also.

---
 .../components/KeyWordsEditor.vue             | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
index 7435ee6d6..228291406 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
@@ -1,27 +1,29 @@
 <template>
-    <div class="key-words-editor-component">
+    <div class="common-content">
 
-        <div class="my-2 input-with-button">
-            <CharacterCount v-model="newKeyword"
-                            inputId="newKeyword"
-                            v-bind:characterLimit="50"
-                            v-bind:hasOtherError="keywordError"
-                            @input="keywordError=false">
-                <template v-slot:title>
-                    Keywords
-                </template>
-                <template v-slot:otherErrorMessage>
+        <div class="row">
+            <div class="form-group" v-bind:class="{ 'input-validation-error': keywordError }">
+                <div class="col-12 mb-0 error-text" v-if="keywordError">
                     <span class="text-danger">This keyword has already been added.</span>
-                </template>
-                <template v-slot:description>
-                    To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
-                </template>
-                <template v-slot:afterInput>
-                    <Button class="ml-3" v-on:click="addKeyword">Add</Button>
-                </template>
-            </CharacterCount>
-        </div>
+                </div>
+                <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
+                    <span class="text-danger">
+                        Each keyword must be no longer than 50 characters.
+                    </span>
+                </div>
 
+                <div class="col-12">
+                    To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
+                </div>
+                <div class="col-12 input-with-button">
+                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
+                    <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 button_width nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
+                </div>
+                <div class="col-12 footer-text">
+                    You can enter a maximum of 50 characters per keyword
+                </div>
+            </div>
+        </div>    
         <div class="keyword-container my-4 d-flex">
             <div class="keyword-tag" v-for="keyword in resourceDetails.resourceKeywords" :key="keyword.id">
                 <button class="btn btn-link" aria-label="Delete keyword" @click="deleteKeyword(keyword.id)">
@@ -57,6 +59,7 @@
             return {
                 newKeyword: '',
                 keywordError: false,
+                keywordLengthExceeded: false,
             }
         },
         computed: {
@@ -68,6 +71,10 @@
             },
         },
         methods: {
+            keywordChange() {
+                this.keywordError = false;
+                this.keywordLengthExceeded = false;
+            },
             async addKeyword() {  
                 if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
                     let allTrimmedKeyword = this.newKeywordTrimmed.toLowerCase().split(',');
@@ -75,7 +82,8 @@
                     if (!this.resourceDetails.resourceKeywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                         for (var i = 0; i < allTrimmedKeyword.length; i++) {
                             let item = allTrimmedKeyword[i];
-                            if (item.length > 0) {
+                            if (item.length > 0 && item.length <= 50) {
+                                debugger;
                                 let newKeywordObj = new KeywordModel({
                                     keyword: item,
                                     resourceVersionId: this.resourceVersionId,
@@ -93,13 +101,11 @@
 
                             }
                             else {
-                                this.keywordError = true;
+                                ////this.keywordError = true;
+                                this.keywordLengthExceeded = true;
                             }
                         }
-
-                    }
-
-                    
+                    }                    
                     else {
                         this.keywordError = true;
                     }
@@ -122,6 +128,10 @@
         display: flex;
         align-items: center;
     }
+    .button_width
+    {
+        width:15%;
+    }
 
     .input-with-button::v-deep #newKeyword {
         text-transform: lowercase;

From 01d3751a57ef1455584b5bab439cd34f3285eadf Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 24 Jul 2024 18:16:16 +0100
Subject: [PATCH 51/64] Removed the debugger

---
 .../vuesrc/contribute-resource/components/KeyWordsEditor.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
index 228291406..e2096f210 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
@@ -83,7 +83,6 @@
                         for (var i = 0; i < allTrimmedKeyword.length; i++) {
                             let item = allTrimmedKeyword[i];
                             if (item.length > 0 && item.length <= 50) {
-                                debugger;
                                 let newKeywordObj = new KeywordModel({
                                     keyword: item,
                                     resourceVersionId: this.resourceVersionId,

From 24132d654f43d2ad109351789f7aaf4171d4e168 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 24 Jul 2024 18:18:41 +0100
Subject: [PATCH 52/64] Removed the commented lines

---
 .../vuesrc/contribute-resource/components/KeyWordsEditor.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
index e2096f210..bfc00c5aa 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
@@ -100,7 +100,6 @@
 
                             }
                             else {
-                                ////this.keywordError = true;
                                 this.keywordLengthExceeded = true;
                             }
                         }

From 3e1dd09998a47b0f32f6de4cce873b7712d926bf Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 25 Jul 2024 14:25:39 +0100
Subject: [PATCH 53/64] lh model version update

---
 AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj  | 2 +-
 LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj              | 2 +-
 WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj           | 2 +-
 .../LearningHub.Nhs.Api.Shared.csproj                           | 2 +-
 .../LearningHub.Nhs.Api.UnitTests.csproj                        | 2 +-
 .../LearningHub.Nhs.Repository.Interface.csproj                 | 2 +-
 .../LearningHub.Nhs.Repository.csproj                           | 2 +-
 .../LearningHub.Nhs.Services.Interface.csproj                   | 2 +-
 .../LearningHub.Nhs.Services.UnitTests.csproj                   | 2 +-
 WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj | 2 +-
 .../LearningHub.Nhs.Migration.ConsoleApp.csproj                 | 2 +-
 .../LearningHub.Nhs.Migration.Interface.csproj                  | 2 +-
 .../LearningHub.Nhs.Migration.Models.csproj                     | 2 +-
 .../LearningHub.Nhs.Migration.Staging.Repository.csproj         | 2 +-
 .../LearningHub.Nhs.Migration.UnitTests.csproj                  | 2 +-
 .../LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj  | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 87d033c41..f222dc100 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -89,7 +89,7 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index d94046f5e..6a9ff6ca0 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -108,7 +108,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 306a1d96b..191c99713 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -27,7 +27,7 @@
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index cb4ee1d13..fdacce920 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index fcb18f40b..ca2c85a82 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index 265a6732b..2fa729986 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index dcae43e50..bca29eeb0 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index 805eb0bf0..13e00879d 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index bd60bf209..87beb0d40 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index cde7e952e..b479d88df 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index 114fef270..5a7f79921 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index e864135b8..2306024b3 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index a19a496c8..c45bd555b 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index e969bef6b..2501535f9 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index a700f45a8..ac9a749f6 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index 3a3ab4459..b5fc07022 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentValidation" Version="10.3.4" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From d7ef467d48e5b68d4fccf8b43ba584b8d2272bc4 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Thu, 25 Jul 2024 16:00:42 +0100
Subject: [PATCH 54/64] Fixes

---
 LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
index 054f80d79..298bddc08 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_Breadcrumbs.cshtml
@@ -18,7 +18,7 @@
         if (Model.Breadcrumbs.Count > 2)
         {
             <i class="fa-solid fa-chevron-left nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1 nhsuk-u-padding-left-2 nhsuk-u-padding-right-2"></i>
-            <a href="@parent.Url">@parent.Url</a>
+            <a href="@parent.Url">@parent.Title</a>
         }
         else
         {

From ca9c913e07ec6c43a48cb681100deb1885850788 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Wed, 31 Jul 2024 09:08:29 +0100
Subject: [PATCH 55/64] Fixes-For-LastOn

---
 .../Helpers/LearningActivityHelper.cs                       | 6 ++++++
 LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs         | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs
index b7646146e..caffaaa5d 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs
@@ -116,6 +116,12 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                     return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
+                case ResourceTypeEnum.Html:
+                    return "Viewed";
+                case ResourceTypeEnum.Case:
+                    return "Accessed";
+                case ResourceTypeEnum.Assessment:
+                    return "Accessed";
                 default:
                     return string.Empty;
             }
diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
index a6b4652ed..8d17307cf 100644
--- a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
+++ b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
@@ -115,6 +115,12 @@ public static string GetResourceTypeVerb(this ActivityDetailedItemViewModel acti
                     return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000);
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
+                case ResourceTypeEnum.Html:
+                    return "Viewed";
+                case ResourceTypeEnum.Case:
+                    return "Accessed";
+                case ResourceTypeEnum.Assessment:
+                    return "Accessed";
                 default:
                     return string.Empty;
             }

From 58c944ea97e242e072c66131c42b5834642a6cb0 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 1 Aug 2024 10:08:54 +0100
Subject: [PATCH 56/64] TD-4389: Certificate badge not appearing on certificate

---
 WebAPI/LearningHub.Nhs.Services/MyLearningService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
index 65b4acdba..a4d6049f9 100644
--- a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
@@ -236,7 +236,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
             var viewModels = new List<MyLearningDetailedItemViewModel>();
 
             var activityNodes = (from entity in resourceActivities
-                                 let data = entity.NodePath.NodeId
+                                 let data = entity.NodePath.CatalogueNodeId
                                  select data).Distinct().ToArray();
 
             var activityCatalogues = this.catalogueNodeVersionRepository.GetAll()
@@ -296,7 +296,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
                 }
 
                 var catalogueNodeVersion = await activityCatalogues
-                .SingleOrDefaultAsync(x => x.NodeVersion.NodeId == resourceActivity.NodePath.NodeId);
+                .SingleOrDefaultAsync(x => x.NodeVersion.NodeId == resourceActivity.NodePath.CatalogueNodeId);
                 if (catalogueNodeVersion != null)
                 {
                     viewModel.CertificateUrl = catalogueNodeVersion.CertificateUrl;

From 3417fe89792e92996853f36332e29c822c280461 Mon Sep 17 00:00:00 2001
From: Sarathlal Sarangadharan <Sarathlal.Sarangadharan@hee.nhs.uk>
Date: Tue, 6 Aug 2024 16:10:50 +0100
Subject: [PATCH 57/64] TD-4023: Considering only active users in the page

---
 .../Stored Procedures/Hub/RestrictedCatalogueGetSummary.sql     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetSummary.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetSummary.sql
index 3f162a9f9..9e877b690 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetSummary.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hub/RestrictedCatalogueGetSummary.sql	
@@ -7,6 +7,7 @@
 --
 -- 25-03-2021  Killian Davies	Initial Revision
 -- 12-02-2023  SA				Included preview access
+-- 06-08-2023  SS				Considering only active users
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [hub].[RestrictedCatalogueGetSummary]
 (
@@ -63,6 +64,7 @@ BEGIN
 		WHERE
 			car.CatalogueNodeId = @catalogueNodeId
 			AND car.Deleted = 0
+			AND up.Deleted = 0
 			AND car.Status = 0
 			AND car.EmailAddress NOT IN (SELECT DISTINCT EmailAddress FROM [hierarchy].[CatalogueAccessRequest] WHERE CatalogueNodeId = @catalogueNodeId
 										AND Deleted = 0

From d9e5f4593bbaf840ad2d477112b4328500caca4d Mon Sep 17 00:00:00 2001
From: binon <Binon.Yesudhas@hee.nhs.uk>
Date: Wed, 7 Aug 2024 10:56:50 +0100
Subject: [PATCH 58/64] Reverting tucana landing page implementation

---
 .../Views/Home/_CmsVideo.cshtml               | 175 +++++++++++++-----
 .../Shared/Tenant/LearningHub/_Layout.cshtml  |   2 +-
 2 files changed, 128 insertions(+), 49 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml
index 577ddfc93..1f6275efe 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CmsVideo.cshtml
@@ -2,12 +2,9 @@
 @model PageSectionDetailViewModel
 @{
     string mkPlayerLicence = (string)ViewData["mkPlayerLicenceKey"];
-    var scheme = Context?.Request?.Scheme ?? "undefined"; 
-    var host = Context?.Request?.Host; 
-    var path = Context?.Request?.Path ?? "undefined"; 
-    var requestURL = $"{scheme}://{host}{path}";
 }
 
+@* <link href="~/css/mkplayer-ui.css" rel="stylesheet" asp-append-version="true" /> *@
 <script type="text/javascript" src="~/js/mkplayer.js" asp-append-version="true"></script>
 
 @* @if (Model != null)
@@ -53,7 +50,7 @@
 } *@
 <div class="video-container" id="@($"{"videoContainer"}{Model.Id}")"></div>
 
-<script type="text/javascript">
+<script>
 
     var model = @Json.Serialize(Model);
     // 1. Grab the video container
@@ -62,65 +59,142 @@
     // 2. Prepare the player configuration
     var playerConfig = {
         key: "@mkPlayerLicence",
-        ui: true,
+        ui: false,
         theme: "dark",
         playback: {
             muted: false,
             autoplay: false,
             preferredTech: [{ player: 'html5', streaming: 'hls' }]
-        }        
+        },
+
+        // Subscribe to player events
+        events: {
+            [mkplayer.MKPlayerEvent.Error]: (event) => {
+                console.log("Encountered player error: ", JSON.stringify(event));
+            },
+            [mkplayer.MKPlayerEvent.TimeChanged]: (event) => {
+                console.log("Current player position: ", event.time);
+            },
+            [mkplayer.MKPlayerEvent.Muted]: (data) => {
+                console.log("Audio muted!")
+            },
+            [mkplayer.MKPlayerEvent.Unmuted]: onUnmute,
+
+            [mkplayer.MKPlayerEvent.Ready]: () => {
+
+                // debugger;
+                //var caption = model.videoAsset.closedCaptionsFile.fileName;
+
+                // var subtitleTrack = {
+                //     id: "@($"{"subid"}{Model.Id}")",
+                //     lang: "en",
+                //     label: "Custom Subtitle",
+                //     url: "https://bitdash-a.akamaihd.net/content/sintel/subtitles/subtitles_en.vtt",
+                //     kind: "subtitle"
+                // };
+                // player.addSubtitle(subtitleTrack);
+            },
+            [mkplayer.MKPlayerEvent.SubtitleAdded]: () => {
+                //  player.enableSubtitle("@($"{"subid"}{Model.Id}")");
+            },
+            [mkplayer.MKPlayerEvent.playbackSpeed]: (data) => {
+                alert("Video playback quality changed to: ");
+            },
+        }
     };
 
     // 3. Initialize the player with video container and player configuration
     var player = new mkplayer.MKPlayer(videoContainer, playerConfig);
 
-    // [BY] Commenting and leaving this code here for future reference : When we set UI:false, we need to manually add controls
-    // -----------------------------------------------------------------------------------------------------------------------
-    // player.on(mkplayer.MKPlayerEvent.Ready, (event) => {        
-    //     const videoElement = document.getElementById("@($"{"bitmovinplayer-video-videoContainer"}{Model.Id}")");
-    //     if (videoElement) {
-    //         videoElement.controls = true;
-
-    //         // Check if captions available
-    //         if (model.videoAsset.closedCaptionsFile) {
-    //             const captionsInfo = model.videoAsset.closedCaptionsFile;
-    //             if (captionsInfo.filePath) {
-    //                 const trackElement = document.createElement('track');
-    //                 const srcPath = "/file/download/" + captionsInfo.filePath + "/" + captionsInfo.fileName;
-    //                 trackElement.kind = 'captions'; // Or 'subtitles' or 'descriptions' depending on your track type
-    //                 trackElement.label = captionsInfo.language || 'english';
-    //                 trackElement.srclang = captionsInfo.language || 'en';
-    //                 trackElement.src = srcPath;
-
-    //                 // Append the track to the video element
-    //                 videoElement.appendChild(trackElement);
-    //             }
-    //         }
-    //     }
-    // });
-    // -----------------------------------------------------------------------------------------------------------------------
+    player.on("loaded", () => {
+        playerElement.addEventListener("mousemove", () => {
+        });
+    });
+
+    player.on(mkplayer.MKPlayerEvent.SourceLoaded, (event) => {
+        console.log("Source loaded successfully!");
+    });
+
+    player.on(mkplayer.MKPlayerEvent.Ready, (event) => {
+
+        const videoElement = document.getElementById("@($"{"bitmovinplayer-video-videoContainer"}{Model.Id}")");
+        if (videoElement) {
+            videoElement.controls = true;
+            // debugger;
+            // Check if captions available
+            if (model.videoAsset.closedCaptionsFile) {
+                const captionsInfo = model.videoAsset.closedCaptionsFile;
+                if (captionsInfo.filePath) {
+                    const trackElement = document.createElement('track');
+                    //  const srcPath = "/file/download?filePath=" + captionsInfo.filePath + "&fileName=" + captionsInfo.fileName;
+                    const srcPath = "/file/download/" + captionsInfo.filePath + "/" + captionsInfo.fileName;
+                    trackElement.kind = 'captions'; // Or 'subtitles' or 'descriptions' depending on your track type
+                    trackElement.label = captionsInfo.language || 'english';
+                    trackElement.srclang = captionsInfo.language || 'en';
+                    // trackElement.src = "/api/resource/DownloadResource?filePath=396eb836-5cf5-4255-b33f-66a31fdbef39&amp;fileName=samplecaption.vtt";
+                    // trackElement.src = "https://bitdash-a.akamaihd.net/content/sintel/subtitles/subtitles_en.vtt";
+                    trackElement.src = srcPath;
+
+
+                    // Append the track to the video element
+                    videoElement.appendChild(trackElement);
+
+                    // Add event listener to TextTrackList for when a new text track is added
+                    // videoElement.textTracks.addEventListener('addtrack', function (event) {
+                    //     let track = event.track;
+                    //     console.log('Track added:', track);
+
+                    //     if (track.kind === 'subtitles' || track.kind === 'captions') {
+                    //         track.mode = 'showing'; // Automatically show captions
+                    //         console.log('Track showing:', track);
+                    //     }
+                    // });
+
+                    // trackElement.addEventListener('load', function () {
+                    //     debugger;
+                    //     this.track.mode = 'showing'; // Automatically show captions
+                    //     alert('Track loaded and showing:', this.track);
+                    // });
+
+                    // Manually check and set track mode after a slight delay
+                    // setTimeout(() => {
+                    //     var textTracks = videoElement.textTracks;
+                    //     for (let i = 0; i < textTracks.length; i++) {
+                    //         if ((textTracks[i].kind === 'subtitles' || textTracks[i].kind === 'captions') && textTracks[i].src === srcPath) {
+                    //             textTracks[i].mode = 'showing';
+                    //             debugger;
+                    //             console.log('Track set to showing:', textTracks[i]);
+                    //         }
+                    //     }
+                    // }, 1000);
+
+                    // Ensure the track is loaded and ready
+                    // trackElement.addEventListener('load', function () {
+                    //     debugger;
+                    //     this.mode = 'showing'; // Automatically show captions
+                    // });
+
+                }
+            }
+        }
+
+        // document.getElementById("@($"{"bitmovinplayer-video-videoContainer"}{Model.Id}")").controls = true;
+        // console.log("Player is ready for playback!");
+    });
 
     var url = model.videoAsset.azureMediaAsset.locatorUri;
     url = url.substring(0, url.lastIndexOf("manifest")) + "manifest(format=m3u8-cmaf,encryption=cbc)";
 
-    var subtitleTrack = null;
-    if (model.videoAsset.closedCaptionsFile) {
-        const captionsInfo = model.videoAsset.closedCaptionsFile;
-        var srcPath = "file/download/" + captionsInfo.filePath + "/" + captionsInfo.fileName;
-        srcPath = '@requestURL' + srcPath;
-       
-        subtitleTrack = {
-            id: "subtitle",
-            lang: "en",
-            label: "english",
-            url: srcPath,
-            kind: "subtitle"
-        };
-    }
-
     var sourceConfig = {
         hls: url,
-        subtitleTracks: [subtitleTrack],
+        // Custom subtitle track
+        // subtitleTracks: [{
+        //     id: "sub1",
+        //     lang: "en",
+        //     label: "Custom Subtitle",
+        //     url: "https://bitdash-a.akamaihd.net/content/sintel/subtitles/subtitles_en.vtt",
+        //     kind: "subtitle"
+        // }],
         drm: {
             clearkey: {
                 LA_URL: "HLS_AES",
@@ -133,11 +207,16 @@
 
     player.load(sourceConfig)
         .then(() => {
+            // you can also get notified when subscribed to `SourceLoaded` event.
             console.log("Source loaded successfull!");
         })
         .catch((error) => {
             console.error("An error occurred while loading the source!");
         });
+
+    function onUnmute(data) {
+        console.log("Audio unmuted!");
+    }
 </script>
 
 <style>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index 146164a7e..e02e57be8 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -21,7 +21,7 @@
     <link rel="manifest" href="~/site.webmanifest.json">
     <link href="~/css/nhsuk/common.css" rel="stylesheet" asp-append-version="true" />
     <link href="~/css/nhsuk/layout.css" rel="stylesheet" asp-append-version="true" />
-    <link href="~/css/mkplayer-ui.css" rel="stylesheet" asp-append-version="true" />
+    @* <link href="~/css/mkplayer-ui.css" rel="stylesheet" asp-append-version="true" /> *@
     <noscript>
         <link href="~/css/no-js/no-js.css" rel="stylesheet" asp-append-version="true" />
     </noscript>

From 734a7598d492eece0f264f3c96010062f6e3e9dc Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 8 Aug 2024 17:16:56 +0100
Subject: [PATCH 59/64] TD-4009: Google Tag Manager tracking for all Non Prod
 Environments [ Replaced hosting envirinment checking with the envirinment
 variable from the appsettings]

---
 .../Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml      | 4 ++--
 .../Views/Shared/_GoogleTagManagerPartial.cshtml              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml
index f090cb2a5..6a4577eb8 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerNoScriptPartial.cshtml
@@ -1,6 +1,6 @@
 @inject LearningHub.Nhs.WebUI.Configuration.Settings settings
-@inject Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnv
-@if (settings.GoogleTagManagerEnabled && hostingEnv.EnvironmentName == "Production")
+@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
+@if (settings.GoogleTagManagerEnabled && @Configuration["Environment"] == "Production")
 { 
 <!-- Google Tag Manager (noscript) -->
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=@settings.GoogleTagManagerContainerId"
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml
index 051d3c5c7..a85cb14c7 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_GoogleTagManagerPartial.cshtml
@@ -1,10 +1,10 @@
 @inject LearningHub.Nhs.WebUI.Configuration.Settings settings
-@inject Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnv
+@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
 @{
   var detectCookieStatusBeforePageLoad = (string)TempData["ObtainUserConsentToTrackPriorToPageLoad"]; // Need to capture cookie status before page load to avoid inconsistencies.
 }
 
-@if (detectCookieStatusBeforePageLoad == "true" && settings.GoogleTagManagerEnabled && hostingEnv.EnvironmentName == "Production")  // [BY] When the user consent for first time load the follolwing JS. To avoid inconsistencies a temp varaible has been set when the user consent cookie choice
+@if (detectCookieStatusBeforePageLoad == "true" && settings.GoogleTagManagerEnabled && @Configuration["Environment"] == "Production")  // [BY] When the user consent for first time load the follolwing JS. To avoid inconsistencies a temp varaible has been set when the user consent cookie choice
 {
   <!-- Google Tag Manager -->
   <script>

From 88519851439abbdfeb428dcd8698837a4cf985b0 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:39:52 +0100
Subject: [PATCH 60/64] defect fix for URL

---
 .../Views/User/_UserLearningRecord.cshtml                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
index 2057d1a2b..5a55469c7 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
@@ -36,7 +36,7 @@
         <tr>
           <td>
             <span class="nhsuk-u-text-align-left table-content-spacing">
-              @if (userLearningRecord.ResourceReferenceId > 0 && userLearningRecord.VersionStatusId != (int?)VersionStatusEnum.Unpublished)
+              @if (userLearningRecord.IsCurrentResourceVersion && userLearningRecord.ResourceReferenceId > 0 && userLearningRecord.VersionStatusId != (int?)VersionStatusEnum.Unpublished)
               {
                 <span>
                   <a class="learning-td" href="@resourceUrl/@userLearningRecord.ResourceReferenceId" target="_blank">@userLearningRecord.Title</a><br />
@@ -47,6 +47,7 @@
               {
                 <span class="learning-td">
                   @userLearningRecord.Title
+                  <b>Last @LearningActivityHelper.GetResourceTypeVerb(userLearningRecord).ToLower() on : </b>  @userLearningRecord.ActivityDate.DateTime.ToString("dd MMM yyyy") at @userLearningRecord.ActivityDate.DateTime.ToShortTimeString()<br />
                 </span>
 
               }

From ebbf74f31c4c4abb6d7ec3845e9ca198c2dcc8d3 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 12 Aug 2024 13:07:22 +0100
Subject: [PATCH 61/64] fixes

---
 .../Views/User/_UserLearningRecord.cshtml                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
index 5a55469c7..b60466822 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml
@@ -46,7 +46,7 @@
               else
               {
                 <span class="learning-td">
-                  @userLearningRecord.Title
+                  @userLearningRecord.Title<br />
                   <b>Last @LearningActivityHelper.GetResourceTypeVerb(userLearningRecord).ToLower() on : </b>  @userLearningRecord.ActivityDate.DateTime.ToString("dd MMM yyyy") at @userLearningRecord.ActivityDate.DateTime.ToShortTimeString()<br />
                 </span>
 

From e9e6a42e1b2a23731e0e46969effe2f22955c653 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 19 Aug 2024 00:52:10 +0100
Subject: [PATCH 62/64] archive replaced file

---
 LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs | 5 +++--
 LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue | 5 +++--
 LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts       | 4 ++--
 WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user  | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
index 0616474ff..e5e8ab35e 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs
@@ -2,6 +2,7 @@ namespace LearningHub.Nhs.WebUI.Controllers.Api
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Resource;
@@ -565,9 +566,9 @@ public async Task<ActionResult> DeleteResourceProviderAsync(int resourceVersionI
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         [HttpPost]
         [Route("ArchiveResourceFile")]
-        public ActionResult ArchiveResourceFile(List<string> filePaths)
+        public ActionResult ArchiveResourceFile(IEnumerable<string> filePaths)
         {
-            _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, filePaths); });
+            _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, filePaths.ToList()); });
             return this.Ok();
         }
 
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
index 154d78e98..00d740bb2 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
@@ -822,7 +822,7 @@
                 this.fileUploadRef.value = null;
                 (this.$refs.fileUploader as any).uploadResourceFile(this.file);
             },
-            fileUploadComplete(uploadResult: FileUploadResult) {
+            async fileUploadComplete(uploadResult: FileUploadResult) {
                 if (!uploadResult.invalid) {
                     if (uploadResult.resourceType != ResourceType.SCORM) {
                         this.$store.commit("setResourceType", uploadResult.resourceType);
@@ -841,7 +841,7 @@
                     }
 
                     if (this.filePathBeforeFileChange.length > 0) {
-                        this.getResourceFilePath('completed');
+                        await this.getResourceFilePath('completed');
                         if (this.filePathBeforeFileChange.length > 0 && this.filePathAfterFileChange.length > 0) {
                             let filePaths = this.filePathBeforeFileChange.filter(item => !this.filePathAfterFileChange.includes(item));
                             if (filePaths.length > 0) {
@@ -1040,6 +1040,7 @@
                     await resourceData.getObsoleteResourceFile(resource.resourceVersionId).then(response => {
                         if (fileChangeStatus == 'initialised') {
                             this.filePathBeforeFileChange = response;
+                            this.filePathAfterFileChange.length = 0;
                         }
                         else if (fileChangeStatus == 'completed') {
                             this.filePathAfterFileChange = response;
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
index 9127917d3..817ffcf2f 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/resource.ts
@@ -558,8 +558,8 @@ const getObsoleteResourceFile = async function (id: number): Promise<string[]> {
 };
 
 const archiveResourceFile = async function (filepaths: string[]): Promise<boolean> {
-    const params = {filePaths:filepaths};
-    return await AxiosWrapper.axios.post('/api/Resource/DuplicateBlocks', params).then(() => {
+
+    return await AxiosWrapper.axios.post('/api/Resource/ArchiveResourceFile', filepaths).then(() => {
         return true
     }).catch(e => {
             console.log('archiveResourceFile:' + e);
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
index 696cf1eb7..b4b25c980 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
@@ -4,7 +4,7 @@
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup>
-    <ActiveDebugProfile>IIS Local</ActiveDebugProfile>
+    <ActiveDebugProfile>API IIS</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

From 32046d21f3e3a6d944c6fb2f588872eba44ea10a Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 22 Aug 2024 06:39:14 +0100
Subject: [PATCH 63/64] case publish error catch

---
 .../Controllers/Api/ContributeController.cs     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
index 6bfbcca6c..572cd69c9 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
@@ -349,11 +349,18 @@ public async Task<ActionResult> PublishResourceVersionAsync([FromBody] PublishVi
             {
                 if (associatedResource.ResourceType != ResourceTypeEnum.Scorm && associatedResource.ResourceType != ResourceTypeEnum.Html)
                 {
+                    try
+                    {
                         var obsoleteFiles = await this.resourceService.GetObsoleteResourceFile(publishViewModel.ResourceVersionId);
                         if (obsoleteFiles != null && obsoleteFiles.Any())
                         {
-                            await this.fileService.PurgeResourceFile(null, obsoleteFiles);
+                            _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, obsoleteFiles); });
                         }
+                    }
+                    catch (Exception ex)
+                    {
+                        this.Logger.LogError($"File Archive Error: {ex.Message}", $"ResourceVersionId -{publishViewModel.ResourceVersionId}");
+                    }
                 }
             }
 
@@ -707,8 +714,8 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
                         {
                             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 || x.MediaBlock?.Image?.File?.FilePath == oldblock.MediaBlock?.Image?.File?.FilePath));
-                               if (entry == null)
+                                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 || x.MediaBlock?.Image?.File?.FilePath == oldblock.MediaBlock?.Image?.File?.FilePath));
+                                if (entry == null)
                                 {
                                     filePaths.Add(oldblock?.MediaBlock?.Image?.File?.FilePath);
                                 }
@@ -790,8 +797,10 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
                     _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(null, deleteList); });
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                var param = new object[] { resourceVersionId, existingResource, newResource };
+                this.Logger.LogError($"BlockCollection Archive Error: {ex.Message}", param);
             }
         }
 

From 18b9ef38d10f296120278fad124be0a271a278ef Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 22 Aug 2024 06:47:43 +0100
Subject: [PATCH 64/64] .

---
 WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
index b4b25c980..696cf1eb7 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
@@ -4,7 +4,7 @@
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup>
-    <ActiveDebugProfile>API IIS</ActiveDebugProfile>
+    <ActiveDebugProfile>IIS Local</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>