jamespot-front-business 1.3.5 → 1.3.6

package/dist/esm.js

@@ -1136,17 +1136,27 @@ const initialState$k = {
     types: [],
     pendingStatusChanges: [],
 };
+let fetchTimeout = null;
+const debounceFetch = (dispatch, params, delay = 500) => {
+    if (fetchTimeout)
+        clearTimeout(fetchTimeout);
+    fetchTimeout = setTimeout(() => {
+        dispatch(fetchEvents(params));
+    }, delay);
+};
 const fetchEvents = createAsyncThunk('calendarEvents/fetchEvents', async (params, { extra, rejectWithValue, dispatch, signal, getState }) => {
     const state = getState().calendar.events;
     if (!params.dates && !state.dates) {
         return rejectWithValue({ error: 1, errorMsg: 'Dates must be set' });
     }
+    let types = params.types ?? state.types;
+    types = types.includes('socialEvent') ? [...types, 'recurringEvent'] : [...types];
     try {
         const payload = {
             dateStart: params.dates?.start ?? state.dates?.start ?? '',
             dateEnd: params.dates?.end ?? state.dates?.end ?? '',
             statuses: state.statuses,
-            types: params.types ?? state.types,
+            types,
         };
         const res = await extra.jApi.calendar.listEvents(payload, {
             format: 'raw-view',
@@ -1162,11 +1172,11 @@ const fetchEvents = createAsyncThunk('calendarEvents/fetchEvents', async (params
     }
 });
 const setDates = createAsyncThunk('calendarEvents/setDates', async (params, { dispatch }) => {
-    dispatch(fetchEvents({ dates: params }));
+    debounceFetch(dispatch, { dates: params });
     return true;
 });
 const setTypes = createAsyncThunk('calendarEvents/setTypes', async (params, { dispatch }) => {
-    dispatch(fetchEvents({ types: params }));
+    debounceFetch(dispatch, { types: params });
     return true;
 });
 const changeResponse = createAsyncThunk('calendarEvents/changeResponse', async (params, { dispatch, extra, signal, rejectWithValue }) => {
@@ -1265,19 +1275,33 @@ const CalendarEventsSlice = createSlice({
                 }
                 state.pendingStatusChanges = state.pendingStatusChanges.filter((e) => e.requestId !== action.meta.requestId);
             }
+        })
+            .addCase(setDates.pending, (state, action) => {
+            state.dates = { start: action.meta.arg.start, end: action.meta.arg.end };
+            state.loading = 'pending';
+        })
+            .addCase(setTypes.pending, (state, action) => {
+            state.types = action.meta.arg;
+            state.loading = 'pending';
         });
     },
 });
 
-const isCalendarEvent = (type) => ['socialEvent', 'meeting', 'animatedMeeting'].includes(type);
+const isCalendarEvent = (type) => ['socialEvent', 'meeting', 'animatedMeeting', 'recurringEvent', 'recurringEventOccurrence'].includes(type);
 const getCalendarRTHandlers = function (dispatch, jApi) {
     const addEventHandler = function (message) {
         if (message.namespace === 'JAMESPOT' &&
             message.function === 'article-create' &&
             isCalendarEvent(message.object.type)) {
-            jApi.article.get({ uri: message.object.uri }, { format: 'raw-view', formatExtension: ['socialEventRecord'] })
+            if (message.object.type === 'recurringEvent') {
+                dispatch(fetchEvents({}));
+                return;
+            }
+            jApi.article.get({ uri: message.object.uri }, { format: 'raw-view', formatExtension: ['socialEventRecord', 'recurringEventRecord'] })
                 .then((res) => {
-                dispatch(CalendarEventsSlice.actions.addEvent(res.result));
+                if (!('hideFromCalendar' in res.result) || !res.result.hideFromCalendar) {
+                    dispatch(CalendarEventsSlice.actions.addEvent(res.result));
+                }
             })
                 .catch((e) => {
                 dispatch(Toast.actions.error({ label: getErrorMessage(e) }));
@@ -1288,6 +1312,10 @@ const getCalendarRTHandlers = function (dispatch, jApi) {
         if (message.namespace === 'JAMESPOT' &&
             message.function === 'article-delete' &&
             isCalendarEvent(message.object.type)) {
+            if (message.object.type === 'recurringEvent') {
+                dispatch(fetchEvents({}));
+                return;
+            }
             dispatch(CalendarEventsSlice.actions.removeEvent({ uri: message.object.uri }));
         }
     };
@@ -1295,9 +1323,18 @@ const getCalendarRTHandlers = function (dispatch, jApi) {
         if (message.namespace === 'JAMESPOT' &&
             message.function === 'article-update' &&
             isCalendarEvent(message.object.type)) {
-            jApi.article.get({ uri: message.object.uri }, { format: 'raw-view', formatExtension: ['socialEventRecord'] })
+            if (message.object.type === 'recurringEvent') {
+                dispatch(fetchEvents({}));
+                return;
+            }
+            jApi.article.get({ uri: message.object.uri }, { format: 'raw-view', formatExtension: ['socialEventRecord', 'recurringEventRecord'] })
                 .then((res) => {
-                dispatch(CalendarEventsSlice.actions.updateEvent(res.result));
+                if ('hideFromCalendar' in res.result && res.result.hideFromCalendar) {
+                    dispatch(CalendarEventsSlice.actions.removeEvent({ uri: message.object.uri }));
+                }
+                else {
+                    dispatch(CalendarEventsSlice.actions.updateEvent(res.result));
+                }
             })
                 .catch((e) => {
                 dispatch(Toast.actions.error({ label: getErrorMessage(e) }));
@@ -1305,12 +1342,12 @@ const getCalendarRTHandlers = function (dispatch, jApi) {
         }
     };
     const updateResponseHandler = function (message) {
-        if ((message.namespace === 'CUSTOM-ACTION' &&
+        if (message.namespace === 'CUSTOM-ACTION' &&
             (message.function === 'update' || message.function === 'remove') &&
             message.object.targetType &&
             message.object.targetId &&
-            isCalendarEvent(message.object.targetType))) {
-            jApi.article.get({ idArticle: message.object.targetId }, { format: 'raw-view', formatExtension: ['socialEventRecord'] })
+            isCalendarEvent(message.object.targetType)) {
+            jApi.article.get({ idArticle: message.object.targetId }, { format: 'raw-view', formatExtension: ['socialEventRecord', 'recurringEventRecord'] })
                 .then((res) => {
                 dispatch(CalendarEventsSlice.actions.updateEvent(res.result));
             })