Implement personal calendar modification reset button (#202)

Author: albi005

StartSch.Wasm/Components/EventSettingsDialog.razor

@@ -35,6 +35,10 @@
 
     .selected-event-settings {
         position: relative;
+        border-radius: 8px;
+        background-color: var(--md-sys-color-surface-container-lowest);
+        padding: 16px;
+        margin-top: 16px;
 
         .section-label {
             position: absolute;
@@ -58,10 +62,13 @@
                 margin-bottom: 8px;
             }
         }
-
-        border-radius: 8px;
-        background-color: var(--md-sys-color-surface-container-lowest);
-        padding: 16px;
-        margin-top: 16px;
+        
+        .option-with-reset-button {
+            &:has(.reset-button) {
+                display: grid;
+                grid-template-columns: 1fr auto;
+                gap: 8px;
+            }
+        }
     }
 }

StartSch.Wasm/Components/EventSettingsDialog.razor.css

@@ -5,6 +5,7 @@
 @using StartSch.Wasm.PersonalCalendars
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
+@inject IJSRuntime Js
 @rendermode InteractiveWebAssemblyWithoutPrerendering
 
 <div class="root">
@@ -38,7 +39,7 @@
             var fullCalendarEvents = events.Select(eventContext =>
             {
                 var e = _applyModifications ? eventContext.ModifiedEvent : eventContext.OriginalEvent;
-                var category = e.CategoryCalendar;
+                var category = e.CategoryCalendarOrDefault;
                 return new FullCalendarEvent(
                     e.Id,
                     e.Start.ToDateTimeOffset(),
@@ -125,7 +126,7 @@
 
     protected override void OnInitialized()
     {
-        _welcome = NavigationManager.Uri.Contains("welcome");
+        _welcome = NavigationManager.Uri.EndsWith("#welcome");
         _isSettingsOpen = _welcome;
 
         _editorToken = EditorToken;
@@ -147,6 +148,14 @@
         }
     }
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (!firstRender || !_welcome)
+            return;
+        var newUri = NavigationManager.Uri.RemoveFromEnd("#welcome").ToString();
+        await Js.InvokeVoidAsync("history.replaceState", null, "", newUri);
+    }
+
     private async Task Save(PersonalCalendarLive calendar)
     {
         using var responseMessage = await HttpClient.PutAsJsonAsync(

StartSch.Wasm/Components/PersonalCalendarConfigurator.razor

@@ -0,0 +1,12 @@
+@if (!IsVisible) return;
+
+<md-icon-button @onclick="@ResetCallback" class="reset-button">
+    <md-icon>
+        reset_wrench
+    </md-icon>
+</md-icon-button>
+
+@code {
+    [Parameter, EditorRequired] public bool IsVisible { get; set; }
+    [Parameter, EditorRequired] public EventCallback ResetCallback { get; set; }
+}

StartSch.Wasm/Components/ResetButton.razor

@@ -18,7 +18,7 @@ private PersonalCalendarEvent CreateModifiedEvent()
         var modifiedEvent = OriginalEvent.Copy();
         foreach (var modification in _modifications)
             modification.Action.Apply(modifiedEvent);
-        modifiedEvent.CategoryCalendar = modifiedEvent.CategoryCalendarId is { } categoryCalendarId
+        modifiedEvent.CategoryCalendarOrDefault = modifiedEvent.CategoryCalendarId is { } categoryCalendarId
             ? getCategoryById(categoryCalendarId)
             : null;
         return modifiedEvent;

StartSch.Wasm/PersonalCalendars/EventContext.cs

@@ -12,6 +12,8 @@ public interface IModificationTarget
     /// Updates the target, such that the given event is no longer matched
     /// <returns>true, if there are no more targets, and the modification can therefore be garbage collected</returns>
     bool RemoveTarget(EventContext eventContext);
+
+    IModificationTarget Clone();
 }
 
 public class CalendarAndEventIdTarget : IModificationTarget
@@ -25,6 +27,8 @@ public IReadOnlySet<EventContext> GetTargets(TargetIndex index) =>
             : ImmutableHashSet<EventContext>.Empty;
 
     public bool RemoveTarget(EventContext eventContext) => true;
+    
+    public IModificationTarget Clone() => new CalendarAndEventIdTarget { CalendarId = CalendarId, EventId = EventId };
 }
 
 public class NeptunSeriesTarget : IModificationTarget
@@ -34,8 +38,7 @@ public class NeptunSeriesTarget : IModificationTarget
 
     public IReadOnlySet<EventContext> GetTargets(TargetIndex index) =>
         SelectedDates
-            .Select(date =>
-                index.SubjectCourseAndDateToEvent.GetValueOrDefault((SubjectAndCourse, date)))
+            .Select(date => index.SubjectCourseAndDateToEvent.GetValueOrDefault((SubjectAndCourse, date)))
             .Where(x => x != null)
             .Select(x => x!)
             .ToImmutableHashSet();
@@ -45,4 +48,10 @@ public bool RemoveTarget(EventContext eventContext)
         SelectedDates.Remove(eventContext.OriginalEvent.Start);
         return SelectedDates.Count == 0;
     }
