Merge pull request #348 from culturecreates/develop

Develop
culturecreates · May 22, 2023 · 17b6d51 · 17b6d51
2 parents 3962d40 + d0cab4b
commit 17b6d51
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 27 deletions.
diff --git a/src/components/RecurringEvents/RecurringEvents.jsx b/src/components/RecurringEvents/RecurringEvents.jsx
@@ -38,8 +38,10 @@ const RecurringEvents = function ({
 
   useEffect(() => {
     if (eventDetails) {
-      if (formFields?.frequency === 'CUSTOM' || eventDetails.recurringEvent?.frequency === 'CUSTOM') setIsCustom(true);
-      else setIsCustom(false);
+      if (formFields?.frequency === 'CUSTOM' || eventDetails.recurringEvent?.frequency === 'CUSTOM') {
+        setDateModified(true);
+        setIsCustom(true);
+      } else setIsCustom(false);
       if (eventDetails.recurringEvent?.customDates) {
         setIsCustom(true);
         const custom = eventDetails.recurringEvent?.customDates.map((item) => {
@@ -212,7 +214,6 @@ const RecurringEvents = function ({
       };
       return obj;
     });
-
     if (!dateModified) setCustomDates(custom);
   };
   function getDaysBetweenDates(start, end, dayName) {

diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx
@@ -41,7 +41,6 @@ import { useGetAllTaxonomyQuery, useLazyGetAllTaxonomyQuery } from '../../../ser
 import { taxonomyClass } from '../../../constants/taxonomyClass';
 import { dateTimeTypeHandler } from '../../../utils/dateTimeTypeHandler';
 import ImageUpload from '../../../components/ImageUpload';
-import Compressor from 'compressorjs';
 import { useAddImageMutation } from '../../../services/image';
 import TreeSelectOption from '../../../components/TreeSelectOption';
 import {
@@ -475,32 +474,26 @@ function AddEvent() {
           };
 
           if (values?.dragger?.length > 0 && values?.dragger[0]?.originFileObj) {
-            new Compressor(values?.dragger[0]?.originFileObj, {
-              convertSize: 200000,
-              success: (compressedResult) => {
-                const formdata = new FormData();
-                formdata.append('files', values?.dragger[0].originFileObj);
-                formdata.append('files', new File([compressedResult], 'compressed' + compressedResult.name));
-                formdata &&
-                  addImage({ data: formdata, calendarId })
-                    .unwrap()
-                    .then((response) => {
-                      image = response?.data;
-                      eventObj['image'] = image;
-                      addUpdateEventApiHandler(eventObj, toggle)
-                        .then((id) => resolve(id))
-                        .catch((error) => {
-                          reject();
-                          console.log(error);
-                        });
-                    })
+            const formdata = new FormData();
+            formdata.append('file', values?.dragger[0].originFileObj);
+            formdata &&
+              addImage({ data: formdata, calendarId })
+                .unwrap()
+                .then((response) => {
+                  image = response?.data;
+                  eventObj['image'] = image;
+                  addUpdateEventApiHandler(eventObj, toggle)
+                    .then((id) => resolve(id))
                     .catch((error) => {
+                      reject();
                       console.log(error);
-                      const element = document.getElementsByClassName('draggerWrap');
-                      element && element[0]?.scrollIntoView({ block: 'center', behavior: 'smooth' });
                     });
-              },
-            });
+                })
+                .catch((error) => {
+                  console.log(error);
+                  const element = document.getElementsByClassName('draggerWrap');
+                  element && element[0]?.scrollIntoView({ block: 'center', behavior: 'smooth' });
+                });
           } else {
             if (values?.draggerWrap) {
               if (values?.dragger && values?.dragger?.length == 0) eventObj['image'] = null;