@zeniai/client-epic-state 5.0.2-betaRR19 → 5.0.2-betaRR4

package/lib/view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic.js

@@ -31,7 +31,6 @@ const initializeTaskToLocalStoreEpic = (actions$, state$) => actions$.pipe((0, o
             savedRecurringEndDate: task.recurringEndDate,
             recurringStartDate: task.recurringStartDate,
             timeSpent: task.timeSpent,
-            isPrivate: task.isPrivate,
         };
         const actions = [
             (0, taskDetailReducer_1.saveTaskUpdatesToLocalStore)({ taskDetailLocalData, taskId }),

package/lib/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.js

@@ -98,6 +98,5 @@ const prepareTaskPayload = (state, taskId, taskGroupId) => {
         sync_token: syncToken,
         task_group_ids: taskGroupId != null ? [taskGroupId] : [],
         time_spent: (0, formatMinutesToFromHHMM_1.convertHHMMStrToMinutes)(localData.timeSpent),
-        is_private: localData.isPrivate ?? false,
     };
 };

package/lib/view/taskManager/taskDetailView/taskDetail.d.ts

@@ -33,7 +33,6 @@ export interface EditTaskLocalData {
     timeSpent: string;
     type: TaskType;
     dueDate?: ZeniDate;
-    isPrivate?: boolean;
     recurringFrequency?: RecurringFrequencyType;
     recurringStartDate?: ZeniDate;
     savedRecurringEndDate?: ZeniDate;

package/lib/view/taskManager/taskDetailView/taskDetailSelector.d.ts

@@ -21,7 +21,6 @@ export interface TaskDetailSelectorView extends SelectorView {
     createdByUser?: UserAndRole;
     isArchived?: boolean;
     isDeleted?: boolean;
-    recurringSourceTaskId?: ID;
     snoozedUntil?: ZeniDate | null;
 }
 export declare const getTaskDetail: (state: RootState, taskId?: ID) => TaskDetailSelectorView;

package/lib/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -30,7 +30,6 @@ const getTaskDetail = (state, taskId) => {
     let createdByUser = undefined;
     let isArchived = undefined;
     let isDeleted = undefined;
-    let recurringSourceTaskId = undefined;
     let snoozedUntil = undefined;
     if (taskId != null && sourceTaskDetail != null) {
         const taskEntity = (0, taskSelector_1.getTaskById)(taskState, taskId);
@@ -39,7 +38,6 @@ const getTaskDetail = (state, taskId) => {
             createdByUser = (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, taskEntity.createdBy);
             isArchived = taskEntity.isArchived;
             isDeleted = taskEntity.isDeleted;
-            recurringSourceTaskId = taskEntity.recurringSourceTaskId;
             snoozedUntil = taskEntity.snoozedUntil;
         }
         if (fileIdsInEntity.length > 0) {
@@ -58,7 +56,7 @@ const getTaskDetail = (state, taskId) => {
             ]);
         }
         showTaskDetailFormFooter = showFormFooter(sourceTaskDetail.taskDetailLocalData, taskEntity);
-        taskHistory = taskDetailState.taskHistoryById[taskId]?.historicEvents ?? [];
+        taskHistory = taskDetailState.taskHistoryById[taskId].historicEvents;
     }
     else if (taskId == null) {
         fetchStatus = (0, reduceFetchState_1.reduceFetchState)([userList, classListState]);
@@ -90,7 +88,6 @@ const getTaskDetail = (state, taskId) => {
         createdByUser,
         isArchived,
         isDeleted,
-        recurringSourceTaskId,
         showTaskDetailFormFooter,
         snoozedUntil,
     };

package/lib/view/taskManager/taskListView/epics/updateTaskFromListViewEpic.js

@@ -11,10 +11,9 @@ const updateTaskFromListViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(
     const state = state$.value;
     const { task, updates } = action.payload;
     const taskId = task.id;
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { snoozed_until: _snoozedUntil, ...taskData } = (0, bulkUpdateTaskListEpic_1.getTaskPayload)(state, taskId, updates);
+    const taskData = (0, bulkUpdateTaskListEpic_1.getTaskPayload)(state, taskId, updates);
     return zeniAPI
-        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}`, taskData)
+        .putAndGetJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks/${taskId}`, { ...taskData })
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.from)([

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

@@ -5,7 +5,6 @@ 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';
@@ -14,7 +13,6 @@ 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;
@@ -38,12 +36,11 @@ export interface TaskListSelectorView extends SelectorView {
     userGroupList: UserGroupListSelectorView;
     userList: UserListSelectorView;
 }
-export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
+export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
-    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {
@@ -52,12 +49,11 @@ export declare const getTaskListGroupedByAssignees: ({ taskListState, taskState,
     isDefault: boolean;
     tasks: TaskWithUserDetails[];
 }[];
-export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }: {
+export declare const getTaskListGroupedByPriority: ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }: {
     addressState: AddressState;
     tagState: TagState;
     taskListState: TaskListState;
     taskState: TaskState;
-    userGroupsState: UserGroupsState;
     userRoleState: UserRoleState;
     userState: UserState;
 }) => {

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

@@ -5,6 +5,7 @@ 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");
@@ -20,6 +21,11 @@ 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);
@@ -34,12 +40,10 @@ 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':
-                return task.isPrivate === true ? 1 : 0;
+                return task.isPrivate ? 1 : 0;
             case 'name':
             default:
                 return task.name.toLowerCase();
@@ -47,7 +51,7 @@ const sortTasksList = (tagState, tasksList, sortKey, sortOrder) => {
     }, sortOrder);
     return tasksInOrder;
 };
-const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, userGroupsState, }) => {
+const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRoleState, addressState, taskIds, tagState, }) => {
     const { sortKey, searchText } = taskListState.uiState;
     const sortOrder = (0, sortOrderPayload_1.getSortOrder)(taskListState.uiState.sortOrder);
     const tasks = taskIds
@@ -57,15 +61,7 @@ const getTasksWithUserDetails = ({ taskListState, taskState, userState, userRole
             const assigneeUsers = task.assignees
                 .map((userId) => (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, userId))
                 .filter((value) => value != null);
-            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 !== '' ? firstUserName : (firstGroupName ?? '')).toLowerCase();
-            return { ...task, assigneeUsers, firstAssigneeSortName };
+            return { ...task, assigneeUsers };
         }
         return undefined;
     })
