@sprucelabs/spruce-calendar-components 25.4.2 → 25.5.1

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

@@ -48,6 +48,7 @@ export default class SpyEventManager extends CalendarEventManager {
         meta?: Record<string, any> | null | undefined;
         error?: Error | null | undefined;
         isSelected?: boolean | null | undefined;
+        colors?: import("@sprucelabs/spruce-core-schemas").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEventColorOverride | null | undefined;
         controller?: import("@sprucelabs/heartwood-view-controllers").CalendarEventViewController | null | undefined;
     }>;
 }

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

@@ -39,6 +39,7 @@ export default class CalendarEventManager {
     getCalendars(): import("@sprucelabs/calendar-utils").SpruceSchemas.Calendar.v2021_05_19.Calendar[];
     addDraftEvent(event: CalendarEvent, shouldSelectEvent?: boolean): Promise<void>;
     addEvent(event: CalendarEvent): void;
+    addEvents(events: CalendarEvent[]): void;
     silentlySwapEvent(oldId: string, event: CalendarEvent): Promise<void>;
     handleDropEvent(id: string, updates: Partial<CalendarEvent>): Promise<boolean>;
     reset(): Promise<void>;
@@ -52,7 +53,7 @@ export default class CalendarEventManager {
         shouldUpdateAllEventsGoingForward?: boolean;
         shouldPersist?: boolean;
     }): void;
-    loadEvents(startDate: number, endDate: number, peopleIds: string[]): Promise<void>;
+    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>;
     setupVcForEventType(vcId: string, typeSlug: string): Promise<void>;
     private assertValidCalendarId;
@@ -81,6 +82,7 @@ export default class CalendarEventManager {
         meta?: Record<string, any> | null | undefined;
         error?: Error | null | undefined;
         isSelected?: boolean | null | undefined;
+        colors?: import("@sprucelabs/calendar-utils").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEventColorOverride | null | undefined;
         controller?: import("@sprucelabs/heartwood-view-controllers").CalendarEventViewController | null | undefined;
     }>;
     private setEventInContext;

package/build/esm/calendar/CalendarEventManager.js

@@ -102,6 +102,10 @@ export default class CalendarEventManager {
         this.allEvents.push(Object.assign({}, event));
         this.calendarVc.addEvent(event);
     }
+    addEvents(events) {
+        this.allEvents.push(...events);
+        this.calendarVc.mixinEvents(events);
+    }
     silentlySwapEvent(oldId, event) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -215,7 +219,6 @@ export default class CalendarEventManager {
                 peopleIds,
             });
             yield this.calendarVc.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
-                this.replaceEventsInRange(events, startDate, endDate);
                 if (!this.eventTypes) {
                     this.eventTypes = yield this.events.getEventTypes();
                 }
@@ -226,7 +229,9 @@ export default class CalendarEventManager {
                         yield this.setupVcForEventType(type.viewControllerId, type.slug);
                     }
                 })));
+                this.replaceEventsInRange(events, startDate, endDate);
             }));
+            return events;
         });
     }
     setCalendarVisibility(calendarId, shouldBeVisible) {

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

@@ -63,6 +63,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     getCalendarSelectVc(): import("../tools/CalendarSelectTool.vc").default | undefined;
     getCalendarVc(): CalendarViewController;
     load(options: SkillViewControllerLoadOptions<RootArgs>): Promise<void>;
+    private optionallyLoadCachedEvents;
     private handleStateChange;
     destroy(): Promise<void>;
     private setupCalendarEventListeners;
@@ -75,6 +76,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private syncOffsetWithLocale;
     protected loadEvents(options?: LoadEventOptions): Promise<void>;
     private _loadEvents;
+    private cacheEvents;
     protected transitionToRoot(): Promise<void>;
     private loadLoggedInPerson;
     private getVisibleEvents;

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

@@ -358,13 +358,13 @@ class RootSkillViewController extends AbstractSkillViewController {
             const { startDate = this.dates.getStartOfDay(), visiblePeopleIds } = args;
             yield this.calendarVc.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
                 this.syncOffsetWithLocale(locale);
-                yield this.events.setCurrentDate(startDate);
-                yield this.transitionToRoot();
+                this.optionallyLoadCachedEvents();
                 if (visiblePeopleIds) {
                     yield this.people.setVisibilityMode('custom');
                     yield this.people.setVisiblePeopleIds(visiblePeopleIds);
                 }
             }));
+            yield this.transitionToRoot();
             if (RootSkillViewController.shouldUpdateOnInterval) {
                 this.loadEventInterval = setInterval(() => {
                     return this.loadEvents({
@@ -373,9 +373,16 @@ class RootSkillViewController extends AbstractSkillViewController {
                 }, RootSkillViewController.refreshInterval);
             }
             yield this.client.on('connection-status-change', this.handleStateChange);
+            yield this.events.setCurrentDate(startDate);
             yield this.waitUntilDoneSaving();
         });
     }
