@zeniai/client-epic-state 5.0.2-betaRR9 → 5.0.2

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearTaskList = exports.removeTaskFromList = exports.updateTaskListOnCreateTaskFromTemplateSuccess = exports.updateTasksListOnUpdateTaskFailure = exports.updateTasksListOnUpdateTaskSuccess = exports.updateTaskFromListView = exports.updateTaskListOnTaskGroupNameUpdate = exports.updateTaskListOnNewTaskCreationSuccess = exports.dragNDropTasks = exports.updateTaskListOnTaskGroupDeletion = exports.updateTaskListLocalData = exports.initiateTaskListLocalData = exports.updateTasksListOnBulkUpdateTasksFailure = exports.updateTasksListOnBulkUpdateTasksSuccess = exports.bulkUpdateTaskList = exports.updateTaskListOnNewGroupCreationSuccess = exports.updateTaskFilters = exports.updateTaskListUIState = exports.updateTaskListSearchText = exports.updateTaskListFetchStatus = exports.updateTaskListTab = exports.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = void 0;
+exports.clearTaskList = exports.updateTaskListOnCreateTaskFromTemplateSuccess = exports.updateTasksListOnUpdateTaskFailure = exports.updateTasksListOnUpdateTaskSuccess = exports.updateTaskFromListView = exports.updateTaskListOnTaskGroupNameUpdate = exports.updateTaskListOnNewTaskCreationSuccess = exports.dragNDropTasks = exports.updateTaskListOnTaskGroupDeletion = exports.updateTaskListLocalData = exports.initiateTaskListLocalData = exports.updateTasksListOnBulkUpdateTasksFailure = exports.updateTasksListOnBulkUpdateTasksSuccess = exports.bulkUpdateTaskList = exports.updateTaskListOnNewGroupCreationSuccess = exports.updateTaskFilters = exports.updateTaskListUIState = exports.updateTaskListSearchText = exports.updateTaskListFetchStatus = exports.updateTaskList = exports.fetchTaskList = exports.fetchTaskListPage = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const taskState_1 = require("../../../entity/task/taskState");
 const zeniDayJS_1 = require("../../../zeniDayJS");
@@ -33,23 +33,7 @@ const initialTaskIdsByDueDate = {
     today: [],
     upcoming: [],
 };
