@sprucelabs/spruce-calendar-components 25.6.7 → 25.6.8

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

@@ -29,9 +29,7 @@ export default class CalendarViewController extends CoreCalendarViewController {
     addDraftEvent(e: Omit<Event, 'id'>): Promise<SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent>;
     getIsSwappingEvent(): boolean;
     private swapEvent;
-    updateEvent(id: string, updates: Partial<UpdateEvent> & {
-        shouldPersist?: boolean;
-    }): any;
+    updateEvent(id: string, updates: UpdateEventOptions): any;
     private persist;
     waitForPendingSaves(): Promise<void>;
     private _persist;
@@ -57,4 +55,7 @@ export interface CalendarViewControllerOptions {
     onChangeStartDate?: StartDateTimeChangeHandler;
     onDeselectEvent?: DeselectEventHandler;
 }
+export type UpdateEventOptions = Partial<UpdateEvent> & {
+    shouldPersist?: boolean | null;
+};
 export {};

package/build/calendar/CalendarEventManager.d.ts

@@ -128,8 +128,8 @@ export interface CancelOptions {
     shouldPersist?: boolean;
 }
 export type UpdateEventOptions = Partial<CalendarEvent> & {
-    dateToUpdate?: number;
-    shouldUpdateAllEventsGoingForward?: boolean;
-    shouldPersist?: boolean;
+    dateToUpdate?: number | null;
+    shouldUpdateAllEventsGoingForward?: boolean | null;
+    shouldPersist?: boolean | null;
 };
 export {};

package/build/calendar/CalendarEventManager.js

@@ -17,9 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
 const schema_1 = require("@sprucelabs/schema");
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
-const isEqual_1 = __importDefault(require("../stores/isEqual"));
 const calendarShiftGenerator_1 = __importDefault(require("../utilities/calendarShiftGenerator"));
 const draftGenerator_1 = __importDefault(require("../utilities/draftGenerator"));
+const calculateEventDifferences_1 = __importDefault(require("./calculateEventDifferences"));
 class CalendarEventManager {
     get calendarIds() {
         return this.calendars.map((c) => c.id);
@@ -223,13 +223,13 @@ class CalendarEventManager {
     }
     async _updateEvent(id, updates) {
         var _a, _b;
-        const { shouldPersist } = updates, rest = __rest(updates, ["shouldPersist"]);
+        const { shouldPersist = true } = updates, rest = __rest(updates, ["shouldPersist"]);
         const { isTheSame, isTheSameWithoutBusy } = this.calculateDifferences(id, updates);
         if (isTheSame) {
             return;
         }
         try {
-            this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist }));
+            this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist: shouldPersist && !isTheSameWithoutBusy }));
         }
         catch (err) {
             console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
@@ -249,13 +249,7 @@ class CalendarEventManager {
     }
     calculateDifferences(id, updates) {
         const match = this.allEvents.find((e) => e.id === id);
-        const updated = Object.assign(Object.assign({}, match), updates);
-        const isTheSame = (0, isEqual_1.default)(match, updated);
-        const updatesWithoutBusy = Object.assign({}, updated);
-        delete updatesWithoutBusy.isBusy;
-        const matchWithoutBusy = Object.assign({}, match);
-        delete matchWithoutBusy.isBusy;
-        const isTheSameWithoutBusy = (0, isEqual_1.default)(matchWithoutBusy, updatesWithoutBusy);
+        const { isTheSame, isTheSameWithoutBusy } = (0, calculateEventDifferences_1.default)(match, updates);
         return { isTheSame, isTheSameWithoutBusy };
     }
     async loadEvents(startDate, endDate, peopleIds) {

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

@@ -29,9 +29,7 @@ export default class CalendarViewController extends CoreCalendarViewController {
     addDraftEvent(e: Omit<Event, 'id'>): Promise<SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CalendarEvent>;
     getIsSwappingEvent(): boolean;
     private swapEvent;
-    updateEvent(id: string, updates: Partial<UpdateEvent> & {
-        shouldPersist?: boolean;
-    }): any;
+    updateEvent(id: string, updates: UpdateEventOptions): any;
     private persist;
     waitForPendingSaves(): Promise<void>;
     private _persist;
@@ -57,4 +55,7 @@ export interface CalendarViewControllerOptions {
     onChangeStartDate?: StartDateTimeChangeHandler;
     onDeselectEvent?: DeselectEventHandler;
 }
+export type UpdateEventOptions = Partial<UpdateEvent> & {
+    shouldPersist?: boolean | null;
+};
 export {};

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

@@ -128,8 +128,8 @@ export interface CancelOptions {
     shouldPersist?: boolean;
 }
 export type UpdateEventOptions = Partial<CalendarEvent> & {
-    dateToUpdate?: number;
-    shouldUpdateAllEventsGoingForward?: boolean;
-    shouldPersist?: boolean;
+    dateToUpdate?: number | null;
+    shouldUpdateAllEventsGoingForward?: boolean | null;
+    shouldPersist?: boolean | null;
 };
 export {};

package/build/esm/calendar/CalendarEventManager.js

@@ -21,9 +21,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { calendarEventSchema, } from '@sprucelabs/heartwood-view-controllers';
 import { assertOptions, normalizeSchemaValues } from '@sprucelabs/schema';
 import SpruceError from '../errors/SpruceError.js';
-import isEqual from '../stores/isEqual.js';
 import calendarShiftGenerator from '../utilities/calendarShiftGenerator.js';
 import draftEventGenerator from '../utilities/draftGenerator.js';
+import calculateEventDifferences from './calculateEventDifferences.js';
 export default class CalendarEventManager {
     get calendarIds() {
         return this.calendars.map((c) => c.id);
@@ -248,13 +248,13 @@ export default class CalendarEventManager {
     _updateEvent(id, updates) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const { shouldPersist } = updates, rest = __rest(updates, ["shouldPersist"]);
+            const { shouldPersist = true } = updates, rest = __rest(updates, ["shouldPersist"]);
             const { isTheSame, isTheSameWithoutBusy } = this.calculateDifferences(id, updates);
             if (isTheSame) {
                 return;
             }
             try {
-                this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist }));
+                this.calendarVc.updateEvent(id, Object.assign(Object.assign({}, rest), { shouldPersist: shouldPersist && !isTheSameWithoutBusy }));
             }
             catch (err) {
                 console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
@@ -275,13 +275,7 @@ export default class CalendarEventManager {
     }
     calculateDifferences(id, updates) {
         const match = this.allEvents.find((e) => e.id === id);
-        const updated = Object.assign(Object.assign({}, match), updates);
-        const isTheSame = isEqual(match, updated);
-        const updatesWithoutBusy = Object.assign({}, updated);
-        delete updatesWithoutBusy.isBusy;
-        const matchWithoutBusy = Object.assign({}, match);
-        delete matchWithoutBusy.isBusy;
-        const isTheSameWithoutBusy = isEqual(matchWithoutBusy, updatesWithoutBusy);
+        const { isTheSame, isTheSameWithoutBusy } = calculateEventDifferences(match, updates);
         return { isTheSame, isTheSameWithoutBusy };
     }
     loadEvents(startDate, endDate, peopleIds) {

package/package.json

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