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

package/lib/esm/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -21,6 +21,8 @@ export const getTaskDetail = (state, taskId) => {
     };
     let taskHistory = [];
     let createdByUser = undefined;
+    let isArchived = undefined;
+    let isDeleted = undefined;
     let snoozedUntil = undefined;
     if (taskId != null && sourceTaskDetail != null) {
         const taskEntity = getTaskById(taskState, taskId);
@@ -28,6 +30,8 @@ export const getTaskDetail = (state, taskId) => {
         if (taskEntity != null) {
             createdByUser = getUserAndUserRole(userState, userRoleState, addressState, taskEntity.createdBy);
             snoozedUntil = taskEntity.snoozedUntil;
+            isArchived = taskEntity.isArchived;
+            isDeleted = taskEntity.isDeleted;
         }
         if (fileIdsInEntity.length > 0) {
             fetchStatus = reduceFetchState([
@@ -75,6 +79,8 @@ export const getTaskDetail = (state, taskId) => {
         error: fetchStatus.error,
         version: 0,
         createdByUser,
+        isArchived,
+        isDeleted,
         showTaskDetailFormFooter,
         snoozedUntil,
     };

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

@@ -5,21 +5,16 @@ import { convertHHMMStrToMinutes } from '../../../../commonStateTypes/fiscalYear
 import { DEFAULT_DATE_FORMAT } from '../../../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY';
 import { updateTasks } from '../../../../entity/task/taskReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { bulkUpdateTaskList, updateTasksListOnBulkUpdateTasksFailure, updateTasksListOnBulkUpdateTasksSuccess, } from '../taskListReducer';
-export const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(bulkUpdateTaskList.match), switchMap((action) => {
-    const state = state$.value;
+import { bulkUpdateTaskList, fetchTaskList, updateTasksListOnBulkUpdateTasksFailure, updateTasksListOnBulkUpdateTasksSuccess, } from '../taskListReducer';
+export const bulkUpdateTaskListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(bulkUpdateTaskList.match), switchMap((action) => {
     const { taskIds, updates, groupId } = action.payload;
-    // 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) };
+    const bulkUpdates = toBulkUpdatesPayload(updates);
+    if (groupId != null) {
+        bulkUpdates.task_group_ids = [groupId];
+    }
+    const payload = { task_ids: taskIds, updates: bulkUpdates };
     return zeniAPI
-        .putAndGetJSON(url, payload)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/bulk-update`, payload)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             const removeFromList = updates.isArchived != null ||
@@ -29,7 +24,7 @@ export const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pi
                 taskIds,
                 groupId,
                 removeFromList,
-            }));
+            }), fetchTaskList());
         }
         else {
             return of(updateTasksListOnBulkUpdateTasksFailure({
@@ -64,7 +59,7 @@ const toBulkUpdatesPayload = (updates) => {
         payload.tags = updates.tagIds;
     }
     if (updates.timeSpent != null) {
-        payload.time_spent = convertHHMMStrToMinutes(updates.timeSpent);
+        payload.time_spent = convertHHMMStrToMinutes(updates.timeSpent.replace(/\D/g, ''));
     }
     if (updates.isArchived != null) {
         payload.is_archived = updates.isArchived;

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

@@ -1,5 +1,4 @@
 import { createSelector } from '@reduxjs/toolkit';
-import isEqual from 'lodash/isEqual';
 import orderBy from 'lodash/orderBy';
 import { getSortOrder, } from '../../../commonPayloadTypes/sortOrderPayload';
 import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
@@ -15,15 +14,6 @@ import { getUserGroupList } from '../../userGroupListView/userGroupListViewSelec
 import { getUserList, } from '../../userListView/userListViewSelector';
 import { allTaskPriority, allTaskStatus, } from '../taskDetailView/taskDetailSelector';
 import { DUE_DATE_GROUP_KEYS, } from './taskList';
-import { initialState } from './taskListReducer';
-const isDefaultFilters = (taskListState) => {
-    if (taskListState.uiState.searchText !== initialState.uiState.searchText) {
-        return false;
-    }
-    const hasNoActiveFilters = taskListState.filters.categories == null ||
-        taskListState.filters.categories.length === 0;
-    return (hasNoActiveFilters || isEqual(taskListState.filters, initialState.filters));
-};
 const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     const tasksInOrder = orderBy(tasksList, (task) => {
         const tagsByIds = getTagsByIds(tagState, task.tagIds);
@@ -124,11 +114,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     if (defaultTaskGroup != null) {
         sortedTaskGroupsWithTasksList.push(defaultTaskGroup);
     }
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return sortedTaskGroupsWithTasksList;
+    return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
@@ -158,11 +144,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return taskGroupsWithTasksList;
+    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_PRIORITY_CODE.map((groupKey) => {
@@ -185,11 +167,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return taskGroupsWithTasksList;
+    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_TASK_STATUS_CODE.map((groupKey) => {
@@ -212,11 +190,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return taskGroupsWithTasksList;
+    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const tagGroups = Object.keys(taskListState.taskIdsByTags);
@@ -245,11 +219,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return taskGroupsWithTasksList;
+    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = DUE_DATE_GROUP_KEYS.map((groupKey) => {
@@ -271,11 +241,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return taskGroupsWithTasksList;
+    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, userGroupsState, }) => {
     const { groupByKey } = taskListState.uiState;