Merge RC Chnages to release v1.0.0

.gitignore

@@ -48,3 +48,7 @@ obj
 /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.dbmdl
 /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.jfm
 /LearningHub.Nhs.WebUI.AutomatedUiTests/appsettings.Development.json
+/OpenAPI/LearningHub.Nhs.OpenApi/appsettings.Development.json
+/OpenAPI/LearningHub.Nhs.OpenApi/web.config
+/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
+/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user

AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs

@@ -257,6 +257,7 @@ public async Task<IActionResult> AddUsersToUserGroup(int userGroupId, string use
             var vr = await this.userGroupService.AddUsersToUserGroup(userGroupId, userIdList);
             if (vr.IsValid)
             {
+                this.ClearUserCachedPermissions(userIdList);
                 return this.Json(new
                 {
                     success = true,
@@ -527,5 +528,16 @@ public async Task<IActionResult> UserGroupCatalogues(int id)
 
             return this.PartialView("_UserGroupCatalogues", catalogues);
         }
+
+        private void ClearUserCachedPermissions(string userIdList)
+        {
+            if (!string.IsNullOrWhiteSpace(userIdList))
+            {
+                foreach (var userId in userIdList.Split(","))
+                {
+                    _ = Task.Run(async () => { await this.userService.ClearUserCachedPermissions(int.Parse(userId)); });
+                }
+            }
+        }
     }
 }

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.33" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
     <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" />

AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml

@@ -162,6 +162,11 @@
             <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
           </div>
         </div>
+        <div class="row">
+          <div class="col-12">
+            <span id="keyword-error-span" class="field-validation-error" style="display: none;"></span>
+          </div>
+        </div>
 
       </div>
       <div class="col-12">
@@ -341,6 +346,9 @@
         } else {
           $('#add-keyword').removeAttr('disabled');
         }
+
+        $('#keyword-error-span').hide();
+        $('#keyword-error-span').html('');
       });
 
       $('#add-keyword').on('click', function () {
@@ -352,9 +360,11 @@
 
         // Split the input value by commas and trim each keyword
         var values = value.split(',').map(function (item) {
-          return item.trim();
+                    return item.trim().toLowerCase();
         });
 
+        var duplicateKeywords = [];
+        $('#keyword-error-span').hide();
         values.forEach(function (value) {
           if (value && keywords.indexOf(value) === -1) {
             keywords.push(value);
@@ -368,9 +378,15 @@
               $(x).attr('name', "Keywords[" + i + "]");
             });
           }
+          else
+          {
+            duplicateKeywords.push(value);
+            $('#keyword-error-span').show();
+            $('#keyword-error-span').html('The keyword(s) have already been added : ' + duplicateKeywords.join(', '))
+          }
         });
 
-        $keywordInput.val("");      
+        $keywordInput.val("");
         if (keywords.length > 4) {
           $('#add-keyword').attr('disabled', 'disabled');
           $('#add-keyword-input').attr('disabled', 'disabled');
@@ -441,4 +457,4 @@
 
   </script>
   <script src="~/js/imageInput.js"></script>
-}
+}

LearningHub.Nhs.WebUI/Configuration/FindwiseSettings.cs

@@ -14,5 +14,10 @@ public class FindwiseSettings
         /// Gets or sets the CatalogueSearchPageSize.
         /// </summary>
         public int CatalogueSearchPageSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the AllCatalogueSearchPageSize.
+        /// </summary>
+        public int AllCatalogueSearchPageSize { get; set; }
     }
 }

LearningHub.Nhs.WebUI/Configuration/Settings.cs

@@ -245,5 +245,10 @@ public Settings()
         /// Gets or sets the MediaKindSettings.
         /// </summary>
         public MediaKindSettings MediaKindSettings { get; set; } = new MediaKindSettings();
+
+        /// <summary>
+        /// Gets or sets AllCataloguePageSize.
+        /// </summary>
+        public int AllCataloguePageSize { get; set; }
     }
 }

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);
             }
         }
 

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();
         }
 

LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs

@@ -110,6 +110,7 @@ public async Task<IActionResult> Index(int pageIndex = 1, string term = null)
                     });
 
                 catalogues.TotalCount = termCatalogues.TotalHits;
