@sprucelabs/spruce-calendar-components 25.6.4 → 25.6.6

package/build/__tests__/support/CalendarToolBeltStateMachineTestFactory.d.ts

@@ -2,11 +2,17 @@ import { SpruceSchemas } from '@sprucelabs/calendar-utils';
 import { ToolBeltViewController } from '@sprucelabs/heartwood-view-controllers';
 import { ViewFixture } from '@sprucelabs/spruce-test-fixtures';
 import CalendarViewController from '../../calendar/Calendar.vc';
+import CalendarEventManager, { CalendarEventManagerOptions, EventManagerCalendarVc } from '../../calendar/CalendarEventManager';
+import { PeopleManagerCalendarVc } from '../../calendar/CalendarPeopleManager';
 import { GetScheduleOptions, RemoteEventStore } from '../../stores/RemoteEventStore';
 import { Calendar, CalendarToolBeltStateMachine, UpdateEvent } from '../../types/calendar.types';
 import SpyEventManager from './SpyEventManager';
 export default class CalendarToolBeltStateMachineTestFactory {
-    static StateMachine(views: ViewFixture): Promise<{
+    static StateMachine(views: ViewFixture, options?: {
+        calendarVc?: EventManagerCalendarVc & PeopleManagerCalendarVc;
+        shouldUpdateCalendarOnContextUpdates?: boolean;
+        EventManagerClass?: new (options: CalendarEventManagerOptions) => CalendarEventManager;
+    }): Promise<{
         stateMachine: CalendarToolBeltStateMachine;
         toolBeltVc: ToolBeltViewController;
         calendarVc: CalendarViewController;

package/build/__tests__/support/CalendarToolBeltStateMachineTestFactory.js

@@ -14,7 +14,8 @@ const draftGenerator_1 = __importDefault(require("../../utilities/draftGenerator
 const SpyEventManager_1 = __importDefault(require("./SpyEventManager"));
 const SpyPeopleManager_1 = __importDefault(require("./SpyPeopleManager"));
 class CalendarToolBeltStateMachineTestFactory {
-    static async StateMachine(views) {
+    static async StateMachine(views, options) {
+        const { EventManagerClass, calendarVc: passedCalendarVc, shouldUpdateCalendarOnContextUpdates = true, } = options !== null && options !== void 0 ? options : {};
         const factory = views.getFactory();
         if (!factory.hasController('calendar.calendar')) {
             factory.mixinControllers({
@@ -24,7 +25,7 @@ class CalendarToolBeltStateMachineTestFactory {
         }
         const toolBeltVc = views.Controller('toolBelt', {});
         const event = heartwood_view_controllers_1.calendarSeeder.generateEventValues();
-        const calendarVc = views.Controller('calendar.calendar', {
+        const calendarVc = passedCalendarVc !== null && passedCalendarVc !== void 0 ? passedCalendarVc : views.Controller('calendar.calendar', {
             onAddDraftEvent: () => { },
             onEventSwapped(draft, saved) {
                 return events.silentlySwapEvent(draft.id, saved);
@@ -35,13 +36,12 @@ class CalendarToolBeltStateMachineTestFactory {
             vcFactory: views.getFactory(),
             toolBeltVc,
             connectToApi: async () => spruce_test_fixtures_1.fake.getClient(),
-            context: Object.assign(Object.assign({}, views.getRouter().buildLoadOptions()), { event,
-                calendarVc, cancelEvent: () => { } }),
+            context: Object.assign(Object.assign({}, views.getRouter().buildLoadOptions()), { event, calendarVc: calendarVc, cancelEvent: () => { } }),
         });
         const connectToApi = async () => spruce_test_fixtures_1.fake.getClient();
         const preferences = new FakeRemotePreferences({ connectToApi });
         const remoteEventsStore = new FakeRemoteEventStore();
-        const events = new SpyEventManager_1.default({
+        const events = new (EventManagerClass !== null && EventManagerClass !== void 0 ? EventManagerClass : SpyEventManager_1.default)({
             calendarVc,
             sm,
             dates: calendar_utils_1.dateUtil,
@@ -63,9 +63,13 @@ class CalendarToolBeltStateMachineTestFactory {
             getVisibleEvents: () => [],
         });
         await sm.updateContext({ events, people });
-        await sm.on('did-update-context', () => {
-            calendarVc.updateEvent(event.id, Object.assign({}, sm.getContext().event));
-        });
+        if (shouldUpdateCalendarOnContextUpdates) {
+            // await sm.on('did-update-context', () => {
+            // 	calendarVc.updateEvent(event.id, {
+            // 		...sm.getContext().event,
+            // 	})
+            // })
+        }
         //@ts-ignore
         return { stateMachine: sm, toolBeltVc, calendarVc, events };
     }

package/build/__tests__/support/SpyEventManager.d.ts

@@ -7,7 +7,8 @@ export default class SpyEventManager extends CalendarEventManager {
     wereShiftsRefreshed: boolean;
     getShouldIgnoreNextContextUpdate(): boolean;
     constructor(options: SpyEventManagerOptions);
-    protected refreshShifts(): void;
+    refreshShifts(): void;
+    generateShifts(): import("@sprucelabs/spruce-core-schemas").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarShift[];
     getRemoteEventsStore(): SpyRemoteEventStore;
     getStateMachine(): import("../../types/calendar.types").CalendarToolBeltStateMachine<CalendarToolBeltContext>;
     getPreferences(): SpyRemotePreferencesStore;

package/build/__tests__/support/SpyEventManager.js

@@ -16,6 +16,9 @@ class SpyEventManager extends CalendarEventManager_1.default {
         this.wereShiftsRefreshed = true;
         return super.refreshShifts();
     }
+    generateShifts() {
+        return super.generateShifts();
+    }
     getRemoteEventsStore() {
         return this.events;
     }

package/build/calendar/CalendarEventManager.d.ts

@@ -20,14 +20,19 @@ export default class CalendarEventManager {
     protected shouldUpdateAllEventsGoingForward?: boolean;
     protected prefs: RemotePreferencesStore;
     private calendars;
-    private shouldUpdateContextOnNextSave;
     private isLoaded;
     protected updateContext?: UpdateCalendarToolBeltContextHandler<CalendarToolBeltContext>;
+    private updateOperations;
+    private isRunningUpdateQueue;
+    private updateQueuePromise?;
     protected get calendarIds(): string[];
     protected get visibleCalendarIds(): string[];
     constructor(options: CalendarEventManagerOptions);
     replaceEventsInRange(events: CalendarEvent[], startMs: number, endMs: number): void;
     protected refreshShifts(): void;
+    private doShiftsMatchWhatIsInCalendar;
+    private generateShiftKeys;
+    protected generateShifts(): import("@sprucelabs/calendar-utils").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarShift[];
     private isCalendarSelected;
     private doesCalenderExist;
     getEvents(): CalendarEvent[];
@@ -49,6 +54,9 @@ export default class CalendarEventManager {
     makeCalendarVisible(calendarId: string): Promise<void>;
     makeCalendarHidden(calendarId: string): Promise<void>;
     updateEvent(id: string, updates: UpdateEventOptions): void;
+    waitForPendingOperations(): Promise<void>;
+    private startUpdateQueue;
+    private _updateEvent;
     private calculateDifferences;
     loadEvents(startDate: number, endDate: number, peopleIds: string[]): Promise<import("@sprucelabs/calendar-utils").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent[]>;
     setCalendarVisibility(calendarId: string, shouldBeVisible: boolean): Promise<void>;
@@ -95,7 +103,7 @@ export default class CalendarEventManager {
     setCurrentDate(dateMs: number): Promise<void>;
     private handleDidUpdateContext;
     protected saveEvent(event: SavedEvent): Promise<void>;
-    private clearPersistRepeatingOptions;
+    private clearRepeatingStrategyOptions;
     getIsLoaded(): boolean;
     hasEvent(id: string): boolean;
     optionallyAskForUpdateRepeatingStrategy(event: UpdateEvent, action?: RepeatingUpdateAction): Promise<boolean>;

package/build/calendar/CalendarEventManager.js

@@ -34,8 +34,9 @@ class CalendarEventManager {
         this.hasVcForEventTypeBeenLoaded = {};
         this.shouldIgnoreNextContextUpdate = false;
         this.calendars = [];
-        this.shouldUpdateContextOnNextSave = true;
         this.isLoaded = false;
+        this.updateOperations = [];
+        this.isRunningUpdateQueue = false;
         const { calendarVc, events, remoteVc, sm, askForUpdateStrategy, preferences, } = (0, schema_1.assertOptions)(options, [
             'calendarVc',
             'events',
@@ -60,9 +61,29 @@ class CalendarEventManager {
         this.refreshShifts();
     }
     refreshShifts() {
+        const shifts = this.generateShifts();
+        const areSame = this.doShiftsMatchWhatIsInCalendar(shifts);
+        if (areSame) {
+            return;
+        }
+        this.calendarVc.setShifts([...shifts]);
+    }
+    doShiftsMatchWhatIsInCalendar(shifts) {
+        var _a;
+        const currentShifts = this.generateShiftKeys((_a = this.calendarVc.getShifts()) !== null && _a !== void 0 ? _a : []);
+        const newShifts = this.generateShiftKeys(shifts);
+        const areShiftsTheSame = newShifts === currentShifts;
+        return areShiftsTheSame;
+    }
+    generateShiftKeys(shifts) {
+        return shifts
+            .map((s) => `${s.id}-${s.startDateTimeMs}-${s.endDateTimeMs}`)
+            .join('-');
+    }
+    generateShifts() {
         const inclusiveEvents = this.allEvents.filter((e) => this.inclusiveCalendarIds.indexOf(e.calendarId) > -1);
         const shifts = calendarShiftGenerator_1.default.generateFromEvents(inclusiveEvents);
-        this.calendarVc.setShifts([...shifts]);
+        return shifts;
     }
     isCalendarSelected(calendarId) {
         return this.visibleCalendarIds.indexOf(calendarId) > -1;
@@ -159,7 +180,7 @@ class CalendarEventManager {
             console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
             this.calendarVc.addEvent(Object.assign(Object.assign({}, event), { error: err }));
         }
-        this.clearPersistRepeatingOptions();
+        this.clearRepeatingStrategyOptions();
     }
     async makeCalendarVisible(calendarId) {
         this.assertValidCalendarId(calendarId);
@@ -176,27 +197,54 @@ class CalendarEventManager {
         await this.prefs.setVisibleCalendarIds(visibleCalendarIds);
     }
     updateEvent(id, updates) {
-        var _a;
+        const operation = new UpdateOperation({
+            id,
+            updates,
+            onComplete: this._updateEvent.bind(this),
+        });
+        this.updateOperations.push(operation);
+        this.clearRepeatingStrategyOptions();
+        this.updateQueuePromise = this.startUpdateQueue();
+    }
+    async waitForPendingOperations() {
+        await this.updateQueuePromise;
+    }
+    async startUpdateQueue() {
+        if (this.isRunningUpdateQueue) {
+            return;
+        }
+        this.isRunningUpdateQueue = true;
+        let next;
+        while ((next = this.updateOperations.shift())) {
+            await next.execute();
+        }
+        this.isRunningUpdateQueue = false;
+    }
+    async _updateEvent(id, updates) {
+        var _a, _b;
         const { shouldPersist } = updates, rest = __rest(updates, ["shouldPersist"]);
         const { isTheSame, isTheSameWithoutBusy } = this.calculateDifferences(id, updates);
         if (isTheSame) {
             return;
         }
-        this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist }));
+        try {
+            this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist }));
+        }
+        catch (err) {
+            console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
+            return;
+        }
         const idx = this.allEvents.findIndex((e) => e.id === id);
         this.allEvents[idx] = Object.assign(Object.assign({}, this.allEvents[idx]), rest);
         if (isTheSameWithoutBusy) {
             return;
         }
         this.refreshShifts();
-        if (this.shouldUpdateContextOnNextSave &&
-            ((_a = this.sm.getContext().event) === null || _a === void 0 ? void 0 : _a.id) === id) {
+        if (((_b = this.sm.getContext().event) === null || _b === void 0 ? void 0 : _b.id) === id) {
             this.shouldIgnoreNextContextUpdate = true;
-            void this.updateEventInContext(rest).then(() => {
-                this.shouldIgnoreNextContextUpdate = false;
-            });
+            await this.updateEventInContext(rest);
+            this.shouldIgnoreNextContextUpdate = false;
         }
-        this.shouldUpdateContextOnNextSave = true;
     }
     calculateDifferences(id, updates) {
         const match = this.allEvents.find((e) => e.id === id);
@@ -335,7 +383,6 @@ class CalendarEventManager {
         }
         const { event } = this.sm.getContext();
         if (event === null || event === void 0 ? void 0 : event.id) {
-            this.shouldUpdateContextOnNextSave = false;
             await this.saveEvent(event);
         }
     }
@@ -347,9 +394,8 @@ class CalendarEventManager {
         catch (err) {
             console.error('Updating event in context from root failed because:\n\n', err);
         }
-        this.clearPersistRepeatingOptions();
     }
-    clearPersistRepeatingOptions() {
+    clearRepeatingStrategyOptions() {
         this.dateToUpdate = undefined;
         this.shouldUpdateAllEventsGoingForward = undefined;
     }
@@ -387,3 +433,14 @@ class CalendarEventManager {
     }
 }
 exports.default = CalendarEventManager;
+class UpdateOperation {
+    constructor(options) {
+        const { id, updates, onComplete } = options;
+        this.id = id;
+        this.updates = updates;
+        this.onComplete = onComplete;
+    }
+    async execute() {
+        await this.onComplete(this.id, this.updates);
+    }
+}

package/build/esm/__tests__/support/CalendarToolBeltStateMachineTestFactory.d.ts

@@ -2,11 +2,17 @@ import { SpruceSchemas } from '@sprucelabs/calendar-utils';
 import { ToolBeltViewController } from '@sprucelabs/heartwood-view-controllers';
 import { ViewFixture } from '@sprucelabs/spruce-test-fixtures';
 import CalendarViewController from '../../calendar/Calendar.vc';
+import CalendarEventManager, { CalendarEventManagerOptions, EventManagerCalendarVc } from '../../calendar/CalendarEventManager';
+import { PeopleManagerCalendarVc } from '../../calendar/CalendarPeopleManager';
 import { GetScheduleOptions, RemoteEventStore } from '../../stores/RemoteEventStore';
 import { Calendar, CalendarToolBeltStateMachine, UpdateEvent } from '../../types/calendar.types';
 import SpyEventManager from './SpyEventManager';
 export default class CalendarToolBeltStateMachineTestFactory {
-    static StateMachine(views: ViewFixture): Promise<{
+    static StateMachine(views: ViewFixture, options?: {
+        calendarVc?: EventManagerCalendarVc & PeopleManagerCalendarVc;
+        shouldUpdateCalendarOnContextUpdates?: boolean;
+        EventManagerClass?: new (options: CalendarEventManagerOptions) => CalendarEventManager;
+    }): Promise<{
         stateMachine: CalendarToolBeltStateMachine;
         toolBeltVc: ToolBeltViewController;
         calendarVc: CalendarViewController;

package/build/esm/__tests__/support/CalendarToolBeltStateMachineTestFactory.js

@@ -17,8 +17,9 @@ import draftEventGenerator from '../../utilities/draftGenerator.js';
 import SpyEventManager from './SpyEventManager.js';
 import SpyPeopleManager from './SpyPeopleManager.js';
 export default class CalendarToolBeltStateMachineTestFactory {
-    static StateMachine(views) {
+    static StateMachine(views, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { EventManagerClass, calendarVc: passedCalendarVc, shouldUpdateCalendarOnContextUpdates = true, } = options !== null && options !== void 0 ? options : {};
             const factory = views.getFactory();
             if (!factory.hasController('calendar.calendar')) {
                 factory.mixinControllers({
@@ -28,7 +29,7 @@ export default class CalendarToolBeltStateMachineTestFactory {
             }
             const toolBeltVc = views.Controller('toolBelt', {});
             const event = calendarSeeder.generateEventValues();
-            const calendarVc = views.Controller('calendar.calendar', {
+            const calendarVc = passedCalendarVc !== null && passedCalendarVc !== void 0 ? passedCalendarVc : views.Controller('calendar.calendar', {
                 onAddDraftEvent: () => { },
                 onEventSwapped(draft, saved) {
                     return events.silentlySwapEvent(draft.id, saved);
@@ -39,13 +40,12 @@ export default class CalendarToolBeltStateMachineTestFactory {
                 vcFactory: views.getFactory(),
                 toolBeltVc,
                 connectToApi: () => __awaiter(this, void 0, void 0, function* () { return fake.getClient(); }),
-                context: Object.assign(Object.assign({}, views.getRouter().buildLoadOptions()), { event,
-                    calendarVc, cancelEvent: () => { } }),
+                context: Object.assign(Object.assign({}, views.getRouter().buildLoadOptions()), { event, calendarVc: calendarVc, cancelEvent: () => { } }),
             });
             const connectToApi = () => __awaiter(this, void 0, void 0, function* () { return fake.getClient(); });
             const preferences = new FakeRemotePreferences({ connectToApi });
             const remoteEventsStore = new FakeRemoteEventStore();
-            const events = new SpyEventManager({
+            const events = new (EventManagerClass !== null && EventManagerClass !== void 0 ? EventManagerClass : SpyEventManager)({
                 calendarVc,
                 sm,
                 dates: dateUtil,
@@ -67,9 +67,13 @@ export default class CalendarToolBeltStateMachineTestFactory {
                 getVisibleEvents: () => [],
             });
             yield sm.updateContext({ events, people });
-            yield sm.on('did-update-context', () => {
-                calendarVc.updateEvent(event.id, Object.assign({}, sm.getContext().event));
-            });
+            if (shouldUpdateCalendarOnContextUpdates) {
+                // await sm.on('did-update-context', () => {
+                // 	calendarVc.updateEvent(event.id, {
+                // 		...sm.getContext().event,
+                // 	})
+                // })
+            }
             //@ts-ignore
             return { stateMachine: sm, toolBeltVc, calendarVc, events };
         });

package/build/esm/__tests__/support/SpyEventManager.d.ts

@@ -7,7 +7,8 @@ export default class SpyEventManager extends CalendarEventManager {
     wereShiftsRefreshed: boolean;
     getShouldIgnoreNextContextUpdate(): boolean;
     constructor(options: SpyEventManagerOptions);
-    protected refreshShifts(): void;
+    refreshShifts(): void;
+    generateShifts(): import("@sprucelabs/spruce-core-schemas").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarShift[];
     getRemoteEventsStore(): SpyRemoteEventStore;
     getStateMachine(): import("../../types/calendar.types").CalendarToolBeltStateMachine<CalendarToolBeltContext>;
     getPreferences(): SpyRemotePreferencesStore;

package/build/esm/__tests__/support/SpyEventManager.js

@@ -20,6 +20,9 @@ export default class SpyEventManager extends CalendarEventManager {
         this.wereShiftsRefreshed = true;
         return super.refreshShifts();
     }
+    generateShifts() {
+        return super.generateShifts();
+    }
     getRemoteEventsStore() {
         return this.events;
     }

package/build/esm/calendar/CalendarEventManager.d.ts

@@ -20,14 +20,19 @@ export default class CalendarEventManager {
     protected shouldUpdateAllEventsGoingForward?: boolean;
     protected prefs: RemotePreferencesStore;
     private calendars;
-    private shouldUpdateContextOnNextSave;
     private isLoaded;
     protected updateContext?: UpdateCalendarToolBeltContextHandler<CalendarToolBeltContext>;
+    private updateOperations;
+    private isRunningUpdateQueue;
+    private updateQueuePromise?;
     protected get calendarIds(): string[];
     protected get visibleCalendarIds(): string[];
     constructor(options: CalendarEventManagerOptions);
     replaceEventsInRange(events: CalendarEvent[], startMs: number, endMs: number): void;
     protected refreshShifts(): void;
+    private doShiftsMatchWhatIsInCalendar;
+    private generateShiftKeys;
+    protected generateShifts(): import("@sprucelabs/calendar-utils").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarShift[];
     private isCalendarSelected;
     private doesCalenderExist;
     getEvents(): CalendarEvent[];
@@ -49,6 +54,9 @@ export default class CalendarEventManager {
     makeCalendarVisible(calendarId: string): Promise<void>;
     makeCalendarHidden(calendarId: string): Promise<void>;
     updateEvent(id: string, updates: UpdateEventOptions): void;
+    waitForPendingOperations(): Promise<void>;
+    private startUpdateQueue;
+    private _updateEvent;
     private calculateDifferences;
     loadEvents(startDate: number, endDate: number, peopleIds: string[]): Promise<import("@sprucelabs/calendar-utils").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent[]>;
     setCalendarVisibility(calendarId: string, shouldBeVisible: boolean): Promise<void>;
@@ -95,7 +103,7 @@ export default class CalendarEventManager {
     setCurrentDate(dateMs: number): Promise<void>;
     private handleDidUpdateContext;
     protected saveEvent(event: SavedEvent): Promise<void>;
-    private clearPersistRepeatingOptions;
+    private clearRepeatingStrategyOptions;
     getIsLoaded(): boolean;
     hasEvent(id: string): boolean;
     optionallyAskForUpdateRepeatingStrategy(event: UpdateEvent, action?: RepeatingUpdateAction): Promise<boolean>;

package/build/esm/calendar/CalendarEventManager.js

@@ -38,8 +38,9 @@ export default class CalendarEventManager {
         this.hasVcForEventTypeBeenLoaded = {};
         this.shouldIgnoreNextContextUpdate = false;
         this.calendars = [];
-        this.shouldUpdateContextOnNextSave = true;
         this.isLoaded = false;
+        this.updateOperations = [];
+        this.isRunningUpdateQueue = false;
         const { calendarVc, events, remoteVc, sm, askForUpdateStrategy, preferences, } = assertOptions(options, [
             'calendarVc',
             'events',
@@ -64,9 +65,29 @@ export default class CalendarEventManager {
         this.refreshShifts();
     }
     refreshShifts() {
+        const shifts = this.generateShifts();
+        const areSame = this.doShiftsMatchWhatIsInCalendar(shifts);
+        if (areSame) {
+            return;
+        }
+        this.calendarVc.setShifts([...shifts]);
+    }
+    doShiftsMatchWhatIsInCalendar(shifts) {
+        var _a;
+        const currentShifts = this.generateShiftKeys((_a = this.calendarVc.getShifts()) !== null && _a !== void 0 ? _a : []);
+        const newShifts = this.generateShiftKeys(shifts);
+        const areShiftsTheSame = newShifts === currentShifts;
+        return areShiftsTheSame;
+    }
+    generateShiftKeys(shifts) {
+        return shifts
+            .map((s) => `${s.id}-${s.startDateTimeMs}-${s.endDateTimeMs}`)
+            .join('-');
+    }
+    generateShifts() {
         const inclusiveEvents = this.allEvents.filter((e) => this.inclusiveCalendarIds.indexOf(e.calendarId) > -1);
         const shifts = calendarShiftGenerator.generateFromEvents(inclusiveEvents);
-        this.calendarVc.setShifts([...shifts]);
+        return shifts;
     }
     isCalendarSelected(calendarId) {
         return this.visibleCalendarIds.indexOf(calendarId) > -1;
@@ -174,7 +195,7 @@ export default class CalendarEventManager {
                 console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
                 this.calendarVc.addEvent(Object.assign(Object.assign({}, event), { error: err }));
             }
-            this.clearPersistRepeatingOptions();
+            this.clearRepeatingStrategyOptions();
         });
     }
     makeCalendarVisible(calendarId) {
@@ -196,27 +217,60 @@ export default class CalendarEventManager {
         });
     }
     updateEvent(id, updates) {
-        var _a;
-        const { shouldPersist } = updates, rest = __rest(updates, ["shouldPersist"]);
-        const { isTheSame, isTheSameWithoutBusy } = this.calculateDifferences(id, updates);
-        if (isTheSame) {
-            return;
-        }
-        this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist }));
-        const idx = this.allEvents.findIndex((e) => e.id === id);
-        this.allEvents[idx] = Object.assign(Object.assign({}, this.allEvents[idx]), rest);
-        if (isTheSameWithoutBusy) {
-            return;
-        }
-        this.refreshShifts();
-        if (this.shouldUpdateContextOnNextSave &&
-            ((_a = this.sm.getContext().event) === null || _a === void 0 ? void 0 : _a.id) === id) {
-            this.shouldIgnoreNextContextUpdate = true;
-            void this.updateEventInContext(rest).then(() => {
+        const operation = new UpdateOperation({
+            id,
+            updates,
+            onComplete: this._updateEvent.bind(this),
+        });
+        this.updateOperations.push(operation);
+        this.clearRepeatingStrategyOptions();
+        this.updateQueuePromise = this.startUpdateQueue();
+    }
+    waitForPendingOperations() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.updateQueuePromise;
+        });
+    }
+    startUpdateQueue() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isRunningUpdateQueue) {
+                return;
+            }
+            this.isRunningUpdateQueue = true;
+            let next;
+            while ((next = this.updateOperations.shift())) {
+                yield next.execute();
+            }
+            this.isRunningUpdateQueue = false;
+        });
+    }
+    _updateEvent(id, updates) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const { shouldPersist } = updates, rest = __rest(updates, ["shouldPersist"]);
+            const { isTheSame, isTheSameWithoutBusy } = this.calculateDifferences(id, updates);
+            if (isTheSame) {
+                return;
+            }
+            try {
+                this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist }));
+            }
+            catch (err) {
+                console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
+                return;
+            }
+            const idx = this.allEvents.findIndex((e) => e.id === id);
+            this.allEvents[idx] = Object.assign(Object.assign({}, this.allEvents[idx]), rest);
+            if (isTheSameWithoutBusy) {
+                return;
+            }
+            this.refreshShifts();
+            if (((_b = this.sm.getContext().event) === null || _b === void 0 ? void 0 : _b.id) === id) {
+                this.shouldIgnoreNextContextUpdate = true;
+                yield this.updateEventInContext(rest);
                 this.shouldIgnoreNextContextUpdate = false;
-            });
-        }
-        this.shouldUpdateContextOnNextSave = true;
+            }
+        });
     }
     calculateDifferences(id, updates) {
         const match = this.allEvents.find((e) => e.id === id);
@@ -378,7 +432,6 @@ export default class CalendarEventManager {
             }
             const { event } = this.sm.getContext();
             if (event === null || event === void 0 ? void 0 : event.id) {
-                this.shouldUpdateContextOnNextSave = false;
                 yield this.saveEvent(event);
             }
         });
@@ -392,10 +445,9 @@ export default class CalendarEventManager {
             catch (err) {
                 console.error('Updating event in context from root failed because:\n\n', err);
             }
-            this.clearPersistRepeatingOptions();
         });
     }
-    clearPersistRepeatingOptions() {
+    clearRepeatingStrategyOptions() {
         this.dateToUpdate = undefined;
         this.shouldUpdateAllEventsGoingForward = undefined;
     }
@@ -434,3 +486,16 @@ export default class CalendarEventManager {
         });
     }
 }
+class UpdateOperation {
+    constructor(options) {
+        const { id, updates, onComplete } = options;
+        this.id = id;
+        this.updates = updates;
+        this.onComplete = onComplete;
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.onComplete(this.id, this.updates);
+        });
+    }
+}

package/build/esm/skillViewControllers/Root.svc.js

@@ -169,6 +169,7 @@ class RootSkillViewController extends AbstractSkillViewController {
                 this.loadEventsPromise,
                 this.sm.waitForContextUpdate(),
                 this.calendarVc.waitForPendingSaves(),
+                this.events.waitForPendingOperations(),
             ]);
         });
     }

package/build/esm/stores/isEqual.d.ts

@@ -0,0 +1 @@
+export default function isEqual(a: any, b: any): boolean;

package/build/esm/stores/isEqual.js

@@ -0,0 +1,29 @@
+export default function isEqual(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (a instanceof Date && b instanceof Date) {
+        return a.getTime() === b.getTime();
+    }
+    if (!a || !b || (typeof a !== 'object' && typeof b !== 'object')) {
+        return a === b;
+    }
+    if (a.prototype !== b.prototype) {
+        return false;
+    }
+    a = removeUndefinedAndNullFields(Object.assign({}, a));
+    b = removeUndefinedAndNullFields(Object.assign({}, b));
+    const keys = Object.keys(a);
+    if (keys.length !== Object.keys(b).length) {
+        return false;
+    }
+    return keys.every((k) => isEqual(a[k], b[k]));
+}
+function removeUndefinedAndNullFields(obj) {
+    for (const key in obj) {
+        if (obj[key] === undefined || obj[key] === null) {
+            delete obj[key];
+        }
+    }
+    return obj;
+}

package/build/esm/toolBelt/states/AbstractCalendarEventToolBeltState.js

@@ -36,7 +36,7 @@ export default class AbstractCalendarEventToolBeltState {
                 position: 'bottom',
             });
             this.handleDidUpdateContext = this.handleDidUpdateContext.bind(this);
-            yield this.sm.on('did-update-context', this.handleDidUpdateContext);
+            void this.sm.on('did-update-context', this.handleDidUpdateContext);
         });
     }
     getIsLoaded() {

package/build/skillViewControllers/Root.svc.js

@@ -150,6 +150,7 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             this.loadEventsPromise,
             this.sm.waitForContextUpdate(),
             this.calendarVc.waitForPendingSaves(),
+            this.events.waitForPendingOperations(),
         ]);
     }
     async handleSelectCalendar(calendar) {

package/build/stores/isEqual.d.ts

@@ -0,0 +1 @@
+export default function isEqual(a: any, b: any): boolean;

package/build/stores/isEqual.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function isEqual(a, b) {
+    if (a === b) {
+        return true;
+    }
+    if (a instanceof Date && b instanceof Date) {
+        return a.getTime() === b.getTime();
+    }
+    if (!a || !b || (typeof a !== 'object' && typeof b !== 'object')) {
+        return a === b;
+    }
+    if (a.prototype !== b.prototype) {
+        return false;
+    }
+    a = removeUndefinedAndNullFields(Object.assign({}, a));
+    b = removeUndefinedAndNullFields(Object.assign({}, b));
+    const keys = Object.keys(a);
+    if (keys.length !== Object.keys(b).length) {
+        return false;
+    }
+    return keys.every((k) => isEqual(a[k], b[k]));
+}
+exports.default = isEqual;
+function removeUndefinedAndNullFields(obj) {
+    for (const key in obj) {
+        if (obj[key] === undefined || obj[key] === null) {
+            delete obj[key];
+        }
+    }
+    return obj;
+}

package/build/toolBelt/states/AbstractCalendarEventToolBeltState.js

@@ -31,7 +31,7 @@ class AbstractCalendarEventToolBeltState {
             position: 'bottom',
         });
         this.handleDidUpdateContext = this.handleDidUpdateContext.bind(this);
-        await this.sm.on('did-update-context', this.handleDidUpdateContext);
+        void this.sm.on('did-update-context', this.handleDidUpdateContext);
     }
     getIsLoaded() {
         return this.isLoaded;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sprucelabs/spruce-calendar-components",
   "description": "Calendar components for working with calendars and Sprucebot.",
-  "version": "25.6.4",
+  "version": "25.6.6",
   "skill": {
     "namespace": "calendar"
   },
@@ -62,6 +62,10 @@
     "build/constants.d.ts",
     "build/esm/constants.js",
     "build/esm/constants.d.ts",
+    "build/stores/isEqual.js",
+    "build/stores/isEqual.d.ts",
+    "build/esm/stores/isEqual.js",
+    "build/esm/stores/isEqual.d.ts",
     "build/index-components.js",
     "build/index-components.d.ts",
     "build/esm/index-components.js",