(false);
const navigate = useNavigate();
const navigateToProcessModel = (result: ProcessModel) => {
@@ -64,6 +75,7 @@ export default function ProcessModelForm({
const postBody = {
display_name: processModel.display_name,
description: processModel.description,
+ metadata_extraction_paths: processModel.metadata_extraction_paths,
};
if (mode === 'new') {
Object.assign(postBody, {
@@ -87,6 +99,80 @@ export default function ProcessModelForm({
setProcessModel(processModelToCopy);
};
+ const metadataExtractionPathForm = (
+ index: number,
+ metadataExtractionPath: MetadataExtractionPath
+ ) => {
+ return (
+
+
+
+
+
+
+ {
+ const cep: MetadataExtractionPath[] =
+ processModel.metadata_extraction_paths || [];
+ cep.splice(index, 1);
+ updateProcessModel({ metadata_extraction_paths: cep });
+ }}
+ />
+
+
+ );
+ };
+
+ const metadataExtractionPathFormArea = () => {
+ if (processModel.metadata_extraction_paths) {
+ return processModel.metadata_extraction_paths.map(
+ (metadataExtractionPath: MetadataExtractionPath, index: number) => {
+ return metadataExtractionPathForm(index, metadataExtractionPath);
+ }
+ );
+ }
+ return null;
+ };
+
+ const addBlankMetadataExtractionPath = () => {
+ const cep: MetadataExtractionPath[] =
+ processModel.metadata_extraction_paths || [];
+ cep.push({ key: '', path: '' });
+ updateProcessModel({ metadata_extraction_paths: cep });
+ };
+
const onDisplayNameChanged = (newDisplayName: any) => {
setDisplayNameInvalid(false);
const updateDict = { display_name: newDisplayName };
@@ -108,7 +194,6 @@ export default function ProcessModelForm({
onChange={(event: any) => {
onDisplayNameChanged(event.target.value);
}}
- onBlur={(event: any) => console.log('event', event)}
/>,
];
@@ -145,6 +230,38 @@ export default function ProcessModelForm({
/>
);
+ textInputs.push(Metadata Extractions );
+ textInputs.push(
+
+
+
+ You can provide one or more metadata extractions to pull data from
+ your process instances to provide quick access in searches and
+ perspectives.
+
+
+
+ );
+ textInputs.push(<>{metadataExtractionPathFormArea()});
+ textInputs.push(
+
+
+ {
+ addBlankMetadataExtractionPath();
+ }}
+ >
+ Add Metadata Extraction Path
+
+
+
+ );
+
return textInputs;
};
diff --git a/spiffworkflow-frontend/src/components/ProcessModelListTiles.tsx b/spiffworkflow-frontend/src/components/ProcessModelListTiles.tsx
index 4787fe94..1412635c 100644
--- a/spiffworkflow-frontend/src/components/ProcessModelListTiles.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessModelListTiles.tsx
@@ -54,9 +54,9 @@ export default function ProcessModelListTiles({
Process Instance {processInstance.id} kicked off (
(null);
+
useEffect(() => {
const setMessageInstanceListFromResult = (result: any) => {
setMessageInstances(result.results);
@@ -35,41 +42,89 @@ export default function MessageInstanceList() {
});
}, [searchParams, params]);
- const buildTable = () => {
- // return null;
- const rows = messageIntances.map((row) => {
- const rowToUse = row as any;
+ const handleCorrelationDisplayClose = () => {
+ setMessageInstanceForModal(null);
+ };
+
+ const correlationsDisplayModal = () => {
+ if (messageInstanceForModal) {
+ let failureCausePre = null;
+ if (messageInstanceForModal.failure_cause) {
+ failureCausePre = (
+ <>
+
+ {messageInstanceForModal.failure_cause}
+
+
- {rowToUse.id}
-
-
+
+ {failureCausePre}
+ Correlations:
+
+ {JSON.stringify(
+ messageInstanceForModal.message_correlations,
+ null,
+ 2
+ )}
+
+
+ );
+ }
+ return null;
+ };
+
+ const buildTable = () => {
+ const rows = messageIntances.map((row: MessageInstance) => {
+ let errorIcon = null;
+ let errorTitle = null;
+ if (row.failure_cause) {
+ errorTitle = 'Instance has an error';
+ errorIcon = (
+ <>
+
+
+ {row.id}
+ {FormatProcessModelDisplayName(row)}
- {rowToUse.message_identifier}
- {rowToUse.message_type}
- {rowToUse.failure_cause || '-'}
- {rowToUse.status}
+ {row.message_identifier}
+ {row.message_type}
- {convertSecondsToFormattedDateString(
- rowToUse.created_at_in_seconds
- )}
+ setMessageInstanceForModal(row)}
+ title={errorTitle}
+ >
+ View
+ {errorIcon}
+
+
+ {row.status}
+
+ {convertSecondsToFormattedDateTime(row.created_at_in_seconds)}
);
@@ -78,12 +133,12 @@ export default function MessageInstanceList() {
- Instance Id
- Process Model
+ Id
+ Process
Process Instance
- Message Model
+ Name
Type
- Failure Cause
+ Details
Status
Created At
@@ -108,9 +163,9 @@ export default function MessageInstanceList() {
},
[
`Process Instance: ${searchParams.get('process_instance_id')}`,
- `/admin/process-models/${searchParams.get(
+ `/admin/process-instances/${searchParams.get(
'process_model_id'
- )}/process-instances/${searchParams.get('process_instance_id')}`,
+ )}/${searchParams.get('process_instance_id')}`,
],
['Messages'],
]}
@@ -121,6 +176,7 @@ export default function MessageInstanceList() {
<>
{breadcrumbElement}
Messages
+ {correlationsDisplayModal()}
Process Instance {processInstance.id} kicked off (
- {rowToUse.bpmn_process_identifier}
+ {rowToUse.id}
{rowToUse.message}
- {rowToUse.bpmn_task_identifier}
{rowToUse.bpmn_task_name}
- {rowToUse.bpmn_task_type}
+ {isDetailedView && (
+ <>
+ {rowToUse.bpmn_task_identifier}
+ {rowToUse.bpmn_task_type}
+ {rowToUse.bpmn_process_identifier}
+
+ )}
{rowToUse.username}
- Bpmn Process Identifier
+ Id
Message
- Task Identifier
Task Name
- Task Type
+ {isDetailedView && (
+ <>
+ Task Identifier
+ Task Type
+ Bpmn Process Identifier
+
+ )}
User
Timestamp
@@ -71,11 +89,12 @@ export default function ProcessInstanceLogList() {
);
};
+ const selectedTabIndex = isDetailedView ? 1 : 0;
if (pagination) {
const { page, perPage } = getPageInfoFromSearchParams(searchParams);
return (
-
+ <>
+
+ {
+ searchParams.set('detailed', 'false');
+ setSearchParams(searchParams);
+ }}
+ >
+ Simple
+
+ {
+ searchParams.set('detailed', 'true');
+ setSearchParams(searchParams);
+ }}
+ >
+ Detailed
+
+
+
+
+
);
}
return null;
diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
index c407c771..9a0495d1 100644
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
@@ -59,6 +59,11 @@ export default function ProcessInstanceShow() {
const permissionRequestData: PermissionsToCheck = {
[targetUris.messageInstanceListPath]: ['GET'],
[targetUris.processInstanceTaskListPath]: ['GET'],
+ [targetUris.processInstanceActionPath]: ['DELETE'],
+ [targetUris.processInstanceLogListPath]: ['GET'],
+ [`${targetUris.processInstanceActionPath}/suspend`]: ['PUT'],
+ [`${targetUris.processInstanceActionPath}/terminate`]: ['PUT'],
+ [`${targetUris.processInstanceActionPath}/resume`]: ['PUT'],
};
const { ability, permissionsLoaded } = usePermissionFetcher(
permissionRequestData
@@ -76,7 +81,7 @@ export default function ProcessInstanceShow() {
setTasksCallHadError(true);
};
HttpService.makeCallToBackend({
- path: `/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}`,
+ path: `/process-instances/${modifiedProcessModelId}/${params.process_instance_id}`,
successCallback: setProcessInstance,
});
let taskParams = '?all_tasks=true';
@@ -85,7 +90,7 @@ export default function ProcessInstanceShow() {
}
if (ability.can('GET', targetUris.processInstanceTaskListPath)) {
HttpService.makeCallToBackend({
- path: `/process-instances/${modifiedProcessModelId}/${params.process_instance_id}/tasks${taskParams}`,
+ path: `${targetUris.processInstanceTaskListPath}${taskParams}`,
successCallback: setTasks,
failureCallback: processTaskFailure,
});
@@ -97,7 +102,7 @@ export default function ProcessInstanceShow() {
const deleteProcessInstance = () => {
HttpService.makeCallToBackend({
- path: `/process-instances/${params.process_instance_id}`,
+ path: targetUris.processInstanceActionPath,
successCallback: navigateToProcessInstances,
httpMethod: 'DELETE',
});
@@ -110,7 +115,7 @@ export default function ProcessInstanceShow() {
const terminateProcessInstance = () => {
HttpService.makeCallToBackend({
- path: `/process-instances/${params.process_instance_id}/terminate`,
+ path: `${targetUris.processInstanceActionPath}/terminate`,
successCallback: refreshPage,
httpMethod: 'POST',
});
@@ -118,7 +123,7 @@ export default function ProcessInstanceShow() {
const suspendProcessInstance = () => {
HttpService.makeCallToBackend({
- path: `/process-instances/${params.process_instance_id}/suspend`,
+ path: `${targetUris.processInstanceActionPath}/suspend`,
successCallback: refreshPage,
httpMethod: 'POST',
});
@@ -126,7 +131,7 @@ export default function ProcessInstanceShow() {
const resumeProcessInstance = () => {
HttpService.makeCallToBackend({
- path: `/process-instances/${params.process_instance_id}/resume`,
+ path: `${targetUris.processInstanceActionPath}/resume`,
successCallback: refreshPage,
httpMethod: 'POST',
});
@@ -174,7 +179,7 @@ export default function ProcessInstanceShow() {
+
Completed:{' '}
@@ -235,7 +240,7 @@ export default function ProcessInstanceShow() {
return (
<>
-
+
Started:{' '}
@@ -246,7 +251,7 @@ export default function ProcessInstanceShow() {
{currentEndDateTag}
-
+
Status:{' '}
@@ -259,14 +264,20 @@ export default function ProcessInstanceShow() {
-
- Logs
-
+
+ Logs
+
+
{
const elements = [];
- elements.push(terminateButton(processInstanceToUse));
- elements.push(suspendButton(processInstanceToUse));
- elements.push(resumeButton(processInstanceToUse));
- elements.push(
-
Process Instance {processInstance.id} kicked off (
<>
diff --git a/spiffworkflow-frontend/src/routes/TaskShow.tsx b/spiffworkflow-frontend/src/routes/TaskShow.tsx
index 768043cd..9e0f65c5 100644
--- a/spiffworkflow-frontend/src/routes/TaskShow.tsx
+++ b/spiffworkflow-frontend/src/routes/TaskShow.tsx
@@ -26,6 +26,9 @@ import Form from '../themes/carbon';
import HttpService from '../services/HttpService';
import ErrorContext from '../contexts/ErrorContext';
import { modifyProcessIdentifierForPathParam } from '../helpers';
+import { useUriListForPermissions } from '../hooks/UriListForPermissions';
+import { PermissionsToCheck } from '../interfaces';
+import { usePermissionFetcher } from '../hooks/PermissionService';
export default function TaskShow() {
const [task, setTask] = useState(null);
@@ -35,24 +38,36 @@ export default function TaskShow() {
const setErrorMessage = (useContext as any)(ErrorContext)[1];
- useEffect(() => {
- const processResult = (result: any) => {
- setTask(result);
- HttpService.makeCallToBackend({
- path: `/process-instances/${modifyProcessIdentifierForPathParam(
- result.process_model_identifier
- )}/${params.process_instance_id}/tasks`,
- successCallback: setUserTasks,
- });
- };
+ const { targetUris } = useUriListForPermissions();
+ const permissionRequestData: PermissionsToCheck = {
+ [targetUris.processInstanceTaskListPath]: ['GET'],
+ };
+ const { ability, permissionsLoaded } = usePermissionFetcher(
+ permissionRequestData
+ );
- HttpService.makeCallToBackend({
- path: `/tasks/${params.process_instance_id}/${params.task_id}`,
- successCallback: processResult,
- // This causes the page to continuously reload
- // failureCallback: setErrorMessage,
- });
- }, [params]);
+ useEffect(() => {
+ if (permissionsLoaded) {
+ const processResult = (result: any) => {
+ setTask(result);
+ if (ability.can('GET', targetUris.processInstanceTaskListPath)) {
+ HttpService.makeCallToBackend({
+ path: `/task-data/${modifyProcessIdentifierForPathParam(
+ result.process_model_identifier
+ )}/${params.process_instance_id}`,
+ successCallback: setUserTasks,
+ });
+ }
+ };
+
+ HttpService.makeCallToBackend({
+ path: `/tasks/${params.process_instance_id}/${params.task_id}`,
+ successCallback: processResult,
+ // This causes the page to continuously reload
+ // failureCallback: setErrorMessage,
+ });
+ }
+ }, [params, permissionsLoaded, ability, targetUris]);
const processSubmitResult = (result: any) => {
setErrorMessage(null);
@@ -116,17 +131,18 @@ export default function TaskShow() {
}
return null;
});
+ return (
+
+
+ {userTasksElement}
+
+
+ );
}
- return (
-
-
- {userTasksElement}
-
-
- );
+ return null;
};
const formElement = (taskToUse: any) => {
@@ -207,7 +223,7 @@ export default function TaskShow() {
);
};
- if (task && userTasks) {
+ if (task) {
const taskToUse = task as any;
let statusString = '';
if (taskToUse.state !== 'READY') {