+                catalogues.GroupId = Guid.NewGuid();
                 catalogues.Catalogues = termCatalogues.DocumentModel.Select(t => new DashboardCatalogueViewModel
                 {
                     Url = t.Url,
@@ -123,6 +124,8 @@ public async Task<IActionResult> Index(int pageIndex = 1, string term = null)
                     BookmarkId = t.BookmarkId,
                     NodeId = int.Parse(t.Id),
                     BadgeUrl = t.BadgeUrl,
+                    Providers = t.Providers,
+                    ClickPayload = t.Click.Payload,
                 }).ToList();
             }
             else
@@ -551,5 +554,70 @@ public async Task<IActionResult> RequestPreviewAccess(CatalogueRequestAccessView
                 return this.View("RequestPreviewAccess", viewModel);
             }
         }
+
+        /// <summary>
+        /// Get all catelogues, filter and pagination based on alphabets.
+        /// </summary>
+        /// <param name="filterChar">filterChar.</param>
+        /// <returns>rk.</returns>
+        [Route("/allcatalogue")]
+        [Route("/allcatalogue/{filterChar}")]
+        public async Task<IActionResult> GetAllCatalogue(string filterChar = "a")
+        {
+            var pageSize = this.settings.AllCataloguePageSize;
+            var catalogues = await this.catalogueService.GetAllCatalogueAsync(filterChar, pageSize);
+            return this.View("allcatalogue", catalogues);
+        }
+
+        /// <summary>
+        /// AllCatalogues Search.
+        /// </summary>
+        /// <param name="pageIndex">pageIndex.</param>
+        /// <param name="term">Search term.</param>
+        /// <returns>IActionResult.</returns>
+        [Route("/allcataloguesearch")]
+        public async Task<IActionResult> GetAllCatalogueSearch(int pageIndex = 1, string term = null)
+        {
+            var catalogues = new AllCatalogueSearchResponseViewModel();
+            var searchString = term?.Trim() ?? string.Empty;
+            var allCatalogueSearchPageSize = this.settings.FindwiseSettings.AllCatalogueSearchPageSize;
+
+            if (!string.IsNullOrWhiteSpace(term))
+            {
+                var termCatalogues = await this.searchService.GetAllCatalogueSearchResultAsync(
+                    new AllCatalogueSearchRequestModel
+                    {
+                        SearchText = searchString,
+                        PageIndex = pageIndex - 1,
+                        PageSize = allCatalogueSearchPageSize,
+                    });
+
+                catalogues.TotalCount = termCatalogues.TotalHits;
+                catalogues.Catalogues = termCatalogues.DocumentModel.Select(t => new AllCatalogueViewModel
+                {
+                    Url = t.Url,
+                    Name = t.Name,
+                    CardImageUrl = t.CardImageUrl,
+                    BannerUrl = t.BannerUrl,
+                    Description = t.Description,
+                    RestrictedAccess = t.RestrictedAccess,
+                    HasAccess = t.HasAccess,
+                    IsBookmarked = t.IsBookmarked,
+                    BookmarkId = t.BookmarkId,
+                    NodeId = int.Parse(t.Id),
+                    BadgeUrl = t.BadgeUrl,
+                    Providers = t.Providers,
+                }).ToList();
+            }
+            else
+            {
+                catalogues.TotalCount = 0;
+                catalogues.Catalogues = new List<AllCatalogueViewModel>();
+            }
+
+            this.ViewBag.PageIndex = pageIndex;
+            this.ViewBag.PageSize = allCatalogueSearchPageSize;
+            return this.View("AllCatalogueSearch", catalogues);
+        }
     }
 }

LearningHub.Nhs.WebUI/Controllers/LearningSessionsController.cs

@@ -68,6 +68,7 @@ public async Task<IActionResult> Scorm(int id)
         /// <param name="filePath">filePath.</param>
         /// <returns>bool.</returns>
         //// [ResponseCache(VaryByQueryKeys = new[] { "*" }, Duration = 0, NoStore = true)] // disable caching
+        //// Removed Request.Headers["Referer"] Referer URL checking based on issue reported in TD-4283
         [AllowAnonymous]
         [Route("ScormContent/{*filePath}")]
         public async Task<IActionResult> ScormContent(string filePath)
