Merge pull request #452 from NeoCoderMatrix86/437-import-of-cuesheet-is-not-undoable-as-one-thing

Import of cuesheet is not undoable as one thing

Author: NeoCoderMatrix86

AudioCuesheetEditor.End2EndTests/Pages/IndexTest.cs

@@ -116,6 +116,8 @@ public async Task OpenSampleCuesheetAsync()
             await Expect(Page.GetByRole(AriaRole.Textbox, new() { Name = "Cuesheet title" })).ToHaveValueAsync("Sample CD Title");
             await Expect(Page.GetByRole(AriaRole.Cell, new() { Name = "Sample Artist 3 Clear" })).ToBeVisibleAsync();
             await Expect(Page.GetByRole(AriaRole.Cell, new() { Name = ":45:54" }).Nth(1)).ToBeVisibleAsync();
+            await Page.GetByRole(AriaRole.Toolbar).GetByRole(AriaRole.Button).Filter(new() { HasTextRegex = new Regex("^$") }).First.ClickAsync();
+            await Expect(Page.GetByRole(AriaRole.Paragraph).Filter(new() { HasText = "Tracks has invalid Count (0)!" })).ToBeVisibleAsync();
         }
 
         [TestMethod]
@@ -131,6 +133,8 @@ public async Task OpenProjectFileAsync()
             await Expect(Page.GetByRole(AriaRole.Cell, new() { Name = "Sample Title 2 Clear" })).ToBeVisibleAsync();
             await Expect(Page.GetByRole(AriaRole.Cell, new() { Name = ":09:23" }).Nth(1)).ToBeVisibleAsync();
             await Expect(Page.GetByRole(AriaRole.Cell, new() { Name = ":45:54" }).First).ToBeVisibleAsync();
+            await Page.GetByRole(AriaRole.Toolbar).GetByRole(AriaRole.Button).Filter(new() { HasTextRegex = new Regex("^$") }).First.ClickAsync();
+            await Expect(Page.GetByRole(AriaRole.Paragraph).Filter(new() { HasText = "Tracks has invalid Count (0)!" })).ToBeVisibleAsync();
         }
 
         [TestMethod]

AudioCuesheetEditor.Tests/Services/UI/SessionStateContainerTests.cs

@@ -40,14 +40,16 @@ public void Cuesheet_SetNewValue_ShouldTriggerCuesheetChangedEvent()
             // Arrange
             var newCuesheet = new Cuesheet();
             bool eventTriggered = false;
+            bool traceablePropertyChangedFired = false;
             sessionStateContainer.CuesheetChanged += (sender, args) => eventTriggered = true;
+            sessionStateContainer.TraceablePropertyChanged += (sender, args) => traceablePropertyChangedFired = true;
 
             // Act
             sessionStateContainer.Cuesheet = newCuesheet;
 
             // Assert
             Assert.IsTrue(eventTriggered);
-            traceChangeManagerMock.Verify(m => m.Reset(), Times.Exactly(2));
+            Assert.IsTrue(traceablePropertyChangedFired);
             traceChangeManagerMock.Verify(m => m.TraceChanges(newCuesheet), Times.Once);
         }
 

AudioCuesheetEditor/Services/IO/ImportManager.cs

@@ -48,6 +48,7 @@ public async Task<Dictionary<IBrowserFile, ImportFileType>> ImportFilesAsync(IEn
             {
                 if (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Projectfile, FileExtensions.Projectfile))
                 {
+                    //TODO: can not be undone
                     var fileContent = await ReadFileContentAsync(file);
                     var cuesheet = Projectfile.ImportFile(fileContent.ToArray());
                     if (cuesheet != null)
@@ -114,7 +115,9 @@ private void ImportCuesheet(IEnumerable<String?> fileContent)
             _sessionStateContainer.Importfile = CuesheetImportService.Analyse(fileContent);
             if (_sessionStateContainer.Importfile.AnalysedCuesheet != null)
             {
+                _traceChangeManager.BulkEdit = true;
                 CopyCuesheet(_sessionStateContainer.Cuesheet, _sessionStateContainer.Importfile.AnalysedCuesheet);
+                _traceChangeManager.BulkEdit = false;
             }
         }
         private static async Task<MemoryStream> ReadFileContentAsync(IBrowserFile file)

AudioCuesheetEditor/Services/UI/SessionStateContainer.cs

@@ -16,13 +16,15 @@
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.UI;
 
 namespace AudioCuesheetEditor.Services.UI
 {
-    public class SessionStateContainer : ISessionStateContainer
+    public class SessionStateContainer : ISessionStateContainer, ITraceable
     {
         public event EventHandler? CuesheetChanged;
         public event EventHandler? ImportCuesheetChanged;
+        public event EventHandler<TraceablePropertiesChangedEventArgs>? TraceablePropertyChanged;
 
         private readonly ITraceChangeManager _traceChangeManager;
         private Cuesheet cuesheet;
@@ -34,6 +36,7 @@ public SessionStateContainer(ITraceChangeManager traceChangeManager)
             _traceChangeManager = traceChangeManager;
             cuesheet = new Cuesheet();
             SetCuesheetReference(cuesheet);
+            _traceChangeManager.TraceChanges(this);
         }
         public Cuesheet Cuesheet 
         {
@@ -84,9 +87,10 @@ public void ResetImport()
 
         private void SetCuesheetReference(Cuesheet value)
         {
+            var previousValue = Cuesheet;
             cuesheet = value;
-            _traceChangeManager.Reset();
             _traceChangeManager.TraceChanges(Cuesheet);
+            TraceablePropertyChanged?.Invoke(this, new TraceablePropertiesChangedEventArgs(new TraceableChange(previousValue, nameof(Cuesheet))));
             CuesheetChanged?.Invoke(this, EventArgs.Empty);
         }
     }

AudioCuesheetEditor/Shared/AppBar.razor

@@ -162,6 +162,7 @@ along with Foobar.  If not, see
         if (result?.Canceled == false)
         {
             _sessionStateContainer.Cuesheet = new();
+            TraceChangeManager.Reset();
         }
     }