+    
+    public IModificationTarget Clone() => new NeptunSeriesTarget
+    {
+        SubjectAndCourse = SubjectAndCourse,
+        SelectedDates = new(SelectedDates),
+    };
 }

StartSch.Wasm/PersonalCalendars/IModificationTarget.cs

@@ -54,14 +54,15 @@ public PersonalCalendarContext(PersonalCalendarContextDto dto)
             AddOriginalEvents(calendar, calendar.Events);
 
         foreach (var modification in config.Modifications)
-            foreach (var eventContext in modification.Target.GetTargets(_targetIndex))
-                eventContext.AddModification(modification);
+        foreach (var eventContext in modification.Target.GetTargets(_targetIndex))
+            eventContext.AddModification(modification);
 
         foreach (var eventIndexEntry in _eventsByStart)
             IndexModifiedEvent(eventIndexEntry.EventContext);
     }
 
-    private List<EventContext> AddOriginalEvents(PersonalCalendarLive sourceCalendar, IEnumerable<PersonalCalendarEvent> events)
+    private List<EventContext> AddOriginalEvents(PersonalCalendarLive sourceCalendar,
+        IEnumerable<PersonalCalendarEvent> events)
     {
         List<EventContext> results = [];
         foreach (PersonalCalendarEvent originalEvent in events)
@@ -90,22 +91,22 @@ public void ReplaceOriginalEvents(PersonalCalendarLive sourceCalendar, IEnumerab
             foreach (EventContext oldContext in oldContexts)
             {
                 DeindexModifiedEvent(oldContext);
-                
+
                 var originalEvent = oldContext.OriginalEvent;
                 _eventsByStart.Remove(new(originalEvent.Start, originalEvent.Id, oldContext));
                 _eventsByEnd.Remove(new(originalEvent.End, originalEvent.Id, oldContext));
                 _calIdToEvents.RemoveFromCollection(sourceCalendar.Id, oldContext);
                 _calAndIdToEvent.Remove((sourceCalendar.Id, originalEvent.Id));
                 _targetIndex.Remove(oldContext);
             }
-        
+
         var newContexts = AddOriginalEvents(sourceCalendar, events);
         TargetIndex tempIndex = new();
         foreach (var eventContext in newContexts)
             tempIndex.Add(eventContext);
         foreach (var modification in _modifications)
-            foreach (var affectedEvent in modification.Target.GetTargets(tempIndex))
-                affectedEvent.AddModification(modification);
+        foreach (var affectedEvent in modification.Target.GetTargets(tempIndex))
+            affectedEvent.AddModification(modification);
         foreach (var eventContext in newContexts)
             IndexModifiedEvent(eventContext);
     }
@@ -171,15 +172,16 @@ public EventEditContext GetEditContext(int calendarId, string eventId)
         var e = _calAndIdToEvent[(cal.Id, eventId)];
         var time = e.OriginalEvent.Start.InZone(SharedUtils.HungarianTimeZone);
 
-        List<EventContext>? relatedEvents = null;
-        if (e.OriginalEvent is { Subject: { } subject, Course: { } course })
+        return new(e, GetRelatedEvents());
+
+        IRelatedEvents? GetRelatedEvents()
         {
-            relatedEvents = _targetIndex.SeriesToEvents[new(new(subject, course), time.DayOfWeek, time.TimeOfDay)]
-                .Select(x => x.EventContext)
-                .ToList();
+            if (e.OriginalEvent is { Subject: { } subject, Course: { } course }
+                && _targetIndex.SeriesToEvents[new(new(subject, course), time.DayOfWeek, time.TimeOfDay)]
+                    is { Count: > 1 } entries)
+                return new NeptunSeriesEvents(entries.Select(x => x.EventContext).ToList(), new(subject, course));
+            return null;
         }
-
-        return new(e, relatedEvents);
     }
 
     public void AddModification(Modification modification)
