Merge pull request #586 from TechnologyEnhancedLearning/RC

Merge  Arizona release to master

Author: AnjuJose011

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/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/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;
+        }
     }
 }