@zeniai/client-epic-state 4.14.54 → 4.14.56

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

@@ -10,16 +10,14 @@ const taskGroupTemplateViewReducer_1 = require("../../taskGroupTemplateView/task
 const taskGroupViewReducer_1 = require("../../taskGroupView/taskGroupViewReducer");
 const taskListReducer_1 = require("../taskListReducer");
 const fetchTaskListPageEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(taskListReducer_1.fetchTaskListPage.match), (0, operators_1.mergeMap)((action) => {
-    const { cacheOverride } = action.payload;
+    const { cacheOverride, isTaskTemplatesEnabled } = action.payload;
     const taskListPageActions = [];
     const state = state$.value;
     if (cacheOverride === true) {
-        taskListPageActions.push((0, taskListReducer_1.fetchTaskList)());
-        taskListPageActions.push((0, classListReducer_1.fetchClassList)());
-        taskListPageActions.push((0, userListViewReducer_1.fetchUserListByType)('taskManagerCandidate', true));
-        taskListPageActions.push((0, tagViewReducer_1.fetchTagList)());
-        taskListPageActions.push((0, taskGroupViewReducer_1.fetchAllTaskGroups)());
-        taskListPageActions.push((0, taskGroupTemplateViewReducer_1.fetchTaskGroupTemplates)());
+        taskListPageActions.push((0, taskListReducer_1.fetchTaskList)(), (0, classListReducer_1.fetchClassList)(), (0, userListViewReducer_1.fetchUserListByType)('taskManagerCandidate', true), (0, tagViewReducer_1.fetchTagList)(), (0, taskGroupViewReducer_1.fetchAllTaskGroups)());
+        if (isTaskTemplatesEnabled === true) {
+            taskListPageActions.push((0, taskGroupTemplateViewReducer_1.fetchTaskGroupTemplates)());
+        }
     }
     else {
         if (state.taskListState.fetchState !== 'In-Progress' &&
@@ -43,7 +41,8 @@ const fetchTaskListPageEpic = (actions$, state$) => actions$.pipe((0, operators_
             state.taskGroupViewState.fetchState !== 'In-Progress') {
             taskListPageActions.push((0, taskGroupViewReducer_1.fetchAllTaskGroups)());
         }
-        if (state.taskGroupTemplateViewState.hasValidState() === false &&
+        if (isTaskTemplatesEnabled === true &&
+            state.taskGroupTemplateViewState.hasValidState() === false &&
             state.taskGroupTemplateViewState.fetchState !== 'In-Progress') {
             taskListPageActions.push((0, taskGroupTemplateViewReducer_1.fetchTaskGroupTemplates)());
         }

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

@@ -6,8 +6,9 @@ import { TaskGroup } from '../../../entity/taskGroup/taskGroupState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { TaskListFilters, TaskListLocalData, TaskListState, TaskListUIState } from './taskList';
 export declare const initialState: TaskListState;
-export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean], {
+export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, isTaskTemplatesEnabled: boolean], {
     cacheOverride: boolean;
+    isTaskTemplatesEnabled: boolean;
 }, "taskList/fetchTaskListPage", never, never>, fetchTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/fetchTaskList">, updateTaskList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     data: TaskPayload[];
     updateType: UpdateType;

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

@@ -77,8 +77,8 @@ const taskList = (0, toolkit_1.createSlice)({
             reducer() {
                 //do nothing
             },
-            prepare(cacheOverride) {
-                return { payload: { cacheOverride } };
+            prepare(cacheOverride, isTaskTemplatesEnabled) {
+                return { payload: { cacheOverride, isTaskTemplatesEnabled } };
             },
         },
         fetchTaskList(draft) {

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

@@ -58,4 +58,4 @@ export declare const getTaskListGroupedByPriority: ({ taskListState, taskState,
     isDefault: boolean;
     tasks: TaskWithUserDetails[];
 }[];
-export declare const getAllTasks: (state: RootState) => TaskListSelectorView;
+export declare const getAllTasks: (state: RootState, isTaskTemplatesEnabled: boolean) => TaskListSelectorView;

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

@@ -318,7 +318,7 @@ const getTaskGroupsWithTaskList = ({ taskListState, taskState, userState, userRo
         tagState,
     });
 };
-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, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState) => {
+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, isTaskTemplatesEnabled) => isTaskTemplatesEnabled, (taskListState, taskState, userState, userRoleState, userListViewState, addressState, taskGroupState, taskGroupViewState, tagViewState, tagState, taskGroupTemplateState, taskGroupTemplateViewState, isTaskTemplatesEnabled) => {
     const { localData } = taskListState;
     const taskGroupsWithTasksList = getTaskGroupsWithTaskList({
         taskListState,
@@ -330,12 +330,15 @@ exports.getAllTasks = (0, toolkit_1.createSelector)((state) => state.taskListSta
         taskGroupViewState,
         tagState,
     });
-    const { fetchState, error } = (0, reduceFetchState_1.reduceAnyFetchState)([
+    const fetchStateVariables = [
         taskListState,
         taskGroupViewState,
         tagViewState,
-        taskGroupTemplateViewState,
-    ]);
+    ];
+    if (isTaskTemplatesEnabled) {
+        fetchStateVariables.push(taskGroupTemplateViewState);
+    }
+    const { fetchState, error } = (0, reduceFetchState_1.reduceAnyFetchState)(fetchStateVariables);
     const taskGroupTemplates = (0, taskGroupTemplateSelector_1.getTaskGroupTemplateByIds)(taskGroupTemplateState, taskGroupTemplateViewState.taskGroupTemplateIds);
     return {
         uiState: taskListState.uiState,

package/package.json

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