@sprucelabs/spruce-calendar-components 25.1.4 → 25.2.2

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

@@ -1,6 +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';
+import { CalendarPerson, UpdateEvent } from '../types/calendar.types';
 export default class CalendarViewController extends CoreCalendarViewController {
     static id: string;
     private remoteEventStore?;
@@ -14,6 +14,7 @@ export default class CalendarViewController extends CoreCalendarViewController {
     private activelyPersisting;
     private persistPromise?;
     constructor(options: ViewControllerOptions & CalendarViewControllerOptions);
+    setPeople(people: CalendarPerson[]): void;
     private handleTapView;
     protected handleLongPressViewDrop(options: ClickCalendarViewOptions): Promise<void>;
     private handleDropEvent;
@@ -33,11 +34,10 @@ export default class CalendarViewController extends CoreCalendarViewController {
     }): any;
     private persist;
     waitForPendingSaves(): Promise<void>;
-    getPeople(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson[];
     private _persist;
     render(): {
-        people: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson[];
         controller?: import("@sprucelabs/heartwood-view-controllers").ViewController<SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Calendar> | null | undefined;
+        people?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson[] | null | undefined;
         minTime?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarTime | null | undefined;
         maxTime?: SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarTime | null | undefined;
         startDate?: number | null | undefined;

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

@@ -18,10 +18,10 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+import { PeopleSorter } from '@sprucelabs/calendar-utils';
 import { CalendarViewController as CoreCalendarViewController, } from '@sprucelabs/heartwood-view-controllers';
 import { assertOptions, SchemaError } from '@sprucelabs/schema';
 import draftEventGenerator from '../utilities/draftGenerator.js';
-import StubPeopleSorter from './StubPeopleSorter.js';
 class CalendarViewController extends CoreCalendarViewController {
     constructor(options) {
         const { remoteEventStore, onDropEvent } = options, rest = __rest(options, ["remoteEventStore", "onDropEvent"]);
@@ -35,7 +35,7 @@ class CalendarViewController extends CoreCalendarViewController {
         this.activelyPersisting = {};
         this.isSwapping = false;
         const { onAddDraftEvent, onRemoveDraftEvent, onEventSwapped } = assertOptions(options, ['onAddDraftEvent']);
-        this.sorter = new StubPeopleSorter();
+        this.sorter = new PeopleSorter();
         this.draftAddedHandler = onAddDraftEvent;
         this.draftRemovedHandler = onRemoveDraftEvent;
         this.eventSwappedHandler = onEventSwapped;
@@ -44,6 +44,11 @@ class CalendarViewController extends CoreCalendarViewController {
         this.model.onClickView = this.handleClickView.bind(this);
         this.setDefaultControllerForEvents('calendar.universal-calendar-event');
     }
+    setPeople(people) {
+        this.sorter.setPeople(people);
+        const sorted = this.sorter.sort();
+        return super.setPeople(sorted);
+    }
     handleTapView() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
@@ -221,27 +226,6 @@ class CalendarViewController extends CoreCalendarViewController {
             yield this.persistPromise;
         });
     }
-    getPeople() {
-        const people = super.getPeople();
-        this.sorter.setPeople(people !== null && people !== void 0 ? people : []);
-        this.sorter.setEvents(this.getEvents().map((e) => {
-            var _a;
-            return ({
-                id: e.id,
-                groupId: (_a = e.groupId) !== null && _a !== void 0 ? _a : undefined,
-                personId: e.target.personId,
-                startDateTimeMs: e.startDateTimeMs,
-            });
-        }));
-        const selectedEvent = this.getSelectedEvent();
-        if (selectedEvent && !draftEventGenerator.isDraftId(selectedEvent.id)) {
-            this.sorter.setSelectedEvents([selectedEvent.id]);
-        }
-        else {
-            this.sorter.setSelectedEvents([]);
-        }
-        return this.sorter.sort();
-    }
     _persist(event) {
         const _super = Object.create(null, {
             updateEvent: { get: () => super.updateEvent }
@@ -288,7 +272,7 @@ class CalendarViewController extends CoreCalendarViewController {
         });
     }
     render() {
-        return Object.assign(Object.assign({}, super.render()), { people: this.getPeople() });
+        return Object.assign({}, super.render());
     }
 }
 CalendarViewController.id = 'calendar';

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

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

package/build/esm/calendar/CalendarEventManager.js

@@ -216,17 +216,21 @@ export default class CalendarEventManager {
                 endDate,
                 peopleIds,
             });
-            this.replaceEventsInRange(events, startDate, endDate);
-            if (!this.eventTypes) {
-                this.eventTypes = yield this.events.getEventTypes();
-            }
-            yield Promise.all(events.map((e) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const type = (_a = this.eventTypes) === null || _a === void 0 ? void 0 : _a.find((t) => t.slug === e.eventTypeSlug);
-                if (type === null || type === void 0 ? void 0 : type.viewControllerId) {
-                    yield this.setupVcForEventType(type.viewControllerId, type.slug);
+            yield this.calendarVc.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
+                console.log('CalendarEventManager.loadEvents triggerRender start');
+                this.replaceEventsInRange(events, startDate, endDate);
+                if (!this.eventTypes) {
+                    this.eventTypes = yield this.events.getEventTypes();
                 }
-            })));
+                yield Promise.all(events.map((e) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    const type = (_a = this.eventTypes) === null || _a === void 0 ? void 0 : _a.find((t) => t.slug === e.eventTypeSlug);
+                    if (type === null || type === void 0 ? void 0 : type.viewControllerId) {
+                        yield this.setupVcForEventType(type.viewControllerId, type.slug);
+                    }
+                })));
+                console.log('CalendarEventManager.loadEvents triggerRender end');
+            }));
         });
     }
     setCalendarVisibility(calendarId, shouldBeVisible) {
@@ -247,6 +251,7 @@ export default class CalendarEventManager {
             }
             this.hasVcForEventTypeBeenLoaded[key] = true;
             yield this.remoteVc.fetchRemoteController(vcId);
+            console.log('set controller for type');
             this.calendarVc.setControllerForEventType(typeSlug, vcId);
         });
     }
