From dd988e702b23c8301d2d539e668b106acdadf437 Mon Sep 17 00:00:00 2001
From: kjh2064 <kjh2064@gmail.com>
Date: Mon, 6 Jul 2026 16:55:09 +0900
Subject: [PATCH] Optimize Collection page load with Task.WhenAll and fix
 BaseAddress SSR prerendering check in Users.razor

---
 .../QuantEngine.Web/Client/Pages/Collection.razor      | 10 ++++++++--
 src/dotnet/QuantEngine.Web/Client/Pages/Users.razor    |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/dotnet/QuantEngine.Web/Client/Pages/Collection.razor b/src/dotnet/QuantEngine.Web/Client/Pages/Collection.razor
index a7154e8..42d9050 100644
--- a/src/dotnet/QuantEngine.Web/Client/Pages/Collection.razor
+++ b/src/dotnet/QuantEngine.Web/Client/Pages/Collection.razor
@@ -107,8 +107,14 @@ else if (DashboardState != null)
         IsLoading = true;
         try
         {
-            DashboardState = await ApiClient.GetCollectionStateAsync();
-            var runsResponse = await ApiClient.GetCollectionRunsAsync(10);
+            // Parallelize API calls to avoid sequential RTT bottlenecks
+            var stateTask = ApiClient.GetCollectionStateAsync();
+            var runsTask = ApiClient.GetCollectionRunsAsync(10);
+            
+            await Task.WhenAll(stateTask, runsTask);
+            
+            DashboardState = await stateTask;
+            var runsResponse = await runsTask;
             RecentRuns = runsResponse?.Runs ?? new();
         }
         catch (Exception ex)
diff --git a/src/dotnet/QuantEngine.Web/Client/Pages/Users.razor b/src/dotnet/QuantEngine.Web/Client/Pages/Users.razor
index f91740c..e5b9d98 100644
--- a/src/dotnet/QuantEngine.Web/Client/Pages/Users.razor
+++ b/src/dotnet/QuantEngine.Web/Client/Pages/Users.razor
@@ -136,6 +136,10 @@
     {
         try
         {
+            if (Http.BaseAddress == null)
+            {
+                Http.BaseAddress = new Uri("http://localhost:5265/");
+            }
             var res = await Http.GetFromJsonAsync<List<UserDto>>("api/users");
             if (res != null)
             {