[release/13.3] Fix notification action closure over scoped services

src/Aspire.Dashboard/Components/Dialogs/NotificationEntryComponent.razor.cs

@@ -16,6 +16,9 @@ public partial class NotificationEntryComponent : ComponentBase
     [Parameter]
     public EventCallback OnDismiss { get; set; }
 
+    [Inject]
+    public required IServiceProvider Services { get; init; }
+
     private string IntentClass => Entry.Intent switch
     {
         MessageIntent.Success => "intent-success",
@@ -49,7 +52,7 @@ private async Task HandlePrimaryAction()
     {
         if (Entry.PrimaryAction is { } primaryAction)
         {
-            await primaryAction.OnClick();
+            await primaryAction.OnClick(Services);
         }
     }
 }

src/Aspire.Dashboard/Model/DashboardCommandExecutor.cs

@@ -165,20 +165,20 @@ public async Task ExecuteAsyncCore(ResourceViewModel resource, CommandViewModel
             if (response.Result is not null)
             {
                 toastParameters.PrimaryAction = loc[nameof(Dashboard.Resources.Resources.ResourceCommandViewResponse)];
-                toastParameters.OnPrimaryAction = EventCallback.Factory.Create<ToastResult>(this, () => OpenViewResponseDialogAsync(command, response));
+                toastParameters.OnPrimaryAction = EventCallback.Factory.Create<ToastResult>(this, () => OpenViewResponseDialogAsync(dialogService, command, response));
             }
 
             notificationService.ReplaceNotification(progressNotificationId, new NotificationEntry
             {
                 Title = successTitle,
                 Body = response.Message,
                 Intent = MessageIntent.Success,
-                PrimaryAction = response.Result is not null ? CreateViewResponseNotificationAction(command, response) : null
+                PrimaryAction = response.Result is not null ? CreateViewResponseNotificationAction(loc, command, response) : null
             });
 
             if (response.Result?.DisplayImmediately == true)
             {
-                await OpenViewResponseDialogAsync(command, response).ConfigureAwait(false);
+                await OpenViewResponseDialogAsync(dialogService, command, response).ConfigureAwait(false);
             }
         }
         else if (response.Kind == ResourceCommandResponseKind.Cancelled)
@@ -206,20 +206,20 @@ public async Task ExecuteAsyncCore(ResourceViewModel resource, CommandViewModel
             if (response.Result is not null)
             {
                 toastParameters.SecondaryAction = loc[nameof(Dashboard.Resources.Resources.ResourceCommandViewResponse)];
-                toastParameters.OnSecondaryAction = EventCallback.Factory.Create<ToastResult>(this, () => OpenViewResponseDialogAsync(command, response));
+                toastParameters.OnSecondaryAction = EventCallback.Factory.Create<ToastResult>(this, () => OpenViewResponseDialogAsync(dialogService, command, response));
             }
 
             notificationService.ReplaceNotification(progressNotificationId, new NotificationEntry
             {
                 Title = failedTitle,
                 Body = response.Message,
                 Intent = MessageIntent.Error,
-                PrimaryAction = response.Result is not null ? CreateViewResponseNotificationAction(command, response) : null
+                PrimaryAction = response.Result is not null ? CreateViewResponseNotificationAction(loc, command, response) : null
             });
 
             if (response.Result?.DisplayImmediately == true)
             {
-                await OpenViewResponseDialogAsync(command, response).ConfigureAwait(false);
+                await OpenViewResponseDialogAsync(dialogService, command, response).ConfigureAwait(false);
             }
         }
 
@@ -261,16 +261,22 @@ private static (Icon Icon, Color Color)? GetIntentIcon(ToastIntent intent)
         };
     }
 
-    private NotificationAction CreateViewResponseNotificationAction(CommandViewModel command, ResourceCommandResponseViewModel response)
+    private static NotificationAction CreateViewResponseNotificationAction(IStringLocalizer<Dashboard.Resources.Resources> loc, CommandViewModel command, ResourceCommandResponseViewModel response)
     {
         return new NotificationAction
         {
             Text = loc[nameof(Dashboard.Resources.Resources.ResourceCommandViewResponse)],
-            OnClick = () => OpenViewResponseDialogAsync(command, response)
+            OnClick = (services) =>
+            {
+                // Get dialog service from passed in services since this data is long lived.
+                // Using the dialog service from executor could cause closure over scoped services.
+                var dialogService = services.GetRequiredService<DashboardDialogService>();
+                return OpenViewResponseDialogAsync(dialogService, command, response);
+            }
         };
     }
 
-    private async Task OpenViewResponseDialogAsync(CommandViewModel command, ResourceCommandResponseViewModel response)
+    private static async Task OpenViewResponseDialogAsync(DashboardDialogService dialogService, CommandViewModel command, ResourceCommandResponseViewModel response)
     {
         var fixedFormat = response.Result!.Format switch
         {

src/Aspire.Dashboard/Model/INotificationService.cs

@@ -72,7 +72,7 @@ public sealed class NotificationEntry
 public sealed class NotificationAction
 {
     public required string Text { get; init; }
-    public required Func<Task> OnClick { get; init; }
+    public required Func<IServiceProvider, Task> OnClick { get; init; }
 }
 
 /// <summary>