Merge pull request #1554 from TechnologyEnhancedLearning/Develop/Features/TD-6467-implement-new-search-ui

Develop/features/td 6467 implement new search UI

Author: binon

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

@@ -89,7 +89,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj

@@ -12,7 +12,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.14" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="Selenium.Axe" Version="4.0.19" />

LearningHub.Nhs.WebUI/Controllers/SearchController.cs

@@ -8,6 +8,7 @@ namespace LearningHub.Nhs.WebUI.Controllers
     using LearningHub.Nhs.Models.Search;
     using LearningHub.Nhs.Models.Search.SearchClick;
     using LearningHub.Nhs.WebUI.Filters;
+    using LearningHub.Nhs.WebUI.Helpers;
     using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models.Search;
     using Microsoft.AspNetCore.Authorization;
@@ -16,6 +17,7 @@ namespace LearningHub.Nhs.WebUI.Controllers
     using Microsoft.AspNetCore.Routing;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
+    using Microsoft.FeatureManagement;
     using Settings = LearningHub.Nhs.WebUI.Configuration.Settings;
 
     /// <summary>
@@ -28,6 +30,7 @@ public class SearchController : BaseController
     {
         private readonly ISearchService searchService;
         private readonly IFileService fileService;
+        private readonly IFeatureManager featureManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SearchController"/> class.
@@ -38,17 +41,20 @@ public class SearchController : BaseController
         /// <param name="searchService">The searchService.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="fileService">The fileService.</param>
+        /// <param name="featureManager"> The Feature flag manager.</param>
         public SearchController(
             IHttpClientFactory httpClientFactory,
             IWebHostEnvironment hostingEnvironment,
             IOptions<Settings> settings,
             ISearchService searchService,
             ILogger<SearchController> logger,
-            IFileService fileService)
+            IFileService fileService,
+            IFeatureManager featureManager)
         : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
         {
             this.searchService = searchService;
             this.fileService = fileService;
+            this.featureManager = featureManager;
         }
 
         /// <summary>
@@ -65,18 +71,32 @@ public async Task<IActionResult> Index(SearchRequestViewModel search, bool noSor
             search.SearchId ??= 0;
             search.GroupId = !string.IsNullOrWhiteSpace(search.GroupId) && Guid.TryParse(search.GroupId, out Guid groupId) ? groupId.ToString() : Guid.NewGuid().ToString();
 
-            var searchResult = await this.searchService.PerformSearch(this.User, search);
+            // Fix: Ensure an instance of IFeatureManager is injected and used
+            var azureSearchEnabled = Task.Run(() => this.featureManager.IsEnabledAsync(FeatureFlags.AzureSearch)).Result;
+            SearchResultViewModel searchResult = new SearchResultViewModel();
+
+            if (azureSearchEnabled)
+            {
+                searchResult = await this.searchService.PerformSearch(this.User, search);
+            }
+            else
+            {
+                searchResult = await this.searchService.PerformSearchInFindwise(this.User, search);
+            }
 
             if (search.SearchId == 0 && searchResult.ResourceSearchResult != null)
             {
                 var searchId = await this.searchService.RegisterSearchEventsAsync(
                     search,
                     SearchFormActionTypeEnum.BasicSearch,
                     searchResult.ResourceSearchResult.TotalHits,
-                    searchResult.CatalogueSearchResult.TotalHits);
+                    searchResult.CatalogueSearchResult != null ? searchResult.CatalogueSearchResult.TotalHits : 0);
 
                 searchResult.ResourceSearchResult.SearchId = searchId;
-                searchResult.CatalogueSearchResult.SearchId = searchId;
+                if (searchResult.CatalogueSearchResult != null)
+                {
+                    searchResult.CatalogueSearchResult.SearchId = searchId;
+                }
             }
 
             if (filterApplied)
