@sprucelabs/spruce-calendar-components 24.3.6 → 24.3.8

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

@@ -73,7 +73,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private loadScope;
     protected syncPeopleOnCalendar(): void;
     private syncOffsetWithLocale;
-    protected loadEvents(): Promise<void>;
+    protected loadEvents(options?: LoadEventOptions): Promise<void>;
     private _loadEvents;
     protected transitionToRoot(): Promise<void>;
     private loadLoggedInPerson;
@@ -86,3 +86,6 @@ export interface RootArgs {
     startDate?: number;
     visiblePeopleIds?: string[];
 }
+export type LoadEventOptions = {
+    shouldRenderAlertOnFail: boolean;
+};

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

@@ -365,13 +365,15 @@ class RootSkillViewController extends AbstractSkillViewController {
                 yield this.people.setVisibilityMode('custom');
                 yield this.people.setVisiblePeopleIds(visiblePeopleIds);
             }
-            yield this.waitUntilDoneSaving();
             if (RootSkillViewController.shouldUpdateOnInterval) {
                 this.loadEventInterval = setInterval(() => {
-                    return this.loadEvents();
+                    return this.loadEvents({
+                        shouldRenderAlertOnFail: false,
+                    });
                 }, RootSkillViewController.refreshInterval);
             }
             yield this.client.on('connection-status-change', this.handleStateChange);
+            yield this.waitUntilDoneSaving();
         });
     }
     handleStateChange(options) {
@@ -383,9 +385,10 @@ class RootSkillViewController extends AbstractSkillViewController {
         });
     }
     destroy() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             clearInterval(this.loadEventInterval);
-            yield this.client.off('connection-status-change', this.handleStateChange);
+            yield ((_a = this.client) === null || _a === void 0 ? void 0 : _a.off('connection-status-change', this.handleStateChange));
         });
     }
     setupCalendarEventListeners() {
@@ -458,13 +461,13 @@ class RootSkillViewController extends AbstractSkillViewController {
         const offset = locale.getTimezoneOffsetMinutes();
         this.calendarVc.setTimezoneOffsetMs(offset * 60 * 1000);
     }
-    loadEvents() {
+    loadEvents(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.loadEventsPromise = this._loadEvents();
+            this.loadEventsPromise = this._loadEvents(options);
             yield this.loadEventsPromise;
         });
     }
-    _loadEvents() {
+    _loadEvents(options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -477,6 +480,12 @@ class RootSkillViewController extends AbstractSkillViewController {
                 }
             }
             catch (err) {
+                if ((options === null || options === void 0 ? void 0 : options.shouldRenderAlertOnFail) === false) {
+                    this.toast({
+                        message: 'Updating your calendar failed! Trying again now...',
+                    });
+                    return;
+                }
                 console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
                 void this.alert({
                     message: err.message,

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

@@ -73,7 +73,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
     private loadScope;
     protected syncPeopleOnCalendar(): void;
     private syncOffsetWithLocale;
-    protected loadEvents(): Promise<void>;
+    protected loadEvents(options?: LoadEventOptions): Promise<void>;
     private _loadEvents;
     protected transitionToRoot(): Promise<void>;
     private loadLoggedInPerson;
@@ -86,3 +86,6 @@ export interface RootArgs {
     startDate?: number;
     visiblePeopleIds?: string[];
 }
+export type LoadEventOptions = {
+    shouldRenderAlertOnFail: boolean;
+};

package/build/skillViewControllers/Root.svc.js

@@ -324,13 +324,15 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             await this.people.setVisibilityMode('custom');
             await this.people.setVisiblePeopleIds(visiblePeopleIds);
         }
-        await this.waitUntilDoneSaving();
         if (RootSkillViewController.shouldUpdateOnInterval) {
             this.loadEventInterval = setInterval(() => {
-                return this.loadEvents();
+                return this.loadEvents({
+                    shouldRenderAlertOnFail: false,
+                });
             }, RootSkillViewController.refreshInterval);
         }
         await this.client.on('connection-status-change', this.handleStateChange);
+        await this.waitUntilDoneSaving();
     }
     async handleStateChange(options) {
         const { status } = options.payload;
@@ -339,8 +341,9 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         }
     }
     async destroy() {
+        var _a;
         clearInterval(this.loadEventInterval);
-        await this.client.off('connection-status-change', this.handleStateChange);
+        await ((_a = this.client) === null || _a === void 0 ? void 0 : _a.off('connection-status-change', this.handleStateChange));
     }
     async setupCalendarEventListeners() {
         await Promise.all([
@@ -400,11 +403,11 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         const offset = locale.getTimezoneOffsetMinutes();
         this.calendarVc.setTimezoneOffsetMs(offset * 60 * 1000);
     }
-    async loadEvents() {
-        this.loadEventsPromise = this._loadEvents();
+    async loadEvents(options) {
+        this.loadEventsPromise = this._loadEvents(options);
         await this.loadEventsPromise;
     }
-    async _loadEvents() {
+    async _loadEvents(options) {
         var _a;
         try {
             if (this.events.getCalendars().length > 0) {
@@ -416,6 +419,12 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             }
         }
         catch (err) {
+            if ((options === null || options === void 0 ? void 0 : options.shouldRenderAlertOnFail) === false) {
+                this.toast({
+                    message: 'Updating your calendar failed! Trying again now...',
+                });
+                return;
+            }
             console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
             void this.alert({
                 message: err.message,

package/package.json

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