Merge pull request #1341 from culturecreates/develop

Develop
culturecreates · Sep 20, 2024 · d4ac794 · d4ac794
2 parents e658b82 + 7665258
commit d4ac794
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 10 deletions.
diff --git a/src/components/RecurringEvents/recurringEvents.css b/src/components/RecurringEvents/recurringEvents.css
@@ -135,6 +135,13 @@
   color: #222732;
 }
 
+.recurring-modal .calendar .calendar-header .year-neighbor {
+  display: none !important;
+}
+.recurring-modal .calendar .calendar-header .year-neighbor2 {
+  display: none !important;
+}
+
 @media screen and (max-width: 480px) {
   .custom-date-column {
     height: 200px;

diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx
@@ -1338,6 +1338,72 @@ function AddEvent() {
     setScrollToSelectedField(array?.at(-1));
   };
 
+  const handleDateTypeChange = (activeDateType) => {
+    let currentActiveDateValue;
+
+    switch (dateType) {
+      case dateTypes.SINGLE:
+        currentActiveDateValue = form.getFieldValue('datePicker')
+          ? [form.getFieldValue('datePicker'), undefined]
+          : undefined;
+        break;
+
+      case dateTypes.RANGE:
+        setStartDate(undefined);
+        setEndDate(undefined);
+        currentActiveDateValue = form.getFieldValue('dateRangePicker') ?? undefined;
+        break;
+
+      case dateTypes.MULTIPLE:
+        setStartDate(undefined);
+        setEndDate(undefined);
+        currentActiveDateValue = form.getFieldValue('startDateRecur') ?? undefined;
+        break;
+
+      default:
+        break;
+    }
+
+    setDateType(activeDateType);
+
+    if (currentActiveDateValue && !eventId) {
+      switch (activeDateType) {
+        case dateTypes.SINGLE:
+          form.setFieldValue(
+            'datePicker',
+            Array.isArray(currentActiveDateValue) ? currentActiveDateValue[0] : undefined,
+          );
+          form.setFieldsValue({
+            dateRangePicker: undefined,
+            startDateRecur: undefined,
+          });
+          break;
+
+        case dateTypes.RANGE:
+          form.setFieldValue('dateRangePicker', currentActiveDateValue);
+          form.setFieldsValue({
+            datePicker: undefined,
+            startDateRecur: undefined,
+          });
+          break;
+
+        case dateTypes.MULTIPLE:
+          form.setFieldValue('startDateRecur', currentActiveDateValue);
+          form.setFieldsValue({
+            datePicker: undefined,
+            dateRangePicker: undefined,
+          });
+          break;
+
+        default:
+          break;
+      }
+    }
+
+    form.resetFields(['frequency']);
+    setFormValue(null);
+  };
+
   const onValuesChangeHandler = (changedValues, allValues) => {
     if (eventId) {
       if (!updateEventSuccess) {
@@ -2584,16 +2650,7 @@ function AddEvent() {
                           label={type.label}
                           promptText={type.tooltip}
                           secondaryIcon={<InfoCircleOutlined />}
-                          onClick={() => {
-                            setDateType(type.type);
-                            form.setFieldsValue({
-                              datePicker: undefined,
-                              dateRangePicker: undefined,
-                              startDateRecur: undefined,
-                            });
-                            form.resetFields(['frequency']);
-                            setFormValue(null);
-                          }}
+                          onClick={() => handleDateTypeChange(type.type)}
                         />
                       );
                   })}