Handle aborts from the configure loop dialog

sandermvanvliet · Nov 21, 2023 · 6da42de · 6da42de
1 parent 53f5ea6
commit 6da42de
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/src/RoadCaptain.App.RouteBuilder/DelegateDecorator.cs b/src/RoadCaptain.App.RouteBuilder/DelegateDecorator.cs
@@ -85,7 +85,8 @@ public async Task<MessageBoxResult> ShowClearRouteDialog()
             return await InvokeIfNeededAsync(() => _decorated.ShowClearRouteDialog());
         }
 
-        public async Task<(LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(LoopMode? loopMode = null, int? numberOfLoops = null)
+        public async Task<(bool Success, LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(
+            LoopMode? loopMode = null, int? numberOfLoops = null)
         {
             return await InvokeIfNeededAsync(() => _decorated.ShowRouteLoopDialog(loopMode, numberOfLoops));
         }

diff --git a/src/RoadCaptain.App.RouteBuilder/DesignTimeWindowService.cs b/src/RoadCaptain.App.RouteBuilder/DesignTimeWindowService.cs
@@ -79,7 +79,8 @@ public Task<MessageBoxResult> ShowClearRouteDialog()
             throw new System.NotImplementedException();
         }
 
-        public Task<(LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(LoopMode? loopMode = null, int? numberOfLoops = null)
+        public Task<(bool Success, LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(
+            LoopMode? loopMode = null, int? numberOfLoops = null)
         {
             throw new System.NotImplementedException();
         }

diff --git a/src/RoadCaptain.App.RouteBuilder/IWindowService.cs b/src/RoadCaptain.App.RouteBuilder/IWindowService.cs
@@ -17,7 +17,8 @@ public interface IWindowService : RoadCaptain.App.Shared.IWindowService
         Task<bool> ShowDefaultSportSelectionDialog(SportType sport);
         Task<MessageBoxResult> ShowShouldSaveRouteDialog();
         Task<MessageBoxResult> ShowClearRouteDialog();
-        Task<(LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(LoopMode? loopMode = null, int? numberOfLoops = null);
+        Task<(bool Success, LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(LoopMode? loopMode = null,
+            int? numberOfLoops = null);
         Task ShowSaveRouteDialog(string? lastUsedFolder, RouteViewModel routeViewModel);
         Task<TokenResponse?> ShowLogInDialog(Window owner);
         Window? GetCurrentWindow();

diff --git a/src/RoadCaptain.App.RouteBuilder/ViewModels/RouteSegmentListViewModel.cs b/src/RoadCaptain.App.RouteBuilder/ViewModels/RouteSegmentListViewModel.cs
@@ -29,6 +29,11 @@ private async Task<CommandResult> ConfigureLoop()
         {
             var shouldCreateLoop = await _windowService.ShowRouteLoopDialog(Route.LoopMode, Route.NumberOfLoops);
 
+            if (!shouldCreateLoop.Success)
+            {
+                return CommandResult.Aborted();
+            }
+
             if (shouldCreateLoop.Mode is LoopMode.Infinite or LoopMode.Constrained)
             {
                 Route.LoopMode = shouldCreateLoop.Mode;

diff --git a/src/RoadCaptain.App.RouteBuilder/ViewModels/RouteViewModel.cs b/src/RoadCaptain.App.RouteBuilder/ViewModels/RouteViewModel.cs
@@ -109,6 +109,7 @@ public LoopMode LoopMode
             {
                 if (value == _loopMode) return;
                 _loopMode = value;
+                IsTainted = true;
                 this.RaisePropertyChanged();
             }
         }
@@ -120,6 +121,7 @@ public int? NumberOfLoops
             {
                 if (value == _numberOfLoops) return;
                 _numberOfLoops = value;
+                IsTainted = true;
                 this.RaisePropertyChanged();
             }
         }

diff --git a/src/RoadCaptain.App.RouteBuilder/WindowService.cs b/src/RoadCaptain.App.RouteBuilder/WindowService.cs
@@ -104,7 +104,7 @@ public async Task<MessageBoxResult> ShowClearRouteDialog()
                 MessageBoxIcon.Question);
         }
 
-        public async Task<(LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(LoopMode? loopMode = null,
+        public async Task<(bool Success, LoopMode Mode, int? NumberOfLoops)> ShowRouteLoopDialog(LoopMode? loopMode = null,
             int? numberOfLoops = null)
         {
             var makeLoopDialog = Resolve<MakeLoopDialog>();
@@ -121,25 +121,25 @@ public async Task<MessageBoxResult> ShowClearRouteDialog()
 
             if (makeLoopDialog.DialogResult != DialogResult.Confirm)
             {
-                return (LoopMode.Unknown, null);
+                return (false, LoopMode.Unknown, null);
             }
 
             if (makeLoopDialogViewModel.NoLoop)
             {
-                return (LoopMode.Unknown, null);
+                return (true, LoopMode.Unknown, null);
             }
 
             if (makeLoopDialogViewModel.InfiniteLoop)
             {
-                return (LoopMode.Infinite, null);
+                return (true, LoopMode.Infinite, null);
             }
 
             if (makeLoopDialogViewModel.ConstrainedLoop)
             {
-                return (LoopMode.Constrained, makeLoopDialogViewModel.NumberOfLoops);
+                return (true, LoopMode.Constrained, makeLoopDialogViewModel.NumberOfLoops);
             }
 
-            return (LoopMode.Unknown, null);
+            return (true, LoopMode.Unknown, null);
         }
 
         public async Task ShowSaveRouteDialog(string? lastUsedFolder, RouteViewModel routeViewModel)