@@ -109,10 +129,11 @@ public async Task<IActionResult> Index(SearchRequestViewModel search, bool noSor
         /// <param name="groupId">The search group id.</param>
         /// <param name="searchId">The search id.</param>
         /// <param name="actionType">The action type.</param>
+        /// <param name="resourceCollectionFilter">The show filter.</param>
         /// <param name="feedback">The feedback.</param>
         /// <returns>The actionResult.</returns>
         [HttpPost("results")]
-        public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel search, int resourceCount, [FromForm] IEnumerable<string> filters, [FromForm] int? resourceAccessLevelId, [FromForm] IEnumerable<string> providerfilters, [FromForm] int? sortby, [FromForm] string groupId, [FromForm] int searchId, [FromQuery] string actionType, string feedback)
+        public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel search, int resourceCount, [FromForm] IEnumerable<string> filters, [FromForm] int? resourceAccessLevelId, [FromForm] IEnumerable<string> providerfilters, [FromForm] int? sortby, [FromForm] string groupId, [FromForm] int searchId, [FromQuery] string actionType, [FromForm] IEnumerable<string> resourceCollectionFilter, string feedback)
         {
             if (actionType == "feedback")
             {
@@ -144,14 +165,17 @@ public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel se
                 var existingProviderFilters = (search.ProviderFilters ?? new List<string>()).OrderBy(t => t);
                 var newProviderFilters = providerfilters.OrderBy(t => t);
                 var filterProviderUpdated = !newProviderFilters.SequenceEqual(existingProviderFilters);
+                var existingResourceCollectionFilter = (search.ResourceCollectionFilter ?? new List<string>()).OrderBy(t => t);
+                var newResourceCollectionFilter = resourceCollectionFilter.OrderBy(t => t);
+                var filterResourceCollectionUpdated = !newResourceCollectionFilter.SequenceEqual(existingResourceCollectionFilter);
 
-                // No sort or resource type filter updated or resource access level filter updated or provider filter applied
-                if ((search.Sortby ?? 0) == sortby && !filterUpdated && !resourceAccessLevelFilterUpdated && !filterProviderUpdated)
+                // No sort or resource type filter updated or resource access level filter updated or provider filter applied or resource collection filter applied
+                if ((search.Sortby ?? 0) == sortby && !filterUpdated && !resourceAccessLevelFilterUpdated && !filterProviderUpdated && !filterResourceCollectionUpdated)
                 {
                     return await this.Index(search, noSortFilterError: true);
                 }
 
-                if (search.ResourcePageIndex > 0 && (filterUpdated || resourceAccessLevelFilterUpdated || filterProviderUpdated))
+                if (search.ResourcePageIndex > 0 && (filterUpdated || resourceAccessLevelFilterUpdated || filterProviderUpdated || filterResourceCollectionUpdated))
                 {
                     search.ResourcePageIndex = null;
                 }
@@ -163,6 +187,7 @@ public async Task<IActionResult> IndexPost([FromQuery] SearchRequestViewModel se
             search.GroupId = groupId;
             search.SearchId = searchId;
             search.ResourceAccessLevelId = resourceAccessLevelId;
+            search.ResourceCollectionFilter = resourceCollectionFilter;
 
             var routeValues = new RouteValueDictionary(search)
             {

LearningHub.Nhs.WebUI/Helpers/FeatureFlags.cs

@@ -19,5 +19,10 @@ public static class FeatureFlags
         /// The EnableMoodle.
         /// </summary>
         public const string EnableMoodle = "EnableMoodle";
+
+        /// <summary>
+        /// The AzureSearch.
+        /// </summary>
+        public const string AzureSearch = "AzureSearch";
     }
 }

LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs

@@ -25,13 +25,16 @@ public static class UtilityHelper
             { "article", ResourceTypeEnum.Article },
             { "case", ResourceTypeEnum.Case },
             { "weblink", ResourceTypeEnum.WebLink },
+            { "web link", ResourceTypeEnum.WebLink },
             { "audio", ResourceTypeEnum.Audio },
             { "scorm", ResourceTypeEnum.Scorm },
             { "assessment", ResourceTypeEnum.Assessment },
             { "genericfile", ResourceTypeEnum.GenericFile },
+            { "file", ResourceTypeEnum.GenericFile },
             { "image", ResourceTypeEnum.Image },
             { "html", ResourceTypeEnum.Html },
             { "moodle", ResourceTypeEnum.Moodle },
+            { "catalogue", ResourceTypeEnum.Catalogue },
         };
 
         /// <summary>
@@ -146,6 +149,8 @@ public static string GetPrettifiedResourceTypeName(ResourceTypeEnum resourceType
                     return "HTML";
                 case ResourceTypeEnum.Moodle:
                     return "Course";
+                case ResourceTypeEnum.Catalogue:
+                    return "Catalogue";
                 default:
                     return "File";
             }
@@ -186,6 +191,8 @@ public static string GetPrettifiedResourceTypeName(ResourceTypeEnum resourceType
                     return "HTML";
                 case ResourceTypeEnum.Moodle:
                     return "Course";
+                case ResourceTypeEnum.Catalogue:
+                    return "Catalogue";
                 default:
                     return "File";
             }

LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs

@@ -116,6 +116,9 @@ public static string GetResourceTypeDesc(ResourceTypeEnum resourceType)
                 case ResourceTypeEnum.Moodle:
                     typeText = "Course";
                     break;
+                case ResourceTypeEnum.Catalogue:
+                    typeText = "Catalogue";
+                    break;
                 default:
                     typeText = string.Empty;
                     break;

LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs

@@ -20,6 +20,15 @@ public interface ISearchService
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
         Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRequestViewModel searchRequest);
 
+        /// <summary>
+        /// Performs a search - either a combined resource and catalogue search, or just a resource search if
+        /// searching within a catalogue.
+        /// </summary>
+        /// <param name="user">User.</param>
+        /// <param name="searchRequest">The SearchRequestViewModel.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<SearchResultViewModel> PerformSearchInFindwise(IPrincipal user, SearchRequestViewModel searchRequest);
+
         /// <summary>
         /// Records the analytics events associated with a search.
         /// </summary>

LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj

@@ -113,7 +113,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.3" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="4.0.5" />
 		<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/Search/SearchRequestViewModel.cs

@@ -75,5 +75,10 @@ public class SearchRequestViewModel
         /// </summary>
         [FromQuery]
         public IEnumerable<string> ProviderFilters { get; set; }
+
+        /// <summary>
+        /// Gets or sets the show filter (all, catalogues, courses, resources).
+        /// </summary>
+        public IEnumerable<string> ResourceCollectionFilter { get; set; }
     }
 }

LearningHub.Nhs.WebUI/Models/Search/SearchResultViewModel.cs

@@ -1,6 +1,7 @@
 namespace LearningHub.Nhs.WebUI.Models.Search
 {
     using System;
+    using System.Collections.Generic;
     using LearningHub.Nhs.Models.Paging;
     using LearningHub.Nhs.Models.Search;
 
@@ -93,5 +94,10 @@ public class SearchResultViewModel
         /// Gets or sets Suggested Resource name.
         /// </summary>
         public string SuggestedResource { get; set; }
+
+        /// <summary>
+        /// Gets or sets the show filter (all, catalogues, courses, resources).
+        /// </summary>
+        public List<SearchFilterModel> ResourceCollectionFilter { get; set; }
     }
 }