@@ -343,6 +348,7 @@ export default class CalendarEventManager {
     }
     setCurrentDate(dateMs) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('CalendarEventManager.setStartDate');
             yield this.calendarVc.setStartDate(dateMs);
         });
     }

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

@@ -356,15 +356,16 @@ class RootSkillViewController extends AbstractSkillViewController {
                 return;
             }
             const { startDate = this.dates.getStartOfDay(), visiblePeopleIds } = args;
+            console.log('render once');
             yield this.calendarVc.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
                 this.syncOffsetWithLocale(locale);
                 yield this.events.setCurrentDate(startDate);
+                yield this.transitionToRoot();
+                if (visiblePeopleIds) {
+                    yield this.people.setVisibilityMode('custom');
+                    yield this.people.setVisiblePeopleIds(visiblePeopleIds);
+                }
             }));
-            yield this.transitionToRoot();
-            if (visiblePeopleIds) {
-                yield this.people.setVisibilityMode('custom');
-                yield this.people.setVisiblePeopleIds(visiblePeopleIds);
-            }
             if (RootSkillViewController.shouldUpdateOnInterval) {
                 this.loadEventInterval = setInterval(() => {
                     return this.loadEvents({
@@ -463,6 +464,7 @@ class RootSkillViewController extends AbstractSkillViewController {
     }
     loadEvents(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('load events');
             this.loadEventsPromise = this._loadEvents(options);
             yield this.loadEventsPromise;
         });

package/build/skillViewControllers/Root.svc.js

@@ -315,15 +315,16 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
             return;
         }
         const { startDate = this.dates.getStartOfDay(), visiblePeopleIds } = args;
+        console.log('render once');
         await this.calendarVc.renderOnce(async () => {
             this.syncOffsetWithLocale(locale);
             await this.events.setCurrentDate(startDate);
+            await this.transitionToRoot();
+            if (visiblePeopleIds) {
+                await this.people.setVisibilityMode('custom');
+                await this.people.setVisiblePeopleIds(visiblePeopleIds);
+            }
         });
-        await this.transitionToRoot();
-        if (visiblePeopleIds) {
-            await this.people.setVisibilityMode('custom');
-            await this.people.setVisiblePeopleIds(visiblePeopleIds);
-        }
         if (RootSkillViewController.shouldUpdateOnInterval) {
             this.loadEventInterval = setInterval(() => {
                 return this.loadEvents({
@@ -404,6 +405,7 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         this.calendarVc.setTimezoneOffsetMs(offset * 60 * 1000);
     }
     async loadEvents(options) {
+        console.log('load events');
         this.loadEventsPromise = this._loadEvents(options);
         await this.loadEventsPromise;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sprucelabs/spruce-calendar-components",
   "description": "Calendar components for working with calendars and Sprucebot.",
-  "version": "25.1.4",
+  "version": "25.2.2",
   "skill": {
     "namespace": "calendar"
   },
@@ -18,10 +18,6 @@
     "build/__tests__/support/CalendarToolBeltStateMachineTestFactory.d.ts",
     "build/esm/__tests__/support/CalendarToolBeltStateMachineTestFactory.js",
     "build/esm/__tests__/support/CalendarToolBeltStateMachineTestFactory.d.ts",
-    "build/calendar/StubPeopleSorter.js",
-    "build/calendar/StubPeopleSorter.d.ts",
-    "build/esm/calendar/StubPeopleSorter.js",
-    "build/esm/calendar/StubPeopleSorter.d.ts",
     "build/__tests__/support/SpyEventManager.js",
     "build/__tests__/support/SpyEventManager.d.ts",
     "build/esm/__tests__/support/SpyEventManager.js",

package/build/calendar/StubPeopleSorter.d.ts

@@ -1,4 +0,0 @@
-import { PeopleSorter } from '@sprucelabs/calendar-utils';
-export default class StubPeopleSorter extends PeopleSorter {
-    sort(): import("@sprucelabs/calendar-utils/build/utilities/PeopleSorter").Person[];
-}

package/build/calendar/StubPeopleSorter.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const calendar_utils_1 = require("@sprucelabs/calendar-utils");
-class StubPeopleSorter extends calendar_utils_1.PeopleSorter {
-    sort() {
-        return this.getPeople();
-    }
-}
-exports.default = StubPeopleSorter;

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

@@ -1,4 +0,0 @@
-import { PeopleSorter } from '@sprucelabs/calendar-utils';
-export default class StubPeopleSorter extends PeopleSorter {
-    sort(): import("@sprucelabs/calendar-utils/build/utilities/PeopleSorter").Person[];
-}

package/build/esm/calendar/StubPeopleSorter.js

@@ -1,6 +0,0 @@
-import { PeopleSorter } from '@sprucelabs/calendar-utils';
-export default class StubPeopleSorter extends PeopleSorter {
-    sort() {
-        return this.getPeople();
-    }
-}