Merge pull request #426 from culturecreates/develop

Develop - fix for calendar widget
culturecreates · Jun 26, 2023 · b324ad0 · b324ad0
2 parents 97583ab + 027c4bd
commit b324ad0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/components/RecurringEvents/RecurringModal/RecurringModal.jsx b/src/components/RecurringEvents/RecurringModal/RecurringModal.jsx
@@ -162,7 +162,7 @@ const RecurringModal = ({
         const newCopyArray = dateArrayCal.filter((item) => !checkDateExisting.includes(item.initDate));
 
         const iterated = [...dateSource, [].concat.apply([], newCopyArray)];
-        setDataSource([].concat.apply([], iterated).sort((a, b) => (b?.initDate < a?.initDate ? 1 : -1)));
+        setDataSource([].concat.apply([], iterated).sort((a, b) => (b.initDate < a.initDate ? 1 : -1)));
       }
       setDateArrayCal(null);
     }
@@ -289,14 +289,14 @@ const RecurringModal = ({
                 const dateLength = await getNumberOfDays(e.startDate, e.endDate);
                 if (dateLength && dateLength.length > 1) {
                   const dateArray = dateLength.map((item) => {
-                    // const date = moment(item, 'YYYY-MM-DD');
+                    const date = moment(item, 'YYYY-MM-DD');
                     const obj = {
                       id: uniqid(),
                       name: 'test name',
                       location: 'test Location',
-                      startDate: new Date(item),
-                      endDate: new Date(item),
-                      initDate: item,
+                      startDate: new Date(date.format('YYYY/M/D')),
+                      endDate: new Date(date.format('YYYY/M/D')),
+                      initDate: date.format('YYYY-MM-DD'),
                       isDeleted: false,
                       color: '#607EFC',
                     };

diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx
@@ -120,7 +120,7 @@ function AddEvent() {
   const [getEntities] = useLazyGetEntitiesQuery({ sessionId: timestampRef });
   const [updateEventState, { isLoading: updateEventStateLoading }] = useUpdateEventStateMutation();
   const [updateEvent, { isLoading: updateEventLoading }] = useUpdateEventMutation();
-  const [addImage, { error: isAddImageError }] = useAddImageMutation();
+  const [addImage, { error: isAddImageError, isLoading: addImageLoading }] = useAddImageMutation();
   const [getAllTaxonomy] = useLazyGetAllTaxonomyQuery({ sessionId: timestampRef });
 
   const [dateType, setDateType] = useState();
@@ -639,14 +639,16 @@ function AddEvent() {
               size="large"
               label={t('dashboard.events.addEditEvent.saveOptions.saveAsDraft')}
               onClick={(e) => saveAsDraftHandler(e)}
-              disabled={updateEventLoading || addEventLoading ? true : false}
+              disabled={updateEventLoading || addEventLoading || addImageLoading ? true : false}
             />
           </Form.Item>
           <Form.Item>
             <PrimaryButton
               label={t('dashboard.events.addEditEvent.saveOptions.publish')}
               onClick={(e) => reviewPublishHandler(e)}
-              disabled={updateEventLoading || addEventLoading || updateEventStateLoading ? true : false}
+              disabled={
+                updateEventLoading || addEventLoading || updateEventStateLoading || addImageLoading ? true : false
+              }
             />
           </Form.Item>
         </>
@@ -659,15 +661,17 @@ function AddEvent() {
               size="large"
               label={t('dashboard.events.addEditEvent.saveOptions.saveAsDraft')}
               onClick={(e) => saveAsDraftHandler(e)}
-              disabled={updateEventLoading || addEventLoading ? true : false}
+              disabled={updateEventLoading || addEventLoading || addImageLoading ? true : false}
             />
           </Form.Item>
 
           <Form.Item>
             <PrimaryButton
               label={t('dashboard.events.addEditEvent.saveOptions.sendToReview')}
               onClick={(e) => reviewPublishHandler(e)}
-              disabled={updateEventLoading || addEventLoading || updateEventStateLoading ? true : false}
+              disabled={
+                updateEventLoading || addEventLoading || updateEventStateLoading || addImageLoading ? true : false
+              }
             />
           </Form.Item>
         </>
@@ -687,7 +691,7 @@ function AddEvent() {
             <PrimaryButton
               label={t('dashboard.events.addEditEvent.saveOptions.save')}
               onClick={(e) => saveAsDraftHandler(e)}
-              disabled={updateEventLoading || addEventLoading ? true : false}
+              disabled={updateEventLoading || addEventLoading || addImageLoading ? true : false}
             />
           </Form.Item>
         </>

diff --git a/src/pages/Dashboard/Events/Events.jsx b/src/pages/Dashboard/Events/Events.jsx
@@ -215,11 +215,11 @@ function Events() {
     sessionStorage.setItem('order', filter?.order);
     sessionStorage.setItem('sortBy', filter?.sort);
     if (usersQuery) sessionStorage.setItem('users', usersQuery);
+    else sessionStorage.removeItem('users');
     if (publicationQuery) sessionStorage.setItem('publication', publicationQuery);
     if (filter?.dates?.length > 0 && filter?.dates[0] && filter?.dates[0] !== '')
       sessionStorage.setItem('startDateRange', filter?.dates[0]);
     else sessionStorage.setItem('startDateRange', query?.get('start-date-range'));
-
     if (filter?.dates?.length > 1 && filter?.dates[1] && filter?.dates[1] !== '')
       sessionStorage.setItem('endDateRange', filter?.dates[1]);
     else sessionStorage.setItem('endDateRange', query?.get('end-date-range'));