Separate ScheduleListItem view model from State

Author: justcoding121

src/Bible.Alarm/Common/Extensions/CloneExtensions.cs

@@ -1,4 +1,7 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using System.Reflection;
+using System.Windows.Input;
 
 namespace Bible.Alarm.Common.Extensions;
 
@@ -9,9 +12,27 @@ public static T DeepClone<T>(this T obj)
         var settings = new JsonSerializerSettings
         {
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-            PreserveReferencesHandling = PreserveReferencesHandling.None
+            PreserveReferencesHandling = PreserveReferencesHandling.None,
+            ContractResolver = new IgnoreNonSerializableContractResolver()
         };
         var json = JsonConvert.SerializeObject(obj, settings);
         return JsonConvert.DeserializeObject<T>(json, settings);
     }
+
+    private class IgnoreNonSerializableContractResolver : DefaultContractResolver
+    {
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            var property = base.CreateProperty(member, memberSerialization);
+            
+            // Ignore ICommand properties and other interfaces that can't be instantiated
+            if (property.PropertyType == null) return property;
+            if (!typeof(ICommand).IsAssignableFrom(property.PropertyType) &&
+                !property.PropertyType.IsInterface) return property;
+            property.ShouldSerialize = _ => false;
+            property.Ignored = true;
+
+            return property;
+        }
+    }
 }

src/Bible.Alarm/ViewModels/HomeViewModel.cs

@@ -33,6 +33,8 @@ public class HomeViewModel : ObservableObject, IDisposable, IRecipient<Initializ
 
     private readonly List<IDisposable> _subscriptions = [];
     private readonly Dictionary<ScheduleListItem, PropertyChangedEventHandler> _isEnabledHandlers = [];
