Fix custom labels not saving settings properly

src/AudioBand.Test/ViewModels/CustomLabelViewModelTests.cs

@@ -73,5 +73,34 @@ void CustomLabel_ColorChangedThenCanceled_TextSegmentsHaveCorrectColor()
 
             Assert.All(vm.TextSegments, segment => Assert.Equal(Colors.Blue, segment.Color));
         }
+
+        [Fact]
+        void CustomLabel_CancelEdit_ModelHasNoChanges()
+        {
+            var formatString = "test";
+            var model = new CustomLabel {FormatString = formatString};
+            var vm = new CustomLabelViewModel(model, _dialogMock.Object, _sessionMock.Object, _messageBusMock.Object);
+
+            vm.FormatString = "new";
+            vm.CancelEdit();
+
+            Assert.Equal(formatString, vm.FormatString);
+            Assert.Equal(formatString, model.FormatString);
+        }
+
+        [Fact]
+        void CustomLabel_SaveEdit_ModelHasNewChanges()
+        {
+            var formatString = "test";
+            var newFormatstring = "format";
+            var model = new CustomLabel { FormatString = formatString };
+            var vm = new CustomLabelViewModel(model, _dialogMock.Object, _sessionMock.Object, _messageBusMock.Object);
+
+            vm.FormatString = newFormatstring;
+            vm.EndEdit();
+
+            Assert.Equal(newFormatstring, vm.FormatString);
+            Assert.Equal(newFormatstring, model.FormatString);
+        }
     }
 }

src/AudioBand.Test/ViewModels/CustomLabelsViewModelTests.cs

@@ -137,5 +137,29 @@ public void ProfileChanged_NewLabelsHaveCorrectAudioSessionData()
             _appSettingsMock.Raise(m => m.ProfileChanged += null, null, EventArgs.Empty);
             Assert.True(vm.CustomLabels[0].IsPlaying);
         }
+
+        [Fact]
+        public void RemoveLabel_PublishEdit()
+        {
+            _appSettingsMock.SetupGet(x => x.CustomLabels).Returns(new List<CustomLabel> { new CustomLabel() });
+            _dialogMock.Setup(o => o.ShowConfirmationDialog(It.IsAny<ConfirmationDialogType>(), It.IsAny<object>())).Returns(true);
+            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object, _messageBus.Object);
+            var label = _viewModel.CustomLabels[0];
+            _viewModel.RemoveLabelCommand.Execute(label);
+
+            Assert.True(_viewModel.IsEditing);
+            _messageBus.Verify(m => m.Publish(It.IsAny<EditStartMessage>(), It.IsAny<string>()));
+        }
+
+        [Fact]
+        public void AddLabel_PublishEdit()
+        {
+            _appSettingsMock.SetupGet(x => x.CustomLabels).Returns(new List<CustomLabel> { new CustomLabel() });
+            _viewModel = new CustomLabelsViewModel(_appSettingsMock.Object, _dialogMock.Object, _sessionMock.Object, _messageBus.Object);
+            _viewModel.AddLabelCommand.Execute(null);
+
+            Assert.True(_viewModel.IsEditing);
+            _messageBus.Verify(m => m.Publish(It.IsAny<EditStartMessage>(), It.IsAny<string>()));
+        }
     }
 }

src/AudioBand/ViewModels/CustomLabelViewModel.cs

@@ -17,6 +17,7 @@ namespace AudioBand.ViewModels
     /// </summary>
     public class CustomLabelViewModel : LayoutViewModelBase<CustomLabel>
     {
+        private readonly CustomLabel _source;
         private readonly IAudioSession _audioSession;
         private bool _isPlaying;
         private IEnumerable<TextSegment> _textSegments;
@@ -31,6 +32,7 @@ public class CustomLabelViewModel : LayoutViewModelBase<CustomLabel>
         public CustomLabelViewModel(CustomLabel source, IDialogService dialogService, IAudioSession audioSession, IMessageBus messageBus)
             : base(messageBus, source)
         {
+            _source = source;
             _audioSession = audioSession;
             _audioSession.PropertyChanged += AudioSessionOnPropertyChanged;
 
@@ -243,6 +245,13 @@ protected override void OnReset()
             ReParseSegments();
         }
 
+        /// <inheritdoc />
+        protected override void OnEndEdit()
+        {
+            base.OnEndEdit();
+            MapSelf(Model, _source);
+        }
+
         private void AudioSessionOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName != nameof(IAudioSession.IsPlaying))

src/AudioBand/ViewModels/CustomLabelsViewModel.cs

@@ -61,13 +61,17 @@ public CustomLabelsViewModel(IAppSettings appsettings, IDialogService dialogServ
         /// <inheritdoc/>
         protected override void OnBeginEdit()
         {
+            base.OnBeginEdit();
+
             _added.Clear();
             _removed.Clear();
         }
 
         /// <inheritdoc/>
         protected override void OnCancelEdit()
         {
+            base.OnCancelEdit();
+
             foreach (var label in _added)
             {
                 CustomLabels.Remove(label);
@@ -85,6 +89,8 @@ protected override void OnCancelEdit()
         /// <inheritdoc/>
         protected override void OnEndEdit()
         {
+            base.OnEndEdit();
+
             _added.Clear();
             _removed.Clear();
 
@@ -108,13 +114,13 @@ private void AddLabelCommandOnExecute()
 
         private void RemoveLabelCommandOnExecute(CustomLabelViewModel labelViewModel)
         {
-            BeginEdit();
-
             if (!_dialogService.ShowConfirmationDialog(ConfirmationDialogType.DeleteLabel, labelViewModel.Name))
             {
                 return;
             }
 
+            BeginEdit();
+
             CustomLabels.Remove(labelViewModel);
 
             // Only add to removed if not a new label