@zeniai/client-epic-state 5.0.2-betaRR11 → 5.0.2-betaRR13

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

@@ -1,5 +1,4 @@
 import { createSelector } from '@reduxjs/toolkit';
-import isEqual from 'lodash/isEqual';
 import orderBy from 'lodash/orderBy';
 import { getSortOrder, } from '../../../commonPayloadTypes/sortOrderPayload';
 import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
@@ -15,11 +14,6 @@ import { getUserGroupList } from '../../userGroupListView/userGroupListViewSelec
 import { getUserList, } from '../../userListView/userListViewSelector';
 import { allTaskPriority, allTaskStatus, } from '../taskDetailView/taskDetailSelector';
 import { DUE_DATE_GROUP_KEYS, } from './taskList';
-import { initialState } from './taskListReducer';
-const isDefaultFilters = (taskListState) => {
-    return (isEqual(taskListState.filters, initialState.filters) &&
-        initialState.uiState.searchText === taskListState.uiState.searchText);
-};
 const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     const tasksInOrder = orderBy(tasksList, (task) => {
         const tagsByIds = getTagsByIds(tagState, task.tagIds);
@@ -39,7 +33,7 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
             case 'timeSpent':
                 return task.timeSpent;
             case 'visibility':
-                return task.isPrivate ? 1 : 0;
+                return task.isPrivate === true ? 1 : 0;
             case 'name':
             default:
                 return task.name.toLowerCase();
@@ -64,9 +58,7 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
             const firstGroupName = task.groupAssignees
                 .map((gId) => userGroupsState.userGroupByUserGroupId[gId]?.name)
                 .find((name) => name != null && name !== '');
-            const firstAssigneeSortName = (firstUserName ||
-                firstGroupName ||
-                '').toLowerCase();
+            const firstAssigneeSortName = (firstUserName !== '' ? firstUserName : (firstGroupName ?? '')).toLowerCase();
             return { ...task, assigneeUsers, firstAssigneeSortName };
         }
         return undefined;
@@ -119,11 +111,7 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     if (defaultTaskGroup != null) {
         sortedTaskGroupsWithTasksList.push(defaultTaskGroup);
     }
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return sortedTaskGroupsWithTasksList;
+    return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
@@ -153,11 +141,7 @@ export const getTaskListGroupedByAssignees = ({ taskListState, taskState, userSt
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return taskGroupsWithTasksList;
+    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 export const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_PRIORITY_CODE.map((groupKey) => {
@@ -180,11 +164,7 @@ export const getTaskListGroupedByPriority = ({ taskListState, taskState, userSta
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        isDefaultFilters(taskListState) === false) {
-        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
-    }
-    return taskGroupsWithTasksList;
+    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
 };
 const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const taskGroupsWithTasksList = ALL_TASK_STATUS_CODE.map((groupKey) => {
@@ -207,11 +187,7 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        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, userGroupsState, }) => {
     const tagGroups = Object.keys(taskListState.taskIdsByTags);
@@ -240,11 +216,7 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        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, userGroupsState, }) => {
     const taskGroupsWithTasksList = DUE_DATE_GROUP_KEYS.map((groupKey) => {
@@ -266,11 +238,7 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             tasks: tasksWithUserDetails,
         };
     });
-    if (taskListState.currentTab !== 'live' ||
-        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, userGroupsState, }) => {
     const { groupByKey } = taskListState.uiState;