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

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);
@@ -45,7 +39,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();
@@ -70,9 +64,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;
@@ -125,11 +117,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);
 };
 const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
@@ -159,11 +147,7 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             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);
 };
 exports.getTaskListGroupedByAssignees = getTaskListGroupedByAssignees;
 const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
@@ -187,11 +171,7 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             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);
 };
 exports.getTaskListGroupedByPriority = getTaskListGroupedByPriority;
 const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
@@ -215,11 +195,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);
@@ -248,11 +224,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 = taskList_1.DUE_DATE_GROUP_KEYS.map((groupKey) => {
@@ -274,11 +246,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;

package/package.json

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