@zeniai/client-epic-state 5.0.85-betaJK4 → 5.0.85-betaJK6

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.
Files changed (6) hide show
  1. package/lib/esm/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js +1 -0
  2. package/lib/esm/view/taskManager/taskDetailView/epics/fetchTaskDetailEpic.js +0 -13
  3. package/lib/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js +1 -0
  4. package/lib/view/taskManager/taskDetailView/epics/fetchTaskDetailEpic.d.ts +1 -2
  5. package/lib/view/taskManager/taskDetailView/epics/fetchTaskDetailEpic.js +0 -13
  6. package/package.json +1 -1
package/lib/esm/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js CHANGED
@@ -14,6 +14,7 @@ export const fetchCompanyTaskManagerViewEpic = (actions$, _state$, zeniAPI) => a
14
14
  global_search: searchString ?? '',
15
15
  sort_by: toSortKeyPayload(sortKey),
16
16
  sort_order: getSortOrder(sortOrder),
17
+ filter_join: filters?.categoryCombinationOperator === 'AND' ? 'and' : 'or',
17
18
  ...(filters?.categories != null && filters.categories.length > 0
18
19
  ? { filter_by: toFilterByPayload(filters) }
19
20
  : {}),
package/lib/esm/view/taskManager/taskDetailView/epics/fetchTaskDetailEpic.js CHANGED
@@ -4,16 +4,13 @@ import { catchError, filter, mergeMap } from 'rxjs/operators';
4
4
  import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
5
5
  import { updateTags } from '../../../../entity/tag/tagReducer';
6
6
  import { updateTasks } from '../../../../entity/task/taskReducer';
7
- import { getTaskById } from '../../../../entity/task/taskSelector';
8
7
  import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
9
8
  import { fetchFileList } from '../../../fileView/fileViewReducer';
10
- import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
11
9
  import { fetchTaskDetail, initializeTaskToLocalStore, removeTaskDetail, updateEditTaskFetchStatus, } from '../taskDetailReducer';
