Fix exception when unselecting application on metrics page (#369)

dotnet · Oct 18, 2023 · 915c0c0 · 915c0c0
1 parent 4ea75fb
commit 915c0c0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/Aspire.Dashboard/Components/Controls/ChartContainer.razor.cs b/src/Aspire.Dashboard/Components/Controls/ChartContainer.razor.cs
@@ -39,6 +39,7 @@ public partial class ChartContainer : ComponentBase, IAsyncDisposable
 
     protected override void OnInitialized()
     {
+        // Update the graph every 200ms. This displays the latest data and moves time forward.
         _tickTimer = new PeriodicTimer(TimeSpan.FromSeconds(0.2));
         _tickTask = Task.Run(UpdateDataAsync);
     }
@@ -50,22 +51,22 @@ public async ValueTask DisposeAsync()
         // Wait for UpdateData to complete.
         if (_tickTask is { } t)
         {
-            await t.ConfigureAwait(false);
+            await t;
         }
     }
 
     private async Task UpdateDataAsync()
     {
         var timer = _tickTimer;
-        while (await timer!.WaitForNextTickAsync().ConfigureAwait(false))
+        while (await timer!.WaitForNextTickAsync())
         {
             _instrument = GetInstrument();
 
             if (_instrument.Dimensions.Count > _renderedDimensionsCount)
             {
                 // Re-render the entire control if the number of dimensions has changed.
                 _renderedDimensionsCount = _instrument.Dimensions.Count;
-                await InvokeAsync(StateHasChanged).ConfigureAwait(false);
+                await InvokeAsync(StateHasChanged);
             }
             else
             {

diff --git a/src/Aspire.Dashboard/Components/Pages/Metrics.razor b/src/Aspire.Dashboard/Components/Pages/Metrics.razor
@@ -46,9 +46,9 @@
                     </Panel1>
                     <Panel2>
                         <div class="metrics-content">
-                            @if (_selectedInstrument != null)
+                            @if (_selectedApplication.Id != null && _selectedMeter != null && _selectedInstrument != null)
                             {
-                                <ChartContainer ApplicationId="@(_selectedApplication.Id)" MeterName="@(_selectedMeter?.MeterName)" InstrumentName="@(_selectedInstrument.Name)" Duration="_selectedDuration.Duration" />
+                                <ChartContainer ApplicationId="@(_selectedApplication.Id)" MeterName="@(_selectedMeter.MeterName)" InstrumentName="@(_selectedInstrument.Name)" Duration="_selectedDuration.Duration" />
                             }
                             else if (_selectedMeter != null)
                             {

diff --git a/src/Aspire.Dashboard/Components/Pages/Metrics.razor.cs b/src/Aspire.Dashboard/Components/Pages/Metrics.razor.cs
@@ -75,7 +75,7 @@ protected override Task OnInitializedAsync()
 
     protected override void OnParametersSet()
     {
-        _selectedApplication = _applications.SingleOrDefault(e => e.Id == ApplicationInstanceId) ?? _applications.ElementAtOrDefault(1) ?? s_selectApplication;
+        _selectedApplication = _applications.SingleOrDefault(e => e.Id == ApplicationInstanceId) ?? s_selectApplication;
         ViewModel.ApplicationServiceId = _selectedApplication.Id;
         _instruments = !string.IsNullOrEmpty(_selectedApplication.Id) ? TelemetryRepository.GetInstrumentsSummary(_selectedApplication.Id) : null;
 
@@ -105,10 +105,12 @@ private void UpdateApplications()
         UpdateSubscription();
     }
 
-    private Task HandleSelectedApplicationChangedAsync()
+    private async Task HandleSelectedApplicationChangedAsync()
     {
-        NavigationManager.NavigateTo($"/Metrics/{_selectedApplication.Id}");
-        return Task.CompletedTask;
+        var state = new MetricsSelectedState { ApplicationId = _selectedApplication.Id };
+
+        NavigateTo(state);
+        await ProtectedSessionStore.SetAsync(MetricsSelectedState.Key, state);
     }
 
     private sealed class MetricsSelectedState