Update recent list immediately after loading and saving project

src/SimpleAccounting/Infrastructure/ProjectFileLoader.cs

@@ -16,7 +16,6 @@ namespace lg2de.SimpleAccounting.Infrastructure;
 
 internal class ProjectFileLoader
 {
-    private const int MaxRecentProjects = 10;
     private readonly IFileSystem fileSystem;
 
     private readonly IDialogs dialogs;
@@ -170,11 +169,6 @@ private void UpdateSettings(string projectFileName)
             this.settings.SecuredDrives.Add(info.RootPath);
         }
 
-        this.settings.RecentProjects.Remove(projectFileName);
-        this.settings.RecentProjects.Insert(0, projectFileName);
-        while (this.settings.RecentProjects.Count > MaxRecentProjects)
-        {
-            this.settings.RecentProjects.RemoveAt(MaxRecentProjects);
-        }
+        this.settings.SetRecentProject(projectFileName);
     }
 }

src/SimpleAccounting/Model/ProjectData.cs

@@ -24,7 +24,7 @@
 ///     It contains the persistent data according to <see cref="AccountingData" />
 ///     as well as the current state of the project.
 /// </remarks>
 internal class ProjectData : IProjectData
 {
     private readonly IDialogs dialogs;
     private readonly IFileSystem fileSystem;
@@ -167,6 +167,8 @@
         {
             this.fileSystem.FileDelete(this.AutoSaveFileName);
         }
+
+        this.Settings.SetRecentProject(this.FileName);
     }
 
     public async Task AutoSaveAsync(CancellationToken cancellationToken)
@@ -230,7 +232,7 @@
     public void ShowAddBookingDialog(bool showInactiveAccounts)
     {
         var bookingModel =
             new EditBookingViewModel(this, DateTime.Today, editMode: false);
         var allAccounts = this.Storage.AllAccounts;
         bookingModel.Accounts.AddRange(showInactiveAccounts ? allAccounts : allAccounts.Where(x => x.Active));
         var bookingTemplates = this.Storage.Setup?.BookingTemplates;

src/SimpleAccounting/Presentation/MenuViewModel.cs

@@ -59,7 +59,7 @@ public MenuViewModel(
         _ => this.OnOpenProject());
 
     public ICommand SaveProjectCommand => new RelayCommand(
-        _ => this.projectData.SaveProject(),
+        _ => this.OnSaveProject(),
         _ => this.projectData.IsModified);
 
     public ICommand ProjectOptionsCommand => new RelayCommand(
@@ -148,6 +148,7 @@ public void BuildRecentProjectsMenu()
             return;
         }
 
+        this.RecentProjects.Clear();
         foreach (var project in this.projectData.Settings.RecentProjects.Cast<string>())
         {
             var command = new AsyncCommand(this.busy, () => this.OnLoadRecentProjectAsync(project));
@@ -167,20 +168,14 @@ public void OnDataLoaded()
     private async Task OnLoadRecentProjectAsync(string project)
     {
         var loadResult = await this.projectData.LoadFromFileAsync(project);
-        if (loadResult != OperationResult.Failed)
+        if (loadResult == OperationResult.Failed)
         {
-            return;
-        }
-
-        // failed to load, remove from menu
-        // keep in menu if aborted (e.g. SecureDrive not available)
-        var item = this.RecentProjects.FirstOrDefault(x => x.Header == project);
-        if (item != null)
-        {
-            this.RecentProjects.Remove(item);
+            // failed to load, remove from menu
+            // keep in menu if aborted (e.g. SecureDrive not available)
+            this.projectData.Settings.RecentProjects.Remove(project);
         }
 
-        this.projectData.Settings.RecentProjects.Remove(project);
+        this.BuildRecentProjectsMenu();
     }
 
     private void OnOpenProject()
@@ -197,10 +192,20 @@ private void OnOpenProject()
             async () =>
             {
                 await this.projectData.LoadFromFileAsync(fileName);
-                await Execute.OnUIThreadAsync(() => this.busy.IsBusy = false);
+                await Execute.OnUIThreadAsync(() =>
+                {
+                    this.busy.IsBusy = false;
+                    this.BuildRecentProjectsMenu();
+                });
             });
     }
 
+    private void OnSaveProject()
+    {
+        this.projectData.SaveProject();
+        this.BuildRecentProjectsMenu();
+    }
+
     private void UpdateBookingYears()
     {
         this.BookingYears.Clear();

src/SimpleAccounting/Properties/Settings.Extensions.cs

@@ -0,0 +1,28 @@
+// <copyright>
+//     Copyright (c) Lukas Grützmacher. All rights reserved.
+// </copyright>
+
+namespace lg2de.SimpleAccounting.Properties;
+
+internal sealed partial class Settings
+{
+    private const int MaxRecentProjects = 10;
+
+    /// <summary>
+    ///     Sets the specified project file (path) as the most recent project. 
+    /// </summary>
+    /// <remarks>
+    ///     The list of recent projects is updated automatically.
+    /// </remarks>
+    /// <param name="projectFileName">The full path of the recent project.</param>
+    public void SetRecentProject(string projectFileName)
+    {
+        this.RecentProjects ??= [];
+        this.RecentProjects.Remove(projectFileName);
+        this.RecentProjects.Insert(0, projectFileName);
+        while (this.RecentProjects.Count > MaxRecentProjects)
+        {
+            this.RecentProjects.RemoveAt(MaxRecentProjects);
+        }
+    }
+}

tests/SimpleAccounting.UnitTests/Presentation/MenuViewModelTests.cs

@@ -81,6 +81,18 @@ public void SwitchCultureCommand_DummyLanguage_MessageBoxShownAndConfigurationUp
         sut.IsSystemCulture.Should().BeFalse();
     }
 
+    [Fact]
+    public void RecentProjects_SaveNewFile_AddedToList()
+    {
+        var sut = CreateSut(out ProjectData projectData);
+        sut.NewProjectCommand.Execute(null);
+        projectData.FileName = "this-is-the-file-name";
+
+        sut.SaveProjectCommand.Execute(null);
+
+        sut.RecentProjects.Should().BeEquivalentTo(new[] { new { Header = "this-is-the-file-name" } });
+    }
+
     [Fact]
     public void NewProjectCommand_ModifiedProjectNoDiscard_ProjectRemains()
     {
@@ -376,7 +388,8 @@ private static MenuViewModel CreateSut(out ProjectData projectData, out IReportF
         return sut;
     }
 
-    private static MenuViewModel CreateSut(out ProjectData projectData, out IDialogs dialogs, out IReportFactory reportFactory)
+    private static MenuViewModel CreateSut(
+        out ProjectData projectData, out IDialogs dialogs, out IReportFactory reportFactory)
     {
         var windowManager = Substitute.For<IWindowManager>();
         var fileSystem = Substitute.For<IFileSystem>();

tests/SimpleAccounting.UnitTests/Presentation/ShellViewModelTests.cs

@@ -279,7 +279,7 @@ public async Task RecentFileCommand_FileOnSecureDriveNotStarted_ProjectKept()
         ((IActivate)sut).Activate();
         sut.Menu.RecentProjects.Select(x => x.Header).Should().Equal("K:\\file1", "file2");
 
-        foreach (var viewModel in sut.Menu.RecentProjects)
+        foreach (var viewModel in sut.Menu.RecentProjects.ToList())
         {
             await viewModel.Command.ExecuteAsync(null);
         }