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

package/lib/view/taskManager/taskDetailView/taskDetailSelector.d.ts

@@ -19,6 +19,8 @@ export interface TaskDetailSelectorView extends SelectorView {
     updateFileStatusById: Record<ID, FetchStateAndError | undefined>;
     userList: UserListSelectorView;
     createdByUser?: UserAndRole;
+    isArchived?: boolean;
+    isDeleted?: boolean;
     snoozedUntil?: ZeniDate;
 }
 export declare const getTaskDetail: (state: RootState, taskId?: ID) => TaskDetailSelectorView;

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

@@ -27,6 +27,8 @@ 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 = (0, taskSelector_1.getTaskById)(taskState, taskId);
@@ -34,6 +36,8 @@ const getTaskDetail = (state, taskId) => {
         if (taskEntity != null) {
             createdByUser = (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, taskEntity.createdBy);
             snoozedUntil = taskEntity.snoozedUntil;
+            isArchived = taskEntity.isArchived;
+            isDeleted = taskEntity.isDeleted;
         }
         if (fileIdsInEntity.length > 0) {
             fetchStatus = (0, reduceFetchState_1.reduceFetchState)([
@@ -81,6 +85,8 @@ const getTaskDetail = (state, taskId) => {
         error: fetchStatus.error,
         version: 0,
         createdByUser,
+        isArchived,
+        isDeleted,
         showTaskDetailFormFooter,
         snoozedUntil,
     };

package/lib/view/taskManager/taskListView/epics/bulkUpdateTaskListEpic.d.ts

@@ -5,9 +5,9 @@ import { updateTasks } from '../../../../entity/task/taskReducer';
 import { Task } from '../../../../entity/task/taskState';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { bulkUpdateTaskList, updateTasksListOnBulkUpdateTasksFailure, updateTasksListOnBulkUpdateTasksSuccess } from '../taskListReducer';
-export type ActionType = ReturnType<typeof bulkUpdateTaskList> | ReturnType<typeof updateTasks> | ReturnType<typeof updateTasksListOnBulkUpdateTasksFailure> | ReturnType<typeof updateTasksListOnBulkUpdateTasksSuccess>;
-export declare const bulkUpdateTaskListEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+import { bulkUpdateTaskList, fetchTaskList, updateTasksListOnBulkUpdateTasksFailure, updateTasksListOnBulkUpdateTasksSuccess } from '../taskListReducer';
+export type ActionType = ReturnType<typeof bulkUpdateTaskList> | ReturnType<typeof fetchTaskList> | ReturnType<typeof updateTasks> | ReturnType<typeof updateTasksListOnBulkUpdateTasksFailure> | ReturnType<typeof updateTasksListOnBulkUpdateTasksSuccess>;
+export declare const bulkUpdateTaskListEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 /**
  * Helpers
  */

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

@@ -12,20 +12,15 @@ const formatZeniDateFY_1 = require("../../../../commonStateTypes/fiscalYearHelpe
 const taskReducer_1 = require("../../../../entity/task/taskReducer");
 const responsePayload_1 = require("../../../../responsePayload");
 const taskListReducer_1 = require("../taskListReducer");
-const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.bulkUpdateTaskList.match), (0, operators_1.switchMap)((action) => {
-    const state = state$.value;
+const bulkUpdateTaskListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.bulkUpdateTaskList.match), (0, operators_1.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: (0, exports.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((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             const removeFromList = updates.isArchived != null ||
@@ -35,7 +30,7 @@ const bulkUpdateTaskListEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                 taskIds,
                 groupId,
                 removeFromList,
-            }));
+            }), (0, taskListReducer_1.fetchTaskList)());
         }
         else {
             return (0, rxjs_1.of)((0, taskListReducer_1.updateTasksListOnBulkUpdateTasksFailure)({
@@ -71,7 +66,7 @@ const toBulkUpdatesPayload = (updates) => {
         payload.tags = updates.tagIds;
     }
     if (updates.timeSpent != null) {
-        payload.time_spent = (0, formatMinutesToFromHHMM_1.convertHHMMStrToMinutes)(updates.timeSpent);
+        payload.time_spent = (0, formatMinutesToFromHHMM_1.convertHHMMStrToMinutes)(updates.timeSpent.replace(/\D/g, ''));
     }
     if (updates.isArchived != null) {
         payload.is_archived = updates.isArchived;

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllTasks = exports.getTaskListGroupedByPriority = exports.getTaskListGroupedByAssignees = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const sortOrderPayload_1 = require("../../../commonPayloadTypes/sortOrderPayload");
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
@@ -21,15 +20,6 @@ const userGroupListViewSelector_1 = require("../../userGroupListView/userGroupLi
 const userListViewSelector_1 = require("../../userListView/userListViewSelector");
 const taskDetailSelector_1 = require("../taskDetailView/taskDetailSelector");
 const taskList_1 = require("./taskList");
-const taskListReducer_1 = require("./taskListReducer");
-const isDefaultFilters = (taskListState) => {
-    if (taskListState.uiState.searchText !== taskListReducer_1.initialState.uiState.searchText) {
-        return false;
-    }
-    const hasNoActiveFilters = taskListState.filters.categories == null ||
-        taskListState.filters.categories.length === 0;
-    return (hasNoActiveFilters || (0, isEqual_1.default)(taskListState.filters, taskListReducer_1.initialState.filters));
-};
 const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     const tasksInOrder = (0, orderBy_1.default)(tasksList, (task) => {
         const tagsByIds = (0, tagSelector_1.getTagsByIds)(tagState, task.tagIds);
@@ -130,11 +120,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);
 };
 const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
@@ -164,11 +150,7 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             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);
 };
 exports.getTaskListGroupedByAssignees = getTaskListGroupedByAssignees;
 const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
@@ -192,11 +174,7 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             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);
 };
 exports.getTaskListGroupedByPriority = getTaskListGroupedByPriority;
 const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
@@ -220,11 +198,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);
@@ -253,11 +227,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 = taskList_1.DUE_DATE_GROUP_KEYS.map((groupKey) => {
@@ -279,11 +249,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.20.2-beta33RR",
+  "version": "4.20.2-beta35RR",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",