@sprucelabs/spruce-calendar-components 22.8.19 → 22.8.21

package/build/esm/skillViewControllers/Root.svc.d.ts

@@ -45,7 +45,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private setSelectedDateInDateSelectVc;
     private getStartDate;
     private handleDeselectEvent;
-    private resetToRootState;
+    protected resetToRootState(): Promise<void>;
     private ToolBeltVc;
     private handleClickEvent;
     private handleDraftEventAdded;

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

@@ -80,6 +80,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
                 message: `You wanna cancel this?`,
             });
             if (confirm) {
+                yield this.resetToRootState();
                 yield this.events.removeEvent(eventId);
             }
         });
@@ -166,7 +167,10 @@ export default class RootSkillViewController extends AbstractSkillViewController
     }
     handleSelectCalendar(calendar) {
         var _a;
-        (_a = this.remoteEventStore) === null || _a === void 0 ? void 0 : _a.setCalendarId(calendar.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            (_a = this.remoteEventStore) === null || _a === void 0 ? void 0 : _a.setCalendarId(calendar.id);
+            yield this.events.makeCalendarVisible(calendar.id);
+        });
     }
     getToolBeltStateMachine() {
         return this.sm;
@@ -213,11 +217,11 @@ export default class RootSkillViewController extends AbstractSkillViewController
     }
     resetToRootState() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.events.reset();
-            this.makeDateSelectMatchSelectedDateFromCalendar();
-            this.transitionPromise = this.sm.transitionTo(this.toolBeltStates.root);
             this.toolBeltVc.close();
+            this.transitionPromise = this.sm.transitionTo(this.toolBeltStates.root);
             yield this.transitionPromise;
+            yield this.events.reset();
+            this.makeDateSelectMatchSelectedDateFromCalendar();
         });
     }
     ToolBeltVc() {

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

@@ -100,7 +100,7 @@ export default class CalendarEventManager {
     hasEvent(id: string): boolean;
     optionallyAskForUpdateRepeatingStrategy(event: UpdateEvent): Promise<boolean>;
 }
-export declare type EventManagerCalendarVc = Pick<CalendarViewController, 'replaceEventsInRange' | 'mixinEvents' | 'removeEvent' | 'addEvent' | 'hasEvent' | 'updateEvent' | 'setShifts' | 'getShifts' | 'getEvent' | 'getPeople' | 'setControllerForEventType' | 'setRemoteStore' | 'getSelectedEvent' | 'selectEvent' | 'deselectEvent'>;
+export declare type EventManagerCalendarVc = Pick<CalendarViewController, 'replaceEventsInRange' | 'mixinEvents' | 'removeEvent' | 'addEvent' | 'hasEvent' | 'updateEvent' | 'setShifts' | 'getShifts' | 'getEvent' | 'getPeople' | 'setControllerForEventType' | 'setRemoteStore' | 'getSelectedEvent' | 'selectEvent' | 'deselectEvent' | 'removeEvents'>;
 declare type EventManagerRemoteViewControllerFactory = Pick<RemoteViewControllerFactory, 'fetchRemoteController'>;
 export interface CalendarEventManagerOptions {
     calendarVc: EventManagerCalendarVc;

package/build/esm/utilities/CalendarEventManager.js

@@ -127,7 +127,7 @@ export default class CalendarEventManager {
     reset() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            void this.setEventInContext(undefined);
+            yield this.setEventInContext(undefined);
             (_a = this.events) === null || _a === void 0 ? void 0 : _a.clearCalendarId();
         });
     }
@@ -175,12 +175,8 @@ export default class CalendarEventManager {
         return __awaiter(this, void 0, void 0, function* () {
             this.assertValidCalendarId(calendarId);
             const visibleCalendarIds = this.visibleCalendarIds.filter((id) => id !== calendarId);
-            for (const event of this.allEvents) {
-                if (event.calendarId === calendarId &&
-                    this.calendarVc.hasEvent(event.id)) {
-                    yield this.calendarVc.removeEvent(event.id);
-                }
-            }
+            const toHide = this.allEvents.filter((e) => e.calendarId === calendarId);
+            yield this.calendarVc.removeEvents(toHide.map((e) => e.id).filter((e) => this.calendarVc.hasEvent(e)));
             yield this.prefs.setVisibleCalendarIds(visibleCalendarIds);
         });
     }

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