@@ -79,12 +80,6 @@ public async Task<IActionResult> ScormContent(string filePath)
 
             try
             {
-                var referringUrl = this.Request.Headers["Referer"].ToString();
-                if (string.IsNullOrEmpty(referringUrl))
-                {
-                    throw new UnauthorizedAccessException("Referer URL is required.");
-                }
-
                 if (!this.User.Identity.IsAuthenticated)
                 {
                     throw new UnauthorizedAccessException("User is not authenticated.");

LearningHub.Nhs.WebUI/Controllers/SearchController.cs

@@ -214,8 +214,9 @@ public async Task<IActionResult> RecordCatalogueNavigation(SearchRequestViewMode
         /// <param name="timeOfSearch">time of search.</param>
         /// <param name="userQuery">user query.</param>
         /// <param name="query">search query.</param>
+        /// <param name="title">the title.</param>
         [HttpGet("record-resource-click")]
-        public void RecordResourceClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int resourceReferenceId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query)
+        public void RecordResourceClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int resourceReferenceId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query, string title)
         {
             var searchActionResourceModel = new SearchActionResourceModel
             {
@@ -230,6 +231,7 @@ public void RecordResourceClick(string url, int nodePathId, int itemIndex, int p
                 TimeOfSearch = timeOfSearch,
                 UserQuery = userQuery,
                 Query = query,
+                Title = title,
             };
 
             this.searchService.CreateResourceSearchActionAsync(searchActionResourceModel);
@@ -251,9 +253,10 @@ public void RecordResourceClick(string url, int nodePathId, int itemIndex, int p
         /// <param name="timeOfSearch">time of search.</param>
         /// <param name="userQuery">user query.</param>
         /// <param name="query">search query.</param>
+        /// <param name="name">the name.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         [HttpGet("record-catalogue-click")]
-        public async Task<IActionResult> RecordCatalogueClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int catalogueId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query)
+        public async Task<IActionResult> RecordCatalogueClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int catalogueId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query, string name)
         {
             SearchActionCatalogueModel searchActionCatalogueModel = new SearchActionCatalogueModel
             {
@@ -268,6 +271,7 @@ public async Task<IActionResult> RecordCatalogueClick(string url, int nodePathId
                 TimeOfSearch = timeOfSearch,
                 UserQuery = userQuery,
                 Query = query,
+                Name = name,
             };
 
             await this.searchService.CreateCatalogueSearchActionAsync(searchActionCatalogueModel);

LearningHub.Nhs.WebUI/Interfaces/ICatalogueService.cs

@@ -138,5 +138,13 @@ public interface ICatalogueService
         /// <param name="userUserGroupId">The user - user group id.</param>
         /// <returns>The validation result.</returns>
         Task<LearningHubValidationResult> RemoveUserFromRestrictedAccessUserGroup(int userUserGroupId);
+
+        /// <summary>
+        /// The GetAllCatalogueAsync.
+        /// </summary>
+        /// <param name="filterChar">The letter.</param>
+        /// <param name="pageSize">The pageSize.</param>
+        /// <returns>The allcatalogue result based on letters.</returns>
+        Task<AllCatalogueResponseViewModel> GetAllCatalogueAsync(string filterChar, int pageSize);
     }
 }

LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs

@@ -77,5 +77,12 @@ public interface ISearchService
         /// <param name="catalogueSearchRequestModel">catalogue search request model.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<int> CreateCatalogueSearchTermEventAsync(CatalogueSearchRequestModel catalogueSearchRequestModel);
+
+        /// <summary>
+        /// Get AllCatalogue Search Result Async.
+        /// </summary>
+        /// <param name="catalogueSearchRequestModel">The catalogue Search Request Model.</param>
+        /// <returns>The <see cref="Task{SearchAllCatalogueViewModel}"/>.</returns>
+        Task<SearchAllCatalogueViewModel> GetAllCatalogueSearchResultAsync(AllCatalogueSearchRequestModel catalogueSearchRequestModel);
     }
 }

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.33" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
 		<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" />

LearningHub.Nhs.WebUI/Models/NavigationModel.cs

@@ -69,5 +69,10 @@ public class NavigationModel
         /// Gets or sets a value indicating whether to show my account.
         /// </summary>
         public bool ShowMyAccount { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to show Browse Catalogues.
+        /// </summary>
+        public bool ShowBrowseCatalogues { get; set; }
     }
 }