Show a flyout with a warning on a package downgrade (#27)

* Show a flyout with a warning on a package downgrade

* Update doc

Author: Gitii

Numbers/Program.cs

@@ -9,7 +9,6 @@
 using Shared.Services;
 using Shared.Services.Implementations;
 using Shared.Services.Implementations.WinUI;
-using Shared.Services.Implementations.WinuiUI;
 using Splat;
 using Splat.Microsoft.Extensions.DependencyInjection;
 

PackageInstaller.Core/ModelViews/ActionModelView.cs

@@ -5,29 +5,43 @@ namespace PackageInstaller.Core.ModelViews;
 
 public class ActionModelView : ReactiveObject
 {
-    public ActionModelView(Func<Task> action, string title, string? warningText = null)
+    public ActionModelView(
+        Func<ActionModelView, Task> action,
+        string title,
+        string? warningText = null,
+        string? tooltip = null
+    )
     {
         Title = title;
         WarningText = warningText;
         ActionCommand = ReactiveCommand.CreateFromTask(action);
+        ToolTip = tooltip;
     }
 
-    public ActionModelView(Action action, string title, string? warningText = null)
+    public ActionModelView(
+        Action<ActionModelView> action,
+        string title,
+        string? warningText = null,
+        string? tooltip = null
+    )
     {
         Title = title;
         WarningText = warningText;
         ActionCommand = ReactiveCommand.CreateFromTask(
-            () =>
+            (ActionModelView vm) =>
             {
-                action();
+                action(vm);
                 return Task.CompletedTask;
             }
         );
+        ToolTip = tooltip;
     }
 
     public string Title { get; }
 
     public string? WarningText { get; }
 
-    public ReactiveCommand<Unit, Unit> ActionCommand { get; }
+    public string? ToolTip { get; }
+
+    public ReactiveCommand<ActionModelView, Unit> ActionCommand { get; }
 }

PackageInstaller.Core/ModelViews/PackageActionsViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Reactive;
 using System.Reactive.Linq;
+using System.Reactive.Threading.Tasks;
 using DynamicData;
 using Microsoft.Extensions.Hosting;
 using PackageInstaller.Core.Services;
@@ -48,6 +49,7 @@ public class PackageActionsViewModel : ReactiveObject, IViewModel, INavigable
     DistributionModelView? _selectedWslDistribution;
     private IThreadHelpers _threadHelpers;
     private readonly IApplicationLifeCycle _lifeCycle;
+    private readonly Interaction<string, bool> _actionConfirmationDialogInteraction;
 
 #pragma warning disable MA0051 // Method is too long
     public PackageActionsViewModel(
@@ -71,6 +73,8 @@ IApplicationLifeCycle lifeCycle
         _threadHelpers = threadHelpers;
         _lifeCycle = lifeCycle;
 
+        _actionConfirmationDialogInteraction = new Interaction<string, bool>();
+
         _progressStatusMessage = String.Empty;
         ProgressStatusMessage = String.Empty;
         _notifications = ImmutableList<NotificationModelView>.Empty;
@@ -111,35 +115,43 @@ IApplicationLifeCycle lifeCycle
             .SelectMany(OnSelectedDistributionChangedAsync)
             .Subscribe();
 
-        _launchActionMv = new ActionModelView(BuildCommandFunction(PackageAction.Launch), "Launch");
+        _launchActionMv = new ActionModelView(
+            BuildCommandFunction(PackageAction.Launch),
+            "Launch",
+            tooltip: "Launch the application"
+        );
         _installActionMv = new ActionModelView(
             BuildCommandFunction(PackageAction.Install),
-            "Install"
+            "Install",
+            tooltip: "Install this application in the selected distribution"
         );
         _uninstallActionMv = new ActionModelView(
             BuildCommandFunction(PackageAction.Uninstall),
-            "Uninstall"
+            "Uninstall",
+            tooltip: "Uninstall this application in the selected distribution"
         );
         _reinstallActionMv = new ActionModelView(
             BuildCommandFunction(PackageAction.Install),
-            "Reinstall"
+            "Reinstall",
+            tooltip: "Reinstall this application in the selected distribution"
         );
         _upgradeActionMv = new ActionModelView(
             BuildCommandFunction(PackageAction.Upgrade),
-            "Upgrade"
+            "Upgrade",
+            tooltip: "Upgrade this application in the selected distribution"
         );
         _downgradeActionMv = new ActionModelView(
             BuildCommandFunction(PackageAction.Downgrade),
             "Downgrade",
             "This action may not do any dependency checking on downgrades "
                 + "and therefore will not warn you if the downgrade breaks the dependency "
-                + "of some other package.This can have serious side effects, downgrading "
+                + "of some other package. This can have serious side effects, downgrading "
                 + "essential system components can even make your whole system unusable. "
                 + "Use with care."
         );
         _doNothingActionMv = new ActionModelView(
-            () => _applicationLifetime.StopApplication(),
-            "Do nothing and exit"
+            (_) => _applicationLifetime.StopApplication(),
+            "Do nothing and close"
         );
 
         _primaryAction = this.WhenAnyValue((mv) => mv.PackageInstallationStatus)
@@ -251,6 +263,9 @@ public IObservable<Unit> WhenNavigatingTo(INavigationParameter parameter)
 
     public string Id { get; } = nameof(PackageActionsViewModel);
 
+    public Interaction<string, bool> ActionConfirmationDialogInteraction =>
+        _actionConfirmationDialogInteraction;
+
     private IImmutableList<ActionModelView> ChooseSecondaryActions(
         IPlatformDependentPackageManager.PackageInstallationStatus? arg
     )
@@ -300,10 +315,22 @@ private IImmutableList<ActionModelView> ChooseSecondaryActions(
         }
     }
 
-    private Action BuildCommandFunction(PackageAction action)
+    private Func<ActionModelView, Task> BuildCommandFunction(PackageAction action)
     {
-        return () =>
+        return async (ActionModelView avm) =>
         {
+            if (avm.WarningText != null)
+            {
+                var confirmedByUser = await _actionConfirmationDialogInteraction
+                    .Handle(avm.WarningText)
+                    .ToTask()
+                    .ConfigureAwait(true);
+                if (!confirmedByUser)
+                {
+                    return;
+                }
+            }
+
             var navParms = new ActionExecutionViewModel.NavigationParameter()
             {
                 Distribution = SelectedWslDistribution!,
@@ -408,7 +435,7 @@ private async Task ProcessPackageAsync()
 
         if (SelectedWslDistribution == null && _distroSourceList.Count > 0)
         {
-            await Task.Delay(TimeSpan.FromMilliseconds(0)).ConfigureAwait(true);
+            await Task.Delay(TimeSpan.FromMilliseconds(10)).ConfigureAwait(true);
 
             SelectedWslDistribution = _distroSourceList.Items.First();
         }

PackageInstaller/Pages/PackageActions.xaml

@@ -125,11 +125,13 @@
                 <controls:ColumnDefinition Width="*" />
                 <controls:ColumnDefinition Width="Auto" />
             </controls:Grid.ColumnDefinitions>
-            <controls:Grid
-                controls:Grid.Column="0"
-                attached:FrameworkElementExtensions.Cursor="Hand"
-            >
-                <controls1:NotificationIcon HorizontalAlignment="Left" VerticalAlignment="Top" Padding="5" x:Name="NotificationIconGlyph" />
+            <controls:Grid controls:Grid.Column="0" attached:FrameworkElementExtensions.Cursor="Hand">
+                <controls1:NotificationIcon
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Padding="5"
+                    x:Name="NotificationIconGlyph"
+                />
             </controls:Grid>
             <controls:StackPanel controls:Grid.Column="1" Orientation="Vertical" Spacing="4">
                 <controls:StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Spacing="8">
@@ -147,6 +149,19 @@
                         </controls:ComboBox.ItemTemplate>
                     </controls:ComboBox>
                     <controls:SplitButton x:Name="ActionButton">
+                        <controls:SplitButton.Resources>
+                            <controls:Flyout x:Name="ActionFlyout">
+                                <controls:StackPanel Spacing="15" Orientation="Vertical" HorizontalAlignment="Stretch">
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        MaxWidth="250"
+                                        TextWrapping="WrapWholeWords"
+                                        x:Name="ActionFlyoutText"
+                                    />
+                                    <controls:Button x:Name="ActionFlyoutButton" Content="Acknowledged and Continue" />
+                                </controls:StackPanel>
+                            </controls:Flyout>
+                        </controls:SplitButton.Resources>
                         <controls:StackPanel Orientation="Horizontal">
                             <controls:FontIcon
                                 x:Name="PrimaryActionButtonIcon"

PackageInstaller/Pages/PackageActions.xaml.cs

@@ -3,14 +3,17 @@
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Threading.Tasks;
 using DynamicData;
 using DynamicData.Binding;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using PackageInstaller.Core.ModelViews;
 using PackageInstaller.Core.Services;
 using ReactiveUI;
+using Windows.Foundation;
 
 namespace PackageInstaller.Pages;
 
@@ -105,6 +108,14 @@ public PackageActions()
                     )
                     .DisposeWith(disposable);
 
+                this.ViewModel
+                    .WhenAnyValue((vm) => vm.PrimaryAction!.ToolTip)
+                    .ObserveOn(RxApp.MainThreadScheduler)
+                    .Subscribe(
+                        (tooltip) => ToolTipService.SetToolTip(PrimaryActionButtonText, tooltip)
+                    )
+                    .DisposeWith(disposable);
+
                 this.ViewModel
                     .WhenAnyValue((vm) => vm.PackageIconStream)
                     .ObserveOn(RxApp.MainThreadScheduler)
@@ -135,7 +146,8 @@ public PackageActions()
                 this.BindCommand(
                         ViewModel,
                         (vm) => vm.PrimaryAction!.ActionCommand,
-                        (v) => v.ActionButton
+                        (v) => v.ActionButton,
+                        (vm) => vm.PrimaryAction
                     )
                     .DisposeWith(disposable);
 
@@ -155,13 +167,16 @@ public PackageActions()
                             SecondaryActions.Items.AddRange(
                                 list.Select(
                                     (a) =>
-                                        (
-                                            new MenuFlyoutItem()
-                                            {
-                                                Text = a.Title,
-                                                Command = a.ActionCommand,
-                                            }
-                                        )
+                                    {
+                                        var item = new MenuFlyoutItem()
+                                        {
+                                            Text = a.Title,
+                                            Command = a.ActionCommand,
+                                            CommandParameter = a
+                                        };
+                                        ToolTipService.SetToolTip(item, a.ToolTip);
+                                        return item;
+                                    }
                                 )
                             );
                         }
@@ -204,6 +219,48 @@ public PackageActions()
                     .Select(x => Unit.Default)
                     .InvokeCommand(ViewModel!.GotoNotificationHub)
                     .DisposeWith(disposable);
+
+                this.ViewModel.ActionConfirmationDialogInteraction.RegisterHandler(
+                    (interaction) =>
+                    {
+                        TaskCompletionSource src = new TaskCompletionSource();
+                        RoutedEventHandler handleClick = null!;
+                        TypedEventHandler<FlyoutBase, FlyoutBaseClosingEventArgs>? handleClose =
+                            null!;
+
+                        handleClick = (_, _) =>
+                        {
+                            ActionFlyout.Closing -= handleClose;
+                            ActionFlyoutButton.Click -= handleClick;
+
+                            if (!interaction.IsHandled)
+                            {
+                                interaction.SetOutput(true);
+                            }
+
+                            src.SetResult();
+                        };
+
+                        handleClose = (_, _) =>
+                        {
+                            ActionFlyout.Closing -= handleClose;
+                            ActionFlyoutButton.Click -= handleClick;
+
+                            if (!interaction.IsHandled)
+                            {
+                                interaction.SetOutput(false);
+                            }
+
+                            src.SetResult();
+                        };
+                        ActionFlyout.Closing += handleClose;
+                        ActionFlyoutButton.Click += handleClick;
+                        ActionFlyout.ShowAt(ActionButton);
+                        ActionFlyoutText.Text = interaction.Input;
+
+                        return src.Task;
+                    }
+                );
             }
         );
     }

