@zeniai/client-epic-state 4.11.72 → 4.11.73

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

@@ -3,21 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllTasks = void 0;
+exports.getAllTasks = exports.getTaskListGroupedByPriority = exports.getTaskListGroupedByAssignees = void 0;
+const toolkit_1 = require("@reduxjs/toolkit");
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const sortOrderPayload_1 = require("../../../commonPayloadTypes/sortOrderPayload");
 const taskState_1 = require("../../../entity/task/taskState");
 const taskSelector_1 = require("../../../entity/task/taskSelector");
 const userAndRole_1 = require("../../companyView/types/userAndRole");
+const taskList_1 = require("./taskList");
 const userListViewSelector_1 = require("../../userListView/userListViewSelector");
 const spendManagementFilterHelpers_1 = require("../../spendManagement/spendManagementFilterHelpers");
 const tagSelector_1 = require("../../../entity/tag/tagSelector");
 const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const taskGroupSelector_1 = require("../../../entity/taskGroup/taskGroupSelector");
-const sortTasksList = (state, tasksList, sortKey, sortOrder) => {
+const userSelector_1 = require("../../../entity/user/userSelector");
+const taskDetailSelector_1 = require("../taskDetailView/taskDetailSelector");
+const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     const tasksInOrder = (0, orderBy_1.default)(tasksList, (task) => {
         var _a, _b;
-        const tagsByIds = (0, tagSelector_1.getTagsByIds)(state.tagState, task.tagIds);
+        const tagsByIds = (0, tagSelector_1.getTagsByIds)(tagState, task.tagIds);
         switch (sortKey) {
             case 'dueDate':
                 return task.dueDate;
@@ -28,7 +32,7 @@ const sortTasksList = (state, tasksList, sortKey, sortOrder) => {
             case 'status':
                 return task.status.name;
             case 'priority':
-                return taskState_1.ALL_PRORITY_CODE.indexOf(task.priority.code);
+                return taskState_1.ALL_PRIORITY_CODE.indexOf(task.priority.code);
             case 'name':
             default:
                 return task.name.toLowerCase();
@@ -36,65 +40,286 @@ const sortTasksList = (state, tasksList, sortKey, sortOrder) => {
     }, sortOrder);
     return tasksInOrder;
 };
-const getAllTasks = (state) => {
-    const { taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagViewState, } = state;
-    const { localData, searchText } = taskListState;
-    const sortKey = taskListState.uiState.sortKey;
+const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, }) => {
+    const { sortKey, searchText } = taskListState.uiState;
     const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
-    const taskGroupIds = taskGroupViewState.taskGroupsIds;
-    const taskGroupsWithTasksList = taskGroupIds
+    const tasks = taskIds
+        .map((taskId) => {
+        const task = (0, taskSelector_1.getTaskById)(taskState, taskId);
+        if (task != null) {
+            const assigneeUsers = task.assignees
+                .map((userId) => (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, userId))
+                .filter((value) => value != null);
+            return Object.assign(Object.assign({}, task), { assigneeUsers });
+        }
+        return undefined;
+    })
+        .filter((value) => (value === null || value === void 0 ? void 0 : value.name.toLowerCase().includes(searchText.toLowerCase())) === true);
+    const filteredTaskList = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('task_management', tasks, taskListState.filters);
+    const sortedTaskList = sortTasksList(tagState, filteredTaskList, sortKey, sortOrder);
+    return sortedTaskList;
+};
+const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupViewState, userState, userRoleState, addressState, tagState, }) => {
+    const { taskGroupsIds } = taskGroupViewState;
+    const taskGroupsWithTasksList = taskGroupsIds
         .map((taskGroupId) => {
         var _a;
         const taskGroup = (0, taskGroupSelector_1.getTaskGroupById)(taskGroupState, taskGroupId);
         const taskIds = (_a = taskListState.taskIdsByGroupsIds[taskGroupId]) !== null && _a !== void 0 ? _a : [];
-        const tasks = taskIds
-            .map((taskId) => {
-            const task = (0, taskSelector_1.getTaskById)(taskState, taskId);
-            if (task != null) {
-                const assigneeUsers = task.assignees
-                    .map((userId) => (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, userId))
-                    .filter((value) => value != null);
-                return Object.assign(Object.assign({}, task), { assigneeUsers });
-            }
-            return undefined;
-        })
-            .filter((value) => (value === null || value === void 0 ? void 0 : value.name.toLowerCase().includes(searchText.toLowerCase())) ===
-            true);
+        const tasksWithUserDetails = getTasksWithUserDetails({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            taskIds,
+            tagState,
+        });
         if (taskGroup != null) {
-            const filteredTaskList = (0, spendManagementFilterHelpers_1.applyAdvancedFiltersOnList)('task_management', tasks, taskListState.filters);
-            const sortedTaskList = sortTasksList(state, filteredTaskList, sortKey, sortOrder);
-            return Object.assign(Object.assign({}, taskGroup), { tasks: sortedTaskList });
+            return {
+                groupName: taskGroup.name,
+                id: taskGroup.id,
+                tasks: tasksWithUserDetails,
+                isDefault: taskGroup.isDefault,
+            };
         }
         return undefined;
     })
         .filter((value) => value != null);
-    taskGroupsWithTasksList.sort((a, b) => {
-        return b.createdAt.valueOf() - a.createdAt.valueOf();
+    taskGroupsWithTasksList.sort((group1, group2) => {
+        const taskGroup1 = taskGroupState.taskGroupById[group1.id];
+        const taskGroup2 = taskGroupState.taskGroupById[group2.id];
+        return taskGroup2.createdAt.valueOf() - taskGroup1.createdAt.valueOf();
+    });
+    const sortedTaskGroupsWithTasksList = taskGroupsWithTasksList.filter((group) => {
+        const taskGroup = taskGroupState.taskGroupById[group.id];
+        return taskGroup.isDefault === false;
+    });
+    const defaultTaskGroup = taskGroupsWithTasksList.find((group) => {
+        const taskGroup = taskGroupState.taskGroupById[group.id];
+        return taskGroup.isDefault === true;
     });
-    const sortedTaskGroupsWithTasksList = taskGroupsWithTasksList.filter((taskGroup) => taskGroup.isDefault === false);
-    const defaultTaskGroup = taskGroupsWithTasksList.find((taskGroup) => taskGroup.isDefault === true);
     if (defaultTaskGroup != null) {
         sortedTaskGroupsWithTasksList.push(defaultTaskGroup);
     }
+    return sortedTaskGroupsWithTasksList;
+};
+const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+    const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
+    const taskGroupsWithTasksList = assigneeGroups.map((groupKey) => {
+        const taskIds = taskListState.taskIdsByAssignees[groupKey];
+        const tasksWithUserDetails = getTasksWithUserDetails({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            taskIds,
+            tagState,
+        });
+        const assigneeIds = groupKey.split(',');
+        const groupName = (0, userSelector_1.getUsersByUserIds)(userState, assigneeIds)
+            .map((user) => {
+            return (0, userSelector_1.getUserName)(user);
+        })
+            .slice(0, 5)
+            .join(', ');
+        return {
+            groupName,
+            id: groupKey !== '' ? groupKey : 'no_assignee',
+            isDefault: true,
+            tasks: tasksWithUserDetails,
+        };
+    });
+    return taskGroupsWithTasksList;
+};
+exports.getTaskListGroupedByAssignees = getTaskListGroupedByAssignees;
+const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+    const taskGroupsWithTasksList = taskState_1.ALL_PRIORITY_CODE.map((groupKey) => {
+        var _a, _b, _c;
+        const taskIds = (_a = taskListState.taskIdsByPriority[groupKey]) !== null && _a !== void 0 ? _a : [];
+        const tasksWithUserDetails = getTasksWithUserDetails({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            taskIds,
+            tagState,
+        });
+        return {
+            groupName: (_c = (_b = taskDetailSelector_1.allTaskPriority.find((priority) => priority.code === groupKey)) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : groupKey,
+            id: groupKey,
+            isDefault: true,
+            tasks: tasksWithUserDetails,
+        };
+    });
+    return taskGroupsWithTasksList;
+};
+exports.getTaskListGroupedByPriority = getTaskListGroupedByPriority;
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+    const taskGroupsWithTasksList = taskState_1.ALL_TASK_STATUS_CODE.map((groupKey) => {
+        var _a, _b, _c;
+        const taskIds = (_a = taskListState.taskIdsByStatus[groupKey]) !== null && _a !== void 0 ? _a : [];
+        const tasksWithUserDetails = getTasksWithUserDetails({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            taskIds,
+            tagState,
+        });
+        return {
+            groupName: (_c = (_b = taskDetailSelector_1.allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : groupKey,
+            id: groupKey,
+            isDefault: true,
+            tasks: tasksWithUserDetails,
+        };
+    });
+    return taskGroupsWithTasksList;
+};
+const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+    const tagGroups = Object.keys(taskListState.taskIdsByTags);
+    const taskGroupsWithTasksList = tagGroups.map((groupKey) => {
+        const taskIds = taskListState.taskIdsByTags[groupKey];
+        const tasksWithUserDetails = getTasksWithUserDetails({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            taskIds,
+            tagState,
+        });
+        const tagIds = groupKey.split(',');
+        const groupName = (0, tagSelector_1.getTagsByIds)(tagState, tagIds)
+            .map((tag) => {
+            return tag.name;
+        })
+            .join(', ');
+        return {
+            groupName,
+            id: groupKey !== '' ? groupKey : 'no_tag',
+            isDefault: true,
+            tasks: tasksWithUserDetails,
+        };
+    });
+    return taskGroupsWithTasksList;
+};
+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({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            taskIds,
+            tagState,
+        });
+        return {
+            groupName: groupKey,
+            id: groupKey,
+            isDefault: true,
+            tasks: tasksWithUserDetails,
+        };
+    });
+    return taskGroupsWithTasksList;
+};
+const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, }) => {
+    const { groupByKey } = taskListState.uiState;
+    if (groupByKey === 'groupName') {
+        return getTaskListGroupedByGroupName({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            taskGroupState,
+            taskGroupViewState,
+            tagState,
+        });
+    }
+    if (groupByKey === 'assignee') {
+        return (0, exports.getTaskListGroupedByAssignees)({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            tagState,
+        });
+    }
+    if (groupByKey === 'priority') {
+        return (0, exports.getTaskListGroupedByPriority)({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            tagState,
+        });
+    }
+    if (groupByKey === 'status') {
+        return getTaskListGroupedByStatus({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            tagState,
+        });
+    }
+    if (groupByKey === 'tag') {
+        return getTaskListGroupedByTags({
+            taskListState,
+            taskState,
+            userState,
+            userRoleState,
+            addressState,
+            tagState,
+        });
+    }
+    return getTaskListGroupedByDueDate({
+        taskListState,
+        taskState,
+        userState,
+        userRoleState,
+        addressState,
+        tagState,
+    });
+};
+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, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState) => {
+    const { localData } = taskListState;
+    const taskGroupsWithTasksList = getTaskGroupsWithTaskList({
+        taskListState,
+        taskState,
+        userState,
+        userRoleState,
+        addressState,
+        taskGroupState,
+        taskGroupViewState,
+        tagState,
+    });
     const { fetchState, error } = (0, reduceFetchState_1.reduceAnyFetchState)([
         taskListState,
         taskGroupViewState,
         tagViewState,
     ]);
     return {
-        searchText: taskListState.searchText,
         uiState: taskListState.uiState,
         filters: taskListState.filters,
         fetchState: fetchState,
-        userList: (0, userListViewSelector_1.getUserList)(state, 'taskManagerCandidate'),
+        userList: (0, userListViewSelector_1.getUserList)(userState, userRoleState, userListViewState, 'taskManagerCandidate'),
         error: error,
         version: 0,
-        taskGroupsWithTasksList: sortedTaskGroupsWithTasksList,
+        taskGroupsWithTasksList,
         localData,
         updateTasksFetchState: taskListState.updateTasksFetchState,
         taskGroupDeleteStatus: taskGroupViewState.taskGroupDeleteStatus,
         taskGroupUpdateStatus: taskGroupViewState.taskGroupUpdateStatus,
         taskGroupCreationStatus: taskGroupViewState.taskGroupCreationStatus,
     };
-};
-exports.getAllTasks = getAllTasks;
+});

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