+    // Map AlarmSchedule IDs to ScheduleListItem ViewModels for UI binding
+    private readonly Dictionary<long, ScheduleListItem> _scheduleViewModels = [];
 
 
     public HomeViewModel(
@@ -64,7 +66,7 @@ public HomeViewModel(
 
             ReduxContainer.Store.Dispatch(new ViewScheduleAction
             {
-                SelectedScheduleListItem = x
+                SelectedSchedule = x.Schedule
             });
 
             using var scope = _scopeFactory.CreateScope();
@@ -75,11 +77,11 @@ public HomeViewModel(
 
         //set schedules from initial state.
         //this should fire only once (look at the where condition).
-        ObservableHashSet<ScheduleListItem> lastSchedules = null;
+        ObservableHashSet<AlarmSchedule> lastSchedules = null;
         var subscription = ReduxContainer.Store.Subscribe(state =>
         {
             if (state.Schedules == null || state.Schedules == lastSchedules) return;
-            Schedules = state.Schedules;
+            UpdateScheduleViewModels(state.Schedules);
             lastSchedules = state.Schedules;
             ListenIsEnabledChanges();
             IsBusy = false;
@@ -132,10 +134,9 @@ private async Task HandleInitialized()
                     }
                 }
 
-                var initialSchedules = new ObservableHashSet<ScheduleListItem>();
+                var initialSchedules = new ObservableHashSet<AlarmSchedule>();
                 foreach (var schedule in alarmSchedules)
-                    initialSchedules.Add(new ScheduleListItem(schedule,
-                        scope.ServiceProvider.GetRequiredService<ILogger>(), _scopeFactory));
+                    initialSchedules.Add(schedule);
 
                 ReduxContainer.Store.Dispatch(new InitializeAction { ScheduleList = initialSchedules });
 
@@ -192,6 +193,50 @@ public ObservableHashSet<ScheduleListItem> Schedules
         set => SetProperty(ref _schedules, value);
     }
 
+    private void UpdateScheduleViewModels(ObservableHashSet<AlarmSchedule> schedules)
+    {
+        using var scope = _scopeFactory.CreateScope();
+        var logger = scope.ServiceProvider.GetRequiredService<ILogger>();
+        
+        var newViewModels = new ObservableHashSet<ScheduleListItem>();
+        var currentViewModelIds = new HashSet<long>();
+
+        // Create or update ViewModels for each schedule
+        foreach (var schedule in schedules)
+        {
+            currentViewModelIds.Add(schedule.Id);
+            
+            if (_scheduleViewModels.TryGetValue(schedule.Id, out var existingViewModel))
+            {
+                // Update existing ViewModel's Schedule property
+                existingViewModel.Schedule = schedule;
+                existingViewModel.IsEnabled = schedule.IsEnabled;
+                newViewModels.Add(existingViewModel);
+            }
+            else
+            {
+                // Create new ViewModel
+                var viewModel = new ScheduleListItem(schedule, logger, _scopeFactory);
+                _scheduleViewModels[schedule.Id] = viewModel;
+                newViewModels.Add(viewModel);
+            }
+        }
+
+        // Dispose and remove ViewModels for schedules that no longer exist
+        var toRemove = _scheduleViewModels.Keys.Where(id => !currentViewModelIds.Contains(id)).ToList();
+        foreach (var id in toRemove)
+        {
+            if (_scheduleViewModels.TryGetValue(id, out var viewModel))
+            {
+                UnsubscribeFromIsEnabledChanges(viewModel);
+                viewModel.Dispose();
+                _scheduleViewModels.Remove(id);
+            }
+        }
+
+        Schedules = newViewModels;
+    }
+
     private bool _isBusy = true;
 
     public bool IsBusy

src/Bible.Alarm/ViewModels/Redux/Actions/InitializeAction.cs

@@ -1,9 +1,10 @@
 using Bible.Alarm.Common.DataStructures;
 using Bible.Alarm.Common.Redux;
+using Bible.Alarm.Models.Schedule;
 
 namespace Bible.Alarm.ViewModels.Redux.Actions;
 
 public class InitializeAction : IAction
 {
-    public ObservableHashSet<ScheduleListItem> ScheduleList = [];
+    public ObservableHashSet<AlarmSchedule> ScheduleList = [];
 }

src/Bible.Alarm/ViewModels/Redux/Actions/Schedule/AddScheduleAction.cs

@@ -1,8 +1,9 @@
 using Bible.Alarm.Common.Redux;
+using Bible.Alarm.Models.Schedule;
 
 namespace Bible.Alarm.ViewModels.Redux.Actions.Schedule;
 
 public class AddScheduleAction : IAction
 {
-    public ScheduleListItem ScheduleListItem { get; set; }
+    public AlarmSchedule Schedule { get; set; }
 }

src/Bible.Alarm/ViewModels/Redux/Actions/Schedule/RemoveScheduleAction.cs

@@ -1,8 +1,9 @@
 using Bible.Alarm.Common.Redux;
+using Bible.Alarm.Models.Schedule;
 
 namespace Bible.Alarm.ViewModels.Redux.Actions.Schedule;
 
 public class RemoveScheduleAction : IAction
 {
-    public ScheduleListItem ScheduleListItem { get; set; }
+    public AlarmSchedule Schedule { get; set; }
 }

src/Bible.Alarm/ViewModels/Redux/Actions/Schedule/UpdateScheduleAction.cs

@@ -1,8 +1,9 @@
 using Bible.Alarm.Common.Redux;
+using Bible.Alarm.Models.Schedule;
 
 namespace Bible.Alarm.ViewModels.Redux.Actions.Schedule;
 
 public class UpdateScheduleAction : IAction
 {
-    public ScheduleListItem ScheduleListItem { get; set; }
+    public AlarmSchedule Schedule { get; set; }
 }

src/Bible.Alarm/ViewModels/Redux/Actions/Schedule/ViewScheduleAction.cs

@@ -1,8 +1,9 @@
 using Bible.Alarm.Common.Redux;
+using Bible.Alarm.Models.Schedule;
 
 namespace Bible.Alarm.ViewModels.Redux.Actions.Schedule;
 
 public class ViewScheduleAction : IAction
 {
-    public ScheduleListItem SelectedScheduleListItem { get; set; }
+    public AlarmSchedule SelectedSchedule { get; set; }
 }