-const initialTabData = {
-    taskIds: [],
-    taskIdsByAssignees: {},
-    taskIdsByDueDate: { ...initialTaskIdsByDueDate },
-    taskIdsByGroupsIds: {},
-    taskIdsByPriority: { ...initialTaskIdsByPriority },
-    taskIdsByStatus: { ...initialTaskIdsByStatus },
-    taskIdsByTags: {},
-};
 exports.initialState = {
-    currentTab: 'live',
-    byTab: {
-        live: { ...initialTabData },
-        archived: { ...initialTabData },
-        deleted: { ...initialTabData },
-        snoozed: { ...initialTabData },
-    },
     taskIds: [],
     taskIdsByGroupsIds: {},
     taskIdsByPriority: initialTaskIdsByPriority,
@@ -106,30 +90,17 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.error = undefined;
         },
         updateTaskList(draft, action) {
-            const { data, archived, deleted, snoozed } = action.payload;
+            const { data } = action.payload;
             draft.fetchState = 'Completed';
             draft.error = undefined;
-            // Group live tasks
-            const liveGrouped = getGroupedTaskIds(data);
-            draft.byTab.live = toTabData(liveGrouped);
-            // Group other tabs if provided
-            if (archived != null) {
-                draft.byTab.archived = toTabData(getGroupedTaskIds(archived));
-            }
-            if (deleted != null) {
-                draft.byTab.deleted = toTabData(getGroupedTaskIds(deleted));
-            }
-            if (snoozed != null) {
-                draft.byTab.snoozed = toTabData(getGroupedTaskIds(snoozed));
-            }
-            // Copy active tab data to top-level fields
-            const activeTabData = draft.byTab[draft.currentTab];
-            copyTabDataToTopLevel(draft, activeTabData);
-        },
-        updateTaskListTab(draft, action) {
-            draft.currentTab = action.payload;
-            const activeTabData = draft.byTab[action.payload];
-            copyTabDataToTopLevel(draft, activeTabData);
+            const { taskIds, taskIdsGroupedByPriority, taskIdsByGroupIds, taskIdsGroupedByStatus, taskIdsByAssignees, taskIdsByDueDate, taskIdsByTags, } = getGroupedTaskIds(data);
+            draft.taskIds = taskIds;
+            draft.taskIdsByGroupsIds = taskIdsByGroupIds;
+            draft.taskIdsByPriority = taskIdsGroupedByPriority;
+            draft.taskIdsByStatus = taskIdsGroupedByStatus;
+            draft.taskIdsByAssignees = taskIdsByAssignees;
+            draft.taskIdsByDueDate = taskIdsByDueDate;
+            draft.taskIdsByTags = taskIdsByTags;
         },
         initiateTaskListLocalData(draft, action) {
             const { taskGroupById } = action.payload;
@@ -217,13 +188,10 @@ const taskList = (0, toolkit_1.createSlice)({
             },
         },
         updateTasksListOnBulkUpdateTasksSuccess(draft, action) {
-            const { taskIds, groupId, removeFromList } = action.payload;
+            const { taskIds, groupId } = action.payload;
             draft.updateTasksFetchState.fetchState = 'Completed';
             draft.updateTasksFetchState.error = undefined;
-            if (removeFromList) {
-                removeTaskIds(draft, taskIds);
-            }
-            else if (groupId != null) {
+            if (groupId != null) {
                 const { groupByKey } = draft.uiState;
                 if (groupByKey === 'groupName') {
                     Object.keys(draft.taskIdsByGroupsIds).forEach((gId) => {
@@ -440,15 +408,12 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.updateTasksFetchState.fetchState = 'Error';
             draft.updateTasksFetchState.error = action.payload.error;
         },
-        removeTaskFromList(draft, action) {
-            removeTaskIds(draft, [action.payload]);
-        },
         clearTaskList(draft) {
             Object.assign(draft, exports.initialState);
         },
     },
 });
-_a = taskList.actions, exports.fetchTaskListPage = _a.fetchTaskListPage, exports.fetchTaskList = _a.fetchTaskList, exports.updateTaskList = _a.updateTaskList, exports.updateTaskListTab = _a.updateTaskListTab, exports.updateTaskListFetchStatus = _a.updateTaskListFetchStatus, exports.updateTaskListSearchText = _a.updateTaskListSearchText, exports.updateTaskListUIState = _a.updateTaskListUIState, exports.updateTaskFilters = _a.updateTaskFilters, exports.updateTaskListOnNewGroupCreationSuccess = _a.updateTaskListOnNewGroupCreationSuccess, exports.bulkUpdateTaskList = _a.bulkUpdateTaskList, exports.updateTasksListOnBulkUpdateTasksSuccess = _a.updateTasksListOnBulkUpdateTasksSuccess, exports.updateTasksListOnBulkUpdateTasksFailure = _a.updateTasksListOnBulkUpdateTasksFailure, exports.initiateTaskListLocalData = _a.initiateTaskListLocalData, exports.updateTaskListLocalData = _a.updateTaskListLocalData, exports.updateTaskListOnTaskGroupDeletion = _a.updateTaskListOnTaskGroupDeletion, exports.dragNDropTasks = _a.dragNDropTasks, exports.updateTaskListOnNewTaskCreationSuccess = _a.updateTaskListOnNewTaskCreationSuccess, exports.updateTaskListOnTaskGroupNameUpdate = _a.updateTaskListOnTaskGroupNameUpdate, exports.updateTaskFromListView = _a.updateTaskFromListView, exports.updateTasksListOnUpdateTaskSuccess = _a.updateTasksListOnUpdateTaskSuccess, exports.updateTasksListOnUpdateTaskFailure = _a.updateTasksListOnUpdateTaskFailure, exports.updateTaskListOnCreateTaskFromTemplateSuccess = _a.updateTaskListOnCreateTaskFromTemplateSuccess, exports.removeTaskFromList = _a.removeTaskFromList, exports.clearTaskList = _a.clearTaskList;
+_a = taskList.actions, exports.fetchTaskListPage = _a.fetchTaskListPage, exports.fetchTaskList = _a.fetchTaskList, exports.updateTaskList = _a.updateTaskList, exports.updateTaskListFetchStatus = _a.updateTaskListFetchStatus, exports.updateTaskListSearchText = _a.updateTaskListSearchText, exports.updateTaskListUIState = _a.updateTaskListUIState, exports.updateTaskFilters = _a.updateTaskFilters, exports.updateTaskListOnNewGroupCreationSuccess = _a.updateTaskListOnNewGroupCreationSuccess, exports.bulkUpdateTaskList = _a.bulkUpdateTaskList, exports.updateTasksListOnBulkUpdateTasksSuccess = _a.updateTasksListOnBulkUpdateTasksSuccess, exports.updateTasksListOnBulkUpdateTasksFailure = _a.updateTasksListOnBulkUpdateTasksFailure, exports.initiateTaskListLocalData = _a.initiateTaskListLocalData, exports.updateTaskListLocalData = _a.updateTaskListLocalData, exports.updateTaskListOnTaskGroupDeletion = _a.updateTaskListOnTaskGroupDeletion, exports.dragNDropTasks = _a.dragNDropTasks, exports.updateTaskListOnNewTaskCreationSuccess = _a.updateTaskListOnNewTaskCreationSuccess, exports.updateTaskListOnTaskGroupNameUpdate = _a.updateTaskListOnTaskGroupNameUpdate, exports.updateTaskFromListView = _a.updateTaskFromListView, exports.updateTasksListOnUpdateTaskSuccess = _a.updateTasksListOnUpdateTaskSuccess, exports.updateTasksListOnUpdateTaskFailure = _a.updateTasksListOnUpdateTaskFailure, exports.updateTaskListOnCreateTaskFromTemplateSuccess = _a.updateTaskListOnCreateTaskFromTemplateSuccess, exports.clearTaskList = _a.clearTaskList;
 exports.default = taskList.reducer;
 /**
  *  helpers
@@ -527,50 +492,6 @@ const getTagsGroupKey = (tags) => {
     tagIds.sort();
     return tagIds.join(',');
 };
-const toTabData = (grouped) => ({
-    taskIds: grouped.taskIds,
-    taskIdsByAssignees: grouped.taskIdsByAssignees,
-    taskIdsByDueDate: grouped.taskIdsByDueDate,
-    taskIdsByGroupsIds: grouped.taskIdsByGroupIds,
-    taskIdsByPriority: grouped.taskIdsGroupedByPriority,
-    taskIdsByStatus: grouped.taskIdsGroupedByStatus,
-    taskIdsByTags: grouped.taskIdsByTags,
-});
-const copyTabDataToTopLevel = (draft, tabData) => {
-    draft.taskIds = tabData.taskIds;
-    draft.taskIdsByGroupsIds = tabData.taskIdsByGroupsIds;
-    draft.taskIdsByPriority = tabData.taskIdsByPriority;
-    draft.taskIdsByStatus = tabData.taskIdsByStatus;
-    draft.taskIdsByAssignees = tabData.taskIdsByAssignees;
-    draft.taskIdsByDueDate = tabData.taskIdsByDueDate;
-    draft.taskIdsByTags = tabData.taskIdsByTags;
-};
-const removeIdsFromTabData = (tabData, taskIds) => {
-    const isRemoved = (id) => taskIds.includes(id);
-    tabData.taskIds = tabData.taskIds.filter((id) => !isRemoved(id));
-    Object.keys(tabData.taskIdsByGroupsIds).forEach((gId) => {
-        tabData.taskIdsByGroupsIds[gId] = tabData.taskIdsByGroupsIds[gId].filter((id) => !isRemoved(id));
-    });
-    Object.keys(tabData.taskIdsByPriority).forEach((key) => {
-        tabData.taskIdsByPriority[key] = tabData.taskIdsByPriority[key].filter((id) => !isRemoved(id));
-    });
-    Object.keys(tabData.taskIdsByStatus).forEach((key) => {
-        tabData.taskIdsByStatus[key] = tabData.taskIdsByStatus[key].filter((id) => !isRemoved(id));
-    });
-    Object.keys(tabData.taskIdsByDueDate).forEach((key) => {
-        tabData.taskIdsByDueDate[key] = tabData.taskIdsByDueDate[key].filter((id) => !isRemoved(id));
-    });
-    Object.keys(tabData.taskIdsByAssignees).forEach((key) => {
-        tabData.taskIdsByAssignees[key] = tabData.taskIdsByAssignees[key].filter((id) => !isRemoved(id));
-    });
-    Object.keys(tabData.taskIdsByTags).forEach((key) => {
-        tabData.taskIdsByTags[key] = tabData.taskIdsByTags[key].filter((id) => !isRemoved(id));
-    });
-};
-const removeTaskIds = (draft, taskIds) => {
-    removeIdsFromTabData(draft, taskIds);
-    removeIdsFromTabData(draft.byTab[draft.currentTab], taskIds);
-};
 const getGroupedTaskIds = (tasks) => {
     const taskIds = [];
     const taskIdsByGroupIds = {};

package/lib/view/taskManager/taskListView/taskListSelector.d.ts

@@ -5,16 +5,14 @@ import { TagState } from '../../../entity/tag/tagState';
 import { Task, TaskState } from '../../../entity/task/taskState';
 import { TaskGroupTemplate } from '../../../entity/taskGroupTemplate/taskGroupTemplateState';
 import { UserState } from '../../../entity/user/userState';
-import { UserGroupsState } from '../../../entity/userGroups/userGroupsState';
 import { UserRoleState } from '../../../entity/userRole/userRoleState';
 import { RootState } from '../../../reducer';
 import { UserAndRole } from '../../companyView/types/userAndRole';
 import { UserGroupListSelectorView } from '../../userGroupListView/userGroupListViewSelector';
 import { UserListSelectorView } from '../../userListView/userListViewSelector';
-import { TaskListFilters, TaskListLocalData, TaskListState, TaskListTab, TaskListUIState } from './taskList';
+import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
     assigneeUsers: UserAndRole[];
-    firstAssigneeSortName: string;
 }
 export interface TaskGroupWithTasksList {
     groupName: string;
@@ -23,10 +21,8 @@ export interface TaskGroupWithTasksList {
     tasks: TaskWithUserDetails[];
 }
 export interface TaskListSelectorView extends SelectorView {
-    currentTab: TaskListTab;
     filters: TaskListFilters;
     localData: TaskListLocalData;
-    tabCounts: Record<TaskListTab, number>;
     taskCreationFromTemplateStatus: FetchStateAndError;
     taskGroupCreationStatus: FetchStateAndError;
     taskGroupDeleteStatus: FetchStateAndError;
@@ -38,12 +34,11 @@ export interface TaskListSelectorView extends SelectorView {
     userGroupList: UserGroupListSelectorView;
     userList: UserListSelectorView;
 }
-export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
+export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
-    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {
@@ -52,12 +47,11 @@ export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState,
     isDefault: boolean;
     tasks: TaskWithUserDetails[];
 }[];
-export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
+export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
-    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {

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

@@ -40,12 +40,8 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
                 return task.status.name;
             case 'priority':
                 return taskState_1.ALL_PRIORITY_CODE.indexOf(task.priority.code);
-            case 'assignee':
-                return task.firstAssigneeSortName;
             case 'timeSpent':
                 return task.timeSpent;
-            case 'visibility':
-                return task.isPrivate ? 1 : 0;
             case 'name':
             default:
                 return task.name.toLowerCase();
@@ -53,7 +49,7 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     }, sortOrder);
     return tasksInOrder;
 };
-const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, userGroupsState, }) => {
+const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, }) => {
     const { sortKey, searchText } = taskListState.uiState;
     const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
     const tasks = taskIds
@@ -63,17 +59,7 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
             const assigneeUsers = task.assignees
                 .map((userId) => (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, userId))
                 .filter((value) => value != null);
-            const firstUser = assigneeUsers[0]?.user;
-            const firstUserName = (firstUser != null ? (0, userSelector_1.getUserName)(firstUser) : '') ||
-                firstUser?.email ||
-                '';
-            const firstGroupName = task.groupAssignees
-                .map((gId) => userGroupsState.userGroupByUserGroupId[gId]?.name)
-                .find((name) => name != null && name !== '');
-            const firstAssigneeSortName = (firstUserName ||
-                firstGroupName ||
-                '').toLowerCase();
-            return { ...task, assigneeUsers, firstAssigneeSortName };
+            return { ...task, assigneeUsers };
         }
         return undefined;
     })
@@ -82,7 +68,7 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
     const sortedTaskList = sortTasksList(tagState, filteredTaskList, sortKey, sortOrder);
     return sortedTaskList;
 };
-const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupViewState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupViewState, userState, userRoleState, addressState, tagState, }) => {
     const { taskGroupsIds } = taskGroupViewState;
     const taskGroupsWithTasksList = taskGroupsIds
         .map((taskGroupId) => {
@@ -96,7 +82,6 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         if (taskGroup != null) {
             return {
@@ -125,13 +110,12 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     if (defaultTaskGroup != null) {
         sortedTaskGroupsWithTasksList.push(defaultTaskGroup);
     }
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
+    if (isDefaultFilters(taskListState) === false) {
         return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
     }
     return sortedTaskGroupsWithTasksList;
 };
-const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
     const taskGroupsWithTasksList = assigneeGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByAssignees[groupKey];
@@ -143,7 +127,6 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = (0, userSelector_1.getUsersByUserIds)(userState, assigneeIds)
@@ -159,14 +142,13 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
+    if (isDefaultFilters(taskListState) === false) {
         return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
     }
     return taskGroupsWithTasksList;
 };
 exports.getTaskListGroupedByAssignees = getTaskListGroupedByAssignees;
-const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_PRIORITY_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByPriority[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -177,7 +159,6 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -187,14 +168,13 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
+    if (isDefaultFilters(taskListState) === false) {
         return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
     }
     return taskGroupsWithTasksList;
 };
 exports.getTaskListGroupedByPriority = getTaskListGroupedByPriority;
-const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_TASK_STATUS_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByStatus[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -205,7 +185,6 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -215,13 +194,12 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
+    if (isDefaultFilters(taskListState) === false) {
         return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
     }
     return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const tagGroups = Object.keys(taskListState.taskIdsByTags);
     const taskGroupsWithTasksList = tagGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByTags[groupKey];
@@ -233,7 +211,6 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         const tagIds = groupKey.split(',');
         const groupName = (0, tagSelector_1.getTagsByIds)(tagState, tagIds)
@@ -248,13 +225,12 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
+    if (isDefaultFilters(taskListState) === false) {
         return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
     }
     return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const taskGroupsWithTasksList = taskList_1.DUE_DATE_GROUP_KEYS.map((groupKey) => {
         const taskIds = taskListState.taskIdsByDueDate[groupKey];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -265,7 +241,6 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         return {
             groupName: groupKey,
@@ -274,13 +249,12 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
+    if (isDefaultFilters(taskListState) === false) {
         return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
     }
     return taskGroupsWithTasksList;
 };
-const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, userGroupsState, }) => {
+const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, }) => {
     const { groupByKey } = taskListState.uiState;
     if (groupByKey === 'groupName') {
         return getTaskListGroupedByGroupName({
@@ -292,7 +266,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupState,
             taskGroupViewState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'assignee') {
@@ -303,7 +276,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'priority') {
@@ -314,7 +286,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'status') {
@@ -325,7 +296,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'tag') {
@@ -336,7 +306,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -346,7 +315,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         userRoleState,
         addressState,
         tagState,
-        userGroupsState,
     });
 };
 exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListState, (state) => state.taskState, (state) => state.userState, (state) => state.userRoleState, (state) => state.userListViewState, (state) => state.addressState, (state) => state.taskGroupState, (state) => state.taskGroupViewState, (state) => state.tagViewState, (state) => state.tagState, (state) => state.taskGroupTemplateState, (state) => state.taskGroupTemplateViewState, (state) => state.userGroupsState, (state) => state.userGroupListViewState, (_state, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, userGroupsState, userGroupListViewState, isTaskTemplatesEnabled) => {
@@ -360,7 +328,6 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
         taskGroupState,
         taskGroupViewState,
         tagState,
-        userGroupsState,
     });
     const fetchStateVariables = [
         taskListState,
@@ -372,15 +339,7 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
     }
     const { fetchState, error } = (0, reduceFetchState_1.reduceAnyFetchState)(fetchStateVariables);
     const taskGroupTemplates = (0, taskGroupTemplateSelector_1.getTaskGroupTemplateByIds)(taskGroupTemplateState, taskGroupTemplateViewState.taskGroupTemplateIds);
-    const tabCounts = {
-        live: taskListState.byTab.live.taskIds.length,
-        archived: taskListState.byTab.archived.taskIds.length,
-        deleted: taskListState.byTab.deleted.taskIds.length,
-        snoozed: taskListState.byTab.snoozed.taskIds.length,
-    };
     return {
-        currentTab: taskListState.currentTab,
-        tabCounts,
         uiState: taskListState.uiState,
         filters: taskListState.filters,
         taskGroupTemplates,

package/package.json

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

package/lib/esm/view/taskManager/taskDetailView/epics/snoozeTaskEpic.js

@@ -1,65 +0,0 @@
-import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { updateTasks } from '../../../../entity/task/taskReducer';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { date } from '../../../../zeniDayJS';
-import { fetchTaskList, removeTaskFromList, } from '../../taskListView/taskListReducer';
-import { snoozeTask, snoozeTaskSuccessOrFailure } from '../taskDetailReducer';
-export const snoozeTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(snoozeTask.match), mergeMap((action) => handleSnoozeTask(action.payload.taskId, action.payload.snoozedUntil, zeniAPI)));
-const formatSnoozedUntilForDisplay = (snoozedUntil) => date(snoozedUntil).format('MMM D, h:mm A');
-const handleSnoozeTask = (taskId, snoozedUntil, zeniAPI) => {
-    const snoozeTaskApi$ = zeniAPI.postAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/snooze`, { snoozed_until: snoozedUntil });
-    return snoozeTaskApi$.pipe(mergeMap((response) => handleApiResponse(response, taskId, snoozedUntil)), catchError((error) => of(snoozeTaskSuccessOrFailure({
-        fetchState: 'Error',
-        taskId,
-        error: createZeniAPIStatus('Unexpected Error', 'Snooze Task REST API call errored out: ' + JSON.stringify(error)),
-    }))));
-};
-const handleApiResponse = (response, taskId, snoozedUntil) => {
-    if (isSuccessResponse(response) &&
-        response.data != null &&
-        response.data.tasks.length > 0) {
-        const fetchActions = [
-            updateTasks(response.data.tasks),
-            removeTaskFromList(taskId),
-            fetchTaskList(),
-            snoozeTaskSuccessOrFailure({
-                fetchState: 'Completed',
-                taskId,
-            }),
-            openSnackbar({
-                messageSection: 'snooze_task',
-                messageText: 'success',
-                type: 'success',
-                variables: [
-                    {
-                        variableName: '_snoozed_until_',
-                        variableValue: formatSnoozedUntilForDisplay(snoozedUntil),
-                    },
-                ],
-            }),
-        ];
-        return from(fetchActions);
-    }
-    else {
-        return from([
-            snoozeTaskSuccessOrFailure({
-                fetchState: 'Error',
-                taskId,
-                error: response.status,
-            }),
-            openSnackbar({
-                messageSection: 'snooze_task',
-                messageText: 'failed',
-                type: 'error',
-                variables: [
-                    {
-                        variableName: '_api-error_',
-                        variableValue: response.status.message,
-                    },
-                ],
-            }),
-        ]);
-    }
-};

package/lib/esm/view/taskManager/taskDetailView/epics/unsnoozeTaskEpic.js

@@ -1,56 +0,0 @@
-import { from, of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
-import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { updateTasks } from '../../../../entity/task/taskReducer';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { fetchTaskList } from '../../taskListView/taskListReducer';
-import { snoozeTaskSuccessOrFailure, unsnoozeTask, } from '../taskDetailReducer';
-export const unsnoozeTaskEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(unsnoozeTask.match), mergeMap((action) => handleUnsnoozeTask(action.payload.taskId, zeniAPI)));
-const handleUnsnoozeTask = (taskId, zeniAPI) => {
-    const unsnoozeTaskApi$ = zeniAPI.deleteAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}/snooze`);
-    return unsnoozeTaskApi$.pipe(mergeMap((response) => handleApiResponse(response, taskId)), catchError((error) => of(snoozeTaskSuccessOrFailure({
-        fetchState: 'Error',
-        taskId,
-        error: createZeniAPIStatus('Unexpected Error', 'Unsnooze Task REST API call errored out: ' + JSON.stringify(error)),
-    }))));
-};
-const handleApiResponse = (response, taskId) => {
-    if (isSuccessResponse(response) &&
-        response.data != null &&
-        response.data.tasks.length > 0) {
-        const fetchActions = [
-            updateTasks(response.data.tasks),
-            fetchTaskList(),
-            snoozeTaskSuccessOrFailure({
-                fetchState: 'Completed',
-                taskId,
-            }),
-            openSnackbar({
-                messageSection: 'unsnooze_task',
-                messageText: 'success',
-                type: 'success',
-            }),
-        ];
-        return from(fetchActions);
-    }
-    else {
-        return from([
-            snoozeTaskSuccessOrFailure({
-                fetchState: 'Error',
-                taskId,
-                error: response.status,
-            }),
-            openSnackbar({
-                messageSection: 'unsnooze_task',
-                messageText: 'failed',
-                type: 'error',
-                variables: [
-                    {
-                        variableName: '_api-error_',
-                        variableValue: response.status.message,
-                    },
-                ],
-            }),
-        ]);
-    }
-};

package/lib/view/taskManager/taskDetailView/epics/snoozeTaskEpic.d.ts

@@ -1,9 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { updateTasks } from '../../../../entity/task/taskReducer';
-import { RootState } from '../../../../reducer';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { fetchTaskList, removeTaskFromList } from '../../taskListView/taskListReducer';
-import { snoozeTask, snoozeTaskSuccessOrFailure } from '../taskDetailReducer';
-export type ActionType = ReturnType<typeof snoozeTask> | ReturnType<typeof updateTasks> | ReturnType<typeof openSnackbar> | ReturnType<typeof fetchTaskList> | ReturnType<typeof snoozeTaskSuccessOrFailure> | ReturnType<typeof removeTaskFromList>;
-export declare const snoozeTaskEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<ActionType>;