+    optionallyLoadCachedEvents() {
+        const events = this.getDevice().getCachedValue('calendarEvents');
+        if (events) {
+            this.events.addEvents(events);
+        }
+    }
     handleStateChange(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { status } = options.payload;
@@ -475,8 +482,9 @@ class RootSkillViewController extends AbstractSkillViewController {
                     const date = this.getStartDate();
                     const startDate = this.dates.getStartOfDay(date);
                     const endDate = this.dates.getEndOfDay(date);
-                    yield this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
+                    const events = yield this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
                     yield this.people.emitDidUpdate();
+                    this.cacheEvents(events);
                 }
             }
             catch (err) {
@@ -493,6 +501,9 @@ class RootSkillViewController extends AbstractSkillViewController {
             }
         });
     }
+    cacheEvents(events) {
+        this.getDevice().setCachedValue('calendarEvents', events);
+    }
     transitionToRoot() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.sm.transitionTo(this.toolBeltStates.root);

package/build/esm/stores/RemoteEventStore.js

@@ -52,17 +52,18 @@ export default class RemoteEventStoreImpl {
                 this.pendingEvents[event.id] = event;
                 return event;
             }
-            if (!this.queueByEventId[this.getId(event.id)]) {
-                this.queueByEventId[this.getId(event.id)] = [];
+            const id = this.getId(event.id);
+            if (!this.queueByEventId[id]) {
+                this.queueByEventId[id] = [];
             }
             const promise = new Promise((resolve, reject) => {
-                this.queueByEventId[this.getId(event.id)].push({
+                this.queueByEventId[id].push({
                     event,
                     resolve,
                     reject,
                     promiseIdx: this.promises.length,
                 });
-                void this.startQueueForEvent(this.getId(event.id));
+                void this.startQueueForEvent(id);
             });
             this.promises.push(promise);
             return promise;

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

@@ -63,6 +63,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     getCalendarSelectVc(): import("../tools/CalendarSelectTool.vc").default | undefined;
     getCalendarVc(): CalendarViewController;
     load(options: SkillViewControllerLoadOptions<RootArgs>): Promise<void>;
+    private optionallyLoadCachedEvents;
     private handleStateChange;
     destroy(): Promise<void>;
     private setupCalendarEventListeners;
@@ -75,6 +76,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private syncOffsetWithLocale;
     protected loadEvents(options?: LoadEventOptions): Promise<void>;
     private _loadEvents;
+    private cacheEvents;
     protected transitionToRoot(): Promise<void>;
     private loadLoggedInPerson;
     private getVisibleEvents;

package/build/skillViewControllers/Root.svc.js

@@ -317,13 +317,13 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         const { startDate = this.dates.getStartOfDay(), visiblePeopleIds } = args;
         await this.calendarVc.renderOnce(async () => {
             this.syncOffsetWithLocale(locale);
-            await this.events.setCurrentDate(startDate);
-            await this.transitionToRoot();
+            this.optionallyLoadCachedEvents();
             if (visiblePeopleIds) {
                 await this.people.setVisibilityMode('custom');
                 await this.people.setVisiblePeopleIds(visiblePeopleIds);
             }
         });
+        await this.transitionToRoot();
         if (RootSkillViewController.shouldUpdateOnInterval) {
             this.loadEventInterval = setInterval(() => {
                 return this.loadEvents({
@@ -332,8 +332,15 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             }, RootSkillViewController.refreshInterval);
         }
         await this.client.on('connection-status-change', this.handleStateChange);
+        await this.events.setCurrentDate(startDate);
         await this.waitUntilDoneSaving();
     }
+    optionallyLoadCachedEvents() {
+        const events = this.getDevice().getCachedValue('calendarEvents');
+        if (events) {
+            this.events.addEvents(events);
+        }
+    }
     async handleStateChange(options) {
         const { status } = options.payload;
         if (status === 'connected') {
@@ -414,8 +421,9 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
                 const date = this.getStartDate();
                 const startDate = this.dates.getStartOfDay(date);
                 const endDate = this.dates.getEndOfDay(date);
-                await this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
+                const events = await this.events.loadEvents(startDate, endDate, this.people.getTeam().map((t) => t.id));
                 await this.people.emitDidUpdate();
+                this.cacheEvents(events);
             }
         }
         catch (err) {
@@ -431,6 +439,9 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             });
         }
     }
+    cacheEvents(events) {
+        this.getDevice().setCachedValue('calendarEvents', events);
+    }
     async transitionToRoot() {
         await this.sm.transitionTo(this.toolBeltStates.root);
     }

package/build/stores/RemoteEventStore.js

@@ -45,17 +45,18 @@ class RemoteEventStoreImpl {
             this.pendingEvents[event.id] = event;
             return event;
         }
-        if (!this.queueByEventId[this.getId(event.id)]) {
-            this.queueByEventId[this.getId(event.id)] = [];
+        const id = this.getId(event.id);
+        if (!this.queueByEventId[id]) {
+            this.queueByEventId[id] = [];
         }
         const promise = new Promise((resolve, reject) => {
-            this.queueByEventId[this.getId(event.id)].push({
+            this.queueByEventId[id].push({
                 event,
                 resolve,
                 reject,
                 promiseIdx: this.promises.length,
             });
-            void this.startQueueForEvent(this.getId(event.id));
+            void this.startQueueForEvent(id);
         });
         this.promises.push(promise);
         return promise;

package/package.json

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