Load associated plannings when modal opens

thecalcc · Aug 27, 2024 · e644275 · e644275
1 parent e05b429
commit e644275
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/client/actions/main.ts b/client/actions/main.ts
@@ -718,6 +718,11 @@ const openIgnoreCancelSaveModal = ({
             selectors.planning.storedPlannings(getState());
         const item = get(storedItems, itemId) || {};
 
+        if (itemType === ITEM_TYPE.EVENT) {
+            // Load associated plannings so they can be used later
+            dispatch(eventsApi.loadAssociatedPlannings(item));
+        }
+
         if (!isExistingItem(item)) {
             delete item._id;
         }

diff --git a/client/components/IgnoreCancelSaveModal.tsx b/client/components/IgnoreCancelSaveModal.tsx
@@ -86,7 +86,7 @@ export class IgnoreCancelSaveModalComponent extends React.Component<IProps, ISta
             return (
                 <UpdateRecurringEventsForm
                     original={this.props.modalProps.item}
-                    updates={this.props.modalProps.updates}
+                    updates={this.props.modalProps.updates as Partial<IEventItem>}
                     onEventUpdateMethodChange={this.onEventUpdateMethodChange}
                     onPlanningUpdateMethodChange={this.onPlanningUpdateMethodChange}
                     modalProps={{

diff --git a/client/components/ItemActionConfirmation/forms/updateRecurringEventsForm.tsx b/client/components/ItemActionConfirmation/forms/updateRecurringEventsForm.tsx
@@ -75,10 +75,10 @@ function getRecurringPlanningToUpdate(
     updates: Partial<IEventItem>,
     plannings: {[planningId: string]: IPlanningItem}
 ): Array<IPlanningItem['_id']> {
-    const originalCoverages: IPlanningEmbeddedCoverageMap = (original.planning_ids || [])
+    const originalCoverages: IPlanningEmbeddedCoverageMap = (original.planning_ids ?? [])
         .map((planningId) => plannings[planningId])
         .reduce((planningItems, planningItem) => {
-            planningItems[planningItem?._id] = (planningItem?.coverages ?? []).reduce(
+            planningItems[planningItem._id] = (planningItem.coverages ?? []).reduce(
                 (embeddedCoverages, coverage) => {
                     embeddedCoverages[coverage.coverage_id] = eventUtils.convertCoverageToEventEmbedded(coverage);