Merge branch 'RC' into Develop/Fixes/TD-6100-refactor-latest

swapnamol-abraham · web-flow · commit 57a0314ea0fc · 2025-12-04T16:33:28.000Z
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,27 +4,45 @@
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 
 version: 2
+registries:
+  learninghubfeed:
+    type: nuget-feed
+    url: https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json
+    username: "kevin.whittaker" 
+    password: ${{ secrets.AZURE_DEVOPS_PAT }}   
+  nuget.org:
+    type: nuget-feed
+    url: "https://api.nuget.org/v3/index.json"  
 updates:
   - package-ecosystem: "nuget" 
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 5
+    registries:
+      - learninghubfeed
+      - nuget.org
     target-branch: "Automatic_version_update_dependabot"
     ignore:
       # Ignore updates to packages that start with 'Wildcards'
       - dependency-name: "Microsoft.FeatureManagement.AspNetCore*"
       - dependency-name: "LearningHub.Nhs.Models*"
       - dependency-name: "LearningHub.Nhs.Caching*"
-      - dependency-name: "elfhHub.Nhs.Models*"   
-      - dependency-name: "linqtotwitter*"         
-      # Ignore some updates to the package
-      - dependency-name: "Microsoft.VisualStudio.Web.CodeGeneration.Design"
-        versions: [">7.0.0"]
-      - dependency-name: "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
-        versions: [">7.0.0"]
-      - dependency-name: "Microsoft.AspNetCore.Mvc.Testing"
-        versions: [">7.0.0"]
+      - dependency-name: "elfhHub.Nhs.Models*"        
+      - dependency-name: "UK.NHS.CookieBanner"   
+      - dependency-name: "GDS.MultiPageFormData"      
+      - dependency-name: "linqtotwitter*"             
+      # Ignore some updates to the package    
+      - dependency-name: "Azure.Storage.Files.Shares"
+        versions: [">12.11.0"]
+      - dependency-name: "FluentAssertions"
+        versions: [">6.12.0"]
+      - dependency-name: "HtmlSanitizer"
+        versions: [">6.0.453"]
+      - dependency-name: "xunit"
+        versions: [">2.4.1"]
+      - dependency-name: "xunit.runner.visualstudio"
+        versions: [">2.4.3"]   
       - dependency-name: "Selenium.WebDriver.ChromeDriver"
         versions: ">=113.0.5672.1278" # Recommended version
       # For all packages, ignore all patch updates
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs
@@ -338,6 +338,7 @@ public async Task<LearningHubValidationResult> ClearUserCachedPermissions(int us
         {
             await this.cacheService.RemoveAsync($"{userId}:AllRolesWithPermissions");
             await this.cacheService.RemoveAsync($"{userId}:DatabricksReporter");
+            await this.cacheService.RemoveAsync($"{userId}:UserHasPublishedResources");
             return new LearningHubValidationResult(true);
         }
 
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/package.json b/AdminUI/LearningHub.Nhs.AdminUI/package.json
@@ -43,7 +43,7 @@
     "vue-carousel": "^0.18.0",
     "vue-clamp": "0.4.1",
     "vue-click-outside": "1.1.0",
-    "vue-ctk-date-time-picker": "^2.5.0",
+    "vue-ctk-date-time-picker": "2.5.0",
     "vue-router": "^3.6.5",
     "vue-simple-progress": "^1.1.1",
     "vue-typeahead": "^2.3.2",
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -28,7 +28,6 @@
 		<None Remove="Enums\**" />
 		<None Remove="wwwroot\lib\fontawesome-pro-5.9.0\**" />
 		<TypeScriptCompile Remove="Enums\**" />
-		<TypeScriptCompile Remove="node_modules\nhsuk-frontend\**" />
 		<TypeScriptCompile Remove="wwwroot\lib\fontawesome-pro-5.9.0\**" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/LearningHub.Nhs.WebUI/Program.cs b/LearningHub.Nhs.WebUI/Program.cs
@@ -35,6 +35,19 @@
     builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
     builder.Host.UseNLog();
 
+    string corsMoodleUrl = builder.Configuration.GetValue<string>("MoodleAPIConfig:BaseUrl");
+
+    builder.Services.AddCors(options =>
+    {
+        options.AddPolicy("MoodleCORS", builder =>
+        {
+            builder.WithOrigins(corsMoodleUrl.TrimEnd('/'))
+                   .AllowAnyHeader()
+                   .AllowAnyMethod()
+                   .AllowCredentials();
+        });
+    });
+
     builder.Services.AddHostedService<TimedHostedService>();
     builder.Services.ConfigureServices(builder.Configuration, builder.Environment);
 
@@ -80,6 +93,8 @@
 
     app.UseRouting();
 
+    app.UseCors("MoodleCORS");
+
     app.UseAuthentication();
     app.UseAuthorization();
 
diff --git a/LearningHub.Nhs.WebUI/Services/ResourceService.cs b/LearningHub.Nhs.WebUI/Services/ResourceService.cs
@@ -6,17 +6,20 @@ namespace LearningHub.Nhs.WebUI.Services
     using System.Net.Http;
     using System.Text;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Caching;
     using LearningHub.Nhs.Models.Common;
     using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.Models.Enums;
+    using LearningHub.Nhs.Models.Extensions;
     using LearningHub.Nhs.Models.Hierarchy;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.Models.Resource.Contribute;
     using LearningHub.Nhs.Models.Resource.ResourceDisplay;
     using LearningHub.Nhs.Models.Validation;
     using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Newtonsoft.Json;
@@ -29,20 +32,26 @@ public class ResourceService : BaseService<ResourceService>, IResourceService
     {
         private readonly Settings settings;
         private readonly IAzureMediaService azureMediaService;
+        private readonly IHttpContextAccessor contextAccessor;
+        private readonly ICacheService cacheService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceService"/> class.
         /// </summary>
         /// <param name="learningHubHttpClient">Learning hub http client.</param>
         /// <param name="openApiHttpClient">The Open Api Http Client.</param>
         /// <param name="azureMediaService">Azure media services.</param>
+        /// <param name="contextAccessor">The http context accessor.</param>
+        /// <param name="cacheService">The cacheService.</param>
         /// <param name="logger">Logger.</param>
         /// <param name="settings">Settings.</param>
-        public ResourceService(ILearningHubHttpClient learningHubHttpClient, IOpenApiHttpClient openApiHttpClient, IAzureMediaService azureMediaService, ILogger<ResourceService> logger, IOptions<Settings> settings)
+        public ResourceService(ILearningHubHttpClient learningHubHttpClient, IOpenApiHttpClient openApiHttpClient, IAzureMediaService azureMediaService, IHttpContextAccessor contextAccessor, ICacheService cacheService, ILogger<ResourceService> logger, IOptions<Settings> settings)
           : base(learningHubHttpClient, openApiHttpClient, logger)
         {
             this.settings = settings.Value;
             this.azureMediaService = azureMediaService;
+            this.contextAccessor = contextAccessor;
+            this.cacheService = cacheService;
         }
 
         /// <summary>
@@ -885,24 +894,8 @@ public async Task<LearningHubValidationResult> UnpublishResourceVersionAsync(int
         /// <returns>The <see cref="bool"/>.</returns>
         public async Task<bool> UserHasPublishedResourcesAsync()
         {
-            var client = await this.OpenApiHttpClient.GetClientAsync();
-
-            var request = $"Resource/HasPublishedResources";
-            var response = await client.GetAsync(request).ConfigureAwait(false);
-            bool hasResources = false;
-            if (response.IsSuccessStatusCode)
-            {
-                var result = response.Content.ReadAsStringAsync().Result;
-                hasResources = bool.Parse(result);
-            }
-            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
-                        ||
-                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
-            {
-                throw new Exception("AccessDenied");
-            }
-
-            return hasResources;
+            var cacheKey = $"{this.contextAccessor.HttpContext.User.Identity.GetCurrentUserId()}:UserHasPublishedResources";
+            return await this.cacheService.GetOrFetchAsync("UserHasPublishedResources", () => this.HasPublishedResources());
         }
 
         /// <summary>
@@ -1340,5 +1333,32 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
 
             return filePaths;
         }
+
+        /// <summary>
+        /// Check if the user has published resources.
+        /// </summary>
+        /// <returns>The bool.</returns>
+        /// <exception cref="Exception"></exception>
+        private async Task<bool> HasPublishedResources()
+        {
+            var client = await this.OpenApiHttpClient.GetClientAsync();
+
+            var request = $"Resource/HasPublishedResources";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+            bool hasResources = false;
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                hasResources = bool.Parse(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
+                        ||
+                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return hasResources;
+        }
     }
 }
diff --git a/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs b/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs
@@ -57,10 +57,19 @@ public async Task<IViewComponentResult> InvokeAsync(string navView = "Default",
                 var userId = this.User.Identity.GetCurrentUserId();
 
                 var (cacheExists, _) = await this.cacheService.TryGetAsync<string>($"{userId}:LoginWizard");
-
                 model = await this.permissionService.GetNavigationModelAsync(this.User, !cacheExists, controllerName);
 
-                model.NotificationCount = await this.notificationService.GetUserUnreadNotificationCountAsync(userId);
+                // Check if NotificationCount is already stored for this request
+                if (this.HttpContext.Items.TryGetValue("NotificationCount", out var cachedCount))
+                {
+                    model.NotificationCount = (int)cachedCount;
+                }
+                else
+                {
+                    var count = await this.notificationService.GetUserUnreadNotificationCountAsync(userId);
+                    this.HttpContext.Items["NotificationCount"] = count;
+                    model.NotificationCount = count;
+                }
             }
 
             return await Task.FromResult<IViewComponentResult>(this.View(navView, model));
diff --git a/LearningHub.Nhs.WebUI/Views/Policies/AcceptableUsePolicy.cshtml b/LearningHub.Nhs.WebUI/Views/Policies/AcceptableUsePolicy.cshtml
@@ -68,7 +68,7 @@
                     <p class="nhsuk-u-padding-left-7 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.2.2 which requires a subscription or payment to gain access to such content;</p>
                     <p class="nhsuk-u-padding-left-7 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.2.3 in which the user has a commercial interest;</p>
                     <p class="nhsuk-u-padding-left-7 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.2.4 which promotes a business name and/or logo;</p>
-                    <p class="nhsuk-u-padding-left-7 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.2.5 which contains a link to an app via iOS or Google Play; or</p>
+                    <p class="nhsuk-u-padding-left-7 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.2.5 which contains a link to an app via iOS or Google Play or similar; or</p>
                     <p class="nhsuk-u-padding-left-7 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.2.6 which has as its purpose or effect the collection and sharing of personal data;</p>
                     <p class="nhsuk-u-padding-left-4 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.3 be irrelevant to the purpose or aims of the Platform or while addressing relevant subject matter, contain an irrelevant, unsuitable or inappropriate slant (for example relating to potentially controversial opinions or beliefs of any kind intended to influence others);</p>
                     <p class="nhsuk-u-padding-left-4 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.4 be defamatory of any person;</p>
@@ -92,13 +92,12 @@
                     <p class="nhsuk-u-padding-left-4 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.22 contain harmful material;</p>
                     <p class="nhsuk-u-padding-left-4 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.23 give the impression that the Contribution emanates from us, if this is not the case; or</p>
                     <p class="nhsuk-u-padding-left-4 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.24 disclose any third party’s confidential information, identity, personally identifiable information or personal data (including data concerning health).</p>
-                    <p class="nhsuk-u-padding-left-4 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.25 contain or request any material, the provision of which is not compliant  <a href="https://www.england.nhs.uk/ig/ig-resources/">NHS England Information Governance guidance</a>[https://www.england.nhs.uk/ig/ig-resources/].</p>
+                    <p class="nhsuk-u-padding-left-4 nhsuk-u-padding-bottom-2 nhsuk-u-margin-0">4.5.25 contain or request any material, the provision of which is not compliant with <a href="https://www.england.nhs.uk/ig/ig-resources/">NHS England Information Governance guidance</a>[https://www.england.nhs.uk/ig/ig-resources/].</p>
                     <p class="nhsuk-u-margin-bottom-2">4.6 Posts must be made with consideration of the NHS People Promise[https://www.england.nhs.uk/our-nhs-people/online-version/lfaop/our-nhs-people-promise/].</p>
                     <p class="nhsuk-u-margin-bottom-2">4.7 You acknowledge and accept that, when using the Platform and accessing the Content, some Content that has been uploaded by third parties may be factually inaccurate, or the topics addressed by the Content may be offensive,indecent, or objectionable in nature. We are not responsible (legally or otherwise) for any claim you may have in relation to the Content.</p>
                     <p class="nhsuk-u-margin-bottom-2">4.8 When producing Content to upload to the Platform, we encourage you to implement NICE guideline recommendations and ensure that sources of evidence are valid (for example, by peer review). </p>
                     <h2 class="h2 nhsuk-heading-l">5 Metadata</h2>
                     <p class="nhsuk-u-margin-bottom-2">When making any Contribution, you must where prompted include a sufficient description of the Content so that other users can understand the description, source, and age of the Content. For example, if Content has been quality assured, then the relevant information should be posted in the appropriate field. All metadata fields on the Platform must be completed appropriately before initiating upload. Including the correct information is important in order to help other users locate the Content (otherwise the Content may not appear in search results for others to select).</p>
-                    <p class="nhsuk-u-margin-bottom-2">When producing Content to upload to the Platform, we encourage you to implement NICE guideline recommendations and ensure that sources  evidence are valid (for example, by peer review).</p>
                     <h2 class="h2 nhsuk-heading-l">6 Updates</h2>
                     <p class="nhsuk-u-margin-bottom-2">You must update each Contribution at least once every 3 (three) years, or update or remove it should it cease to be relevant or become outdated or revealed or generally perceived to be unsafe or otherwise unsuitable for inclusion on the Platform.</p>
                     <h2 class="h2 nhsuk-heading-l">7 Accessibility</h2>
@@ -128,9 +127,9 @@
                     <p class="nhsuk-u-margin-bottom-2">11.1 Course Manager means a person authorised by NHS England who is responsible for creating and managing courses and learning resources on the Learning Hub, including the moderation of learner's Contributions within social learning environments of an online course, such as discussion forums.</p>
                     <p class="nhsuk-u-margin-bottom-2">11.2 Course Managers shall be responsible for monitoring local forum activity and ensuring compliance of all Contributions with the Learning Hub’s Acceptable Use Policy. Inappropriate Contributions shall be addressed promptly and escalated where necessary to the Learning Hub, who will review the user’s access to the Platform and the relevant forum. </p>
                     <p class="nhsuk-u-margin-bottom-2">11.3 Course Managers shall also take responsibility for the following:</p>
-                    <p class="nhsuk-u-margin-bottom-2"> 11.3.1<strong>Clear Expectations:</strong>Set clear local forum rules within their course at the outset, compliantly with this Acceptable Use Policy, which includes expected behaviour, response times and moderation practices. </p>
+                    <p class="nhsuk-u-margin-bottom-2"> 11.3.1 <strong>Clear Expectations:</strong> Set clear local forum rules within their course at the outset, compliantly with this Acceptable Use Policy, which includes expected behaviour, response times and moderation practices. </p>
                     <p class="nhsuk-u-margin-bottom-2">11.3.2 <strong>Inclusive Practice:</strong> Encourage participation from all learners/users and foster a respectful, inclusive environment that values diverse perspectives. This should involve reminding local forum users of the appropriate measures of this Acceptable Use Policy and potentially removing Contributions that infringe the rules of this Acceptable Use Policy including under paragraph 4.5 above.</p>
-                    <p class="nhsuk-u-margin-bottom-2">11.3.3<strong> Data Protection and Safety:</strong>Ensure that no sensitive or personal data is shared, requested or stored in local forums, including by promptly removing any inclusions or requests for such material and notifying NHS England promptly of any potential breaches by contacting NHS England’s Data Protection Officer team via england.dpo@nhs.net; and ensure that risks are actively managed and the local forums are maintained as a safe space for discussion.</p>
+                    <p class="nhsuk-u-margin-bottom-2">11.3.3 <strong>Data Protection and Safety:</strong> Ensure that no sensitive or personal data is shared, requested or stored in local forums, including by promptly removing any inclusions or requests for such material and notifying NHS England promptly of any potential breaches by contacting NHS England’s Data Protection Officer team via england.dpo@nhs.net; and ensure that risks are actively managed and the local forums are maintained as a safe space for discussion.</p>
                     <p class="nhsuk-u-margin-bottom-2">11.4 All users must comply with this Acceptable Use Policy. Breaches may result  in removal of Contributions and/or withdrawal or suspension of user access without notice. </p>
                 </div>
             </section>
diff --git a/LearningHub.Nhs.WebUI/package-lock.json b/LearningHub.Nhs.WebUI/package-lock.json
diff --git a/LearningHub.Nhs.WebUI/package.json b/LearningHub.Nhs.WebUI/package.json
@@ -47,7 +47,7 @@
     "vue-carousel-3d": "^1.0.1",
     "vue-clamp": "0.4.1",
     "vue-click-outside": "1.1.0",
-    "vue-ctk-date-time-picker": "^2.5.0",
+    "vue-ctk-date-time-picker": "2.5.0",
     "vue-router": "^3.6.5",
     "vue-simple-progress": "^1.1.1",
     "vue-typeahead": "^2.3.2",
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs

Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ public async Task<LearningHubValidationResult> ClearUserCachedPermissions(int us`
`338`	`338`	`{`
`339`	`339`	`await this.cacheService.RemoveAsync($"{userId}:AllRolesWithPermissions");`
`340`	`340`	`await this.cacheService.RemoveAsync($"{userId}:DatabricksReporter");`
	`341`	`+ await this.cacheService.RemoveAsync($"{userId}:UserHasPublishedResources");`
`341`	`342`	`return new LearningHubValidationResult(true);`
`342`	`343`	`}`
`343`	`344`