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

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

@@ -5,6 +5,7 @@ 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';
@@ -13,6 +14,7 @@ import { UserListSelectorView } from '../../userListView/userListViewSelector';
 import { TaskListFilters, TaskListLocalData, TaskListState, TaskListTab, TaskListUIState } from './taskList';
 export interface TaskWithUserDetails extends Task {
     assigneeUsers: UserAndRole[];
+    firstAssigneeSortName: string;
 }
 export interface TaskGroupWithTasksList {
     groupName: string;
@@ -36,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;
 }) => {
@@ -49,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

@@ -40,6 +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':
@@ -51,7 +53,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
@@ -61,7 +63,17 @@ 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 ||
+                firstGroupName ||
+                '').toLowerCase();
+            return { ...task, assigneeUsers, firstAssigneeSortName };
         }
         return undefined;
     })
@@ -70,7 +82,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) => {
@@ -84,6 +96,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         if (taskGroup != null) {
             return {
@@ -118,7 +131,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     }
     return sortedTaskGroupsWithTasksList;
 };
-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];
@@ -130,6 +143,7 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = (0, userSelector_1.getUsersByUserIds)(userState, assigneeIds)
@@ -152,7 +166,7 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
     return taskGroupsWithTasksList;
 };
 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({
@@ -163,6 +177,7 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -179,7 +194,7 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
     return taskGroupsWithTasksList;
 };
 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({
@@ -190,6 +205,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -205,7 +221,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
     }
     return taskGroupsWithTasksList;
 };
-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];
@@ -217,6 +233,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const tagIds = groupKey.split(',');
         const groupName = (0, tagSelector_1.getTagsByIds)(tagState, tagIds)
@@ -237,7 +254,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
     }
     return taskGroupsWithTasksList;
 };
-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({
@@ -248,6 +265,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: groupKey,
@@ -262,7 +280,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
     }
     return taskGroupsWithTasksList;
 };
-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({
@@ -274,6 +292,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupState,
             taskGroupViewState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'assignee') {
@@ -284,6 +303,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'priority') {
@@ -294,6 +314,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'status') {
@@ -304,6 +325,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'tag') {
@@ -314,6 +336,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -323,6 +346,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) => {
@@ -336,6 +360,7 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
         taskGroupState,
         taskGroupViewState,
         tagState,
+        userGroupsState,
     });
     const fetchStateVariables = [
         taskListState,

package/package.json

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