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

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

@@ -34,6 +34,8 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
                 return task.status.name;
             case 'priority':
                 return ALL_PRIORITY_CODE.indexOf(task.priority.code);
+            case 'assignee':
+                return task.firstAssigneeSortName;
             case 'timeSpent':
                 return task.timeSpent;
             case 'visibility':
@@ -45,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 = getSortOrder(taskListState.uiState.sortOrder);
     const tasks = taskIds
@@ -55,7 +57,17 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
             const assigneeUsers = task.assignees
                 .map((userId) => getUserAndUserRole(userState, userRoleState, addressState, userId))
                 .filter((value) => value != null);
-            return { ...task, assigneeUsers };
+            const firstUser = assigneeUsers[0]?.user;
+            const firstUserName = (firstUser != null ? 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;
     })
@@ -64,7 +76,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) => {
@@ -78,6 +90,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         if (taskGroup != null) {
             return {
@@ -112,7 +125,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     }
     return sortedTaskGroupsWithTasksList;
 };
-export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+export 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];
@@ -124,6 +137,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = getUsersByUserIds(userState, assigneeIds)
@@ -145,7 +159,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
     }
     return taskGroupsWithTasksList;
 };
-export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_PRIORITY_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByPriority[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -156,6 +170,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -171,7 +186,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
     }
     return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_TASK_STATUS_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByStatus[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -182,6 +197,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -197,7 +213,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];
@@ -209,6 +225,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         const tagIds = groupKey.split(',');
         const groupName = getTagsByIds(tagState, tagIds)
@@ -229,7 +246,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 = DUE_DATE_GROUP_KEYS.map((groupKey) => {
         const taskIds = taskListState.taskIdsByDueDate[groupKey];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -240,6 +257,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             addressState,
             taskIds,
             tagState,
+            userGroupsState,
         });
         return {
             groupName: groupKey,
@@ -254,7 +272,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({
@@ -266,6 +284,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupState,
             taskGroupViewState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'assignee') {
@@ -276,6 +295,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'priority') {
@@ -286,6 +306,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'status') {
@@ -296,6 +317,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     if (groupByKey === 'tag') {
@@ -306,6 +328,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
+            userGroupsState,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -315,6 +338,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         userRoleState,
         addressState,
         tagState,
+        userGroupsState,
     });
 };
 export const getAllTasks = 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 +352,7 @@ export const getAllTasks = createSelector((state) => state.taskListState, (state
         taskGroupState,
         taskGroupViewState,
         tagState,
+        userGroupsState,
     });
     const fetchStateVariables = [
         taskListState,