@@ -1,15 +1,6 @@
 import { SpruceSchemas, ViewControllerOptions, CalendarViewController as CoreCalendarViewController, ClickCalendarViewOptions, DropEventOptions, ClickEventOptions } from '@sprucelabs/heartwood-view-controllers';
 import { RemoteEventStore } from '../stores/RemoteEventStore';
 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 = (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>;
-declare type StartDateTimeChangeHandler = (date: number) => void | Promise<void>;
-declare type DeselectEventHandler = () => void | Promise<void>;
 export interface CalendarViewControllerOptions {
     people?: NonNullable<Calendar['people']>;
     remoteEventStore?: RemoteEventStore;
@@ -40,7 +31,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
     setRemoteStore(remoteEventStore: RemoteEventStore): void;
     getRemoteStore(): RemoteEventStore | undefined;
     private handleClick;
-    private getDraftEvent;
+    private isDraftEvent;
+    protected getDraftEvent(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent | undefined;
     private removeDraftEvent;
     private addDraftEventFromClick;
     addDraftEvent(e: Omit<Event, 'id'>): Promise<SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent>;
@@ -77,4 +69,13 @@ export default class CalendarViewController extends CoreCalendarViewController {
         shifts?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarShift[] | null | undefined;
     };
 }
+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 = (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>;
+declare type StartDateTimeChangeHandler = (date: number) => void | Promise<void>;
+declare type DeselectEventHandler = () => void | Promise<void>;
 export {};

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

@@ -78,7 +78,7 @@ export default class CalendarViewController extends CoreCalendarViewController {
                 'remoteEventStore',
             ]);
             const selected = this.getSelectedEvent();
-            if (selected && selected.style !== 'draft') {
+            if (selected && !this.isDraftEvent(selected)) {
                 yield this.deselectEvent();
                 return;
             }
@@ -91,9 +91,12 @@ export default class CalendarViewController extends CoreCalendarViewController {
             }
         });
     }
+    isDraftEvent(event) {
+        return event.style === 'draft';
+    }
     getDraftEvent() {
         const events = this.getEvents();
-        const draft = events.find((e) => e.style === 'draft');
+        const draft = events.find((e) => this.isDraftEvent(e));
         return draft;
     }
     removeDraftEvent(id) {

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

@@ -15,6 +15,7 @@ export default class CalendarSelectCardViewController extends AbstractViewContro
     getListVc(): import("@sprucelabs/heartwood-view-controllers").ListViewController;
     getIsLoaded(): boolean;
     getSelectedCalendarIds(): string[];
+    private rowForCalendar;
     load(options: {
         scope: Scope;
     }): Promise<void>;

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

@@ -50,8 +50,10 @@ export default class CalendarSelectCardViewController extends AbstractViewContro
                         name: 'isVisible',
                         value: this.selectedCalendarIds.indexOf(calendar.id) > -1,
                         onChange: (isVisible) => __awaiter(this, void 0, void 0, function* () {
-                            this.changePromise = this.events.setCalendarVisibility(calendar.id, isVisible);
-                            return this.changePromise;
+                            const calendarId = calendar.id;
+                            this.changePromise = this.events.setCalendarVisibility(calendarId, isVisible);
+                            const p = this.changePromise;
+                            return p;
                         }),
                     },
                 },
@@ -76,12 +78,15 @@ export default class CalendarSelectCardViewController extends AbstractViewContro
         const records = this.activeVc.getRecords();
         const ids = [];
         for (const calendar of records) {
-            if (this.getListVc().getRowVc(calendar.id).getValue('isVisible')) {
+            if (this.rowForCalendar(calendar.id).getValue('isVisible')) {
                 ids.push(calendar.id);
             }
         }
         return ids;
     }
