@zeniai/client-epic-state 5.0.32 → 5.0.33

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

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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;
 const toolkit_1 = require("@reduxjs/toolkit");
 const taskState_1 = require("../../../entity/task/taskState");
 const zeniDayJS_1 = require("../../../zeniDayJS");
@@ -33,7 +33,23 @@ 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,
@@ -90,17 +106,30 @@ const taskList = (0, toolkit_1.createSlice)({
             draft.error = undefined;
         },
         updateTaskList(draft, action) {
-            const { data } = action.payload;
+            const { data, archived, deleted, snoozed } = action.payload;
             draft.fetchState = 'Completed';
             draft.error = undefined;
-            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;
+            // 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);
         },
         initiateTaskListLocalData(draft, action) {
             const { taskGroupById } = action.payload;
@@ -188,10 +217,13 @@ const taskList = (0, toolkit_1.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) {
+            if (removeFromList) {
+                removeTaskIds(draft, taskIds);
+            }
+            else if (groupId != null) {
                 const { groupByKey } = draft.uiState;
                 if (groupByKey === 'groupName') {
                     Object.keys(draft.taskIdsByGroupsIds).forEach((gId) => {
@@ -283,6 +315,7 @@ const taskList = (0, toolkit_1.createSlice)({
                 newTaskGroupName: '',
                 selectedTaskIds: [],
             };
+            syncTopLevelToActiveTab(draft);
         },
         updateTasksListOnBulkUpdateTasksFailure(draft, action) {
             draft.updateTasksFetchState.fetchState = 'Error';
@@ -302,6 +335,7 @@ const taskList = (0, toolkit_1.createSlice)({
             }
             delete draft.taskIdsByGroupsIds[taskGroupId];
             delete draft.localData.existingTaskGroupNamesByGroupId[taskGroupId];
+            syncTopLevelToActiveTab(draft);
         },
         updateTaskListOnNewTaskCreationSuccess(draft, action) {
             const { task, taskGroupId, currentTaskState } = action.payload;
@@ -336,6 +370,7 @@ const taskList = (0, toolkit_1.createSlice)({
                     doUpdateTaskList(draft, task, taskGroupId);
                 }
             });
+            syncTopLevelToActiveTab(draft);
         },
         updateTaskListOnTaskGroupNameUpdate(draft, action) {
             const { taskGroupName, taskGroupId } = action.payload;
@@ -399,6 +434,7 @@ const taskList = (0, toolkit_1.createSlice)({
                     };
                 }
             }
+            syncTopLevelToActiveTab(draft);
         },
         updateTasksListOnUpdateTaskSuccess(draft) {
             draft.updateTasksFetchState.fetchState = 'Completed';
@@ -408,12 +444,15 @@ 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.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;
+_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;
 exports.default = taskList.reducer;
 /**
  *  helpers
@@ -492,6 +531,61 @@ 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 syncTopLevelToActiveTab = (draft) => {
+    const tabData = draft.byTab[draft.currentTab];
+    tabData.taskIds = draft.taskIds;
+    tabData.taskIdsByGroupsIds = draft.taskIdsByGroupsIds;
+    tabData.taskIdsByPriority = draft.taskIdsByPriority;
+    tabData.taskIdsByStatus = draft.taskIdsByStatus;
+    tabData.taskIdsByAssignees = draft.taskIdsByAssignees;
+    tabData.taskIdsByDueDate = draft.taskIdsByDueDate;
+    tabData.taskIdsByTags = draft.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 removedSet = new Set(taskIds);
+    const isRemoved = (id) => removedSet.has(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,14 +5,16 @@ 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, TaskListUIState } from './taskList';
+import { TaskListFilters, TaskListLocalData, TaskListState, TaskListTab, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
     assigneeUsers: UserAndRole[];
+    firstAssigneeSortName: string;
 }
 export interface TaskGroupWithTasksList {
     groupName: string;
@@ -21,8 +23,10 @@ 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;
@@ -34,11 +38,12 @@ export interface TaskListSelectorView extends SelectorView {
     userGroupList: UserGroupListSelectorView;
     userList: UserListSelectorView;
 }
-export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
+export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
+    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {
@@ -47,11 +52,12 @@ export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState,
     isDefault: boolean;
     tasks: TaskWithUserDetails[];
 }[];
-export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
+export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
+    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {

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,11 +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) => {
-    return ((0, isEqual_1.default)(taskListState.filters, taskListReducer_1.initialState.filters) &&
-        taskListReducer_1.initialState.uiState.searchText === taskListState.uiState.searchText);
-};
 const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     const tasksInOrder = (0, orderBy_1.default)(tasksList, (task) => {
         const tagsByIds = (0, tagSelector_1.getTagsByIds)(tagState, task.tagIds);
@@ -40,8 +34,12 @@ 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 === true ? 1 : 0;
             case 'name':
             default:
                 return task.name.toLowerCase();
@@ -49,7 +47,7 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     }, sortOrder);
     return tasksInOrder;
 };
-const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, }) => {
+const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, userGroupsState, }) => {
     const { sortKey, searchText } = taskListState.uiState;
     const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
     const tasks = taskIds
@@ -59,7 +57,15 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
             const assigneeUsers = task.assignees
                 .map((userId) => (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, userId))
                 .filter((value) => value != null);
-            return { ...task, assigneeUsers };
+            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 !== '' ? firstUserName : (firstGroupName ?? '')).toLowerCase();
+            return { ...task, assigneeUsers, firstAssigneeSortName };
         }
         return undefined;
     })
@@ -68,7 +74,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, }) => {
+const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupViewState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const { taskGroupsIds } = taskGroupViewState;
     const taskGroupsWithTasksList = taskGroupsIds
         .map((taskGroupId) => {
@@ -82,6 +88,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         if (taskGroup != null) {
             return {
@@ -110,12 +117,9 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     if (defaultTaskGroup != null) {
         sortedTaskGroupsWithTasksList.push(defaultTaskGroup);
     }
-    if (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, }) => {
+const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
     const taskGroupsWithTasksList = assigneeGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByAssignees[groupKey];
@@ -127,6 +131,7 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = (0, userSelector_1.getUsersByUserIds)(userState, assigneeIds)
@@ -142,13 +147,10 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             tasks: tasksWithUserDetails,
         };
     });
-    if (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, }) => {
+const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_PRIORITY_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByPriority[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -159,6 +161,7 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -168,13 +171,10 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             tasks: tasksWithUserDetails,
         };
     });
-    if (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, }) => {
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_TASK_STATUS_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByStatus[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -185,6 +185,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -194,12 +195,9 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             tasks: tasksWithUserDetails,
         };
     });
-    if (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, }) => {
+const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const tagGroups = Object.keys(taskListState.taskIdsByTags);
     const taskGroupsWithTasksList = tagGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByTags[groupKey];
@@ -211,6 +209,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const tagIds = groupKey.split(',');
         const groupName = (0, tagSelector_1.getTagsByIds)(tagState, tagIds)
@@ -225,12 +224,9 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             tasks: tasksWithUserDetails,
         };
     });
-    if (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, }) => {
+const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = taskList_1.DUE_DATE_GROUP_KEYS.map((groupKey) => {
         const taskIds = taskListState.taskIdsByDueDate[groupKey];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -241,6 +237,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: groupKey,
@@ -249,12 +246,9 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             tasks: tasksWithUserDetails,
         };
     });
-    if (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, }) => {
+const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, userGroupsState, }) => {
     const { groupByKey } = taskListState.uiState;
     if (groupByKey === 'groupName') {
         return getTaskListGroupedByGroupName({
@@ -266,6 +260,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupState,
             taskGroupViewState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'assignee') {
@@ -276,6 +271,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'priority') {
@@ -286,6 +282,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'status') {
@@ -296,6 +293,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'tag') {
@@ -306,6 +304,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -315,6 +314,7 @@ 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) => {
@@ -328,6 +328,7 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
         taskGroupState,
         taskGroupViewState,
         tagState,
+        userGroupsState,
     });
     const fetchStateVariables = [
         taskListState,
@@ -339,7 +340,15 @@ 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/lib/view/zeniOAuthView/epics/approveOAuthConsentEpic.d.ts

@@ -0,0 +1,27 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
+import { RootState } from '../../../reducer';
+import { ZeniAPI } from '../../../zeniAPI';
+import { approveOAuthConsent, approveOAuthConsentFailure, approveOAuthConsentSuccess } from '../zeniOAuthReducer';
+export type ActionType = ReturnType<typeof approveOAuthConsent> | ReturnType<typeof approveOAuthConsentSuccess> | ReturnType<typeof approveOAuthConsentFailure> | ReturnType<typeof openSnackbar>;
+export declare const approveOAuthConsentEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
+    payload: {
+        messageSection: import("../../..").SnackbarMessageSections;
+        messageText: import("../../..").SnackbarMessageSectionTexts;
+        type: import("../../..").SnackbarMessageType;
+        showStatusIcon?: boolean;
+        variables?: {
+            variableName: string;
+            variableValue: string;
+        }[];
+    };
+    type: "snackbar/openSnackbar";
+} | {
+    payload: {
+        redirectUrl: string;
+    };
+    type: "zeniOAuthView/approveOAuthConsentSuccess";
+} | {
+    payload: import("../../../responsePayload").ZeniAPIStatus<Record<string, unknown>>;
+    type: "zeniOAuthView/approveOAuthConsentFailure";
+}>;

package/lib/view/zeniOAuthView/epics/approveOAuthConsentEpic.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.approveOAuthConsentEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const snackbarReducer_1 = require("../../../entity/snackbar/snackbarReducer");
+const responsePayload_1 = require("../../../responsePayload");
+const zeniOAuthReducer_1 = require("../zeniOAuthReducer");
+const failureSnackbar = (reason) => (0, snackbarReducer_1.openSnackbar)({
+    messageSection: 'oauth_consent_approve',
+    messageText: 'failed',
+    type: 'error',
+    variables: [{ variableName: '__reason__', variableValue: reason }],
+});
+const approveOAuthConsentEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(zeniOAuthReducer_1.approveOAuthConsent.match), (0, operators_1.switchMap)((action) => {
+    if (state$.value.zeniOAuthViewState.fetchState === 'In-Progress') {
+        return (0, rxjs_1.from)([]);
+    }
+    const { userId, zeniSessionId, tenantId, clientId, redirectUri, codeChallenge, codeChallengeMethod, state, responseType, } = action.payload;
+    const authHeaders = {
+        'zeni-user-id': userId,
+        'zeni-tenant-id': tenantId,
+    };
+    if (zeniSessionId != null) {
+        authHeaders['zeni-session-id'] = zeniSessionId;
+    }
+    return zeniAPI
+        .postJSON(`${zeniAPI.apiEndPoints.authMicroServiceBaseUrl}/oauth/authorize/approve`, {
+        client_id: clientId,
+        redirect_uri: redirectUri,
+        code_challenge: codeChallenge,
+        code_challenge_method: codeChallengeMethod,
+        state,
+        response_type: responseType,
+        tenant_id: tenantId,
+    }, authHeaders)
+        .pipe((0, operators_1.concatMap)((response) => (0, rxjs_1.from)(response.json()).pipe((0, operators_1.mergeMap)((responseJson) => {
+        if (!response.ok) {
+            const errBody = responseJson;
+            const errorMessage = errBody?.error ??
+                errBody?.message ??
+                errBody?.status?.message ??
+                `Authorization failed (${response.status})`;
+            return (0, rxjs_1.from)([
+                (0, zeniOAuthReducer_1.approveOAuthConsentFailure)((0, responsePayload_1.createZeniAPIStatus)(errorMessage)),
+                failureSnackbar(errorMessage),
+            ]);
+        }
+        const body = responseJson;
+        const redirectUrl = body?.redirect_url ?? body?.data?.redirect_url;
+        if (redirectUrl == null || redirectUrl === '') {
+            const noRedirectMessage = 'No redirect URL returned from authorization server';
+            return (0, rxjs_1.from)([
+                (0, zeniOAuthReducer_1.approveOAuthConsentFailure)((0, responsePayload_1.createZeniAPIStatus)(noRedirectMessage)),
+                failureSnackbar(noRedirectMessage),
+            ]);
+        }
+        return (0, rxjs_1.of)((0, zeniOAuthReducer_1.approveOAuthConsentSuccess)({ redirectUrl }));
+    }))), (0, operators_1.catchError)((error) => {
+        const errorDetail = error instanceof Error ? error.message : JSON.stringify(error);
+        const networkErrorMessage = 'OAuth approve request failed: ' + errorDetail;
+        return (0, rxjs_1.from)([
+            (0, zeniOAuthReducer_1.approveOAuthConsentFailure)((0, responsePayload_1.createZeniAPIStatus)(networkErrorMessage)),
+            failureSnackbar(networkErrorMessage),
+        ]);
+    }));
+}));
+exports.approveOAuthConsentEpic = approveOAuthConsentEpic;

package/lib/view/zeniOAuthView/zeniOAuthParamsParser.d.ts

@@ -0,0 +1,16 @@
+export interface OAuthParams {
+    clientId: string;
+    codeChallenge: string;
+    codeChallengeMethod: string;
+    redirectUri: string;
+    responseType: string;
+    state: string;
+}
+export type ParseOAuthParamsResult = {
+    error: null;
+    params: OAuthParams;
+} | {
+    error: string;
+    params: null;
+};
+export declare function parseOAuthParams(search: string): ParseOAuthParamsResult;