@sprucelabs/spruce-calendar-components 22.3.16 → 22.3.17

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

@@ -249,6 +249,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     }
     handleDraftEventAdded(event) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('handle draft event added');
             yield this.events.addDraftEvent(event, !event.eventTypeSlug);
             if (!event.eventTypeSlug) {
                 this.toolBeltVc.open({ shouldStayOpen: true });
@@ -256,9 +257,9 @@ export default class RootSkillViewController extends AbstractSkillViewController
             }
         });
     }
-    handleEventSwapped(event) {
+    handleEventSwapped(draft, event) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.events.silentlySwapEvent(this.sm.getContext().event.id, event);
+            yield this.events.silentlySwapEvent(draft.id, event);
         });
     }
     handleDropEvent(id, updates) {

package/build/esm/viewControllers/Calendar.vc.d.ts

@@ -4,7 +4,7 @@ import { UpdateEvent } from '../types/calendar.types';
 declare type Calendar = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Calendar;
 declare type Event = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent;
 declare type DraftAddedHandler = (event: Event) => void | Promise<void>;
-declare type EventSwappedHandler = (event: Event) => void | Promise<void>;
+declare type EventSwappedHandler = (draft: Event, saved: Event) => void | Promise<void>;
 declare type EventDroppedHandler = (id: string, updates: Partial<Event>) => boolean | Promise<boolean>;
 declare type DraftRemovedHandler = () => void | Promise<void>;
 declare type ClickEventHandler = (options: ClickEventOptions) => void | Promise<void>;

package/build/esm/viewControllers/Calendar.vc.js

@@ -28,14 +28,14 @@ export default class CalendarViewController extends CoreCalendarViewController {
         super(Object.assign(Object.assign({ view: 'day' }, rest), { onDropEvent: (options) => {
                 return this.handleDropEvent(options);
             } }));
-        this.activelyPersisting = 0;
+        this.activelyPersisting = {};
         this.isSwapping = false;
         assertOptions(options, ['onAddDraftEvent']);
-        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped: onDraftEventSaved, } = rest;
+        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped } = rest;
         this.sorter = new PeopleSorter();
         this.draftAddedHandler = onAddDraftEvent;
         this.draftRemovedHandler = onRemoveDraftEvent;
-        this.eventSwappedHandler = onDraftEventSaved;
+        this.eventSwappedHandler = onEventSwapped;
         this.dropEventHandler = onDropEvent;
         this.remoteEventStore = remoteEventStore;
         this.model.onClick = this.handleClick.bind(this);
@@ -189,9 +189,14 @@ export default class CalendarViewController extends CoreCalendarViewController {
             const id = event.id;
             const isBusy = (options === null || options === void 0 ? void 0 : options.isBusy) === true;
             try {
-                this.activelyPersisting++;
+                if (!this.activelyPersisting[id]) {
+                    this.activelyPersisting[id] = 1;
+                }
+                else {
+                    this.activelyPersisting[id]++;
+                }
                 const saved = yield ((_a = this.remoteEventStore) === null || _a === void 0 ? void 0 : _a.persist(Object.assign(Object.assign({}, event), { isBusy })));
-                this.activelyPersisting--;
+                this.activelyPersisting[id]--;
                 if (!saved) {
                     return;
                 }
@@ -203,8 +208,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
                         this.lastSwappedId = id;
                         yield this.swapEvent(event, saved);
                     }
-                    if (this.activelyPersisting === 0) {
-                        yield ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, saved));
+                    if (this.activelyPersisting[id] === 0) {
+                        yield ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, event, saved));
                     }
                 }
                 else {

package/build/skillViewControllers/Root.svc.js

@@ -220,14 +220,15 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         }
     }
     async handleDraftEventAdded(event) {
+        console.log('handle draft event added');
         await this.events.addDraftEvent(event, !event.eventTypeSlug);
         if (!event.eventTypeSlug) {
             this.toolBeltVc.open({ shouldStayOpen: true });
             await this.sm.transitionTo(this.toolBeltStates.prerequisites);
         }
     }
-    async handleEventSwapped(event) {
-        await this.events.silentlySwapEvent(this.sm.getContext().event.id, event);
+    async handleEventSwapped(draft, event) {
+        await this.events.silentlySwapEvent(draft.id, event);
     }
     async handleDropEvent(id, updates) {
         return this.events.handleDropEvent(id, updates);

package/build/viewControllers/Calendar.vc.d.ts

@@ -4,7 +4,7 @@ import { UpdateEvent } from '../types/calendar.types';
 declare type Calendar = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Calendar;
 declare type Event = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent;
 declare type DraftAddedHandler = (event: Event) => void | Promise<void>;
-declare type EventSwappedHandler = (event: Event) => void | Promise<void>;
+declare type EventSwappedHandler = (draft: Event, saved: Event) => void | Promise<void>;
 declare type EventDroppedHandler = (id: string, updates: Partial<Event>) => boolean | Promise<boolean>;
 declare type DraftRemovedHandler = () => void | Promise<void>;
 declare type ClickEventHandler = (options: ClickEventOptions) => void | Promise<void>;

package/build/viewControllers/Calendar.vc.js

@@ -24,14 +24,14 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         super(Object.assign(Object.assign({ view: 'day' }, rest), { onDropEvent: (options) => {
                 return this.handleDropEvent(options);
             } }));
-        this.activelyPersisting = 0;
+        this.activelyPersisting = {};
         this.isSwapping = false;
         (0, schema_1.assertOptions)(options, ['onAddDraftEvent']);
-        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped: onDraftEventSaved, } = rest;
+        const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped } = rest;
         this.sorter = new calendar_utils_1.PeopleSorter();
         this.draftAddedHandler = onAddDraftEvent;
         this.draftRemovedHandler = onRemoveDraftEvent;
-        this.eventSwappedHandler = onDraftEventSaved;
+        this.eventSwappedHandler = onEventSwapped;
         this.dropEventHandler = onDropEvent;
         this.remoteEventStore = remoteEventStore;
         this.model.onClick = this.handleClick.bind(this);
@@ -166,9 +166,14 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         const id = event.id;
         const isBusy = (options === null || options === void 0 ? void 0 : options.isBusy) === true;
         try {
-            this.activelyPersisting++;
+            if (!this.activelyPersisting[id]) {
+                this.activelyPersisting[id] = 1;
+            }
+            else {
+                this.activelyPersisting[id]++;
+            }
             const saved = await ((_a = this.remoteEventStore) === null || _a === void 0 ? void 0 : _a.persist(Object.assign(Object.assign({}, event), { isBusy })));
-            this.activelyPersisting--;
+            this.activelyPersisting[id]--;
             if (!saved) {
                 return;
             }
@@ -180,8 +185,8 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
                     this.lastSwappedId = id;
                     await this.swapEvent(event, saved);
                 }
-                if (this.activelyPersisting === 0) {
-                    await ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, saved));
+                if (this.activelyPersisting[id] === 0) {
+                    await ((_b = this.eventSwappedHandler) === null || _b === void 0 ? void 0 : _b.call(this, event, saved));
                 }
             }
             else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sprucelabs/spruce-calendar-components",
   "description": "Calendar components for working with calendars and Sprucebot.",
-  "version": "22.3.16",
+  "version": "22.3.17",
   "skill": {
     "namespace": "calendar"
   },