+    rowForCalendar(calendarId) {
+        return this.getListVc().getRowVc(calendarId);
+    }
     load(options) {
         return __awaiter(this, void 0, void 0, function* () {
             assertOptions(options, ['scope']);

package/build/skillViewControllers/Root.svc.d.ts

@@ -45,7 +45,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private setSelectedDateInDateSelectVc;
     private getStartDate;
     private handleDeselectEvent;
-    private resetToRootState;
+    protected resetToRootState(): Promise<void>;
     private ToolBeltVc;
     private handleClickEvent;
     private handleDraftEventAdded;

package/build/skillViewControllers/Root.svc.js

@@ -75,6 +75,7 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             message: `You wanna cancel this?`,
         });
         if (confirm) {
+            await this.resetToRootState();
             await this.events.removeEvent(eventId);
         }
     }
@@ -144,9 +145,10 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             this.calendarVc.waitForPendingSaves(),
         ]);
     }
-    handleSelectCalendar(calendar) {
+    async handleSelectCalendar(calendar) {
         var _a;
         (_a = this.remoteEventStore) === null || _a === void 0 ? void 0 : _a.setCalendarId(calendar.id);
+        await this.events.makeCalendarVisible(calendar.id);
     }
     getToolBeltStateMachine() {
         return this.sm;
@@ -188,11 +190,11 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         await this.resetToRootState();
     }
     async resetToRootState() {
-        await this.events.reset();
-        this.makeDateSelectMatchSelectedDateFromCalendar();
-        this.transitionPromise = this.sm.transitionTo(this.toolBeltStates.root);
         this.toolBeltVc.close();
+        this.transitionPromise = this.sm.transitionTo(this.toolBeltStates.root);
         await this.transitionPromise;
+        await this.events.reset();
+        this.makeDateSelectMatchSelectedDateFromCalendar();
     }
     ToolBeltVc() {
         return this.Controller('toolBelt', {

package/build/utilities/CalendarEventManager.d.ts

@@ -100,7 +100,7 @@ export default class CalendarEventManager {
     hasEvent(id: string): boolean;
     optionallyAskForUpdateRepeatingStrategy(event: UpdateEvent): Promise<boolean>;
 }
-export declare type EventManagerCalendarVc = Pick<CalendarViewController, 'replaceEventsInRange' | 'mixinEvents' | 'removeEvent' | 'addEvent' | 'hasEvent' | 'updateEvent' | 'setShifts' | 'getShifts' | 'getEvent' | 'getPeople' | 'setControllerForEventType' | 'setRemoteStore' | 'getSelectedEvent' | 'selectEvent' | 'deselectEvent'>;
+export declare type EventManagerCalendarVc = Pick<CalendarViewController, 'replaceEventsInRange' | 'mixinEvents' | 'removeEvent' | 'addEvent' | 'hasEvent' | 'updateEvent' | 'setShifts' | 'getShifts' | 'getEvent' | 'getPeople' | 'setControllerForEventType' | 'setRemoteStore' | 'getSelectedEvent' | 'selectEvent' | 'deselectEvent' | 'removeEvents'>;
 declare type EventManagerRemoteViewControllerFactory = Pick<RemoteViewControllerFactory, 'fetchRemoteController'>;
 export interface CalendarEventManagerOptions {
     calendarVc: EventManagerCalendarVc;

package/build/utilities/CalendarEventManager.js

@@ -116,7 +116,7 @@ class CalendarEventManager {
     }
     async reset() {
         var _a;
-        void this.setEventInContext(undefined);
+        await this.setEventInContext(undefined);
         (_a = this.events) === null || _a === void 0 ? void 0 : _a.clearCalendarId();
     }
     async restoreEventToDraftOnStateLoadError() {
@@ -156,12 +156,8 @@ class CalendarEventManager {
     async makeCalendarHidden(calendarId) {
         this.assertValidCalendarId(calendarId);
         const visibleCalendarIds = this.visibleCalendarIds.filter((id) => id !== calendarId);
-        for (const event of this.allEvents) {
-            if (event.calendarId === calendarId &&
-                this.calendarVc.hasEvent(event.id)) {
-                await this.calendarVc.removeEvent(event.id);
-            }
-        }
+        const toHide = this.allEvents.filter((e) => e.calendarId === calendarId);
+        await this.calendarVc.removeEvents(toHide.map((e) => e.id).filter((e) => this.calendarVc.hasEvent(e)));
         await this.prefs.setVisibleCalendarIds(visibleCalendarIds);
     }
     updateEvent(id, updates) {

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

@@ -1,15 +1,6 @@
 import { SpruceSchemas, ViewControllerOptions, CalendarViewController as CoreCalendarViewController, ClickCalendarViewOptions, DropEventOptions, ClickEventOptions } from '@sprucelabs/heartwood-view-controllers';
 import { RemoteEventStore } from '../stores/RemoteEventStore';
 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 = (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>;
-declare type StartDateTimeChangeHandler = (date: number) => void | Promise<void>;
-declare type DeselectEventHandler = () => void | Promise<void>;
 export interface CalendarViewControllerOptions {
     people?: NonNullable<Calendar['people']>;
     remoteEventStore?: RemoteEventStore;
@@ -40,7 +31,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
     setRemoteStore(remoteEventStore: RemoteEventStore): void;
     getRemoteStore(): RemoteEventStore | undefined;
     private handleClick;
-    private getDraftEvent;
+    private isDraftEvent;
+    protected getDraftEvent(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent | undefined;
     private removeDraftEvent;
     private addDraftEventFromClick;
     addDraftEvent(e: Omit<Event, 'id'>): Promise<SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent>;
@@ -77,4 +69,13 @@ export default class CalendarViewController extends CoreCalendarViewController {
         shifts?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarShift[] | null | undefined;
     };
 }
+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 = (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>;
+declare type StartDateTimeChangeHandler = (date: number) => void | Promise<void>;
+declare type DeselectEventHandler = () => void | Promise<void>;
 export {};

package/build/viewControllers/Calendar.vc.js

@@ -71,7 +71,7 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
             'remoteEventStore',
         ]);
         const selected = this.getSelectedEvent();
-        if (selected && selected.style !== 'draft') {
+        if (selected && !this.isDraftEvent(selected)) {
             await this.deselectEvent();
             return;
         }
@@ -83,9 +83,12 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
             await this.removeDraftEvent(draft.id);
         }
     }
+    isDraftEvent(event) {
+        return event.style === 'draft';
+    }
     getDraftEvent() {
         const events = this.getEvents();
-        const draft = events.find((e) => e.style === 'draft');
+        const draft = events.find((e) => this.isDraftEvent(e));
         return draft;
     }
     async removeDraftEvent(id) {

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

@@ -15,6 +15,7 @@ export default class CalendarSelectCardViewController extends AbstractViewContro
     getListVc(): import("@sprucelabs/heartwood-view-controllers").ListViewController;
     getIsLoaded(): boolean;
     getSelectedCalendarIds(): string[];
+    private rowForCalendar;
     load(options: {
         scope: Scope;
     }): Promise<void>;

package/build/viewControllers/CalendarSelectTool.vc.js

@@ -43,8 +43,10 @@ class CalendarSelectCardViewController extends heartwood_view_controllers_1.Abst
                         name: 'isVisible',
                         value: this.selectedCalendarIds.indexOf(calendar.id) > -1,
                         onChange: async (isVisible) => {
-                            this.changePromise = this.events.setCalendarVisibility(calendar.id, isVisible);
-                            return this.changePromise;
+                            const calendarId = calendar.id;
+                            this.changePromise = this.events.setCalendarVisibility(calendarId, isVisible);
+                            const p = this.changePromise;
+                            return p;
                         },
                     },
                 },
@@ -67,12 +69,15 @@ class CalendarSelectCardViewController extends heartwood_view_controllers_1.Abst
         const records = this.activeVc.getRecords();
         const ids = [];
         for (const calendar of records) {
-            if (this.getListVc().getRowVc(calendar.id).getValue('isVisible')) {
+            if (this.rowForCalendar(calendar.id).getValue('isVisible')) {
                 ids.push(calendar.id);
             }
         }
         return ids;
     }
+    rowForCalendar(calendarId) {
+        return this.getListVc().getRowVc(calendarId);
+    }
     async load(options) {
         (0, schema_1.assertOptions)(options, ['scope']);
         const { scope } = options;

package/package.json

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