diff --git a/src/components/RecurringEvents/RecurringModal/RecurringModal.jsx b/src/components/RecurringEvents/RecurringModal/RecurringModal.jsx index d2c005e65..3e12b96fc 100644 --- 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 index fd20e6bb8..47d16770a 100644 --- 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} />