@sprucelabs/spruce-calendar-components 22.8.26 → 22.9.0

package/build/__tests__/support/SpyPeopleManager.d.ts

@@ -4,7 +4,7 @@ export default class SpyPeopleManager extends CalendarPeopleManager {
     visiblePeopleIds?: string[];
     peopleVisibilityMode?: PersonMode;
     constructor(options: PeopleManagerOptions);
-    protected getVisiblePeopleIds(): string[];
+    getVisiblePeopleIds(): string[];
     getVisibilityMode(): PersonMode;
     setVisiblePeopleIds(ids: string[], options?: SetVisiblePeolpeOptions): Promise<void>;
 }

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

@@ -4,7 +4,7 @@ export default class SpyPeopleManager extends CalendarPeopleManager {
     visiblePeopleIds?: string[];
     peopleVisibilityMode?: PersonMode;
     constructor(options: PeopleManagerOptions);
-    protected getVisiblePeopleIds(): string[];
+    getVisiblePeopleIds(): string[];
     getVisibilityMode(): PersonMode;
     setVisiblePeopleIds(ids: string[], options?: SetVisiblePeolpeOptions): Promise<void>;
 }

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

@@ -57,13 +57,13 @@ export default class RootSkillViewController extends AbstractSkillViewController
     getCalendarSelectVc(): import("../viewControllers/CalendarSelectTool.vc").default | undefined;
     getCalendarVc(): CalendarViewController;
     load(options: SkillViewControllerLoadOptions<RootArgs>): Promise<void>;
-    private setupEventListeners;
+    private setupCalendarEventListeners;
     private handleDidCancelEvent;
     private handleDidCreateOrUpdate;
     private loadEventStore;
     private loadPeople;
     private loadScope;
-    private syncPeopleOnCalendar;
+    protected syncPeopleOnCalendar(): void;
     private syncOffsetWithLocale;
     private loadEvents;
     private _loadEvents;

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

@@ -222,6 +222,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
             yield this.transitionPromise;
             yield this.events.reset();
             this.makeDateSelectMatchSelectedDateFromCalendar();
+            this.syncPeopleOnCalendar();
         });
     }
     ToolBeltVc() {
@@ -293,7 +294,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
             this.client = yield this.connectToApi();
             const { scope, locale, args, router } = options;
             yield Promise.all([
-                this.setupEventListeners(),
+                this.setupCalendarEventListeners(),
                 locale.on('did-change-timezones', () => {
                     return this.syncOffsetWithLocale(locale);
                 }),
@@ -323,7 +324,7 @@ export default class RootSkillViewController extends AbstractSkillViewController
             yield this.waitUntilDoneSaving();
         });
     }