PackageInstaller/Program.cs

@@ -12,7 +12,6 @@
 using Shared.Services;
 using Shared.Services.Implementations;
 using Shared.Services.Implementations.WinUI;
-using Shared.Services.Implementations.WinuiUI;
 using Splat;
 using Splat.Microsoft.Extensions.DependencyInjection;
 
@@ -41,8 +40,8 @@ private static void ConfigureServices(WindowsAppSdkHostBuilder<App> builder)
             {
                 ConfigureSplatIntegration(collection);
                 ConfigureModelViews(collection);
-                ConfigureComplexServices(collection);
                 ConfigureServiceDiscovery(collection);
+                ConfigureComplexServices(collection);
             }
         );
     }

Shared.Misc/ObservableAsync.cs

@@ -11,6 +11,7 @@ public static class ObservableAsync
     /// Converts an asynchronous action into an observable sequence. Each subscription to the resulting sequence causes the action to be started.
     /// </summary>
     /// <param name="actionAsync">Asynchronous action to convert.</param>
+    /// <param name="scheduler">The scheduler which will be used.</param>
     /// <returns>An observable sequence exposing a Unit value upon completion of the action, or an exception.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="actionAsync"/> is null.</exception>
     public static IObservable<Unit> From(Func<Task> actionAsync, IScheduler scheduler)

Shared.Services.Implementations.Winui/ThreadHelpers.cs

@@ -1,7 +1,7 @@
 using System;
 using Microsoft.UI.Dispatching;
 
-namespace Shared.Services.Implementations.WinuiUI;
+namespace Shared.Services.Implementations.WinUI;
 
 public class ThreadHelpers : IThreadHelpers
 {