@@ -209,13 +211,14 @@ public void AddModification(Modification modification)
         }
     }
 
-    public void RevertModifications(IModificationTarget target, Type actionType)
+    public void ResetModifications(IModificationTarget target, Type actionType)
     {
         var targetEvents = target.GetTargets(_targetIndex);
         foreach (var eventContext in targetEvents)
         {
+            var modification = eventContext.Modifications.FirstOrDefault(m => m.Action.GetType() == actionType);
+            if (modification is null) continue;
             DeindexModifiedEvent(eventContext);
-            var modification = eventContext.Modifications.First(m => m.Action.GetType() == actionType);
             eventContext.RemoveModification(modification);
             if (modification.Target.RemoveTarget(eventContext))
                 _modifications.Remove(modification);
@@ -260,7 +263,14 @@ public int CompareTo(EventIndexEntry other)
     }
 }
 
-public record EventEditContext(EventContext EventContext, List<EventContext>? RelatedEvents);
+public record EventEditContext(EventContext EventContext, IRelatedEvents? RelatedEvents);
+
+public interface IRelatedEvents
+{
+    List<EventContext> Events { get; }
+}
+
+public record NeptunSeriesEvents(List<EventContext> Events, NeptunSubjectAndCourse SubjectAndCourse) : IRelatedEvents;
 
 public readonly record struct NeptunSubjectAndCourse(string Subject, string Course);
 

StartSch.Wasm/PersonalCalendars/PersonalCalendarContext.cs

@@ -23,7 +23,7 @@ public class PersonalCalendarEvent
     public List<string>? Teachers { get; set; }
 
     [JsonIgnore] public PersonalCalendarLive SourceCalendar { get; set; } = null!;
-    [JsonIgnore] public PersonalCalendarCategoryLive? CategoryCalendar { get => field ?? GetDefaultCategory?.Invoke(); set; }
+    [JsonIgnore] public PersonalCalendarCategoryLive? CategoryCalendarOrDefault { get => field ?? GetDefaultCategory?.Invoke(); set; }
     [JsonIgnore] public Func<PersonalCalendarCategoryLive>? GetDefaultCategory { get; set; }
 
     public PersonalCalendarEvent Copy()
@@ -42,7 +42,7 @@ public PersonalCalendarEvent Copy()
             Course = Course,
             Teachers = Teachers?.ToList(),
             SourceCalendar = SourceCalendar,
-            CategoryCalendar = CategoryCalendar,
+            CategoryCalendarOrDefault = CategoryCalendarOrDefault,
             GetDefaultCategory = GetDefaultCategory,
         };
     }

StartSch.Wasm/PersonalCalendars/PersonalCalendarEvent.cs

@@ -85,6 +85,7 @@ public class FontCache
                 "open_in_new",
                 "publish",
                 "reset_settings",
+                "reset_wrench",
                 "restaurant",
                 "save",
                 "save_as",

StartSch/Services/FontCache.cs

@@ -12,7 +12,7 @@ namespace StartSch.Services;
 public class IcalendarCache(
     IMemoryCache memoryCache,
     HttpClient httpClient,
-    PortalVikBmeHuModule portalVikBmeHuModule
+    PortalVikBmeHuModule? portalVikBmeHuModule = null
 )
 {
     // TODO: return error events when URL is invalid or return an error to be handled that can then be turned into events
@@ -62,7 +62,7 @@ public async Task<List<PersonalCalendarEvent>> GetEvents(string url, Type extern
             if (icalendarEvent.Categories is [{ } category])
             {
                 subjectId = category;
-                subjectData = portalVikBmeHuModule.GetSubject(subjectId);
+                subjectData = portalVikBmeHuModule?.GetSubject(subjectId);
             }
         }
 
@@ -87,7 +87,8 @@ neptunLessonEventTitleData is { }
             Subject = neptunLessonEventTitleData?.Subject
                       ?? subjectData?.Name,
             Course = neptunLessonEventTitleData?.Course,
-            Teachers = neptunLessonEventTitleData?.Teachers,
+            Teachers = neptunLessonEventTitleData?.Teachers
+                       ?? neptunFinalEventTitleData?.Teachers,
         };
     }