@sprucelabs/spruce-calendar-components 22.9.13 → 22.10.0

package/build/toolBelt/states/AbstractCalendarEventToolBeltState.d.ts

@@ -1,10 +1,6 @@
-import { SpruceSchemas, ToolBeltState, ViewControllerId } from '@sprucelabs/heartwood-view-controllers';
-import { CalendarTool, CalendarToolBeltContext, CalendarToolBeltStateMachine, CalendarToolOptions, GetPersonFromEventHandler, UpdateCalendarContextOptions } from '../../types/calendar.types';
+import { ToolBeltState, ViewControllerId } from '@sprucelabs/heartwood-view-controllers';
+import { CalendarTool, CalendarToolBeltContext, CalendarToolBeltStateMachine, CalendarToolOptions, GetPersonFromEventHandler, Tool, UpdateCalendarContextOptions } from '../../types/calendar.types';
 import EventControlsCardViewController from '../../viewControllers/EventControlsCard.vc';
-declare type Tool = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.ToolBeltTool;
-export declare type AddToolOptions = Omit<Tool, 'card'> & {
-    cardVcId: ViewControllerId;
-};
 export default abstract class AbstractCalendarEventToolBeltState implements ToolBeltState {
     abstract id: string;
     protected sm: CalendarToolBeltStateMachine;
@@ -20,7 +16,7 @@ export default abstract class AbstractCalendarEventToolBeltState implements Tool
     protected handleClickSave(): Promise<void>;
     private deselectEvent;
     private handleDidUpdateContext;
-    private getContext;
+    protected getContext(): CalendarToolBeltContext;
     clearPendingContextChanges(shouldEmitDidUpdate?: boolean): Promise<void>;
     addTool(options: AddToolOptions): Promise<CalendarTool>;
     protected buildVcConstructorOptions(id: string): CalendarToolOptions;
@@ -33,4 +29,6 @@ export default abstract class AbstractCalendarEventToolBeltState implements Tool
     getControlsVc(): EventControlsCardViewController;
     destroy(): Promise<void>;
 }
-export {};
+export declare type AddToolOptions = Omit<Tool, 'card'> & {
+    cardVcId: ViewControllerId;
+};

package/build/toolBelt/states/AbstractCalendarEventToolBeltState.js

