@zeniai/client-epic-state 4.20.2-beta31RR → 4.20.2-beta33RR

package/lib/esm/view/taskManager/taskListView/epics/bulkUpdateTaskListEpic.js

@@ -9,17 +9,26 @@ import { bulkUpdateTaskList, updateTasksListOnBulkUpdateTasksFailure, updateTask
 export const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(bulkUpdateTaskList.match), switchMap((action) => {
     const state = state$.value;
     const { taskIds, updates, groupId } = action.payload;
-    const payload = {
-        task_ids: taskIds,
-        updates: toBulkUpdatesPayload(state, updates, groupId),
-    };
+    // Move-to-group uses old endpoint with full task objects;
+    // all other bulk operations use the bulk-update endpoint
+    const isMoveToGroup = groupId != null;
+    const url = isMoveToGroup
+        ? `${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks`
+        : `${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/bulk-update`;
+    const payload = isMoveToGroup
+        ? { tasks: getTasksListPayload(state, taskIds, updates) }
+        : { task_ids: taskIds, updates: toBulkUpdatesPayload(updates) };
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/bulk-update`, payload)
+        .putAndGetJSON(url, payload)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
+            const removeFromList = updates.isArchived != null ||
+                updates.isDeleted != null ||
+                'snoozedUntil' in updates;
             return of(updateTasks(response.data.tasks), updateTasksListOnBulkUpdateTasksSuccess({
                 taskIds,
                 groupId,
+                removeFromList,
             }));
         }
         else {
@@ -34,7 +43,7 @@ export const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pi
         }));
     }));
 }));
-const toBulkUpdatesPayload = (_state, updates, groupId) => {
+const toBulkUpdatesPayload = (updates) => {
     const payload = {};
     if (updates.status != null) {
         payload.status = updates.status.code;
@@ -69,9 +78,6 @@ const toBulkUpdatesPayload = (_state, updates, groupId) => {
         payload.snoozed_at = null;
         payload.is_snooze_notification_sent = false;
     }
-    if (groupId != null) {
-        payload.task_group_ids = [groupId];
-    }
     return payload;
 };
 export const getTasksListPayload = (state, taskIds, updates) => {

package/lib/esm/view/taskManager/taskListView/epics/dragNDropTasksEpic.js

@@ -11,6 +11,7 @@ export const dragNDropTasksEpic = (actions$, state$) => actions$.pipe(filter(dra
         updateTasksListOnBulkUpdateTasksSuccess({
             taskIds,
             groupId,
+            removeFromList: false,
         }),
         bulkUpdateTaskList(taskIds, groupId, updates),
     ];

package/lib/esm/view/taskManager/taskListView/taskListReducer.js

@@ -213,12 +213,10 @@ const taskList = createSlice({
             },
         },
         updateTasksListOnBulkUpdateTasksSuccess(draft, action) {
-            const { taskIds, groupId } = action.payload;
+            const { taskIds, groupId, removeFromList } = action.payload;
             draft.updateTasksFetchState.fetchState = 'Completed';
             draft.updateTasksFetchState.error = undefined;
-            if (groupId == null) {
-                // Tab-changing operations (archive/delete/unarchive/undo-delete/unsnooze):
-                // Remove affected tasks from the current tab's top-level indices
+            if (removeFromList) {
                 removeTaskIdsFromTopLevel(draft, taskIds);
             }
             else if (groupId != null) {