merge arizona changes

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.38" />
     <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" />

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

@@ -123,6 +123,7 @@ 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,
                 }).ToList();
             }
             else
@@ -551,5 +552,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/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.38" />
 		<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; }
     }
 }

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;

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

LearningHub.Nhs.WebUI/Services/CatalogueService.cs

@@ -602,5 +602,33 @@ public async Task<LearningHubValidationResult> RemoveUserFromRestrictedAccessUse
 
             return apiResponse.ValidationResult;
         }
+
+        /// <summary>
+        /// GetAllCatalogueAsync.
+        /// </summary>
+        /// <param name="filterChar">The filterChar.</param>
+        /// <param name="pageSize">the pageSize.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<AllCatalogueResponseViewModel> GetAllCatalogueAsync(string filterChar, int pageSize)
+        {
+            AllCatalogueResponseViewModel viewmodel = new AllCatalogueResponseViewModel { };
+            var client = await this.LearningHubHttpClient.GetClientAsync();
+
+            var request = $"catalogue/allcatalogues/{pageSize}/{filterChar}";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                viewmodel = JsonConvert.DeserializeObject<AllCatalogueResponseViewModel>(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized ||
+                       response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return viewmodel;
+        }
     }
 }

LearningHub.Nhs.WebUI/Services/NavigationPermissionService.cs

@@ -80,6 +80,7 @@ public NavigationModel NotAuthenticated()
                 ShowRegister = false,
                 ShowSignOut = false,
                 ShowMyAccount = false,
+                ShowBrowseCatalogues = false,
             };
         }
 
@@ -104,6 +105,7 @@ private NavigationModel AuthenticatedAdministrator(string controllerName)
                 ShowRegister = false,
                 ShowSignOut = true,
                 ShowMyAccount = true,
+                ShowBrowseCatalogues = true,
             };
         }
 
@@ -128,6 +130,7 @@ private NavigationModel AuthenticatedBlueUser(string controllerName)
                 ShowRegister = false,
                 ShowSignOut = true,
                 ShowMyAccount = true,
+                ShowBrowseCatalogues = true,
             };
         }
 
@@ -151,6 +154,7 @@ private NavigationModel AuthenticatedGuest()
                 ShowRegister = false,
                 ShowSignOut = true,
                 ShowMyAccount = false,
+                ShowBrowseCatalogues = false,
             };
         }
 
@@ -175,6 +179,7 @@ private async Task<NavigationModel> AuthenticatedReadOnly(string controllerName)
                 ShowRegister = false,
                 ShowSignOut = true,
                 ShowMyAccount = false,
+                ShowBrowseCatalogues = true,
             };
         }
 
@@ -198,6 +203,7 @@ private async Task<NavigationModel> AuthenticatedBasicUserOnly()
                 ShowRegister = false,
                 ShowSignOut = true,
                 ShowMyAccount = true,
+                ShowBrowseCatalogues = true,
             };
         }
 
@@ -221,6 +227,7 @@ private NavigationModel InLoginWizard()
                 ShowRegister = false,
                 ShowSignOut = true,
                 ShowMyAccount = false,
+                ShowBrowseCatalogues = false,
             };
         }
     }