improve forms value when we switch edit recurring

Signed-off-by: AHMAD KADRI <[email protected]>
nordeck · Sep 12, 2023 · 6fe4e92 · 6fe4e92
1 parent 74e40bf
commit 6fe4e92
Showing 1 changed file with 33 additions and 21 deletions.
diff --git a/matrix-meetings-widget/src/components/meetings/ScheduleMeetingModal/ScheduleMeeting.tsx b/matrix-meetings-widget/src/components/meetings/ScheduleMeetingModal/ScheduleMeeting.tsx
@@ -300,6 +300,26 @@ export const ScheduleMeeting = ({
     [],
   );
 
+  const handleChangeWidgets = useCallback(
+    (value: string[]) => {
+      setWidgets(value);
+
+      // Skip setting it to dirty in the first call as the widget picker always
+      // triggers once at startup
+      if (widgets.length > 0) {
+        setIsDirty(true);
+      }
+    },
+    [widgets.length],
+  );
+
+  const handleChangeRecurrence = useCallback(
+    (rrule: string | undefined, isValid: boolean, isDirty: boolean) => {
+      setRecurrence({ rrule, isValid, isDirty });
+    },
+    [],
+  );
+
   const handleSwitchEditRecurring = useCallback(
     (_, checked: boolean) => {
       setIsEditRecurring(checked);
@@ -318,29 +338,21 @@ export const ScheduleMeeting = ({
             initialMeeting.calendarEntries[0].dtend,
           ),
         );
+        if (isEditRecurring) {
+          setTitle(initialMeeting.title);
+          setDescription(initialMeeting.description ?? '');
+          setIsMessagingEnabled(initialIsMessagingEnabled);
+          setParticipants(initialMeeting.participants.map((p) => p.userId));
+          setWidgets(initialMeeting.widgets);
+          setRecurrence({
+            rrule: initialMeeting?.calendarEntries[0].rrule,
+            isValid: true,
+            isDirty: false,
+          });
+        }
       }
     },
-    [initialMeeting, isEditRecurring],
-  );
-
-  const handleChangeWidgets = useCallback(
-    (value: string[]) => {
-      setWidgets(value);
-
-      // Skip setting it to dirty in the first call as the widget picker always
-      // triggers once at startup
-      if (widgets.length > 0) {
-        setIsDirty(true);
-      }
-    },
-    [widgets.length],
-  );
-
-  const handleChangeRecurrence = useCallback(
-    (rrule: string | undefined, isValid: boolean, isDirty: boolean) => {
-      setRecurrence({ rrule, isValid, isDirty });
-    },
-    [],
+    [initialIsMessagingEnabled, initialMeeting, isEditRecurring],
   );
 
   const minStartTimeOverride = isEditingRecurringMeeting