@sprucelabs/spruce-calendar-components 19.1.3 → 19.2.0

package/build/esm/toolBelt/states/AbstractCalendarEventToolBeltState.js

@@ -83,7 +83,7 @@ export default class AbstractCalendarEventToolBeltState {
     }
     buildVcConstructorOptions(id) {
         return {
-            updateContext: (updates) => this.handleUpdateContextFromTool(updates, id),
+            updateContext: (updates, options) => this.handleUpdateContextFromTool(updates, id, options),
             getContext: () => this.getContext(),
             getPersonFromEvent: () => this.getPersonFromEvent(),
         };
@@ -122,7 +122,7 @@ export default class AbstractCalendarEventToolBeltState {
             return null;
         });
     }
-    handleUpdateContextFromTool(updates, fromToolId) {
+    handleUpdateContextFromTool(updates, fromToolId, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const pendingUpdates = Object.assign(Object.assign({}, this.pendingContextUpdates), updates);
             if (equalDeep(this.pendingContextUpdates, pendingUpdates)) {
@@ -131,7 +131,8 @@ export default class AbstractCalendarEventToolBeltState {
             this.pendingContextUpdates = pendingUpdates;
             yield this.handleDidUpdateContext(fromToolId);
             const vc = this.getVcForTool(fromToolId);
-            if (vc === null || vc === void 0 ? void 0 : vc.shouldPersistContextChangesImmediately) {
+            if ((vc === null || vc === void 0 ? void 0 : vc.shouldPersistContextChangesImmediately) ||
+                (options === null || options === void 0 ? void 0 : options.shouldPersistContextChangesImmediately)) {
                 yield this.sm.updateContext(Object.assign({}, updates));
             }
         });

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

@@ -28,7 +28,10 @@ export interface CalendarTool extends AbstractViewController<Card> {
     handleUpdateContext(context: CalendarToolBeltContext): Promise<void> | void;
     load?: () => Promise<void> | void;
 }
-export declare type UpdateCalendarToolBeltContextHandler = (context: Partial<CalendarToolBeltContext>) => Promise<void>;
+export interface UpdateCalendarContextOptions {
+    shouldPersistContextChangesImmediately?: boolean;
+}
+export declare type UpdateCalendarToolBeltContextHandler = (context: Partial<CalendarToolBeltContext>, options?: UpdateCalendarContextOptions) => Promise<void>;
 export declare type GetCalendarToolBeltContextHandler = () => CalendarToolBeltContext;
 export declare type GetPersonFromEventHandler = () => Promise<Person | null>;
 export interface CalendarToolOptions {

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

@@ -38,7 +38,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
     private handleClick;
     private getDraftEvent;
     private removeDraftEvent;
-    private addDraftEvent;
+    private addDraftEventFromClick;
+    addDraftEvent(event: Event): Promise<SpruceSchemas.CalendarUtils.v2021_05_19.CalendarEvent | UpdateEvent | undefined>;
     getIsSwappingEvent(): boolean;
     private swapEvent;
     updateEvent(id: string, updates: Partial<UpdateEvent>): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent;

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

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { PeopleSorter } from '@sprucelabs/calendar-utils';
 import { CalendarViewController as CoreCalendarViewController, } from '@sprucelabs/heartwood-view-controllers';
-import { assertOptions } from '@sprucelabs/schema';
+import { assertOptions, SchemaError } from '@sprucelabs/schema';
 import draftEventGenerator from '../utilities/draftGenerator.js';
 export default class CalendarViewController extends CoreCalendarViewController {
     constructor(options) {
@@ -43,13 +43,13 @@ export default class CalendarViewController extends CoreCalendarViewController {
     handleDropEvent(options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { event, blockUpdates, newPerson, newStartDateTimeMs } = options;
+            const { event, blockUpdates, newPersonId, newStartDateTimeMs } = options;
             const updates = {};
             if (newStartDateTimeMs) {
                 updates.startDateTimeMs = newStartDateTimeMs;
             }
-            if (newPerson) {
-                updates.target = Object.assign(Object.assign({}, event.target), { personId: newPerson.id });
+            if (newPersonId) {
+                updates.target = Object.assign(Object.assign({}, event.target), { personId: newPersonId });
             }
             if (blockUpdates) {
                 updates.timeBlocks = [...event.timeBlocks];
@@ -84,7 +84,7 @@ export default class CalendarViewController extends CoreCalendarViewController {
             }
             const draft = this.getDraftEvent();
             if (!draft) {
-                yield this.addDraftEvent(options);
+                yield this.addDraftEventFromClick(options);
             }
             else {
                 yield this.removeDraftEvent(draft.id);
@@ -108,16 +108,30 @@ export default class CalendarViewController extends CoreCalendarViewController {
             catch (_c) { }
         });
     }
-    addDraftEvent(options) {
+    addDraftEventFromClick(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { person, time } = options;
-            const personId = person === null || person === void 0 ? void 0 : person.id;
-            const event = Object.assign({}, draftEventGenerator.generate(time !== null && time !== void 0 ? time : 0, personId));
+            const { personId, dateTimeMs } = options;
+            const event = Object.assign({}, draftEventGenerator.generate(dateTimeMs !== null && dateTimeMs !== void 0 ? dateTimeMs : 0, personId !== null && personId !== void 0 ? personId : '**missing**'));
+            //@ts-ignore
+            delete event.id;
+            return yield this.addDraftEvent(event);
+        });
+    }
+    addDraftEvent(event) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (event.id) {
+                throw new SchemaError({
+                    code: 'UNEXPECTED_PARAMETERS',
+                    parameters: ['id'],
+                });
+            }
+            event.id = draftEventGenerator.generateId();
             this.addEvent(event);
             this.selectEvent(event.id);
             const draftAddedPromise = this.draftAddedHandler(event);
-            yield this.persist(event);
+            const saved = yield this.persist(event);
             yield draftAddedPromise;
+            return saved;
         });
     }
     getIsSwappingEvent() {
@@ -180,12 +194,14 @@ export default class CalendarViewController extends CoreCalendarViewController {
                 else {
                     _super.updateEvent.call(this, saved.id, { isBusy, error: undefined });
                 }
+                return saved;
             }
             catch (err) {
                 if (this.hasEvent(id)) {
                     _super.updateEvent.call(this, id, { error: err, isBusy: false });
                 }
             }
+            return event;
         });
     }
     getPeople() {

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

@@ -336,8 +336,8 @@ export default class RepeatingControlsListViewController extends AbstractViewCon
         return this.Controller('calendar', {
             onClick: (options) => __awaiter(this, void 0, void 0, function* () {
                 var _b;
-                if (options.date) {
-                    this.changeCalendarSelectedDate(options.date);
+                if (options.dateTimeMs) {
+                    this.changeCalendarSelectedDate(options.dateTimeMs);
                     (_b = this.didChangeRepeating) === null || _b === void 0 ? void 0 : _b.call(this, this.repeating);
                 }
             }),

package/build/toolBelt/states/AbstractCalendarEventToolBeltState.js

@@ -67,7 +67,7 @@ class AbstractCalendarEventToolBeltState {
     }
     buildVcConstructorOptions(id) {
         return {
-            updateContext: (updates) => this.handleUpdateContextFromTool(updates, id),
+            updateContext: (updates, options) => this.handleUpdateContextFromTool(updates, id, options),
             getContext: () => this.getContext(),
             getPersonFromEvent: () => this.getPersonFromEvent(),
         };
@@ -102,7 +102,7 @@ class AbstractCalendarEventToolBeltState {
         }
         return null;
     }
-    async handleUpdateContextFromTool(updates, fromToolId) {
+    async handleUpdateContextFromTool(updates, fromToolId, options) {
         const pendingUpdates = Object.assign(Object.assign({}, this.pendingContextUpdates), updates);
         if ((0, isEqual_1.default)(this.pendingContextUpdates, pendingUpdates)) {
             return;
@@ -110,7 +110,8 @@ class AbstractCalendarEventToolBeltState {
         this.pendingContextUpdates = pendingUpdates;
         await this.handleDidUpdateContext(fromToolId);
         const vc = this.getVcForTool(fromToolId);
-        if (vc === null || vc === void 0 ? void 0 : vc.shouldPersistContextChangesImmediately) {
+        if ((vc === null || vc === void 0 ? void 0 : vc.shouldPersistContextChangesImmediately) ||
+            (options === null || options === void 0 ? void 0 : options.shouldPersistContextChangesImmediately)) {
             await this.sm.updateContext(Object.assign({}, updates));
         }
     }

package/build/types/calendar.types.d.ts

@@ -28,7 +28,10 @@ export interface CalendarTool extends AbstractViewController<Card> {
     handleUpdateContext(context: CalendarToolBeltContext): Promise<void> | void;
     load?: () => Promise<void> | void;
 }
-export declare type UpdateCalendarToolBeltContextHandler = (context: Partial<CalendarToolBeltContext>) => Promise<void>;
+export interface UpdateCalendarContextOptions {
+    shouldPersistContextChangesImmediately?: boolean;
+}
+export declare type UpdateCalendarToolBeltContextHandler = (context: Partial<CalendarToolBeltContext>, options?: UpdateCalendarContextOptions) => Promise<void>;
 export declare type GetCalendarToolBeltContextHandler = () => CalendarToolBeltContext;
 export declare type GetPersonFromEventHandler = () => Promise<Person | null>;
 export interface CalendarToolOptions {

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

@@ -38,7 +38,8 @@ export default class CalendarViewController extends CoreCalendarViewController {
     private handleClick;
     private getDraftEvent;
     private removeDraftEvent;
-    private addDraftEvent;
+    private addDraftEventFromClick;
+    addDraftEvent(event: Event): Promise<SpruceSchemas.CalendarUtils.v2021_05_19.CalendarEvent | UpdateEvent | undefined>;
     getIsSwappingEvent(): boolean;
     private swapEvent;
     updateEvent(id: string, updates: Partial<UpdateEvent>): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent;

package/build/viewControllers/Calendar.vc.js

@@ -38,13 +38,13 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
     }
     async handleDropEvent(options) {
         var _a;
-        const { event, blockUpdates, newPerson, newStartDateTimeMs } = options;
+        const { event, blockUpdates, newPersonId, newStartDateTimeMs } = options;
         const updates = {};
         if (newStartDateTimeMs) {
             updates.startDateTimeMs = newStartDateTimeMs;
         }
-        if (newPerson) {
-            updates.target = Object.assign(Object.assign({}, event.target), { personId: newPerson.id });
+        if (newPersonId) {
+            updates.target = Object.assign(Object.assign({}, event.target), { personId: newPersonId });
         }
         if (blockUpdates) {
             updates.timeBlocks = [...event.timeBlocks];
@@ -77,7 +77,7 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         }
         const draft = this.getDraftEvent();
         if (!draft) {
-            await this.addDraftEvent(options);
+            await this.addDraftEventFromClick(options);
         }
         else {
             await this.removeDraftEvent(draft.id);
@@ -98,15 +98,27 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
         }
         catch (_c) { }
     }
-    async addDraftEvent(options) {
-        const { person, time } = options;
-        const personId = person === null || person === void 0 ? void 0 : person.id;
-        const event = Object.assign({}, draftGenerator_1.default.generate(time !== null && time !== void 0 ? time : 0, personId));
+    async addDraftEventFromClick(options) {
+        const { personId, dateTimeMs } = options;
+        const event = Object.assign({}, draftGenerator_1.default.generate(dateTimeMs !== null && dateTimeMs !== void 0 ? dateTimeMs : 0, personId !== null && personId !== void 0 ? personId : '**missing**'));
+        //@ts-ignore
+        delete event.id;
+        return await this.addDraftEvent(event);
+    }
+    async addDraftEvent(event) {
+        if (event.id) {
+            throw new schema_1.SchemaError({
+                code: 'UNEXPECTED_PARAMETERS',
+                parameters: ['id'],
+            });
+        }
+        event.id = draftGenerator_1.default.generateId();
         this.addEvent(event);
         this.selectEvent(event.id);
         const draftAddedPromise = this.draftAddedHandler(event);
-        await this.persist(event);
+        const saved = await this.persist(event);
         await draftAddedPromise;
+        return saved;
     }
     getIsSwappingEvent() {
         return this.isSwapping;
@@ -159,12 +171,14 @@ class CalendarViewController extends heartwood_view_controllers_1.CalendarViewCo
             else {
                 super.updateEvent(saved.id, { isBusy, error: undefined });
             }
+            return saved;
         }
         catch (err) {
             if (this.hasEvent(id)) {
                 super.updateEvent(id, { error: err, isBusy: false });
             }
         }
+        return event;
     }
     getPeople() {
         const people = super.getPeople();

package/build/viewControllers/RepeatingControlsList.vc.js

@@ -329,8 +329,8 @@ class RepeatingControlsListViewController extends heartwood_view_controllers_1.A
         return this.Controller('calendar', {
             onClick: async (options) => {
                 var _a;
-                if (options.date) {
-                    this.changeCalendarSelectedDate(options.date);
+                if (options.dateTimeMs) {
+                    this.changeCalendarSelectedDate(options.dateTimeMs);
                     (_a = this.didChangeRepeating) === null || _a === void 0 ? void 0 : _a.call(this, this.repeating);
                 }
             },

package/package.json

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