@zeniai/client-epic-state 5.1.41-beta1ND → 5.1.41-betaDI3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/entity/snackbar/snackbarTypes.d.ts +1 -1
- package/lib/entity/snackbar/snackbarTypes.js +1 -1
- package/lib/entity/task/taskPayload.d.ts +2 -1
- package/lib/entity/task/taskPayload.js +8 -1
- package/lib/entity/task/taskReducer.d.ts +8 -1
- package/lib/entity/task/taskReducer.js +29 -4
- package/lib/entity/task/taskState.d.ts +1 -0
- package/lib/entity/tenant/epic/saveExternalConnectionEpic.js +7 -15
- package/lib/epic.d.ts +5 -3
- package/lib/epic.js +5 -3
- package/lib/esm/entity/snackbar/snackbarTypes.js +1 -1
- package/lib/esm/entity/task/taskPayload.js +8 -1
- package/lib/esm/entity/task/taskReducer.js +28 -3
- package/lib/esm/entity/tenant/epic/saveExternalConnectionEpic.js +7 -15
- package/lib/esm/epic.js +5 -3
- package/lib/esm/index.js +3 -3
- package/lib/esm/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js +3 -0
- package/lib/esm/view/companyTaskManagerView/epics/fetchTaskManagerMetricsEpic.js +7 -1
- package/lib/esm/view/taskManager/taskDetailView/epics/createSubTaskEpic.js +96 -0
- package/lib/esm/view/taskManager/taskDetailView/epics/fetchSubTasksEpic.js +53 -0
- package/lib/esm/view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic.js +1 -0
- package/lib/esm/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.js +70 -9
- package/lib/esm/view/taskManager/taskDetailView/taskDetailReducer.js +56 -2
- package/lib/esm/view/taskManager/taskDetailView/taskDetailSelector.js +32 -9
- package/lib/esm/view/taskManager/taskListView/epics/fetchTaskListEpic.js +3 -1
- package/lib/esm/view/taskManager/taskListView/taskList.js +1 -0
- package/lib/esm/view/taskManager/taskListView/taskListReducer.js +240 -12
- package/lib/esm/view/taskManager/taskListView/taskListSelector.js +1 -0
- package/lib/esm/view/taskManager/taskListView/taskListViewHelpers.js +58 -0
- package/lib/index.d.ts +6 -6
- package/lib/index.js +13 -9
- package/lib/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js +3 -0
- package/lib/view/companyTaskManagerView/epics/fetchTaskManagerMetricsEpic.js +7 -1
- package/lib/view/companyView/types/cockpitTypes.d.ts +3 -0
- package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts +1 -1
- package/lib/view/taskManager/taskDetailView/epics/createSubTaskEpic.d.ts +9 -0
- package/lib/view/taskManager/taskDetailView/epics/createSubTaskEpic.js +100 -0
- package/lib/view/taskManager/taskDetailView/epics/fetchSubTasksEpic.d.ts +8 -0
- package/lib/view/taskManager/taskDetailView/epics/fetchSubTasksEpic.js +57 -0
- package/lib/view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic.js +1 -0
- package/lib/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.d.ts +2 -2
- package/lib/view/taskManager/taskDetailView/epics/saveTaskDetailEpic.js +69 -8
- package/lib/view/taskManager/taskDetailView/taskDetail.d.ts +15 -0
- package/lib/view/taskManager/taskDetailView/taskDetailReducer.d.ts +14 -2
- package/lib/view/taskManager/taskDetailView/taskDetailReducer.js +57 -3
- package/lib/view/taskManager/taskDetailView/taskDetailSelector.d.ts +2 -1
- package/lib/view/taskManager/taskDetailView/taskDetailSelector.js +30 -7
- package/lib/view/taskManager/taskListView/epics/fetchTaskListEpic.js +3 -1
- package/lib/view/taskManager/taskListView/taskList.d.ts +1 -1
- package/lib/view/taskManager/taskListView/taskList.js +1 -0
- package/lib/view/taskManager/taskListView/taskListPayload.d.ts +4 -0
- package/lib/view/taskManager/taskListView/taskListReducer.d.ts +6 -2
- package/lib/view/taskManager/taskListView/taskListReducer.js +241 -13
- package/lib/view/taskManager/taskListView/taskListSelector.js +1 -0
- package/lib/view/taskManager/taskListView/taskListViewHelpers.d.ts +11 -0
- package/lib/view/taskManager/taskListView/taskListViewHelpers.js +60 -1
- package/package.json +1 -1
|
@@ -3,9 +3,23 @@ import { DayOfWeek, PriorityCodeType, TaskStatusCodeType, TaskType } from '../..
|
|
|
3
3
|
import { ZeniDate } from '../../../zeniDayJS';
|
|
4
4
|
import { RecurringDatePickerOptions, RecurringFrequencyType } from '../../common/recurringViewHelper';
|
|
5
5
|
import { CommonHistoryView } from '../../spendManagement/commonHistoryView/commonHistory';
|
|
6
|
+
export interface CreateSubTaskPayload {
|
|
7
|
+
assignee: ID[];
|
|
8
|
+
description: string;
|
|
9
|
+
groupAssignees: ID[];
|
|
10
|
+
name: string;
|
|
11
|
+
parentTaskId: ID;
|
|
12
|
+
priority: PriorityCodeType;
|
|
13
|
+
status: TaskStatusCodeType;
|
|
14
|
+
tagIds: ID[];
|
|
15
|
+
timeSpent: string;
|
|
16
|
+
dueDate?: ZeniDate;
|
|
17
|
+
}
|
|
6
18
|
export interface TaskDetailViewState {
|
|
7
19
|
editTaskStateById: Record<ID, EditTaskDetail>;
|
|
8
20
|
newTaskState: EditTaskDetail;
|
|
21
|
+
subTaskCreateStatus: FetchStateAndError;
|
|
22
|
+
subTaskListFetchStatusByParentId: Record<ID, FetchStateAndError>;
|
|
9
23
|
taskHistoryById: Record<ID, CommonHistoryView>;
|
|
10
24
|
}
|
|
11
25
|
export interface EditTaskDetail {
|
|
@@ -40,6 +54,7 @@ export interface EditTaskLocalData {
|
|
|
40
54
|
recurringStartDate?: ZeniDate;
|
|
41
55
|
savedRecurringEndDate?: ZeniDate;
|
|
42
56
|
savedRecurringTasksCount?: number;
|
|
57
|
+
taskGroupId?: ID | null;
|
|
43
58
|
}
|
|
44
59
|
export declare const initialTaskDetailLocalData: EditTaskLocalData;
|
|
45
60
|
export declare const initialTaskDetail: EditTaskDetail;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FetchState, ID } from '../../../commonStateTypes/common';
|
|
2
2
|
import { ZeniAPIStatus } from '../../../responsePayload';
|
|
3
3
|
import { HistoricEventPayload } from '../../spendManagement/commonHistoryView/commonHistoryPayload';
|
|
4
|
-
import { EditTaskLocalData, TaskDetailViewState } from './taskDetail';
|
|
4
|
+
import { CreateSubTaskPayload, EditTaskLocalData, TaskDetailViewState } from './taskDetail';
|
|
5
5
|
export declare const initialState: TaskDetailViewState;
|
|
6
6
|
export declare const fetchTaskDetailPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, taskId?: string | undefined], {
|
|
7
7
|
cacheOverride: boolean;
|
|
@@ -34,7 +34,19 @@ export declare const fetchTaskDetailPage: import("@reduxjs/toolkit").ActionCreat
|
|
|
34
34
|
error?: ZeniAPIStatus;
|
|
35
35
|
newTaskId?: ID;
|
|
36
36
|
taskId?: ID;
|
|
37
|
-
}, "taskDetailView/saveTaskSuccessOrFailure">,
|
|
37
|
+
}, "taskDetailView/saveTaskSuccessOrFailure">, createSubTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: CreateSubTaskPayload], CreateSubTaskPayload, "taskDetailView/createSubTask", never, never>, createSubTaskSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
38
|
+
fetchState: FetchState;
|
|
39
|
+
error?: ZeniAPIStatus;
|
|
40
|
+
newTaskId?: ID;
|
|
41
|
+
}, "taskDetailView/createSubTaskSuccessOrFailure">, resetSubTaskCreateStatus: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskDetailView/resetSubTaskCreateStatus">, fetchSubTasks: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[parentTaskId: string], {
|
|
42
|
+
parentTaskId: string;
|
|
43
|
+
}, "taskDetailView/fetchSubTasks", never, never>, updateSubTasks: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
44
|
+
parentTaskId: ID;
|
|
45
|
+
}, "taskDetailView/updateSubTasks">, updateSubTasksFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
46
|
+
fetchState: FetchState;
|
|
47
|
+
parentTaskId: ID;
|
|
48
|
+
error?: ZeniAPIStatus;
|
|
49
|
+
}, "taskDetailView/updateSubTasksFetchStatus">, deleteTask: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[taskId?: string | undefined], {
|
|
38
50
|
taskId: string | undefined;
|
|
39
51
|
}, "taskDetailView/deleteTask", never, never>, removeTaskDetail: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "taskDetailView/removeTaskDetail">, deleteTaskSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
40
52
|
fetchState: FetchState;
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
var _a;
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.updateDeletedTagToLocalStore = exports.updateCreatedTagToLocalStore = exports.clearTaskDetail = exports.updateTaskHistoryFetchStatus = exports.updateTaskHistory = exports.fetchTaskHistory = exports.unsnoozeTask = exports.snoozeTaskSuccessOrFailure = exports.snoozeTask = exports.deleteTaskSuccessOrFailure = exports.removeTaskDetail = exports.deleteTask = exports.saveTaskSuccessOrFailure = exports.archiveTaskSuccessOrFailure = exports.archiveTask = exports.saveTaskDetail = exports.discardTaskUpdatesInLocalStore = exports.saveTaskUpdatesToLocalStore = exports.updateEditTaskFetchStatus = exports.initializeTaskToLocalStore = exports.fetchTaskDetail = exports.fetchTaskDetailPage = exports.initialState = void 0;
|
|
7
|
+
exports.updateDeletedTagToLocalStore = exports.updateCreatedTagToLocalStore = exports.clearTaskDetail = exports.updateTaskHistoryFetchStatus = exports.updateTaskHistory = exports.fetchTaskHistory = exports.unsnoozeTask = exports.snoozeTaskSuccessOrFailure = exports.snoozeTask = exports.deleteTaskSuccessOrFailure = exports.removeTaskDetail = exports.deleteTask = exports.updateSubTasksFetchStatus = exports.updateSubTasks = exports.fetchSubTasks = exports.resetSubTaskCreateStatus = exports.createSubTaskSuccessOrFailure = exports.createSubTask = exports.saveTaskSuccessOrFailure = exports.archiveTaskSuccessOrFailure = exports.archiveTask = exports.saveTaskDetail = exports.discardTaskUpdatesInLocalStore = exports.saveTaskUpdatesToLocalStore = exports.updateEditTaskFetchStatus = exports.initializeTaskToLocalStore = exports.fetchTaskDetail = exports.fetchTaskDetailPage = exports.initialState = void 0;
|
|
8
8
|
const toolkit_1 = require("@reduxjs/toolkit");
|
|
9
9
|
const get_1 = __importDefault(require("lodash/get"));
|
|
10
10
|
const commonHistory_1 = require("../../spendManagement/commonHistoryView/commonHistory");
|
|
@@ -13,6 +13,11 @@ const taskDetail_1 = require("./taskDetail");
|
|
|
13
13
|
exports.initialState = {
|
|
14
14
|
newTaskState: taskDetail_1.initialTaskDetail,
|
|
15
15
|
editTaskStateById: {},
|
|
16
|
+
subTaskCreateStatus: {
|
|
17
|
+
fetchState: 'Not-Started',
|
|
18
|
+
error: undefined,
|
|
19
|
+
},
|
|
20
|
+
subTaskListFetchStatusByParentId: {},
|
|
16
21
|
taskHistoryById: {},
|
|
17
22
|
};
|
|
18
23
|
const taskDetailView = (0, toolkit_1.createSlice)({
|
|
@@ -57,7 +62,7 @@ const taskDetailView = (0, toolkit_1.createSlice)({
|
|
|
57
62
|
updateEditTaskFetchStatus(draft, action) {
|
|
58
63
|
const { taskId, fetchState, error } = action.payload;
|
|
59
64
|
draft.editTaskStateById[taskId] = {
|
|
60
|
-
...draft.editTaskStateById[taskId],
|
|
65
|
+
...(draft.editTaskStateById[taskId] ?? taskDetail_1.initialTaskDetail),
|
|
61
66
|
fetchTaskStatus: {
|
|
62
67
|
fetchState,
|
|
63
68
|
error: fetchState === 'Error' ? error : undefined,
|
|
@@ -325,10 +330,59 @@ const taskDetailView = (0, toolkit_1.createSlice)({
|
|
|
325
330
|
error,
|
|
326
331
|
};
|
|
327
332
|
},
|
|
333
|
+
createSubTask: {
|
|
334
|
+
reducer(draft) {
|
|
335
|
+
draft.subTaskCreateStatus = {
|
|
336
|
+
fetchState: 'In-Progress',
|
|
337
|
+
error: undefined,
|
|
338
|
+
};
|
|
339
|
+
},
|
|
340
|
+
prepare(payload) {
|
|
341
|
+
return { payload };
|
|
342
|
+
},
|
|
343
|
+
},
|
|
344
|
+
createSubTaskSuccessOrFailure(draft, action) {
|
|
345
|
+
const { fetchState, error } = action.payload;
|
|
346
|
+
draft.subTaskCreateStatus = {
|
|
347
|
+
fetchState,
|
|
348
|
+
error,
|
|
349
|
+
};
|
|
350
|
+
},
|
|
351
|
+
resetSubTaskCreateStatus(draft) {
|
|
352
|
+
draft.subTaskCreateStatus = {
|
|
353
|
+
...exports.initialState.subTaskCreateStatus,
|
|
354
|
+
};
|
|
355
|
+
},
|
|
356
|
+
fetchSubTasks: {
|
|
357
|
+
reducer(draft, action) {
|
|
358
|
+
const { parentTaskId } = action.payload;
|
|
359
|
+
draft.subTaskListFetchStatusByParentId[parentTaskId] = {
|
|
360
|
+
fetchState: 'In-Progress',
|
|
361
|
+
error: undefined,
|
|
362
|
+
};
|
|
363
|
+
},
|
|
364
|
+
prepare(parentTaskId) {
|
|
365
|
+
return { payload: { parentTaskId } };
|
|
366
|
+
},
|
|
367
|
+
},
|
|
368
|
+
updateSubTasks(draft, action) {
|
|
369
|
+
const { parentTaskId } = action.payload;
|
|
370
|
+
draft.subTaskListFetchStatusByParentId[parentTaskId] = {
|
|
371
|
+
fetchState: 'Completed',
|
|
372
|
+
error: undefined,
|
|
373
|
+
};
|
|
374
|
+
},
|
|
375
|
+
updateSubTasksFetchStatus(draft, action) {
|
|
376
|
+
const { parentTaskId, fetchState, error } = action.payload;
|
|
377
|
+
draft.subTaskListFetchStatusByParentId[parentTaskId] = {
|
|
378
|
+
fetchState,
|
|
379
|
+
error,
|
|
380
|
+
};
|
|
381
|
+
},
|
|
328
382
|
clearTaskDetail(draft) {
|
|
329
383
|
Object.assign(draft, exports.initialState);
|
|
330
384
|
},
|
|
331
385
|
},
|
|
332
386
|
});
|
|
333
|
-
_a = taskDetailView.actions, exports.fetchTaskDetailPage = _a.fetchTaskDetailPage, exports.fetchTaskDetail = _a.fetchTaskDetail, exports.initializeTaskToLocalStore = _a.initializeTaskToLocalStore, exports.updateEditTaskFetchStatus = _a.updateEditTaskFetchStatus, exports.saveTaskUpdatesToLocalStore = _a.saveTaskUpdatesToLocalStore, exports.discardTaskUpdatesInLocalStore = _a.discardTaskUpdatesInLocalStore, exports.saveTaskDetail = _a.saveTaskDetail, exports.archiveTask = _a.archiveTask, exports.archiveTaskSuccessOrFailure = _a.archiveTaskSuccessOrFailure, exports.saveTaskSuccessOrFailure = _a.saveTaskSuccessOrFailure, exports.deleteTask = _a.deleteTask, exports.removeTaskDetail = _a.removeTaskDetail, exports.deleteTaskSuccessOrFailure = _a.deleteTaskSuccessOrFailure, exports.snoozeTask = _a.snoozeTask, exports.snoozeTaskSuccessOrFailure = _a.snoozeTaskSuccessOrFailure, exports.unsnoozeTask = _a.unsnoozeTask, exports.fetchTaskHistory = _a.fetchTaskHistory, exports.updateTaskHistory = _a.updateTaskHistory, exports.updateTaskHistoryFetchStatus = _a.updateTaskHistoryFetchStatus, exports.clearTaskDetail = _a.clearTaskDetail, exports.updateCreatedTagToLocalStore = _a.updateCreatedTagToLocalStore, exports.updateDeletedTagToLocalStore = _a.updateDeletedTagToLocalStore;
|
|
387
|
+
_a = taskDetailView.actions, exports.fetchTaskDetailPage = _a.fetchTaskDetailPage, exports.fetchTaskDetail = _a.fetchTaskDetail, exports.initializeTaskToLocalStore = _a.initializeTaskToLocalStore, exports.updateEditTaskFetchStatus = _a.updateEditTaskFetchStatus, exports.saveTaskUpdatesToLocalStore = _a.saveTaskUpdatesToLocalStore, exports.discardTaskUpdatesInLocalStore = _a.discardTaskUpdatesInLocalStore, exports.saveTaskDetail = _a.saveTaskDetail, exports.archiveTask = _a.archiveTask, exports.archiveTaskSuccessOrFailure = _a.archiveTaskSuccessOrFailure, exports.saveTaskSuccessOrFailure = _a.saveTaskSuccessOrFailure, exports.createSubTask = _a.createSubTask, exports.createSubTaskSuccessOrFailure = _a.createSubTaskSuccessOrFailure, exports.resetSubTaskCreateStatus = _a.resetSubTaskCreateStatus, exports.fetchSubTasks = _a.fetchSubTasks, exports.updateSubTasks = _a.updateSubTasks, exports.updateSubTasksFetchStatus = _a.updateSubTasksFetchStatus, exports.deleteTask = _a.deleteTask, exports.removeTaskDetail = _a.removeTaskDetail, exports.deleteTaskSuccessOrFailure = _a.deleteTaskSuccessOrFailure, exports.snoozeTask = _a.snoozeTask, exports.snoozeTaskSuccessOrFailure = _a.snoozeTaskSuccessOrFailure, exports.unsnoozeTask = _a.unsnoozeTask, exports.fetchTaskHistory = _a.fetchTaskHistory, exports.updateTaskHistory = _a.updateTaskHistory, exports.updateTaskHistoryFetchStatus = _a.updateTaskHistoryFetchStatus, exports.clearTaskDetail = _a.clearTaskDetail, exports.updateCreatedTagToLocalStore = _a.updateCreatedTagToLocalStore, exports.updateDeletedTagToLocalStore = _a.updateDeletedTagToLocalStore;
|
|
334
388
|
exports.default = taskDetailView.reducer;
|
|
@@ -2,7 +2,7 @@ import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
|
|
|
2
2
|
import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
|
|
3
3
|
import { Class } from '../../../entity/class/classState';
|
|
4
4
|
import { File } from '../../../entity/file/fileState';
|
|
5
|
-
import { TaskPriority, TaskStatus } from '../../../entity/task/taskState';
|
|
5
|
+
import { Task, TaskPriority, TaskStatus } from '../../../entity/task/taskState';
|
|
6
6
|
import { RootState } from '../../../reducer';
|
|
7
7
|
import { ZeniDate } from '../../../zeniDayJS';
|
|
8
8
|
import { UserAndRole } from '../../companyView/types/userAndRole';
|
|
@@ -14,6 +14,7 @@ export interface TaskDetailSelectorView extends SelectorView {
|
|
|
14
14
|
deleteFileStatusById: Record<ID, FetchStateAndError | undefined>;
|
|
15
15
|
files: File[];
|
|
16
16
|
showTaskDetailFormFooter: boolean;
|
|
17
|
+
subtasks: Task[];
|
|
17
18
|
taskDetailView: EditTaskDetail;
|
|
18
19
|
taskHistory: HistoricEvent[];
|
|
19
20
|
updateFileStatusById: Record<ID, FetchStateAndError | undefined>;
|
|
@@ -33,8 +33,13 @@ const getTaskDetail = (state, taskId) => {
|
|
|
33
33
|
let recurringSourceTaskId = undefined;
|
|
34
34
|
let snoozedUntil = undefined;
|
|
35
35
|
let taskGroupId = undefined;
|
|
36
|
+
let subtasks = [];
|
|
36
37
|
if (taskId != null && sourceTaskDetail != null) {
|
|
37
38
|
const taskEntity = (0, taskSelector_1.getTaskById)(taskState, taskId);
|
|
39
|
+
subtasks =
|
|
40
|
+
taskEntity != null
|
|
41
|
+
? (0, taskSelector_1.getTasksByIds)(taskState, taskEntity.subTasksIds)
|
|
42
|
+
: [];
|
|
38
43
|
const fileIdsInEntity = taskEntity?.fileIds ?? [];
|
|
39
44
|
if (taskEntity != null) {
|
|
40
45
|
createdByUser = (0, userAndRole_1.getUserAndUserRole)(userState, userRoleState, addressState, taskEntity.createdBy);
|
|
@@ -44,26 +49,37 @@ const getTaskDetail = (state, taskId) => {
|
|
|
44
49
|
snoozedUntil = taskEntity.snoozedUntil;
|
|
45
50
|
taskGroupId = taskEntity.taskGroupIds[0];
|
|
46
51
|
}
|
|
52
|
+
// Treat "no entry" as Completed so it doesn't block the combined
|
|
53
|
+
// fetch state. The Not-Started default would pin the detail page
|
|
54
|
+
// below Completed forever before the first fetchSubTasks dispatches.
|
|
55
|
+
const completedSubTaskStatus = {
|
|
56
|
+
fetchState: 'Completed',
|
|
57
|
+
error: undefined,
|
|
58
|
+
};
|
|
59
|
+
const subTaskStatus = taskDetailState.subTaskListFetchStatusByParentId[taskId] ??
|
|
60
|
+
completedSubTaskStatus;
|
|
47
61
|
if (fileIdsInEntity.length > 0) {
|
|
48
|
-
fetchStatus = (0, reduceFetchState_1.
|
|
62
|
+
fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
|
|
49
63
|
fileViewState.fetchFilesStatus,
|
|
50
64
|
sourceTaskDetail.fetchTaskStatus,
|
|
51
65
|
userList,
|
|
52
66
|
classListState,
|
|
67
|
+
subTaskStatus,
|
|
53
68
|
]);
|
|
54
69
|
}
|
|
55
70
|
else {
|
|
56
|
-
fetchStatus = (0, reduceFetchState_1.
|
|
71
|
+
fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
|
|
57
72
|
sourceTaskDetail.fetchTaskStatus,
|
|
58
73
|
userList,
|
|
59
74
|
classListState,
|
|
75
|
+
subTaskStatus,
|
|
60
76
|
]);
|
|
61
77
|
}
|
|
62
78
|
showTaskDetailFormFooter = showFormFooter(sourceTaskDetail.taskDetailLocalData, taskEntity);
|
|
63
79
|
taskHistory = taskDetailState.taskHistoryById[taskId]?.historicEvents ?? [];
|
|
64
80
|
}
|
|
65
81
|
else if (taskId == null) {
|
|
66
|
-
fetchStatus = (0, reduceFetchState_1.
|
|
82
|
+
fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([userList, classListState]);
|
|
67
83
|
}
|
|
68
84
|
const { classIds } = classListState;
|
|
69
85
|
const allAccountingClasses = (0, classSelector_1.getClassesByIds)(classState, {
|
|
@@ -96,6 +112,7 @@ const getTaskDetail = (state, taskId) => {
|
|
|
96
112
|
showTaskDetailFormFooter,
|
|
97
113
|
snoozedUntil,
|
|
98
114
|
taskGroupId,
|
|
115
|
+
subtasks,
|
|
99
116
|
};
|
|
100
117
|
};
|
|
101
118
|
exports.getTaskDetail = getTaskDetail;
|
|
@@ -144,13 +161,16 @@ exports.allTaskPriority = [
|
|
|
144
161
|
},
|
|
145
162
|
];
|
|
146
163
|
const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
|
|
147
|
-
if (
|
|
164
|
+
if (taskDetailInStore == null) {
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
if (taskDetailLocalData.name !== taskDetailInStore.name ||
|
|
148
168
|
taskDetailLocalData.description !== taskDetailInStore.description ||
|
|
149
169
|
taskDetailLocalData.priority !== taskDetailInStore.priority.code ||
|
|
150
170
|
taskDetailLocalData.status !== taskDetailInStore.status.code ||
|
|
151
171
|
!(0, isEqual_1.default)(taskDetailInStore.tagIds, taskDetailLocalData.tagIds) ||
|
|
152
|
-
!(0, isEqual_1.default)(taskDetailLocalData.assignee, taskDetailInStore
|
|
153
|
-
!(0, isEqual_1.default)(taskDetailLocalData.groupAssignees, taskDetailInStore
|
|
172
|
+
!(0, isEqual_1.default)(taskDetailLocalData.assignee, taskDetailInStore.assignees ?? []) ||
|
|
173
|
+
!(0, isEqual_1.default)(taskDetailLocalData.groupAssignees, taskDetailInStore.groupAssignees ?? []) ||
|
|
154
174
|
!(0, isEqual_1.default)(taskDetailLocalData.fileIds, taskDetailInStore.fileIds ?? []) ||
|
|
155
175
|
!(0, isEqual_1.default)(taskDetailLocalData.dueDate, taskDetailInStore.dueDate) ||
|
|
156
176
|
!(0, isEqual_1.default)(taskDetailLocalData.type, taskDetailInStore.type) ||
|
|
@@ -158,7 +178,10 @@ const showFormFooter = (taskDetailLocalData, taskDetailInStore) => {
|
|
|
158
178
|
!(0, isEqual_1.default)(taskDetailLocalData.recurringFrequency, taskDetailInStore.recurringFrequency) ||
|
|
159
179
|
!(0, isEqual_1.default)(taskDetailLocalData.recurringDaysOfWeek, taskDetailInStore.recurringDaysOfWeek) ||
|
|
160
180
|
!(0, isEqual_1.default)(taskDetailLocalData.recurringStartDate, taskDetailInStore.recurringStartDate) ||
|
|
161
|
-
!(0, isEqual_1.default)(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent)
|
|
181
|
+
!(0, isEqual_1.default)(taskDetailLocalData.timeSpent, taskDetailInStore.timeSpent) ||
|
|
182
|
+
!(0, isEqual_1.default)(taskDetailLocalData.taskGroupId, taskDetailInStore.taskGroupIds.length > 0
|
|
183
|
+
? taskDetailInStore.taskGroupIds[0]
|
|
184
|
+
: undefined)) {
|
|
162
185
|
return true;
|
|
163
186
|
}
|
|
164
187
|
return false;
|
|
@@ -12,15 +12,17 @@ const fetchTaskListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, oper
|
|
|
12
12
|
.getJSON(`${zeniAPI.apiEndPoints.taskMicroServiceBaseUrl}/1.0/task-manager/tasks?query=${encodeURIComponent(`{"task_type": "all"}`)}`)
|
|
13
13
|
.pipe((0, operators_1.mergeMap)((response) => {
|
|
14
14
|
if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
|
|
15
|
-
const { tasks, deleted, archived, snoozed } = response.data;
|
|
15
|
+
const { tasks, deleted, archived, snoozed, completed } = response.data;
|
|
16
16
|
const allTasks = [
|
|
17
17
|
...tasks,
|
|
18
|
+
...(completed ?? []),
|
|
18
19
|
...(deleted ?? []),
|
|
19
20
|
...(archived ?? []),
|
|
20
21
|
...(snoozed ?? []),
|
|
21
22
|
];
|
|
22
23
|
return (0, rxjs_1.of)((0, taskReducer_1.updateTasks)(allTasks), (0, taskListReducer_1.updateTaskList)({
|
|
23
24
|
data: tasks,
|
|
25
|
+
completed: completed ?? [],
|
|
24
26
|
deleted: deleted ?? [],
|
|
25
27
|
archived: archived ?? [],
|
|
26
28
|
snoozed: snoozed ?? [],
|
|
@@ -3,7 +3,7 @@ import { PriorityCodeType, TaskStatusCodeType } from '../../../entity/task/taskS
|
|
|
3
3
|
import { ZeniDate } from '../../../zeniDayJS';
|
|
4
4
|
import { SpendManagementUIState } from '../../spendManagement/billPay/billList/billListState';
|
|
5
5
|
import { CategoryCombinationOperator, FilterCategoryType } from '../../spendManagement/spendManagementFilterHelpers';
|
|
6
|
-
export declare const ALL_TASK_LIST_TABS: readonly ["live", "archived", "deleted", "snoozed"];
|
|
6
|
+
export declare const ALL_TASK_LIST_TABS: readonly ["live", "completed", "archived", "deleted", "snoozed"];
|
|
7
7
|
export type TaskListTab = (typeof ALL_TASK_LIST_TABS)[number];
|
|
8
8
|
export interface TaskListTabData {
|
|
9
9
|
taskIds: ID[];
|
|
@@ -3,6 +3,10 @@ import { ZeniAPIResponse } from '../../../responsePayload';
|
|
|
3
3
|
interface FetchTaskListPayload {
|
|
4
4
|
tasks: TaskPayload[];
|
|
5
5
|
archived?: TaskPayload[];
|
|
6
|
+
/** Tasks whose status is "done" or "resolved". Returned as a separate
|
|
7
|
+
* bucket so the "Completed" tab can show them without duplicating
|
|
8
|
+
* them under Active. */
|
|
9
|
+
completed?: TaskPayload[];
|
|
6
10
|
deleted?: TaskPayload[];
|
|
7
11
|
snoozed?: TaskPayload[];
|
|
8
12
|
}
|
|
@@ -12,9 +12,10 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
|
|
|
12
12
|
}, "taskList/fetchTaskListPage", never, never>, fetchTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/fetchTaskList">, updateTaskList: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
13
13
|
data: TaskPayload[];
|
|
14
14
|
archived?: TaskPayload[];
|
|
15
|
+
completed?: TaskPayload[];
|
|
15
16
|
deleted?: TaskPayload[];
|
|
16
17
|
snoozed?: TaskPayload[];
|
|
17
|
-
}, "taskList/updateTaskList">, updateTaskListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"deleted" | "archived" | "live" | "snoozed", "taskList/updateTaskListTab">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
18
|
+
}, "taskList/updateTaskList">, updateTaskListTab: import("@reduxjs/toolkit").ActionCreatorWithPayload<"completed" | "deleted" | "archived" | "live" | "snoozed", "taskList/updateTaskListTab">, updateTaskListFetchStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
18
19
|
fetchState: FetchState;
|
|
19
20
|
error?: ZeniAPIStatus;
|
|
20
21
|
}, "taskList/updateTaskListFetchStatus">, updateTaskListSearchText: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
@@ -58,6 +59,9 @@ export declare const fetchTaskListPage: import("@reduxjs/toolkit").ActionCreator
|
|
|
58
59
|
error: ZeniAPIStatus;
|
|
59
60
|
}, "taskList/updateTasksListOnUpdateTaskFailure">, updateTaskListOnCreateTaskFromTemplateSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
60
61
|
tasks: TaskPayload[];
|
|
61
|
-
}, "taskList/updateTaskListOnCreateTaskFromTemplateSuccess">, removeTaskFromList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "taskList/removeTaskFromList">,
|
|
62
|
+
}, "taskList/updateTaskListOnCreateTaskFromTemplateSuccess">, removeTaskFromList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "taskList/removeTaskFromList">, removeTaskFromGroupBucket: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
|
|
63
|
+
taskGroupId: ID;
|
|
64
|
+
taskId: ID;
|
|
65
|
+
}, "taskList/removeTaskFromGroupBucket">, clearTaskList: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"taskList/clearTaskList">;
|
|
62
66
|
declare const _default: import("redux").Reducer<TaskListState>;
|
|
63
67
|
export default _default;
|