latest changes

ArunimaGeorge · ArunimaGeorge · commit 3625899ec440 · 2025-10-29T17:34:02.000Z
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -118,6 +118,7 @@
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.36" />
 
diff --git a/LearningHub.Nhs.WebUI/Program.cs b/LearningHub.Nhs.WebUI/Program.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Diagnostics;
 using LearningHub.Nhs.WebUI;
+using LearningHub.Nhs.WebUI.BlazorComponentHosting;
 using LearningHub.Nhs.WebUI.Interfaces;
 using LearningHub.Nhs.WebUI.JsDetection;
 using LearningHub.Nhs.WebUI.Middleware;
@@ -34,16 +35,22 @@
     builder.Logging.ClearProviders();
     builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
     builder.Host.UseNLog();
+    builder.Services.AddControllersWithViews();
 
     builder.Services.AddHostedService<TimedHostedService>();
     builder.Services.ConfigureServices(builder.Configuration, builder.Environment);
 
+    // Add Razor components
+    builder.Services.AddRazorComponents().AddInteractiveServerComponents();
     var app = builder.Build();
 
     var appLifetime = app.Services.GetRequiredService<IHostApplicationLifetime>();
     var jsDetectionLogger = app.Services.GetRequiredService<IJsDetectionLogger>();
     appLifetime.ApplicationStopping.Register(async () => await jsDetectionLogger.FlushCounters());
 
+    app.UseBlazorFrameworkFiles("/blazor");
+    app.UseStaticFiles();
+
     if (app.Environment.IsDevelopment())
     {
         app.UseDeveloperExceptionPage();
@@ -84,7 +91,6 @@
     app.UseAuthorization();
 
     app.UseMiddleware<NLogMiddleware>();
-    app.UseStaticFiles();
 
     app.Map(TimezoneInfoMiddleware.TimezoneInfoUrl, b => b.UseMiddleware<TimezoneInfoMiddleware>());
 
@@ -108,6 +114,11 @@
         };
     });
 
+    // Map Razor components (needed for interactivity)
+    app.MapRazorComponents<App>() // App is your root component
+       .AddInteractiveServerRenderMode()
+       .AddAdditionalAssemblies(typeof(TELBlazor.Components._Imports).Assembly);
+
     app.Run();
 }
 catch (Exception ex)
diff --git a/LearningHub.Nhs.WebUI/Views/Search/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Search/Index.cshtml
@@ -9,7 +9,21 @@
 }
 
 <div class="search-page">
-    <div class="nhsuk-width-container app-width-container">     
+    <div class="nhsuk-width-container app-width-container">
+
+        <h2>Search (Blazor WASM mounted)</h2>
+
+        <div id="tel-auto-suggest">
+            Loading auto-suggest...
+        </div>
+
+        @* <h2>Fruit Search (Blazor Server Component)</h2>
+
+        <component type="typeof(TELAutoSuggestTextbox)"
+                   render-mode="Server"
+                   param-ApiUrl=@("/api/search/GetResult1")
+                   param-Placeholder="@("Type a fruit...")"/> *@
+
         @if (Model.DidYouMeanEnabled)
         {
             <p class="nhsuk-u-margin-top-5 nhsuk-u-margin-bottom-6 nhsuk-body-l">
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -5,6 +5,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    <base href="/" />
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
@@ -160,6 +161,19 @@
     <partial name="~/Views/Shared/_SessionManagerScriptPartial.cshtml" />
     <partial name="~/Views/Shared/_JavascriptDetectorPartial.cshtml" />
     <partial name="~/Views/Shared/_SupportUrlsScriptPartial.cshtml" />
+
+   @*  <script>
+        window.__BlazorRuntimeBase = "/blazor/_framework/";
+    </script> *@
+    <script src="~/blazorcomponents/_framework/blazor.webassembly.js"></script>
+@*     <script>
+        Blazor.start({
+          environmentBaseUrl: '/blazor/_framework/',
+          onStart: () => console.log('Blazor started OK'),
+          onError: err => console.error('Blazor startup error:', err)
+        });
+    </script> *@
+
     @RenderSection("Scripts", required: false)
 
     <script type="text/javascript" src="~/js/mkplayer-ui-custom.js" asp-append-version="true"></script>
