Merge branch 'Develop/Features/TD-6467-implement-new-search-ui' into Develop/Features/TD-6212-azure-ai-search-implementation

Author: Binon

AdminUI/LearningHub.Nhs.AdminUI/Helpers/FeatureFlags.cs

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

AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_NavPartial.cshtml

@@ -1,6 +1,9 @@
-@using Microsoft.Extensions.Options;
+@using Microsoft.Extensions.Options;
 @using LearningHub.Nhs.AdminUI.Configuration;
+@using LearningHub.Nhs.AdminUI.Helpers;
+@using Microsoft.FeatureManagement;
 @inject IOptions<WebSettings> webSettings
+@inject IFeatureManager featureManager
 
 @{
     var mainMenu = "Home";
@@ -13,7 +16,7 @@
         case "externalsystem":
         case "log":
         case "roadmap":
-        case "cms":    
+        case "cms":
         case "release":
         case "cache":
             mainMenu = "Settings";
@@ -44,7 +47,6 @@
     </div>
     <div class="d-none d-lg-block align-self-center">
         <div class="mx-auto">
-
         </div>
     </div>
     <div class="align-self-start">
@@ -81,9 +83,12 @@
                 <li class="nav-item @IsActive("Settings")">
                     <a class="nav-link" href="/externalsystem"><i class="fa-solid fa-gear fa-lg" title="System"></i>System</a>
                 </li>
-                <li class="nav-item" @IsActive("ResourceSync")>
-                    <a class="nav-link" href="/ResourceSync/Resources"><i class="fa-solid fa-gear fa-lg" title="Sync"></i>Sync</a>
-                </li>
+                @if (!await featureManager.IsEnabledAsync(FeatureFlags.AzureSearch))
+                {
+                    <li class="nav-item" @IsActive("ResourceSync")>
+                        <a class="nav-link" href="/ResourceSync/Resources"><i class="fa-solid fa-gear fa-lg" title="Sync"></i>Sync</a>
+                    </li>
+                }
             }
         </ul>
         <ul class="navbar-nav ml-auto">
@@ -101,5 +106,4 @@
             }
         </ul>
     </div>
-</nav>
-
+</nav>

AdminUI/LearningHub.Nhs.AdminUI/appsettings.json

@@ -73,6 +73,7 @@
   "APPINSIGHTS_INSTRUMENTATIONKEY": "",
   "FeatureManagement": {
     "AddAudioVideo": true,
-    "DisplayAudioVideo": true
+    "DisplayAudioVideo": true,
+    "AzureSearch": false
   }
 }

OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/AzureSearchConfig.cs

@@ -44,5 +44,10 @@ public class AzureSearchConfig
         /// Gets or sets the suggester name for auto-complete and suggestions.
         /// </summary>
         public string SuggesterName { get; set; } = "test-search-suggester";
+
+        /// <summary>
+        /// Gets or sets the search query type (semantic, full, or simple).
+        /// </summary>
+        public string SearchQueryType { get; set; } = "Semantic";
     }
 }

OpenAPI/LearningHub.Nhs.OpenApi.Services/Helpers/Search/SearchOptionsBuilder.cs

@@ -123,5 +123,26 @@ private static string GetSortOption(Dictionary<string, string>? sortBy)
             return $"{sortColumn} {sortDirection}";
         }
 
+        /// <summary>
+        /// Parses the search query type from configuration string.
+        /// Parsing is case-insensitive. If the value is null, empty, or invalid, defaults to Semantic.
+        /// </summary>
+        /// <param name="searchQueryTypeString">The search query type string (semantic, full, or simple).</param>
+        /// <returns>The parsed SearchQueryType enum value.</returns>
+        public static SearchQueryType ParseSearchQueryType(string searchQueryTypeString)
+        {
+            if (string.IsNullOrWhiteSpace(searchQueryTypeString))
+            {
+                return SearchQueryType.Semantic;
+            }
+
+            if (Enum.TryParse<SearchQueryType>(searchQueryTypeString, ignoreCase: true, out var queryType) &&
+                (queryType == SearchQueryType.Semantic || queryType == SearchQueryType.Full || queryType == SearchQueryType.Simple))
+            {
+                return queryType;
+            }
+
+            return SearchQueryType.Semantic;
+        }
     }
 }