@reltio/components 1.4.883 → 1.4.887

package/esm/components/workflow/components/TaskActions/TaskActions.js

@@ -4,8 +4,13 @@ import { useWorkflowActions } from '../../hooks/useWorkflowActions';
 import DropDownMenuButton from '../../../DropDownMenuButton/DropDownMenuButton';
 import SmallIconButton from '../../../SmallIconButton/SmallIconButton';
 var TaskActions = function (_a) {
-    var taskId = _a.taskId, possibleActions = _a.possibleActions, assignee = _a.assignee;
-    var _b = useWorkflowActions({ taskId: taskId, possibleActions: possibleActions, assignee: assignee }), actions = _b.actions, disabled = _b.actionRequestIsInProgress;
+    var taskId = _a.taskId, possibleActions = _a.possibleActions, assignee = _a.assignee, isTaskOpen = _a.isTaskOpen;
+    var _b = useWorkflowActions({
+        taskId: taskId,
+        possibleActions: possibleActions,
+        assignee: assignee,
+        isOpen: isTaskOpen
+    }), actions = _b.actions, disabled = _b.actionRequestIsInProgress;
     return actions.length > 0 ? (React.createElement(DropDownMenuButton, { buttonComponent: SmallIconButton, buttonProps: {
             icon: MoreVertIcon,
             size: 'L',

package/esm/components/workflow/components/WorkflowComments/WorkflowComments.d.ts

@@ -1,6 +1,7 @@
-export function WorkflowComments({ processInstanceComments, taskId }: {
+export function WorkflowComments({ processInstanceComments, taskId, isTaskOpen }: {
     processInstanceComments: any;
     taskId: any;
+    isTaskOpen: any;
 }): JSX.Element;
 export namespace WorkflowComments {
     namespace propTypes {

package/esm/components/workflow/components/WorkflowComments/WorkflowComments.js

@@ -12,11 +12,15 @@ import { useWorkflowComments } from '../../hooks/useWorkflowComments';
 import { SmallIconButton } from '../../../SmallIconButton';
 var getValue = function (e) { return e.target.value; };
 export var WorkflowComments = function (_a) {
-    var processInstanceComments = _a.processInstanceComments, taskId = _a.taskId;
+    var processInstanceComments = _a.processInstanceComments, taskId = _a.taskId, isTaskOpen = _a.isTaskOpen;
     var styles = useWorkflowStyles();
     var _b = useState(false), expanded = _b[0], setExpanded = _b[1];
     var _c = useState(''), comment = _c[0], setComment = _c[1];
-    var _d = useWorkflowComments({ processInstanceComments: processInstanceComments, taskId: taskId }), comments = _d.comments, writeComment = _d.writeComment, readOnly = _d.readOnly;
+    var _d = useWorkflowComments({
+        processInstanceComments: processInstanceComments,
+        taskId: taskId,
+        isOpen: isTaskOpen
+    }), comments = _d.comments, writeComment = _d.writeComment, readOnly = _d.readOnly;
     var sendComment = useCallback(function () {
         writeComment(comment);
         setComment('');

package/esm/components/workflow/helpers/index.d.ts

@@ -1,3 +1,5 @@
+import { WorkflowTaskData } from '@reltio/mdm-sdk';
 declare const getDCRUri: (objectUris?: string[]) => string;
 declare const getDCRId: (objectUris?: string[]) => string;
-export { getDCRUri, getDCRId };
+declare const isOpenTask: (isOpen: WorkflowTaskData['isOpen']) => boolean;
+export { getDCRUri, getDCRId, isOpenTask };

package/esm/components/workflow/helpers/index.js

@@ -7,4 +7,5 @@ var getDCRId = function (objectUris) {
     if (objectUris === void 0) { objectUris = []; }
     return pipe(getDCRUri, unless(isNil, pipe(split('/'), nth(1))))(objectUris);
 };
-export { getDCRUri, getDCRId };
+var isOpenTask = function (isOpen) { return isOpen === undefined || isOpen === true; };
+export { getDCRUri, getDCRId, isOpenTask };

package/esm/components/workflow/hooks/useWorkflowActions.d.ts

@@ -3,7 +3,7 @@ declare type TaskAction = {
     text: string;
     onClick: () => void;
 };
-export declare const useWorkflowActions: ({ possibleActions, assignee, taskId }: Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assignee'>) => {
+export declare const useWorkflowActions: ({ possibleActions, assignee, taskId, isOpen }: Pick<WorkflowTaskData, 'taskId' | 'possibleActions' | 'assignee' | 'isOpen'>) => {
     actions: TaskAction[];
     actionRequestIsInProgress: boolean;
 };

package/esm/components/workflow/hooks/useWorkflowActions.js

@@ -5,8 +5,9 @@ import mdmModule, { profile, ui } from '@reltio/mdm-module';
 import { ViewIdContext } from '../../../contexts/ViewIdContext';
 import { showWorkflowError } from '../helpers/errors';
 import { WorkflowTasksContext } from '../../../contexts/WorkflowTasksContext';
+import { isOpenTask } from '../helpers';
 export var useWorkflowActions = function (_a) {
-    var possibleActions = _a.possibleActions, assignee = _a.assignee, taskId = _a.taskId;
+    var possibleActions = _a.possibleActions, assignee = _a.assignee, taskId = _a.taskId, isOpen = _a.isOpen;
     var loadWorkflowTasks = (useContext(WorkflowTasksContext) || {}).loadWorkflowTasks;
     var workflowPath = useSelector(mdmModule.selectors.getWorkflowPath);
     var environment = useSelector(mdmModule.selectors.getWorkflowEnvironmentUrl);
@@ -43,7 +44,7 @@ export var useWorkflowActions = function (_a) {
         }
     }; }, [workflowPath, taskId, environment, tenant, dispatch, entityUri, viewId, loadWorkflowTasks]);
     var actions = useMemo(function () {
-        return username === assignee
+        return username === assignee && isOpenTask(isOpen)
             ? (possibleActions || []).map(function (_a) {
                 var action = _a.action, label = _a.label;
                 return ({
@@ -52,6 +53,6 @@ export var useWorkflowActions = function (_a) {
                 });
             })
             : [];
-    }, [possibleActions, performTaskAction, username, assignee]);
+    }, [possibleActions, performTaskAction, username, assignee, isOpen]);
     return { actions: actions, actionRequestIsInProgress: actionRequestIsInProgress };
 };

package/esm/components/workflow/hooks/useWorkflowAssignee.d.ts

@@ -3,7 +3,7 @@ declare type AssigneeOption = {
     label: string;
     value: string;
 };
-export declare const useWorkflowAssignee: ({ assignee, taskId }: Pick<WorkflowTaskData, 'taskId' | 'assignee'>) => {
+export declare const useWorkflowAssignee: ({ assignee, taskId, isOpen }: Pick<WorkflowTaskData, 'taskId' | 'assignee' | 'isOpen'>) => {
     assignee: AssigneeOption;
     getAssignees: (text: any) => Promise<void | unknown[]>;
     updateAssignee: (newValue: AssigneeOption) => void;

package/esm/components/workflow/hooks/useWorkflowAssignee.js

@@ -7,12 +7,13 @@ import { useSafePromise } from '../../../hooks';
 import { WorkflowTasksContext } from '../../../contexts/WorkflowTasksContext';
 import { showWorkflowError } from '../helpers/errors';
 import { useWorkflowCheckPermission } from './useWorkflowCheckPermission';
+import { isOpenTask } from '../helpers';
 var assigneeToValue = function (assignee) { return ({
     label: assignee,
     value: assignee
 }); };
 export var useWorkflowAssignee = function (_a) {
-    var assignee = _a.assignee, taskId = _a.taskId;
+    var assignee = _a.assignee, taskId = _a.taskId, isOpen = _a.isOpen;
     var updateTaskState = (useContext(WorkflowTasksContext) || {}).updateTaskState;
     var workflowPath = useSelector(mdmModule.selectors.getWorkflowPath);
     var environment = useSelector(mdmModule.selectors.getWorkflowEnvironmentUrl);
@@ -23,7 +24,7 @@ export var useWorkflowAssignee = function (_a) {
     var _c = useState(), assignees = _c[0], setAssignees = _c[1];
     var _d = useState(false), updateRequestIsInProgress = _d[0], setUpdateRequestIsInProgress = _d[1];
     var checkWorkflowPermission = useWorkflowCheckPermission();
-    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK');
+    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK') && isOpenTask(isOpen);
     useEffect(function () {
         setCurrentAssignee(assigneeToValue(assignee));
     }, [assignee]);

package/esm/components/workflow/hooks/useWorkflowComments.d.ts

@@ -1,5 +1,5 @@
 import { WorkflowTaskData } from '@reltio/mdm-sdk';
-export declare const useWorkflowComments: ({ processInstanceComments, taskId }: WorkflowTaskData) => {
+export declare const useWorkflowComments: ({ processInstanceComments, taskId, isOpen }: WorkflowTaskData) => {
     comments: any[];
     requestIsInProgress: boolean;
     writeComment: (comment: any) => void;

package/esm/components/workflow/hooks/useWorkflowComments.js

@@ -6,8 +6,9 @@ import { useSafePromise } from '../../../hooks';
 import { WorkflowTasksContext } from '../../../contexts/WorkflowTasksContext';
 import { showWorkflowError } from '../helpers/errors';
 import { useWorkflowCheckPermission } from './useWorkflowCheckPermission';
+import { isOpenTask } from '../helpers';
 export var useWorkflowComments = function (_a) {
-    var processInstanceComments = _a.processInstanceComments, taskId = _a.taskId;
+    var processInstanceComments = _a.processInstanceComments, taskId = _a.taskId, isOpen = _a.isOpen;
     var updateTaskState = (useContext(WorkflowTasksContext) || {}).updateTaskState;
     var workflowPath = useSelector(mdmModule.selectors.getWorkflowPath);
     var environment = useSelector(mdmModule.selectors.getWorkflowEnvironmentUrl);
@@ -16,7 +17,7 @@ export var useWorkflowComments = function (_a) {
     var _b = useState([]), comments = _b[0], setComments = _b[1];
     var _c = useState(false), requestIsInProgress = _c[0], setRequestIsInProgress = _c[1];
     var checkWorkflowPermission = useWorkflowCheckPermission();
-    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK');
+    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK') && isOpenTask(isOpen);
     useEffect(function () {
         setComments(processInstanceComments || []);
     }, [processInstanceComments]);

package/esm/components/workflow/hooks/useWorkflowDueDate.d.ts

@@ -1,5 +1,5 @@
 import { WorkflowTaskData } from '@reltio/mdm-sdk';
-export declare const useWorkflowDueDate: ({ dueDate, taskId }: Pick<WorkflowTaskData, 'dueDate' | 'taskId'>) => {
+export declare const useWorkflowDueDate: ({ dueDate, taskId, isOpen }: Pick<WorkflowTaskData, 'dueDate' | 'taskId' | 'isOpen'>) => {
     updateDueDate: (newValue: number) => void;
     updateRequestIsInProgress: boolean;
     readOnly: boolean;

package/esm/components/workflow/hooks/useWorkflowDueDate.js

@@ -6,8 +6,9 @@ import { useSafePromise } from '../../../hooks';
 import { WorkflowTasksContext } from '../../../contexts/WorkflowTasksContext';
 import { showWorkflowError } from '../helpers/errors';
 import { useWorkflowCheckPermission } from './useWorkflowCheckPermission';
+import { isOpenTask } from '../helpers';
 export var useWorkflowDueDate = function (_a) {
-    var dueDate = _a.dueDate, taskId = _a.taskId;
+    var dueDate = _a.dueDate, taskId = _a.taskId, isOpen = _a.isOpen;
     var updateTaskState = (useContext(WorkflowTasksContext) || {}).updateTaskState;
     var workflowPath = useSelector(mdmModule.selectors.getWorkflowPath);
     var environment = useSelector(mdmModule.selectors.getWorkflowEnvironmentUrl);
@@ -15,7 +16,7 @@ export var useWorkflowDueDate = function (_a) {
     var safePromise = useSafePromise();
     var _b = useState(false), updateRequestIsInProgress = _b[0], setUpdateRequestIsInProgress = _b[1];
     var checkWorkflowPermission = useWorkflowCheckPermission();
-    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK');
+    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK') && isOpenTask(isOpen);
     var updateDueDate = useCallback(function (newValue) {
         if (workflowPath && canUpdateTask && taskId && newValue && dueDate !== newValue) {
             setUpdateRequestIsInProgress(true);

package/esm/components/workflow/hooks/useWorkflowPriority.d.ts

@@ -3,7 +3,7 @@ declare type PriorityOption = {
     label: string;
     value: number;
 };
-export declare const useWorkflowPriority: ({ priority, taskId }: Pick<WorkflowTaskData, 'taskId' | 'priority'>) => {
+export declare const useWorkflowPriority: ({ priority, taskId, isOpen }: Pick<WorkflowTaskData, 'taskId' | 'priority' | 'isOpen'>) => {
     priorities: PriorityOption[];
     updatePriority: (newValue: PriorityOption) => void;
     updateRequestIsInProgress: boolean;

package/esm/components/workflow/hooks/useWorkflowPriority.js

@@ -7,8 +7,9 @@ import { useSafePromise } from '../../../hooks';
 import { WorkflowTasksContext } from '../../../contexts/WorkflowTasksContext';
 import { showWorkflowError } from '../helpers/errors';
 import { useWorkflowCheckPermission } from './useWorkflowCheckPermission';
+import { isOpenTask } from '../helpers';
 export var useWorkflowPriority = function (_a) {
-    var priority = _a.priority, taskId = _a.taskId;
+    var priority = _a.priority, taskId = _a.taskId, isOpen = _a.isOpen;
     var updateTaskState = (useContext(WorkflowTasksContext) || {}).updateTaskState;
     var workflowPath = useSelector(mdmModule.selectors.getWorkflowPath);
     var environment = useSelector(mdmModule.selectors.getWorkflowEnvironmentUrl);
@@ -16,7 +17,7 @@ export var useWorkflowPriority = function (_a) {
     var safePromise = useSafePromise();
     var _b = useState(false), updateRequestIsInProgress = _b[0], setUpdateRequestIsInProgress = _b[1];
     var checkWorkflowPermission = useWorkflowCheckPermission();
-    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK');
+    var canUpdateTask = checkWorkflowPermission('UPDATE_TASK') && isOpenTask(isOpen);
     var updatePriority = useCallback(function (newValue) {
         var newPriority = newValue.value;
         if (workflowPath && canUpdateTask && taskId && priority !== newPriority) {

package/esm/{hooks → components/workflow/hooks}/useWorkflowTasks.d.ts

@@ -1,8 +1,14 @@
 import { WorkflowTaskData } from '@reltio/mdm-sdk';
-export declare const useWorkflowTasks: () => {
+declare type Config = {
+    processTypes?: string[];
+    assignee?: string;
+    showClosedTasks?: boolean;
+};
+export declare const useWorkflowTasks: (config?: Config) => {
     tasks: WorkflowTaskData[];
     total: number;
     loading: boolean;
     updateTaskState: (taskId: WorkflowTaskData['taskId'], payload: Partial<WorkflowTaskData>) => void;
     loadWorkflowTasks: () => void;
 };
+export {};

package/esm/{hooks → components/workflow/hooks}/useWorkflowTasks.js

@@ -11,11 +11,13 @@ var __assign = (this && this.__assign) || function () {
 };
 import { useCallback, useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
+import { filter, flatten, isNil, map, pipe, prop, reject, uniqBy } from 'ramda';
 import mdmModule from '@reltio/mdm-module';
 import { getTasksForEntity, isTempUri } from '@reltio/mdm-sdk';
-import { useSafePromise } from './useSafePromise';
-import { useWorkflowCheckPermission } from '../components/workflow/hooks/useWorkflowCheckPermission';
-export var useWorkflowTasks = function () {
+import { useSafePromise } from '../../../hooks/useSafePromise';
+import { useWorkflowCheckPermission } from './useWorkflowCheckPermission';
+export var useWorkflowTasks = function (config) {
+    var _a = config || {}, processTypes = _a.processTypes, assignee = _a.assignee, showClosedTasks = _a.showClosedTasks;
     var safePromise = useSafePromise();
     var workflowPath = useSelector(mdmModule.selectors.getWorkflowPath);
     var environment = useSelector(mdmModule.selectors.getWorkflowEnvironmentUrl);
@@ -25,21 +27,27 @@ export var useWorkflowTasks = function () {
     var checkWorkflowPermission = useWorkflowCheckPermission();
     var canViewTasks = checkWorkflowPermission('VIEW_TASKS');
     var enabled = !!(workflowPath && environment) && canViewTasks;
-    var _a = useState(null), tasks = _a[0], setTasks = _a[1];
-    var _b = useState(0), total = _b[0], setTotal = _b[1];
-    var _c = useState(false), loading = _c[0], setLoading = _c[1];
+    var _b = useState(null), tasks = _b[0], setTasks = _b[1];
+    var _c = useState(0), total = _c[0], setTotal = _c[1];
+    var _d = useState(false), loading = _d[0], setLoading = _d[1];
     var loadWorkflowTasks = useCallback(function () {
         setLoading(true);
-        safePromise(getTasksForEntity({
-            entityUri: entityUri,
-            workflowPath: workflowPath,
-            environment: environment,
-            tenant: tenant
-        }))
-            .then(function (_a) {
-            var data = _a.data, total = _a.total;
-            setTasks(data);
-            setTotal(total);
+        var parsedProcessTypes = !Array.isArray(processTypes) || processTypes.includes('*') ? null : processTypes;
+        var requests = (parsedProcessTypes || [null]).map(function (processType) {
+            return getTasksForEntity({
+                entityUri: entityUri,
+                workflowPath: workflowPath,
+                environment: environment,
+                tenant: tenant,
+                filter: { assignee: assignee, processType: processType },
+                includeClosed: !!showClosedTasks
+            });
+        });
+        safePromise(Promise.all(requests))
+            .then(function (responses) {
+            var tasks = pipe(map(prop('data')), reject(isNil), flatten, uniqBy(prop('taskId')), filter(isRequestedTask(parsedProcessTypes, assignee)))(responses);
+            setTasks(tasks);
+            setTotal(tasks.length);
         })
             .catch(function (error) {
             console.warn('Workflow error', error);
@@ -47,7 +55,7 @@ export var useWorkflowTasks = function () {
             .finally(function () {
             setLoading(false);
         });
-    }, [entityUri, environment, safePromise, tenant, workflowPath]);
+    }, [entityUri, environment, safePromise, tenant, workflowPath, assignee, showClosedTasks, processTypes]);
     useEffect(function () {
         if (entityUri && enabled && !isTempUri(entityUri)) {
             loadWorkflowTasks();
@@ -63,3 +71,6 @@ export var useWorkflowTasks = function () {
     }, []);
     return { tasks: tasks, total: total, loading: loading, updateTaskState: updateTaskState, loadWorkflowTasks: loadWorkflowTasks };
 };
+var isRequestedTask = function (processTypes, assignee) { return function (task) {
+    return (!processTypes || processTypes.includes(task.processType)) && (!assignee || assignee === task.assignee);
+}; };

package/esm/components/workflow/index.d.ts

@@ -4,3 +4,4 @@ export { default as WorkflowComments } from './components/WorkflowComments';
 export { useWorkflowAssignee } from './hooks/useWorkflowAssignee';
 export { useWorkflowComments } from './hooks/useWorkflowComments';
 export { useWorkflowCheckPermission } from './hooks/useWorkflowCheckPermission';
+export { useWorkflowTasks } from './hooks/useWorkflowTasks';

package/esm/components/workflow/index.js

@@ -4,3 +4,4 @@ export { default as WorkflowComments } from './components/WorkflowComments';
 export { useWorkflowAssignee } from './hooks/useWorkflowAssignee';
 export { useWorkflowComments } from './hooks/useWorkflowComments';
 export { useWorkflowCheckPermission } from './hooks/useWorkflowCheckPermission';
+export { useWorkflowTasks } from './hooks/useWorkflowTasks';

package/esm/hooks/index.d.ts

@@ -11,4 +11,3 @@ export { useSavedState } from './useSavedState';
 export { useUsers } from './useUsers';
 export { useWhyDidYouUpdate } from './useWhyDidYouUpdate';
 export { useConfigPermissions } from './useConfigPermissions';
-export { useWorkflowTasks } from './useWorkflowTasks';

package/esm/hooks/index.js

@@ -11,4 +11,3 @@ export { useSavedState } from './useSavedState';
 export { useUsers } from './useUsers';
 export { useWhyDidYouUpdate } from './useWhyDidYouUpdate';
 export { useConfigPermissions } from './useConfigPermissions';
-export { useWorkflowTasks } from './useWorkflowTasks';

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@reltio/components",
-  "version": "1.4.883",
+  "version": "1.4.887",
   "license": "SEE LICENSE IN LICENSE FILE",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "dependencies": {
     "@date-io/moment": "^1.3.5",
     "@react-google-maps/api": "^2.7.0",
-    "@reltio/mdm-module": "^1.4.883",
-    "@reltio/mdm-sdk": "^1.4.883",
+    "@reltio/mdm-module": "^1.4.887",
+    "@reltio/mdm-sdk": "^1.4.887",
     "classnames": "^2.2.5",
     "frontend-collective-react-dnd-scrollzone": "^1.0.2",
     "nanoid": "^2.0.0",