@@ -74,7 +70,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, userGroupsState, }) => {
+const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupState, taskGroupViewState, userState, userRoleState, addressState, tagState, }) => {
     const { taskGroupsIds } = taskGroupViewState;
     const taskGroupsWithTasksList = taskGroupsIds
         .map((taskGroupId) => {
@@ -88,7 +84,6 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         if (taskGroup != null) {
             return {
@@ -117,9 +112,13 @@ const getTaskListGroupedByGroupName = ({ taskListState, taskState, taskGroupStat
     if (defaultTaskGroup != null) {
         sortedTaskGroupsWithTasksList.push(defaultTaskGroup);
     }
-    return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    if (taskListState.currentTab !== 'live' ||
+        isDefaultFilters(taskListState) === false) {
+        return sortedTaskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    }
+    return sortedTaskGroupsWithTasksList;
 };
-const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const assigneeGroups = Object.keys(taskListState.taskIdsByAssignees);
     const taskGroupsWithTasksList = assigneeGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByAssignees[groupKey];
@@ -131,7 +130,6 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         const assigneeIds = groupKey.split(',');
         const groupName = (0, userSelector_1.getUsersByUserIds)(userState, assigneeIds)
@@ -147,10 +145,14 @@ const getTaskListGroupedByAssignees = ({ taskListState, taskState, userState, us
             tasks: tasksWithUserDetails,
         };
     });
-    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    if (taskListState.currentTab !== 'live' ||
+        isDefaultFilters(taskListState) === false) {
+        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    }
+    return taskGroupsWithTasksList;
 };
 exports.getTaskListGroupedByAssignees = getTaskListGroupedByAssignees;
-const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_PRIORITY_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByPriority[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -161,7 +163,6 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskPriority.find((priority) => priority.code === groupKey)?.name ??
@@ -171,10 +172,14 @@ const getTaskListGroupedByPriority = ({ taskListState, taskState, userState, use
             tasks: tasksWithUserDetails,
         };
     });
-    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    if (taskListState.currentTab !== 'live' ||
+        isDefaultFilters(taskListState) === false) {
+        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    }
+    return taskGroupsWithTasksList;
 };
 exports.getTaskListGroupedByPriority = getTaskListGroupedByPriority;
-const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const taskGroupsWithTasksList = taskState_1.ALL_TASK_STATUS_CODE.map((groupKey) => {
         const taskIds = taskListState.taskIdsByStatus[groupKey] ?? [];
         const tasksWithUserDetails = getTasksWithUserDetails({
@@ -185,7 +190,6 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         return {
             groupName: taskDetailSelector_1.allTaskStatus.find((taskStatus) => taskStatus.code === groupKey)
@@ -195,9 +199,13 @@ const getTaskListGroupedByStatus = ({ taskListState, taskState, userState, userR
             tasks: tasksWithUserDetails,
         };
     });
-    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    if (taskListState.currentTab !== 'live' ||
+        isDefaultFilters(taskListState) === false) {
+        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    }
+    return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, }) => {
     const tagGroups = Object.keys(taskListState.taskIdsByTags);
     const taskGroupsWithTasksList = tagGroups.map((groupKey) => {
         const taskIds = taskListState.taskIdsByTags[groupKey];
@@ -209,7 +217,6 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         const tagIds = groupKey.split(',');
         const groupName = (0, tagSelector_1.getTagsByIds)(tagState, tagIds)
@@ -224,9 +231,13 @@ const getTaskListGroupedByTags = ({ taskListState, taskState, userState, userRol
             tasks: tasksWithUserDetails,
         };
     });
-    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    if (taskListState.currentTab !== 'live' ||
+        isDefaultFilters(taskListState) === false) {
+        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    }
+    return taskGroupsWithTasksList;
 };
-const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, userRoleState, addressState, tagState, userGroupsState, }) => {
+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({
@@ -237,7 +248,6 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             addressState,
             taskIds,
             tagState,
-            userGroupsState,
         });
         return {
             groupName: groupKey,
@@ -246,9 +256,13 @@ const getTaskListGroupedByDueDate = ({ taskListState, taskState, userState, user
             tasks: tasksWithUserDetails,
         };
     });
-    return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    if (taskListState.currentTab !== 'live' ||
+        isDefaultFilters(taskListState) === false) {
+        return taskGroupsWithTasksList.filter((group) => group.tasks.length > 0);
+    }
+    return taskGroupsWithTasksList;
 };
-const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, userGroupsState, }) => {
+const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRoleState, addressState, taskGroupState, taskGroupViewState, tagState, }) => {
     const { groupByKey } = taskListState.uiState;
     if (groupByKey === 'groupName') {
         return getTaskListGroupedByGroupName({
@@ -260,7 +274,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             taskGroupState,
             taskGroupViewState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'assignee') {
@@ -271,7 +284,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'priority') {
@@ -282,7 +294,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'status') {
@@ -293,7 +304,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     if (groupByKey === 'tag') {
@@ -304,7 +314,6 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
             userRoleState,
             addressState,
             tagState,
-            userGroupsState,
         });
     }
     return getTaskListGroupedByDueDate({
@@ -314,7 +323,6 @@ 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) => {
@@ -328,7 +336,6 @@ 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-betaRR19",
+  "version": "5.0.2-betaRR4",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",