12
10
  export const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchTaskDetail.match), mergeMap((action) => {
13
11
  const { taskId, cacheOverride } = action.payload;
14
12
  const taskActions = [];
15
13
  const state = state$.value;
16
- const isTaskListFetched = state.taskListState.fetchState === 'Completed';
17
14
  const taskDetail = recordGet(state.taskDetailState.editTaskStateById, taskId, undefined);
18
15
  if (cacheOverride === true) {
19
16
  taskActions.push(removeTaskDetail(taskId));
@@ -35,16 +32,6 @@ export const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe(
35
32
  updateTags(response.data.tasks.map((task) => task.tags).flat()),
36
33
  initializeTaskToLocalStore(taskId),
37
34
  ];
38
- if (isTaskListFetched === true) {
39
- const taskGroupId = response.data.tasks[0].task_group_ids?.[0];
40
- if (taskGroupId != null) {
41
- fetchActions.push(updateTaskListOnNewTaskCreationSuccess({
42
- taskGroupId,
43
- task: response.data.tasks[0],
44
- currentTaskState: getTaskById(state.taskState, taskId),
45
- }));
46
- }
47
- }
48
35
  const fileIds = response.data.tasks[0].file_ids;
49
36
  if (fileIds.length > 0) {
50
37
  fetchActions.push(fetchFileList(fileIds));
package/lib/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js CHANGED
@@ -17,6 +17,7 @@ const fetchCompanyTaskManagerViewEpic = (actions$, _state$, zeniAPI) => actions$
17
17
  global_search: searchString ?? '',
18
18
  sort_by: toSortKeyPayload(sortKey),
19
19
  sort_order: (0, sortOrderPayload_1.getSortOrder)(sortOrder),
20
+ filter_join: filters?.categoryCombinationOperator === 'AND' ? 'and' : 'or',
20
21
  ...(filters?.categories != null && filters.categories.length > 0
21
22
  ? { filter_by: toFilterByPayload(filters) }
22
23
  : {}),
package/lib/view/taskManager/taskDetailView/epics/fetchTaskDetailEpic.d.ts CHANGED
@@ -6,7 +6,6 @@ import { updateTasks } from '../../../../entity/task/taskReducer';
6
6
  import { RootState } from '../../../../reducer';
7
7
  import { ZeniAPI } from '../../../../zeniAPI';
8
8
  import { fetchFileList } from '../../../fileView/fileViewReducer';
9
- import { updateTaskListOnNewTaskCreationSuccess } from '../../taskListView/taskListReducer';
10
9
  import { fetchTaskDetail, initializeTaskToLocalStore, removeTaskDetail, updateEditTaskFetchStatus } from '../taskDetailReducer';
11
- export type ActionType = ReturnType<typeof fetchTaskDetail> | ReturnType<typeof updateTags> | ReturnType<typeof updateEditTaskFetchStatus> | ReturnType<typeof removeTaskDetail> | ReturnType<typeof updateTasks> | ReturnType<typeof initializeTaskToLocalStore> | ReturnType<typeof fetchFileList> | ReturnType<typeof openSnackbar> | ReturnType<typeof updateTaskListOnNewTaskCreationSuccess>;
10
+ export type ActionType = ReturnType<typeof fetchTaskDetail> | ReturnType<typeof updateTags> | ReturnType<typeof updateEditTaskFetchStatus> | ReturnType<typeof removeTaskDetail> | ReturnType<typeof updateTasks> | ReturnType<typeof initializeTaskToLocalStore> | ReturnType<typeof fetchFileList> | ReturnType<typeof openSnackbar>;
12
11
  export declare const fetchTaskDetailEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
package/lib/view/taskManager/taskDetailView/epics/fetchTaskDetailEpic.js CHANGED
@@ -10,16 +10,13 @@ const operators_1 = require("rxjs/operators");
10
10
  const snackbarReducer_1 = require("../../../../entity/snackbar/snackbarReducer");
11
11
  const tagReducer_1 = require("../../../../entity/tag/tagReducer");
12
12
  const taskReducer_1 = require("../../../../entity/task/taskReducer");
13
- const taskSelector_1 = require("../../../../entity/task/taskSelector");
14
13
  const responsePayload_1 = require("../../../../responsePayload");
15
14
  const fileViewReducer_1 = require("../../../fileView/fileViewReducer");
16
- const taskListReducer_1 = require("../../taskListView/taskListReducer");
17
15
  const taskDetailReducer_1 = require("../taskDetailReducer");
18
16
  const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(taskDetailReducer_1.fetchTaskDetail.match), (0, operators_1.mergeMap)((action) => {
19
17
  const { taskId, cacheOverride } = action.payload;
20
18
  const taskActions = [];
21
19
  const state = state$.value;
22
- const isTaskListFetched = state.taskListState.fetchState === 'Completed';
23
20
  const taskDetail = (0, get_1.default)(state.taskDetailState.editTaskStateById, taskId, undefined);
24
21
  if (cacheOverride === true) {
25
22
  taskActions.push((0, taskDetailReducer_1.removeTaskDetail)(taskId));
@@ -41,16 +38,6 @@ const fetchTaskDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, ope
41
38
  (0, tagReducer_1.updateTags)(response.data.tasks.map((task) => task.tags).flat()),
42
39
  (0, taskDetailReducer_1.initializeTaskToLocalStore)(taskId),
43
40
  ];
44
- if (isTaskListFetched === true) {
45
- const taskGroupId = response.data.tasks[0].task_group_ids?.[0];
46
- if (taskGroupId != null) {
47
- fetchActions.push((0, taskListReducer_1.updateTaskListOnNewTaskCreationSuccess)({
48
- taskGroupId,
49
- task: response.data.tasks[0],
50
- currentTaskState: (0, taskSelector_1.getTaskById)(state.taskState, taskId),
51
- }));
52
- }
53
- }
54
41
  const fileIds = response.data.tasks[0].file_ids;
55
42
  if (fileIds.length > 0) {
56
43
  fetchActions.push((0, fileViewReducer_1.fetchFileList)(fileIds));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zeniai/client-epic-state",
3
- "version": "5.0.85-betaJK4",
3
+ "version": "5.0.85-betaJK6",
4
4
  "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
5
5
  "main": "lib/index.js",
6
6
  "module": "lib/esm/index.js",