@@ -0,0 +1,5 @@
+import { TaskGroupKey } from './taskList';
+import { Task } from '../../../entity/task/taskState';
+import { ZeniDate } from '../../../zeniDayJS';
+export declare const getDueDateValueFromDueDateGroupId: (groupId: string) => ZeniDate;
+export declare const getTaskUpdates: (groupByKey: TaskGroupKey, groupId: string) => Partial<Task>;

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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTaskUpdates = exports.getDueDateValueFromDueDateGroupId = void 0;
+const taskList_1 = require("./taskList");
+const taskDetailSelector_1 = require("../taskDetailView/taskDetailSelector");
+const zeniDayJS_1 = require("../../../zeniDayJS");
+const getDueDateValueFromDueDateGroupId = (groupId) => {
+    const dueDateGroup = (0, taskList_1.toDueDateGroupKeyType)(groupId);
+    const today = (0, zeniDayJS_1.dateNow)();
+    if (dueDateGroup === 'overdue') {
+        return today.subtract(1, 'day');
+    }
+    if (dueDateGroup === 'today') {
+        return today;
+    }
+    if (dueDateGroup === 'this_week') {
+        return today.endOf('week');
+    }
+    if (dueDateGroup === 'this_month') {
+        return today.endOf('month');
+    }
+    return today.add(1, 'month').endOf('month');
+};
+exports.getDueDateValueFromDueDateGroupId = getDueDateValueFromDueDateGroupId;
+const getTaskUpdates = (groupByKey, groupId) => {
+    if (groupByKey === 'priority') {
+        return {
+            priority: taskDetailSelector_1.allTaskPriority.find((priority) => priority.code === groupId),
+        };
+    }
+    if (groupByKey === 'status') {
+        return {
+            status: taskDetailSelector_1.allTaskStatus.find((status) => status.code === groupId),
+        };
+    }
+    if (groupByKey === 'dueDate') {
+        return {
+            dueDate: (0, exports.getDueDateValueFromDueDateGroupId)(groupId),
+        };
+    }
+    if (groupByKey === 'assignee') {
+        return {
+            assignees: groupId.split(','),
+        };
+    }
+    if (groupByKey === 'tag') {
+        return {
+            tagIds: groupId.split(','),
+        };
+    }
+    return {
+        taskGroupIds: [groupId],
+    };
+};
+exports.getTaskUpdates = getTaskUpdates;