@@ -61,7 +61,7 @@ class AbstractCalendarEventToolBeltState {
         this.controlsVc.handleUpdateContext();
     }
     getContext() {
-        return Object.assign(Object.assign({}, this.sm.getContext()), this.pendingContextUpdates);
+        return Object.assign({}, this.sm.getContext(this.pendingContextUpdates));
     }
     async clearPendingContextChanges(shouldEmitDidUpdate = true) {
         this.pendingContextUpdates = {};

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

@@ -52,6 +52,7 @@ export interface UpdateCalendarContextOptions {
     shouldPersistContextChangesImmediately?: boolean;
 }
 export declare type UpdateCalendarToolBeltContextHandler<Context extends CalendarToolBeltContext = CalendarToolBeltContext> = (context: Partial<Context>, options?: UpdateCalendarContextOptions) => Promise<boolean>;
+export declare type Tool = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.ToolBeltTool;
 export declare type GetCalendarToolBeltContextHandler = () => CalendarToolBeltContext;
 export declare type GetPersonFromEventHandler = () => Promise<Person | null>;
 export declare type GetHasPendingContextChangesHandler = () => boolean;
@@ -63,6 +64,7 @@ export interface CalendarToolOptions {
     getPersonFromEvent: GetPersonFromEventHandler;
     getHasPendingContextChanges: GetHasPendingContextChangesHandler;
 }
+export declare type CancelEventRecurringOptions = SpruceSchemas.Calendar.v2021_05_19.CancelCalendarEventEmitPayload;
 export interface EventWithToolBeltState {
     getToolBeltState(): ToolBeltState;
 }

package/build/utilities/CalendarEventManager.d.ts

@@ -16,8 +16,8 @@ export default class CalendarEventManager {
     protected sm: CalendarToolBeltStateMachine<CalendarToolBeltContext>;
     protected shouldIgnoreNextContextUpdate: boolean;
     private askForUpdateStrategy;
-    private dateToUpdate?;
-    private shouldUpdateAllEventsGoingForward?;
+    protected dateToUpdate?: number;
+    protected shouldUpdateAllEventsGoingForward?: boolean;
     private dates;
     protected prefs: RemotePreferencesStore;
     private calendars;
@@ -45,7 +45,7 @@ export default class CalendarEventManager {
     reset(): Promise<void>;
     restoreEventToDraftOnStateLoadError(): Promise<void>;
     getVisibleCalendarIds(): string[];
-    removeEvent(id: string, options?: {
+    cancelEvent(id: string, options?: {
         shouldPersist?: boolean;
     }): Promise<void>;
     makeCalendarVisible(calendarId: string): Promise<void>;
@@ -95,7 +95,8 @@ export default class CalendarEventManager {
     private handleWillUpdateContext;
     deselectEvent(): Promise<void>;
     private handleDidUpdateContext;
-    private saveEvent;
+    protected saveEvent(event: SavedEvent): Promise<void>;
+    private clearPersistRepeatingOptions;
     getIsLoaded(): boolean;
     hasEvent(id: string): boolean;
     optionallyAskForUpdateRepeatingStrategy(event: UpdateEvent): Promise<boolean>;
@@ -111,4 +112,7 @@ export interface CalendarEventManagerOptions {
     preferences: RemotePreferencesStore;
     askForUpdateStrategy: (event: UpdateEvent) => Promise<UpdateRepeatingStrategyWithCancel>;
 }
+export declare type SavedEvent = Partial<CalendarEvent> & {
+    id: string;
+};
 export {};

package/build/utilities/CalendarEventManager.js

@@ -130,21 +130,32 @@ class CalendarEventManager {
     getVisibleCalendarIds() {
         return this.visibleCalendarIds;
     }
-    async removeEvent(id, options) {
+    async cancelEvent(id, options) {
         var _a;
-        this.allEvents = this.allEvents.filter((e) => e.id !== id);
+        const { shouldPersist = true } = options !== null && options !== void 0 ? options : {};
         const event = this.calendarVc.getEvent(id);
+        if (shouldPersist) {
+            const accepted = await this.optionallyAskForUpdateRepeatingStrategy(event);
+            if (!accepted) {
+                return;
+            }
+        }
+        this.allEvents = this.allEvents.filter((e) => e.id !== id);
         await this.calendarVc.removeEvent(id);
-        if ((options === null || options === void 0 ? void 0 : options.shouldPersist) === false) {
+        if (!shouldPersist) {
             return;
         }
         try {
-            await this.events.cancelEvent(event.id);
+            await this.events.cancelEvent(event.id, {
+                shouldCancelAllEventsGoingForward: this.shouldUpdateAllEventsGoingForward,
+                dateToCancel: this.dateToUpdate,
+            });
         }
         catch (err) {
             console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
             this.calendarVc.addEvent(Object.assign(Object.assign({}, event), { error: err }));
         }
+        this.clearPersistRepeatingOptions();
     }
     async makeCalendarVisible(calendarId) {
         this.assertValidCalendarId(calendarId);
@@ -305,6 +316,11 @@ class CalendarEventManager {
         catch (err) {
             console.error('Updating event in context from root failed because:\n\n', err);
         }
+        this.clearPersistRepeatingOptions();
+    }
+    clearPersistRepeatingOptions() {
+        this.dateToUpdate = undefined;
+        this.shouldUpdateAllEventsGoingForward = undefined;
     }
     getIsLoaded() {
         return this.isLoaded;
@@ -314,6 +330,9 @@ class CalendarEventManager {
     }
     async optionallyAskForUpdateRepeatingStrategy(event) {
         var _a;
+        if (!event.id) {
+            return true;
+        }
         const cleaned = (0, schema_1.normalizeSchemaValues)(heartwood_view_controllers_1.calendarEventSchema, event, {});
         if (((_a = cleaned.totalInRepeating) !== null && _a !== void 0 ? _a : 0) > 1) {
             let strategy = await this.askForUpdateStrategy(cleaned);

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

@@ -1,11 +1,5 @@
-import { AbstractViewController, SpruceSchemas, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
+import { AbstractViewController, Card, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
 import { CalendarTool, CalendarToolOptions, CancelEventHandler } from '../types/calendar.types';
-declare type Card = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
-export interface EventControlsCardOptions extends CalendarToolOptions {
-    onCancel: () => Promise<void | boolean> | void | boolean;
-    onCancelEvent: CancelEventHandler;
-    onSave: () => Promise<void | boolean> | void | boolean;
-}
 export default class EventControlsCardViewController extends AbstractViewController<Card> implements CalendarTool {
     static id: string;
     private cardVc;
@@ -25,6 +19,10 @@ export default class EventControlsCardViewController extends AbstractViewControl
     handleUpdateContext(): void;
     private shouldFooterBeEnabled;
     private optionallyDropInCancelButton;
-    render(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
+    render(): import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
+}
+export interface EventControlsCardOptions extends CalendarToolOptions {
+    onCancel: () => Promise<void | boolean> | void | boolean;
+    onCancelEvent: CancelEventHandler;
+    onSave: () => Promise<void | boolean> | void | boolean;
 }
-export {};

package/build/viewControllers/EventDateTimeTool.vc.js

@@ -119,7 +119,8 @@ class EventDateTimeToolViewController extends heartwood_view_controllers_1.Abstr
         var _a;
         if (values.startDateTime) {
             await ((_a = this.updateContext) === null || _a === void 0 ? void 0 : _a.call(this, {
-                event: Object.assign(Object.assign({}, this.getContext().event), { startDateTimeMs: values.startDateTime }),
+                //@ts-ignore
+                'event.startDateTimeMs': values.startDateTime,
             }));
         }
     }

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

@@ -1,29 +1,7 @@
-import { AbstractViewController, FormViewController, SpruceSchemas, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
+import { AbstractViewController, Card, FormViewController, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
 import { CalendarTool } from '../index-components';
 import { CalendarToolBeltContext, CalendarToolOptions } from '../types/calendar.types';
 import RepeatingControlsListViewController, { RepeatingOptions } from './RepeatingControlsList.vc';
-declare type Card = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
-declare const schema: {
-    id: string;
-    fields: {
-        repeat: {
-            type: "text";
-            isRequired: true;
-            defaultValue: string;
-        };
-        repeatEvery: {
-            type: "text";
-        };
-        repeatAmount: {
-            type: "text";
-        };
-        repeatUntilMs: {
-            type: "dateTime";
-        };
-    };
-};
-declare type Schema = typeof schema;
-export declare type FormVc = FormViewController<Schema>;
 export default class EventRepeatingToolViewController extends AbstractViewController<Card> implements CalendarTool {
     static id: string;
     private cardVc;
@@ -35,6 +13,7 @@ export default class EventRepeatingToolViewController extends AbstractViewContro
     handleUpdateContext(_context: CalendarToolBeltContext): void | Promise<void>;
     private CardVc;
     private ControlsListVc;
+    private handleDidChangeRepeating;
     private removeExtraRepeatingFields;
     private FormVc;
     getControlsListVc(): RepeatingControlsListViewController;
@@ -51,6 +30,27 @@ export default class EventRepeatingToolViewController extends AbstractViewContro
     };
     setValues(repeating: RepeatingOptions): void;
     getCalendarVc(): import("@sprucelabs/heartwood-view-controllers").CalendarViewController | undefined;
-    render(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
+    render(): import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
 }
+declare const schema: {
+    id: string;
+    fields: {
+        repeat: {
+            type: "text";
+            isRequired: true;
+            defaultValue: string;
+        };
+        repeatEvery: {
+            type: "text";
+        };
+        repeatAmount: {
+            type: "text";
+        };
+        repeatUntilMs: {
+            type: "dateTime";
+        };
+    };
+};
+declare type Schema = typeof schema;
+export declare type FormVc = FormViewController<Schema>;
 export {};

package/build/viewControllers/EventRepeatingTool.vc.js

@@ -2,25 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
 const schema_1 = require("@sprucelabs/schema");
-const schema = (0, schema_1.buildSchema)({
-    id: 'repeatingSchema',
-    fields: {
-        repeat: {
-            type: 'text',
-            isRequired: true,
-            defaultValue: 'doesntRepeat',
-        },
-        repeatEvery: {
-            type: 'text',
-        },
-        repeatAmount: {
-            type: 'text',
-        },
-        repeatUntilMs: {
-            type: 'dateTime',
-        },
-    },
-});
 class EventRepeatingToolViewController extends heartwood_view_controllers_1.AbstractViewController {
     constructor(options) {
         super(options);
@@ -48,14 +29,23 @@ class EventRepeatingToolViewController extends heartwood_view_controllers_1.Abst
         return this.Controller('calendar.repeating-controls-list', {
             repeating: Object.assign({}, this.getEvent()),
             didChangeRepeating: async (value) => {
-                var _a;
-                const cleaned = this.removeExtraRepeatingFields(value);
-                return (_a = this.updateContextHandler) === null || _a === void 0 ? void 0 : _a.call(this, {
-                    event: Object.assign(Object.assign(Object.assign({}, this.removeExtraRepeatingFields(this.getEvent())), { repeats: undefined, interval: undefined, repeatsUntil: undefined, occurrences: undefined, daysOfWeek: undefined, daysOfMonth: undefined }), cleaned),
-                });
+                const pass = this.handleDidChangeRepeating(value);
+                return pass;
             },
         });
     }
+    handleDidChangeRepeating(value) {
+        var _a;
+        const cleaned = this.removeExtraRepeatingFields(value);
+        const updates = Object.assign({ repeats: undefined, interval: undefined, repeatsUntil: undefined, occurrences: undefined, daysOfWeek: undefined, daysOfMonth: undefined }, cleaned);
+        const keyedUpdates = {};
+        Object.keys(updates).forEach((k) => {
+            //@ts-ignore
+            keyedUpdates[`event.${k}`] = updates[k];
+        });
+        const pass = (_a = this.updateContextHandler) === null || _a === void 0 ? void 0 : _a.call(this, Object.assign({}, keyedUpdates));
+        return pass;
+    }
     removeExtraRepeatingFields(value) {
         const cleaned = Object.assign({}, value);
         delete cleaned.repeatAmount;
@@ -95,3 +85,22 @@ class EventRepeatingToolViewController extends heartwood_view_controllers_1.Abst
 }
 exports.default = EventRepeatingToolViewController;
 EventRepeatingToolViewController.id = 'event-repeating-tool';
+const schema = (0, schema_1.buildSchema)({
+    id: 'repeatingSchema',
+    fields: {
+        repeat: {
+            type: 'text',
+            isRequired: true,
+            defaultValue: 'doesntRepeat',
+        },
+        repeatEvery: {
+            type: 'text',
+        },
+        repeatAmount: {
+            type: 'text',
+        },
+        repeatUntilMs: {
+            type: 'dateTime',
+        },
+    },
+});

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

@@ -1,6 +1,19 @@
-import { AbstractViewController, FormViewController, SpruceSchemas, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
+import { AbstractViewController, Card, FormViewController, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
 import { CalendarTool, CalendarToolBeltContext, CalendarToolOptions } from '../types/calendar.types';
-declare type Card = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
+export default class EventTitleToolViewController extends AbstractViewController<Card> implements CalendarTool {
+    static id: string;
+    private cardVc;
+    private formVc;
+    private getContext;
+    private updateContextHandler;
+    constructor(options: ViewControllerOptions & CalendarToolOptions);
+    private CardVc;
+    private FormVc;
+    private handleChangeForm;
+    handleUpdateContext(context: CalendarToolBeltContext): Promise<void>;
+    getFormVc(): FormVc;
+    render(): import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
+}
 declare const formSchema: {
     id: string;
     fields: {
@@ -17,18 +30,4 @@ declare const formSchema: {
 };
 declare type FormSchema = typeof formSchema;
 declare type FormVc = FormViewController<FormSchema>;
-export default class EventTitleToolViewController extends AbstractViewController<Card> implements CalendarTool {
-    static id: string;
-    private cardVc;
-    private formVc;
-    private getContext;
-    private updateContextHandler;
-    constructor(options: ViewControllerOptions & CalendarToolOptions);
-    private CardVc;
-    private FormVc;
-    private handleChangeForm;
-    handleUpdateContext(context: CalendarToolBeltContext): Promise<void>;
-    getFormVc(): FormVc;
-    render(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
-}
 export {};

package/build/viewControllers/EventTitleTool.vc.js

@@ -2,20 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
 const schema_1 = require("@sprucelabs/schema");
-const formSchema = (0, schema_1.buildSchema)({
-    id: 'titleSubtitle',
-    fields: {
-        title: {
-            type: 'text',
-            isRequired: true,
-            label: 'Title',
-        },
-        subtitle: {
-            type: 'text',
-            label: 'Subtitle',
-        },
-    },
-});
 class EventTitleToolViewController extends heartwood_view_controllers_1.AbstractViewController {
     constructor(options) {
         super(options);
@@ -37,7 +23,8 @@ class EventTitleToolViewController extends heartwood_view_controllers_1.Abstract
         });
     }
     FormVc() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b;
+        const timeBlock = (_b = (_a = this.getContext().event) === null || _a === void 0 ? void 0 : _a.timeBlocks) === null || _b === void 0 ? void 0 : _b[0];
         return this.Controller('form', (0, heartwood_view_controllers_1.buildForm)({
             schema: formSchema,
             shouldShowSubmitControls: false,
@@ -48,16 +35,18 @@ class EventTitleToolViewController extends heartwood_view_controllers_1.Abstract
                 },
             ],
             values: {
-                title: (_c = (_b = (_a = this.getContext().event) === null || _a === void 0 ? void 0 : _a.timeBlocks) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.title,
-                subtitle: (_f = (_e = (_d = this.getContext().event) === null || _d === void 0 ? void 0 : _d.timeBlocks) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.subtitle,
+                title: timeBlock === null || timeBlock === void 0 ? void 0 : timeBlock.title,
+                subtitle: timeBlock === null || timeBlock === void 0 ? void 0 : timeBlock.subtitle,
             },
         }));
     }
     async handleChangeForm() {
-        const { event } = this.getContext();
-        event.timeBlocks[0] = Object.assign(Object.assign({}, event.timeBlocks[0]), this.formVc.getValues());
+        const { title, subtitle } = this.formVc.getValues();
         await this.updateContextHandler({
-            event: Object.assign({}, event),
+            //@ts-ignore
+            'event.timeBlocks[0].title': title,
+            //@ts-ignore
+            'event.timeBlocks[0].subtitle': subtitle,
         });
     }
     async handleUpdateContext(context) {
@@ -75,3 +64,17 @@ class EventTitleToolViewController extends heartwood_view_controllers_1.Abstract
 }
 exports.default = EventTitleToolViewController;
 EventTitleToolViewController.id = 'event-title-card';
+const formSchema = (0, schema_1.buildSchema)({
+    id: 'titleSubtitle',
+    fields: {
+        title: {
+            type: 'text',
+            isRequired: true,
+            label: 'Title',
+        },
+        subtitle: {
+            type: 'text',
+            label: 'Subtitle',
+        },
+    },
+});

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

@@ -1,9 +1,4 @@
-import { AbstractViewController, CalendarEvent, CalendarViewController, ListViewController, SpruceSchemas, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
-declare type List = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.List;
-export declare type RepeatingOptions = Partial<Pick<CalendarEvent, 'repeats' | 'interval' | 'repeatsUntil' | 'occurrences' | 'startDateTimeMs' | 'daysOfWeek' | 'daysOfMonth'> & {
-    repeatAmount?: 'forever' | 'until' | 'after';
-}>;
-declare type Row = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.ListRow;
+import { AbstractViewController, CalendarEvent, CalendarViewController, List, ListRow, ListViewController, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
 export default class RepeatingControlsListViewController extends AbstractViewController<List> {
     static id: string;
     private listVc;
@@ -15,13 +10,13 @@ export default class RepeatingControlsListViewController extends AbstractViewCon
         didChangeRepeating: (values: RepeatingOptions) => void;
     });
     private ListVc;
-    renderRows(): Row[];
-    renderRepeatRow(): Row;
+    renderRows(): ListRow[];
+    renderRepeatRow(): ListRow;
     private renderRepeatingControlsRow;
-    renderRepeatEveryRow(): Row;
-    renderWeekDayRow(): Row;
-    renderCalendarRow(): Row;
-    renderRepeatAmountRow(): Row;
+    renderRepeatEveryRow(): ListRow;
+    renderWeekDayRow(): ListRow;
+    renderCalendarRow(): ListRow;
+    renderRepeatAmountRow(): ListRow;
     private handleRepeatsChange;
     private resetRows;
     private changeRepeatingControlsRow;
@@ -45,6 +40,8 @@ export default class RepeatingControlsListViewController extends AbstractViewCon
     private setCalendarSelectedDatesFromDate;
     private getSelectedDatesFromDate;
     private changeCalendarSelectedDate;
-    render(): SpruceSchemas.HeartwoodViewControllers.v2021_02_11.List;
+    render(): import("@sprucelabs/calendar-utils").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.List;
 }
-export {};
+export declare type RepeatingOptions = Partial<Pick<CalendarEvent, 'repeats' | 'interval' | 'repeatsUntil' | 'occurrences' | 'startDateTimeMs' | 'daysOfWeek' | 'daysOfMonth'> & {
+    repeatAmount?: 'forever' | 'until' | 'after';
+}>;

package/package.json

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