Add wasm load percent to device-access layout.

Author: bitbound

ControlR.Web.Client/Components/Layout/DeviceAccess/DeviceAccessLayout.razor

@@ -57,9 +57,18 @@
       </MudDrawer>
       <MudMainContent Class="h-100">
         <ServerAlertDisplay Class="mb-4" />
-        @if (!RendererInfo.IsInteractive || !string.IsNullOrWhiteSpace(_loadingText))
+        @if (!RendererInfo.IsInteractive)
         {
-          <LoadingIndicator IsVisible Message="@(_loadingText ?? "Loading")" Class="mt-8" />
+          <div class="w-100 text-center mt-8">
+            <MudText Typo="Typo.h4" Color="Color.Info" GutterBottom>
+             Loading <span id="blazor-load-progress"></span>
+            </MudText>
+            <MudProgressCircular Min="0" Max="1" Indeterminate Color="Color.Info" Size="Size.Large" />
+          </div>
+        }
+        else if (_hubConnectionState != HubConnectionState.Connected)
+        {
+            <LoadingIndicator IsVisible Message="Connecting" Class="mt-8" />
         }
         else if (!string.IsNullOrWhiteSpace(_errorText))
         {

ControlR.Web.Client/Components/Layout/DeviceAccess/DeviceAccessLayout.razor.cs

@@ -18,7 +18,6 @@ public partial class DeviceAccessLayout : IAsyncDisposable
   private HubConnectionState _hubConnectionState = HubConnectionState.Disconnected;
   private bool _isAuthenticated;
   private bool _isDarkMode = true;
-  private string? _loadingText = "Loading";
   private PersistingComponentStateSubscription _persistingSubscription;
   private ThemeMode _themeMode = ThemeMode.Auto;
 
@@ -106,7 +105,6 @@ protected override async Task OnInitializedAsync()
     try
     {
       await base.OnInitializedAsync();
-      _loadingText = "Loading";
 
       _isAuthenticated = await AuthState.IsAuthenticated();
 
@@ -155,13 +153,15 @@ protected override async Task OnInitializedAsync()
         var query = HttpUtility.ParseQueryString(uri.Query);
         query.Remove("logonToken");
         // Rebuild the remaining query string (retain deviceId and any future params).
-        var remaining = query.HasKeys() ? "?" + string.Join('&', query.AllKeys.Select(k => $"{k}={query[k]}")) : string.Empty;
+        var remaining = query.HasKeys() 
+          ? "?" + string.Join('&', query.AllKeys.Select(k => $"{k}={query[k]}")) 
+          : string.Empty;
+
         NavManager.NavigateTo(basePath + remaining, replace: true);
         return;
       }
 
-      _loadingText = "Connecting";
-      await InvokeAsync(StateHasChanged);
+      await GetDeviceInfo();
 
       Messenger.Register<ToastMessage>(this, HandleToastMessage);
       Messenger.Register<ThemeChangedMessage>(this, HandleThemeChangedMessage);
@@ -170,7 +170,6 @@ protected override async Task OnInitializedAsync()
       Messenger.Register<DtoReceivedMessage<ChatResponseHubDto>>(this, HandleChatResponseReceived);
 
       await HubConnector.Connect<IViewerHub>(AppConstants.ViewerHubPath);
-      await GetDeviceInfo();
     }
     catch (Exception ex)
     {
@@ -179,7 +178,6 @@ protected override async Task OnInitializedAsync()
     }
     finally
     {
-      _loadingText = null;
       await InvokeAsync(StateHasChanged);
     }
   }