package/lib/view/userListView/userListViewSelector.d.ts

@@ -1,8 +1,9 @@
 import { SelectorView } from '../../commonStateTypes/viewAndReport/viewAndReport';
-import { RootState } from '../../reducer';
+import { UserState } from '../../entity/user/userState';
+import { UserRoleState } from '../../entity/userRole/userRoleState';
 import { Person } from '../people/peopleSelectorTypes';
-import { UserListType } from './userListViewState';
+import { UserListType, UserListViewState } from './userListViewState';
 export interface UserListSelectorView extends SelectorView {
     users: Person[];
 }
-export declare const getUserList: (state: RootState, userType: UserListType) => UserListSelectorView;
+export declare const getUserList: (userState: UserState, userRoleState: UserRoleState, userListViewState: UserListViewState, userType: UserListType) => UserListSelectorView;

package/lib/view/userListView/userListViewSelector.js

@@ -7,9 +7,8 @@ exports.getUserList = void 0;
 const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const userSelector_1 = require("../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../entity/userRole/userRoleSelector");
-const getUserList = (state, userType) => {
+const getUserList = (userState, userRoleState, userListViewState, userType) => {
     var _a, _b;
-    const { userState, userRoleState, userListViewState } = state;
     return {
         users: getUserListByUserIds(userState, userRoleState, userListViewState, userType),
         fetchState: (_a = userListViewState.userListByType[userType]) === null || _a === void 0 ? void 0 : _a.fetchState,

package/package.json

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