-    setupEventListeners() {
+    setupCalendarEventListeners() {
         return __awaiter(this, void 0, void 0, function* () {
             yield Promise.all([
                 this.client.on('calendar.did-create-calendar-event::v2021_05_19', this.handleDidCreateOrUpdate.bind(this)),

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

@@ -25,7 +25,7 @@ export default class CalendarPeopleManager extends AbstractEventEmitter<PeopleCo
     private teammateById;
     getTeam(): import("@sprucelabs/mercury-types").SpruceSchemas.Spruce.v2020_07_22.Person[];
     getLoggedInPerson(): import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson | undefined;
-    protected getVisiblePeopleIds(): string[];
+    getVisiblePeopleIds(): string[];
     private getSavedVisiblePeopleIds;
     getVisibilityMode(): PersonMode;
     setVisibilityMode(mode: PersonMode): Promise<void>;

package/build/esm/utilities/CalendarPeopleManager.js

@@ -29,7 +29,7 @@ export default class CalendarPeopleManager extends AbstractEventEmitter {
             this.organizationId = organizationId;
             this.locationId = locationId;
             yield this.loadTeam();
-            if (this.getVisiblePeople().length === 0 && this.loggedInPerson) {
+            if (this.getVisiblePeopleIds().length === 0 && this.loggedInPerson) {
                 yield this.setVisiblePeopleIds([this.loggedInPerson.id]);
             }
         });
@@ -49,7 +49,7 @@ export default class CalendarPeopleManager extends AbstractEventEmitter {
         });
     }
     getVisiblePeople() {
-        return this.getVisiblePeopleIds()
+        const people = this.getVisiblePeopleIds()
             .map((i) => {
             try {
                 return this.teammateById(i);
@@ -59,6 +59,7 @@ export default class CalendarPeopleManager extends AbstractEventEmitter {
             return null;
         })
             .filter((t) => !!t);
+        return people;
     }
     teammateById(id) {
         var _a;

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

@@ -13,7 +13,6 @@ export interface CalendarViewControllerOptions {
     onDeselectEvent?: DeselectEventHandler;
 }
 export default class CalendarViewController extends CoreCalendarViewController {
-    static shouldDelayStartingAnimationOnSwap: boolean;
     static id: string;
     private remoteEventStore?;
     private draftAddedHandler;
@@ -43,8 +42,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
     }): any;
     private persist;
     waitForPendingSaves(): Promise<void>;
-    private _persist;
     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;

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

@@ -154,7 +154,6 @@ export default class CalendarViewController extends CoreCalendarViewController {
                 _super.updateEvent.call(this, to.id, { isBusy: false });
                 return;
             }
-            this.disableAnimations();
             this.isSwapping = true;
             try {
                 yield this.renderOnce(() => __awaiter(this, void 0, void 0, function* () {
@@ -170,10 +169,6 @@ export default class CalendarViewController extends CoreCalendarViewController {
             }
             catch (_a) { }
             this.isSwapping = false;
-            if (CalendarViewController.shouldDelayStartingAnimationOnSwap) {
-                yield new Promise((r) => setTimeout(r, 100));
-            }
-            this.enableAnimation();
         });
     }
     updateEvent(id, updates) {
@@ -200,6 +195,27 @@ export default 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 }
@@ -245,17 +261,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
             return event;
         });
     }
-    getPeople() {
-        const people = super.getPeople();
-        if (people.length > 0) {
-            this.sorter.setPeople(people !== null && people !== void 0 ? people : []);
-            return this.sorter.sort();
-        }
-        return people;
-    }
     render() {
         return Object.assign(Object.assign({}, super.render()), { people: this.getPeople() });
     }
 }
-CalendarViewController.shouldDelayStartingAnimationOnSwap = true;
 CalendarViewController.id = 'calendar';

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

@@ -21,7 +21,7 @@ export default class PersonSelectToolViewController extends AbstractViewControll
         this.cardVc = this.CardVc();
     }
     get visiblePeopleIds() {
-        return this.people.getVisiblePeople().map((p) => p.id);
+        return this.people.getVisiblePeopleIds();
     }
     get loggedInPersonId() {
         var _a;

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

@@ -57,13 +57,13 @@ export default class RootSkillViewController extends AbstractSkillViewController
     getCalendarSelectVc(): import("../viewControllers/CalendarSelectTool.vc").default | undefined;
     getCalendarVc(): CalendarViewController;
     load(options: SkillViewControllerLoadOptions<RootArgs>): Promise<void>;
-    private setupEventListeners;
+    private setupCalendarEventListeners;
     private handleDidCancelEvent;
     private handleDidCreateOrUpdate;
     private loadEventStore;
     private loadPeople;
     private loadScope;
-    private syncPeopleOnCalendar;
+    protected syncPeopleOnCalendar(): void;
     private syncOffsetWithLocale;
     private loadEvents;
     private _loadEvents;

package/build/skillViewControllers/Root.svc.js

@@ -195,6 +195,7 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         await this.transitionPromise;
         await this.events.reset();
         this.makeDateSelectMatchSelectedDateFromCalendar();
+        this.syncPeopleOnCalendar();
     }
     ToolBeltVc() {
         return this.Controller('toolBelt', {
@@ -254,7 +255,7 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         this.client = await this.connectToApi();
         const { scope, locale, args, router } = options;
         await Promise.all([
-            this.setupEventListeners(),
+            this.setupCalendarEventListeners(),
             locale.on('did-change-timezones', () => {
                 return this.syncOffsetWithLocale(locale);
             }),
@@ -283,7 +284,7 @@ class RootSkillViewController extends heartwood_view_controllers_1.AbstractSkill
         }
         await this.waitUntilDoneSaving();
     }
-    async setupEventListeners() {
+    async setupCalendarEventListeners() {
         await Promise.all([
             this.client.on('calendar.did-create-calendar-event::v2021_05_19', this.handleDidCreateOrUpdate.bind(this)),
             this.client.on('calendar.did-update-calendar-event::v2021_05_19', this.handleDidCreateOrUpdate.bind(this)),

package/build/utilities/CalendarPeopleManager.d.ts

@@ -25,7 +25,7 @@ export default class CalendarPeopleManager extends AbstractEventEmitter<PeopleCo
     private teammateById;
     getTeam(): import("@sprucelabs/mercury-types").SpruceSchemas.Spruce.v2020_07_22.Person[];
     getLoggedInPerson(): import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarPerson | undefined;
-    protected getVisiblePeopleIds(): string[];
+    getVisiblePeopleIds(): string[];
     private getSavedVisiblePeopleIds;
     getVisibilityMode(): PersonMode;
     setVisibilityMode(mode: PersonMode): Promise<void>;

package/build/utilities/CalendarPeopleManager.js

@@ -24,7 +24,7 @@ class CalendarPeopleManager extends mercury_event_emitter_1.AbstractEventEmitter
         this.organizationId = organizationId;
         this.locationId = locationId;
         await this.loadTeam();
-        if (this.getVisiblePeople().length === 0 && this.loggedInPerson) {
+        if (this.getVisiblePeopleIds().length === 0 && this.loggedInPerson) {
             await this.setVisiblePeopleIds([this.loggedInPerson.id]);
         }
     }
@@ -41,7 +41,7 @@ class CalendarPeopleManager extends mercury_event_emitter_1.AbstractEventEmitter
         this.team = people;
     }
     getVisiblePeople() {
-        return this.getVisiblePeopleIds()
+        const people = this.getVisiblePeopleIds()
             .map((i) => {
             try {
                 return this.teammateById(i);
@@ -51,6 +51,7 @@ class CalendarPeopleManager extends mercury_event_emitter_1.AbstractEventEmitter
             return null;
         })
             .filter((t) => !!t);
+        return people;
     }
     teammateById(id) {
         var _a;

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

@@ -13,7 +13,6 @@ export interface CalendarViewControllerOptions {
     onDeselectEvent?: DeselectEventHandler;
 }
 export default class CalendarViewController extends CoreCalendarViewController {
-    static shouldDelayStartingAnimationOnSwap: boolean;
     static id: string;
     private remoteEventStore?;
     private draftAddedHandler;
@@ -43,8 +42,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
     }): any;
     private persist;
     waitForPendingSaves(): Promise<void>;
-    private _persist;
     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;

package/build/viewControllers/Calendar.vc.js

@@ -136,7 +136,6 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
             super.updateEvent(to.id, { isBusy: false });
             return;
         }
-        this.disableAnimations();
         this.isSwapping = true;
         try {
             await this.renderOnce(async () => {
@@ -152,10 +151,6 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         }
         catch (_a) { }
         this.isSwapping = false;
-        if (CalendarViewController.shouldDelayStartingAnimationOnSwap) {
-            await new Promise((r) => setTimeout(r, 100));
-        }
-        this.enableAnimation();
     }
     updateEvent(id, updates) {
         const { shouldPersist = true } = updates, rest = __rest(updates, ["shouldPersist"]);
@@ -177,6 +172,27 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
     async waitForPendingSaves() {
         await 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 && !draftGenerator_1.default.isDraftId(selectedEvent.id)) {
+            this.sorter.setSelectedEvents([selectedEvent.id]);
+        }
+        else {
+            this.sorter.setSelectedEvents([]);
+        }
+        return this.sorter.sort();
+    }
     async _persist(event) {
         var _a, _b;
         let updated = event;
@@ -217,18 +233,9 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         }
         return event;
     }
-    getPeople() {
-        const people = super.getPeople();
-        if (people.length > 0) {
-            this.sorter.setPeople(people !== null && people !== void 0 ? people : []);
-            return this.sorter.sort();
-        }
-        return people;
-    }
     render() {
         return Object.assign(Object.assign({}, super.render()), { people: this.getPeople() });
     }
 }
 exports.default = CalendarViewController;
-CalendarViewController.shouldDelayStartingAnimationOnSwap = true;
 CalendarViewController.id = 'calendar';

package/build/viewControllers/PersonSelectTool.vc.js

@@ -14,7 +14,7 @@ class PersonSelectToolViewController extends heartwood_view_controllers_1.Abstra
         this.cardVc = this.CardVc();
     }
     get visiblePeopleIds() {
-        return this.people.getVisiblePeople().map((p) => p.id);
+        return this.people.getVisiblePeopleIds();
     }
     get loggedInPersonId() {
         var _a;

package/package.json

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