status-im
/
spiff-arena
mirror of https://github.com/status-im/spiff-arena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Feature/interstitial summary (#337)" 

This reverts commit 28086575fe.
This commit is contained in:
burnettk 2023-06-19 08:19:36 -04:00
parent 63a47b83e9
commit 0d228e917b
No known key found for this signature in database
15 changed files with 336 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
docs/wish_list/wish_list.md
View File

@ -2,41 +2,7 @@
The follow is a list of enhancements we wish to do complete in the near (or even distant future) The follow is a list of enhancements we wish to do complete in the near (or even distant future)
## Performance / System Improvements ## Performance Improvements
### Benchmarking / Performance Testing
Automated tests that assure our performance remains consistent as we add features and functionality.
### Support Multiple Connector Proxies
Service Tasks have been a huge win, there are multiple reasons that supporting more than one Connector Proxy would be beneficial:
1. Connect to several separately hosted services
2. Support multiple services written in multiple languages
3. Allow some connectors to be local (http get/post) vs remote (xero/coin gecko)
4. Could support non http based connectors (git interactions could be a workflow)
### Interstitial Performance
push all processing to background so interstitial is just querying, not running (new item)
### Authentication Keys
Provide an ability to access API endpoints using an access key - or authentication process that is specifically designed for API calls. (we currently rely on the grabbing the json token to do this, which is not a real solution)
### Core BPMN features
There are a number of useful BPMN components that we do not currently support. We should evaluate these and determine which ones we should support and how we should support them. We should consider creating a list of unsuported items.
* Compensation Events (valuable, but difficult)
* Conditional events.
* Event Sub-Processes are not currently supported (low-hanging fruit, easy to add)
### Decentralized / Distributed Deployments
This is a broad topic and will be covered in a separate document. But consider a SpiffWorkflow implementation that is deployed across a cluster of systems - and manages transactions on a shared Block Chain implementation. Such a structure could assure compliance to a set of blessed BPMN diagrams. Such a system could support highly transparent and auditable processes that could drive a DAO based organization.
### Improve Parallel Processing
We should support the parallel execution of tasks within a single process whenever possible to do so. This is not as far-fetched or difficult as it may initially seem. While Python is notoriously bad at parallel execution (the lovely GIL) - we have already taken the most critical steps to assuring it is possible:
1. A team has demonstrated parallel execution using the cure SpiffWorkflow library.
2. We can keep a configurable number of "background" SpiffArena processes running that can pick up waiting tasks.
Given these things are already in place, we just need to lock processes at the task or branch level - so that ready tasks on parallel branches can be picked up by different background processes at the same time.
### BPMN Definitions at save time vs run time ### BPMN Definitions at save time vs run time
Improve performance by pre-processing the BPMN Specification and generating the internal JSON representation so we no longer incur the expense of doing this on a per-process basis. Improve performance by pre-processing the BPMN Specification and generating the internal JSON representation so we no longer incur the expense of doing this on a per-process basis.
@ -44,12 +10,6 @@ This will also allow us to do some early and deep validation as well.
## End User Experience ## End User Experience
### UI Overview
We could really use a good UI / UX review of the site and take a stab at cleaning up the whole site to follow some consistent design patterns and resolve potential issues.
### Customizable Home Page (non Status specific)
Allow some way to define custom landing pages that create different experiences for different organizations / needs.
### Markdown rendering could be better ### Markdown rendering could be better
1. When creating a bulleted or numbered list, no bullets or numbers are displayed. This is a bug in our style sheets - or something that is clearing out all styles. 1. When creating a bulleted or numbered list, no bullets or numbers are displayed. This is a bug in our style sheets - or something that is clearing out all styles.
2. Limit the width of paragraphs to something reasonable. Having a line of text stretch across the entire screen is not a good experience. 2. Limit the width of paragraphs to something reasonable. Having a line of text stretch across the entire screen is not a good experience.
@ -61,34 +21,11 @@ Allow defining contact information at the process group and process model level,
This information could then be displayed when a process is in a non-functional state - such an error, suspended, or terminiated state. This information could then be displayed when a process is in a non-functional state - such an error, suspended, or terminiated state.
It might also be available in the footer or under a help icon when displaying a process instance. It might also be available in the footer or under a help icon when displaying a process instance.
### Process Heatmap
Allow administrators to see an overlay of a BPMN diagram that shows all the process instances in the system and where they are (20 people are waiting on approval, 15 are in the re-review .....)
## Modeler Experience ## Modeler Experience
### DMN Editor Sucks
Can we build a better DMN editor? Trisotech seems to do it very well. Would love to have a day or two just to research this area and see if there is just another open source project we can leverage, or if we could build our own tool.
### Modeler Checker
At run time, or when you save it would be great if we could execute a:
* Validation Report - what is wrong with the model? Is it Valid BPMN? Are there intrinsic errors?
* Linting Report! Does the model follow common naming conventions, styles, are there dead-locks, etc. Many of these tools already exist, we just need to integrate them!
### Plugins and Extensions
* Track down our previous research and add here. Color picker, etc....
### Automated Testing
Incorporate an end-to-end testing system that will allow you to quickly assure that
a bpmn model is working as expected. Imagine Cypress tests that you could define and execute in the modeler.
### Json Schemas Everywhere!
Our forms are Json Schemas (a description of the data structure) - we could do similar things for Service Tasks, Script Tasks ... such that the modeler is at all times aware of what data is available - making it possible to build and execute a task as it is created.
### Markdown Support for Process Groups and Models ### Markdown Support for Process Groups and Models
Allow us to define a markdown file for a process group or process model, which would be displayed in the process group or process model in the tile view, or at the top of the details page when a group or model is selected. Allow us to define a markdown file for a process group or process model, which would be displayed in the process group or process model in the tile view, or at the top of the details page when a group or model is selected.
### Adding a unit test from within the script editor would be nice
### Form Builder ### Form Builder
1. Let's invest in a much better Form Builder experience, so that it is trivial to build new forms or modify existing simple forms. We don't want to implement everything here - but a simple builder would be very useful. 1. Let's invest in a much better Form Builder experience, so that it is trivial to build new forms or modify existing simple forms. We don't want to implement everything here - but a simple builder would be very useful.
2. RJSF says it supports markdown in the headers, but it doesn't work fur us. 2. RJSF says it supports markdown in the headers, but it doesn't work fur us.
@ -101,4 +38,15 @@ Right now we allow editing the Display name of a model or group, but it does
not change the name of the underlying directory, making it harder and harder not change the name of the underlying directory, making it harder and harder
over time to look at GitHub or the file system and find what you are seeing in the display. over time to look at GitHub or the file system and find what you are seeing in the display.
## System Improvements
### Support Multiple Connector Proxies
Service Tasks have been a huge win, there are multiple reasons that supporting more than one Connector Proxy would be beneficial:
1. Connect to several separately hosted services
2. Support mulitple services written in multiple languages
3. Allow some connectors to be local (http get/post) vs remote (xero/coin gecko)
4. Could support non http based connectors (git interactions could be a workflow)
### Improve Parallel Processing

89
spiffworkflow-frontend/src/components/InstructionsForEndUser.tsx
View File

@ -1,21 +1,19 @@
import React, { useEffect, useState } from 'react'; import React from 'react';
// @ts-ignore // @ts-ignore
import MDEditor from '@uiw/react-md-editor'; import MDEditor from '@uiw/react-md-editor';
import { Toggle } from '@carbon/react';
type OwnProps = { type OwnProps = {
task: any; task: any;
defaultMessage?: string; defaultMessage?: string;
allowCollapse?: boolean;
}; };
export default function InstructionsForEndUser({ export default function InstructionsForEndUser({
task, task,
defaultMessage = '', defaultMessage = '',
allowCollapse = false,
}: OwnProps) { }: OwnProps) {
const [collapsed, setCollapsed] = useState<boolean>(false); if (!task) {
const [collapsable, setCollapsable] = useState<boolean>(false); return null;
}
let instructions = defaultMessage; let instructions = defaultMessage;
let { properties } = task; let { properties } = task;
if (!properties) { if (!properties) {
@ -25,80 +23,15 @@ export default function InstructionsForEndUser({
if (instructionsForEndUser) { if (instructionsForEndUser) {
instructions = instructionsForEndUser; instructions = instructionsForEndUser;
} }
const maxLineCount: number = 8;
const maxWordCount: number = 75;
const lineCount = (arg: string) => {
return arg.split('\n').length;
};
const wordCount = (arg: string) => {
return arg.split(' ').length;
};
useEffect(() => {
if (
allowCollapse &&
(lineCount(instructions) >= maxLineCount ||
wordCount(instructions) > maxWordCount)
) {
setCollapsable(true);
setCollapsed(true);
} else {
setCollapsable(false);
setCollapsed(false);
}
}, [allowCollapse, instructions]);
if (!task) {
return null;
}
const toggleCollapse = () => {
setCollapsed(!collapsed);
};
const showCollapseToggle = () => {
if (collapsable) {
return (
<Toggle
labelA="Show More"
labelB="Show Less"
onToggle={toggleCollapse}
id="toggle-collapse"
/>
);
}
return null;
};
let instructionsShown = instructions;
if (collapsed) {
if (wordCount(instructions) > maxWordCount) {
instructionsShown = instructions
.split(' ')
.slice(0, maxWordCount)
.join(' ');
instructionsShown += '...';
} else if (lineCount(instructions) > maxLineCount) {
instructionsShown = instructions.split('\n').slice(0, 5).join(' ');
instructionsShown += '...';
}
}
return ( return (
<div style={{ margin: '20px 0 20px 0' }}> <div className="markdown">
<div className="markdown"> {/*
{/* https://www.npmjs.com/package/@uiw/react-md-editor switches to dark mode by default by respecting @media (prefers-color-scheme: dark)
https://www.npmjs.com/package/@uiw/react-md-editor switches to dark mode by default by respecting @media (prefers-color-scheme: dark) This makes it look like our site is broken, so until the rest of the site supports dark mode, turn off dark mode for this component.
This makes it look like our site is broken, so until the rest of the site supports dark mode, turn off dark mode for this component. */}
*/} <div data-color-mode="light">
<div data-color-mode="light"> <MDEditor.Markdown source={instructions} />
<MDEditor.Markdown source={instructionsShown} />
</div>
</div> </div>
{showCollapseToggle()}
</div> </div>
); );
} }

72
spiffworkflow-frontend/src/components/ProcessInterstitial.tsx
View File

@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { fetchEventSource } from '@microsoft/fetch-event-source'; import { fetchEventSource } from '@microsoft/fetch-event-source';
// @ts-ignore // @ts-ignore
import { Loading, InlineNotification } from '@carbon/react'; import { Loading } from '@carbon/react';
import { BACKEND_BASE_URL } from '../config'; import { BACKEND_BASE_URL } from '../config';
import { getBasicHeaders } from '../services/HttpService'; import { getBasicHeaders } from '../services/HttpService';
@ -16,7 +16,6 @@ type OwnProps = {
processInstanceShowPageUrl: string; processInstanceShowPageUrl: string;
allowRedirect: boolean; allowRedirect: boolean;
smallSpinner?: boolean; smallSpinner?: boolean;
collapsableInstructions?: boolean;
}; };
export default function ProcessInterstitial({ export default function ProcessInterstitial({
@ -24,7 +23,6 @@ export default function ProcessInterstitial({
allowRedirect, allowRedirect,
processInstanceShowPageUrl, processInstanceShowPageUrl,
smallSpinner = false, smallSpinner = false,
collapsableInstructions = false,
}: OwnProps) { }: OwnProps) {
const [data, setData] = useState<any[]>([]); const [data, setData] = useState<any[]>([]);
const [lastTask, setLastTask] = useState<any>(null); const [lastTask, setLastTask] = useState<any>(null);
@ -77,13 +75,13 @@ export default function ProcessInterstitial({
}, [allowRedirect, state]); }, [allowRedirect, state]);
useEffect(() => { useEffect(() => {
// Added this separate use effect so that the timer interval will be cleared if // Added this seperate use effect so that the timer interval will be cleared if
// we end up redirecting back to the TaskShow page. // we end up redirecting back to the TaskShow page.
if (shouldRedirectToTask(lastTask)) { if (shouldRedirectToTask(lastTask)) {
lastTask.properties.instructionsForEndUser = ''; lastTask.properties.instructionsForEndUser = '';
const timerId = setInterval(() => { const timerId = setInterval(() => {
navigate(`/tasks/${lastTask.process_instance_id}/${lastTask.id}`); navigate(`/tasks/${lastTask.process_instance_id}/${lastTask.id}`);
}, 500); }, 2000);
return () => clearInterval(timerId); return () => clearInterval(timerId);
} }
if (shouldRedirectToProcessInstance()) { if (shouldRedirectToProcessInstance()) {
@ -120,27 +118,16 @@ export default function ProcessInterstitial({
return null; return null;
}; };
const inlineMessage = (
title: string,
subtitle: string,
kind: string = 'info'
) => {
return (
<div>
<InlineNotification kind={kind} subtitle={subtitle} title={title} />
</div>
);
};
const userMessageForProcessInstance = ( const userMessageForProcessInstance = (
pi: ProcessInstance, pi: ProcessInstance,
myTask: ProcessInstanceTask | null = null myTask: ProcessInstanceTask | null = null
) => { ) => {
if (['terminated', 'suspended'].includes(pi.status)) { if (['terminated', 'suspended'].includes(pi.status)) {
return inlineMessage( return (
`Process ${pi.status}`, <p>
'This process instance was {pi.status} by an administrator. Please get in touch with them for more information.', This process instance was {pi.status} by an administrator. Please get
'warning' in touch with them for more information.
</p>
); );
} }
if (pi.status === 'error') { if (pi.status === 'error') {
@ -148,21 +135,17 @@ export default function ProcessInterstitial({
if (myTask && myTask.error_message) { if (myTask && myTask.error_message) {
errMessage = errMessage.concat(myTask.error_message); errMessage = errMessage.concat(myTask.error_message);
} }
return inlineMessage(`Process Error`, errMessage, 'error'); return <p>{errMessage}</p>;
} }
// Otherwise we are not started, waiting, complete, or user_input_required // Otherwise we are not started, waiting, complete, or user_input_required
const defaultMsg = const defaultMsg =
'There are no additional instructions or information for this process.'; 'There are no additional instructions or information for this process.';
if (myTask) { if (myTask) {
return ( return (
<InstructionsForEndUser <InstructionsForEndUser task={myTask} defaultMessage={defaultMsg} />
task={myTask}
defaultMessage={defaultMsg}
allowCollapse={collapsableInstructions}
/>
); );
} }
return inlineMessage(`Process Error`, defaultMsg, 'info'); return <p>{defaultMsg}</p>;
}; };
const userMessage = (myTask: ProcessInstanceTask) => { const userMessage = (myTask: ProcessInstanceTask) => {
@ -171,29 +154,27 @@ export default function ProcessInterstitial({
} }
if (!myTask.can_complete && userTasks.includes(myTask.type)) { if (!myTask.can_complete && userTasks.includes(myTask.type)) {
return inlineMessage( return (
'', <p>
`This next task is assigned to a different person or team. There is no action for you to take at this time.` This next task is assigned to a different person or team. There is no
action for you to take at this time.
</p>
); );
} }
if (shouldRedirectToTask(myTask)) { if (shouldRedirectToTask(myTask)) {
return inlineMessage('', `Redirecting ...`); return <div>Redirecting you to the next task now ...</div>;
} }
if (myTask && myTask.can_complete && userTasks.includes(myTask.type)) { if (myTask && myTask.can_complete && userTasks.includes(myTask.type)) {
return inlineMessage( return `The task ${myTask.title} is ready for you to complete.`;
'',
`The task "${myTask.title}" is ready for you to complete.`
);
} }
if (myTask.error_message) { if (myTask.error_message) {
return inlineMessage('Error', myTask.error_message, 'error'); return <div>{myTask.error_message}</div>;
} }
return ( return (
<div> <div>
<InstructionsForEndUser <InstructionsForEndUser
task={myTask} task={myTask}
defaultMessage="There are no additional instructions or information for this task." defaultMessage="There are no additional instructions or information for this task."
allowCollapse={collapsableInstructions}
/> />
</div> </div>
); );
@ -210,19 +191,18 @@ export default function ProcessInterstitial({
displayableData = [data[0]]; displayableData = [data[0]];
} }
const className = (index: number) => {
if (displayableData.length === 1) {
return 'user_instructions';
}
return index < 4 ? `user_instructions_${index}` : `user_instructions_4`;
};
if (lastTask) { if (lastTask) {
return ( return (
<div> <div>
{getLoadingIcon()} {getLoadingIcon()}
{displayableData.map((d, index) => ( {displayableData.map((d, index) => (
<div className={className(index)}>{userMessage(d)}</div> <div
className={
index < 4 ? `user_instructions_${index}` : `user_instructions_4`
}
>
{userMessage(d)}
</div>
))} ))}
</div> </div>
); );

17
spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx
View File

@ -44,7 +44,11 @@ import spiffModdleExtension from 'bpmn-js-spiffworkflow/app/spiffworkflow/moddle
// @ts-expect-error TS(7016) FIXME // @ts-expect-error TS(7016) FIXME
import KeyboardMoveModule from 'diagram-js/lib/navigation/keyboard-move'; import KeyboardMoveModule from 'diagram-js/lib/navigation/keyboard-move';
// @ts-expect-error TS(7016) FIXME // @ts-expect-error TS(7016) FIXME
import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas';
// @ts-expect-error TS(7016) FIXME
import TouchModule from 'diagram-js/lib/navigation/touch'; import TouchModule from 'diagram-js/lib/navigation/touch';
// @ts-expect-error TS(7016) FIXME
import ZoomScrollModule from 'diagram-js/lib/navigation/zoomscroll';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
@ -212,7 +216,12 @@ export default function ReactDiagramEditor({
// taken from the non-modeling components at // taken from the non-modeling components at
// bpmn-js/lib/Modeler.js // bpmn-js/lib/Modeler.js
additionalModules: [KeyboardMoveModule, TouchModule], additionalModules: [
KeyboardMoveModule,
MoveCanvasModule,
TouchModule,
ZoomScrollModule,
],
}); });
} }
@ -415,16 +424,12 @@ export default function ReactDiagramEditor({
const canvas = (modeler as any).get('canvas'); const canvas = (modeler as any).get('canvas');
// only get the canvas if the dmn active viewer is actually // only get the canvas if the dmn active viewer is actually
// a Modeler and not an Editor which is what it will be when we are // a Modeler and not an Editor which is what it will when we are
// actively editing a decision table // actively editing a decision table
if ((modeler as any).constructor.name === 'Modeler') { if ((modeler as any).constructor.name === 'Modeler') {
canvas.zoom('fit-viewport'); canvas.zoom('fit-viewport');
} }
if ((modeler as any).constructor.name === 'Viewer') {
canvas.zoom('fit-viewport');
}
// highlighting a field // highlighting a field
// Option 3 at: // Option 3 at:
// https://github.com/bpmn-io/bpmn-js-examples/tree/master/colors // https://github.com/bpmn-io/bpmn-js-examples/tree/master/colors

13
spiffworkflow-frontend/src/index.css
View File

@ -168,7 +168,7 @@ code {
} }
.cds--breadcrumb { .cds--breadcrumb {
margin-bottom: 1em; margin-bottom: 2em;
} }
.process-description { .process-description {
@ -329,8 +329,8 @@ in on this with the react-jsonschema-form repo. This is just a patch fix to allo
.cds--tile.tile-process-group { .cds--tile.tile-process-group {
padding: 0px; padding: 0px;
margin: 12px; margin: 16px;
width: 320px; width: 354px;
height: 264px; height: 264px;
background: #F4F4F4; background: #F4F4F4;
order: 1; order: 1;
@ -338,7 +338,7 @@ in on this with the react-jsonschema-form repo. This is just a patch fix to allo
} }
.tile-process-group-content-container { .tile-process-group-content-container {
width: 320px; width: 354px;
height: 264px; height: 264px;
padding: 1em; padding: 1em;
position: relative; position: relative;
@ -492,11 +492,6 @@ svg.notification-icon {
font-weight: bold; font-weight: bold;
} }
.user_instructions {
filter: opacity(1);
font-size: 1.2em;
margin: 15px 0;
}
.user_instructions_0 { .user_instructions_0 {
filter: opacity(1); filter: opacity(1);

34
spiffworkflow-frontend/src/index.scss
View File

@ -15,37 +15,3 @@
@use '@carbon/colors'; @use '@carbon/colors';
// @use '@carbon/react/scss/colors'; // @use '@carbon/react/scss/colors';
@use '@carbon/react/scss/themes'; @use '@carbon/react/scss/themes';
// Not certain the best location for this, but here are some global
// tweaks the markdown styles.
main {
max-width: 1440px;
margin: auto;
}
p, li, h1, h2, h3, h4, h5, h6, blockquote {
max-width: 640px;
}
li.cds--accordion__item {
max-width: 100%;
}
div.show-page, div.markdown, div.markdown-collapsed, div.markdown-collapsable {
margin: 0 auto;
max-width: 1000px;
padding: 15px 0 15px 0;
}
.wmde-markdown ol {
list-style: decimal;
}
.wmde-markdown ul {
list-style: disc;
}
div.cds--tag svg {
vertical-align: middle;
display: inline-block;
}

3
spiffworkflow-frontend/src/rjsf/carbon_theme/CheckboxesWidget/CheckboxesWidget.tsx
View File

@ -55,6 +55,9 @@ function CheckboxesWidget({
return ( return (
<> <>
<FormLabel required={required} htmlFor={id}>
{label || schema.title}
</FormLabel>
<FormGroup id={id} row={!!inline}> <FormGroup id={id} row={!!inline}>
{Array.isArray(enumOptions) && {Array.isArray(enumOptions) &&
enumOptions.map((option, index: number) => { enumOptions.map((option, index: number) => {

15
spiffworkflow-frontend/src/routes/AdminRoutes.tsx
View File

@ -1,6 +1,6 @@
import { Routes, Route, useLocation } from 'react-router-dom'; import { Routes, Route, useLocation } from 'react-router-dom';
import React, { useEffect } from 'react'; import { useEffect } from 'react';
import ProcessGroupList from './ProcessGroupList'; import ProcessGroupList from './ProcessGroupList';
import ProcessGroupShow from './ProcessGroupShow'; import ProcessGroupShow from './ProcessGroupShow';
import ProcessGroupNew from './ProcessGroupNew'; import ProcessGroupNew from './ProcessGroupNew';
@ -16,12 +16,13 @@ import ProcessInstanceReportList from './ProcessInstanceReportList';
import ProcessInstanceReportNew from './ProcessInstanceReportNew'; import ProcessInstanceReportNew from './ProcessInstanceReportNew';
import ProcessInstanceReportEdit from './ProcessInstanceReportEdit'; import ProcessInstanceReportEdit from './ProcessInstanceReportEdit';
import ReactFormEditor from './ReactFormEditor'; import ReactFormEditor from './ReactFormEditor';
import ProcessInstanceLogList from './ProcessInstanceLogList';
import MessageInstanceList from './MessageInstanceList';
import Configuration from './Configuration'; import Configuration from './Configuration';
import JsonSchemaFormBuilder from './JsonSchemaFormBuilder'; import JsonSchemaFormBuilder from './JsonSchemaFormBuilder';
import ProcessModelNewExperimental from './ProcessModelNewExperimental'; import ProcessModelNewExperimental from './ProcessModelNewExperimental';
import ProcessInstanceFindById from './ProcessInstanceFindById'; import ProcessInstanceFindById from './ProcessInstanceFindById';
import ProcessInterstitialPage from './ProcessInterstitialPage'; import ProcessInterstitialPage from './ProcessInterstitialPage';
import MessageListPage from "./MessageListPage";
export default function AdminRoutes() { export default function AdminRoutes() {
const location = useLocation(); const location = useLocation();
@ -111,6 +112,14 @@ export default function AdminRoutes() {
path="process-models/:process_model_id/form/:file_name" path="process-models/:process_model_id/form/:file_name"
element={<ReactFormEditor />} element={<ReactFormEditor />}
/> />
<Route
path="logs/:process_model_id/:process_instance_id"
element={<ProcessInstanceLogList variant="all" />}
/>
<Route
path="logs/for-me/:process_model_id/:process_instance_id"
element={<ProcessInstanceLogList variant="for-me" />}
/>
<Route <Route
path="process-instances" path="process-instances"
element={<ProcessInstanceList variant="for-me" />} element={<ProcessInstanceList variant="for-me" />}
@ -123,6 +132,7 @@ export default function AdminRoutes() {
path="process-instances/all" path="process-instances/all"
element={<ProcessInstanceList variant="all" />} element={<ProcessInstanceList variant="all" />}
/> />
<Route path="messages" element={<MessageInstanceList />} />
<Route path="configuration/*" element={<Configuration />} /> <Route path="configuration/*" element={<Configuration />} />
<Route <Route
path="process-models/:process_model_id/form-builder" path="process-models/:process_model_id/form-builder"
@ -132,7 +142,6 @@ export default function AdminRoutes() {
path="process-instances/find-by-id" path="process-instances/find-by-id"
element={<ProcessInstanceFindById />} element={<ProcessInstanceFindById />}
/> />
<Route path="messages" element={<MessageListPage />} />
</Routes> </Routes>
); );
} }

26
spiffworkflow-frontend/src/components/MessageInstanceList.tsx → spiffworkflow-frontend/src/routes/MessageInstanceList.tsx
View File

@ -3,26 +3,23 @@ import { useEffect, useState } from 'react';
import { ErrorOutline } from '@carbon/icons-react'; import { ErrorOutline } from '@carbon/icons-react';
// @ts-ignore // @ts-ignore
import { Table, Modal, Button } from '@carbon/react'; import { Table, Modal, Button } from '@carbon/react';
import { Link, useSearchParams } from 'react-router-dom'; import { Link, useParams, useSearchParams } from 'react-router-dom';
import PaginationForTable from './PaginationForTable'; import PaginationForTable from '../components/PaginationForTable';
import ProcessBreadcrumb from './ProcessBreadcrumb'; import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import { import {
convertSecondsToFormattedDateTime, convertSecondsToFormattedDateTime,
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessIdentifierForPathParam, modifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { FormatProcessModelDisplayName } from './MiniComponents'; import { FormatProcessModelDisplayName } from '../components/MiniComponents';
import { MessageInstance } from '../interfaces'; import { MessageInstance } from '../interfaces';
type OwnProps = { export default function MessageInstanceList() {
processInstanceId?: number; const params = useParams();
}; const [searchParams] = useSearchParams();
export default function MessageInstanceList({ processInstanceId }: OwnProps) {
const [messageIntances, setMessageInstances] = useState([]); const [messageIntances, setMessageInstances] = useState([]);
const [pagination, setPagination] = useState(null); const [pagination, setPagination] = useState(null);
const [searchParams] = useSearchParams();
const [messageInstanceForModal, setMessageInstanceForModal] = const [messageInstanceForModal, setMessageInstanceForModal] =
useState<MessageInstance | null>(null); useState<MessageInstance | null>(null);
@ -34,15 +31,16 @@ export default function MessageInstanceList({ processInstanceId }: OwnProps) {
}; };
const { page, perPage } = getPageInfoFromSearchParams(searchParams); const { page, perPage } = getPageInfoFromSearchParams(searchParams);
let queryParamString = `per_page=${perPage}&page=${page}`; let queryParamString = `per_page=${perPage}&page=${page}`;
if (processInstanceId) { if (searchParams.get('process_instance_id')) {
queryParamString += `&process_instance_id=${processInstanceId}`; queryParamString += `&process_instance_id=${searchParams.get(
'process_instance_id'
)}`;
} }
HttpService.makeCallToBackend({ HttpService.makeCallToBackend({
path: `/messages?${queryParamString}`, path: `/messages?${queryParamString}`,
successCallback: setMessageInstanceListFromResult, successCallback: setMessageInstanceListFromResult,
}); });
}, [processInstanceId, searchParams]); }, [searchParams, params]);
const handleCorrelationDisplayClose = () => { const handleCorrelationDisplayClose = () => {
setMessageInstanceForModal(null); setMessageInstanceForModal(null);

5
spiffworkflow-frontend/src/routes/MessageListPage.tsx
View File

@ -1,5 +0,0 @@
import MessageInstanceList from '../components/MessageInstanceList';
export default function MessageListPage() {
return <MessageInstanceList />;
}

92
spiffworkflow-frontend/src/components/ProcessInstanceLogList.tsx → spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
View File

@ -2,6 +2,9 @@ import { useEffect, useState } from 'react';
import { ErrorOutline } from '@carbon/icons-react'; import { ErrorOutline } from '@carbon/icons-react';
import { import {
Table, Table,
Tabs,
TabList,
Tab,
Grid, Grid,
Column, Column,
ButtonSet, ButtonSet,
@ -11,8 +14,14 @@ import {
Loading, Loading,
// @ts-ignore // @ts-ignore
} from '@carbon/react'; } from '@carbon/react';
import { createSearchParams, Link, useSearchParams } from 'react-router-dom'; import {
import PaginationForTable from './PaginationForTable'; createSearchParams,
Link,
useParams,
useSearchParams,
} from 'react-router-dom';
import PaginationForTable from '../components/PaginationForTable';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import { import {
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
convertSecondsToFormattedDateTime, convertSecondsToFormattedDateTime,
@ -25,30 +34,23 @@ import {
ProcessInstanceEventErrorDetail, ProcessInstanceEventErrorDetail,
ProcessInstanceLogEntry, ProcessInstanceLogEntry,
} from '../interfaces'; } from '../interfaces';
import Filters from './Filters'; import Filters from '../components/Filters';
import { usePermissionFetcher } from '../hooks/PermissionService'; import { usePermissionFetcher } from '../hooks/PermissionService';
import { import {
childrenForErrorObject, childrenForErrorObject,
errorForDisplayFromProcessInstanceErrorDetail, errorForDisplayFromProcessInstanceErrorDetail,
} from './ErrorDisplay'; } from '../components/ErrorDisplay';
type OwnProps = { type OwnProps = {
variant: string; // 'all' or 'for-me' variant: string;
isEventsView: boolean;
processModelId: string;
processInstanceId: number;
}; };
export default function ProcessInstanceLogList({ export default function ProcessInstanceLogList({ variant }: OwnProps) {
variant, const params = useParams();
isEventsView = true,
processModelId,
processInstanceId,
}: OwnProps) {
const [clearAll, setClearAll] = useState<boolean>(false); const [clearAll, setClearAll] = useState<boolean>(false);
const [searchParams, setSearchParams] = useSearchParams();
const [processInstanceLogs, setProcessInstanceLogs] = useState([]); const [processInstanceLogs, setProcessInstanceLogs] = useState([]);
const [pagination, setPagination] = useState(null); const [pagination, setPagination] = useState(null);
const [searchParams, setSearchParams] = useSearchParams();
const [taskTypes, setTaskTypes] = useState<string[]>([]); const [taskTypes, setTaskTypes] = useState<string[]>([]);
const [eventTypes, setEventTypes] = useState<string[]>([]); const [eventTypes, setEventTypes] = useState<string[]>([]);
@ -69,18 +71,17 @@ export default function ProcessInstanceLogList({
const [showFilterOptions, setShowFilterOptions] = useState<boolean>(false); const [showFilterOptions, setShowFilterOptions] = useState<boolean>(false);
const randomNumberBetween0and1 = Math.random(); const randomNumberBetween0and1 = Math.random();
searchParams.set('events', isEventsView ? 'true' : 'false');
let shouldDisplayClearButton = false; let shouldDisplayClearButton = false;
if (randomNumberBetween0and1 < 0.05) { if (randomNumberBetween0and1 < 0.05) {
// 5% chance of being here // 5% chance of being here
shouldDisplayClearButton = true; shouldDisplayClearButton = true;
} }
let processInstanceShowPageBaseUrl = `/admin/process-instances/for-me/${processModelId}`; let processInstanceShowPageBaseUrl = `/admin/process-instances/for-me/${params.process_model_id}`;
if (variant === 'all') { if (variant === 'all') {
processInstanceShowPageBaseUrl = `/admin/process-instances/${processModelId}`; processInstanceShowPageBaseUrl = `/admin/process-instances/${params.process_model_id}`;
} }
const isEventsView = searchParams.get('events') === 'true';
const taskNameHeader = isEventsView ? 'Task Name' : 'Milestone'; const taskNameHeader = isEventsView ? 'Task Name' : 'Milestone';
const updateSearchParams = (value: string, key: string) => { const updateSearchParams = (value: string, key: string) => {
@ -129,7 +130,7 @@ export default function ProcessInstanceLogList({
typeaheadQueryParamString = '?task_type=IntermediateThrowEvent'; typeaheadQueryParamString = '?task_type=IntermediateThrowEvent';
} }
HttpService.makeCallToBackend({ HttpService.makeCallToBackend({
path: `/v1.0/logs/typeahead-filter-values/${processModelId}/${processInstanceId}${typeaheadQueryParamString}`, path: `/v1.0/logs/typeahead-filter-values/${params.process_model_id}/${params.process_instance_id}${typeaheadQueryParamString}`,
successCallback: (result: any) => { successCallback: (result: any) => {
setTaskTypes(result.task_types); setTaskTypes(result.task_types);
setEventTypes(result.event_types); setEventTypes(result.event_types);
@ -139,8 +140,7 @@ export default function ProcessInstanceLogList({
}); });
}, [ }, [
searchParams, searchParams,
processInstanceId, params,
processModelId,
targetUris.processInstanceLogListPath, targetUris.processInstanceLogListPath,
isEventsView, isEventsView,
]); ]);
@ -487,12 +487,60 @@ export default function ProcessInstanceLogList({
); );
}; };
const tabs = () => {
const selectedTabIndex = isEventsView ? 1 : 0;
return (
<Tabs selectedIndex={selectedTabIndex}>
<TabList aria-label="List of tabs">
<Tab
title="Only show a subset of the logs, and show fewer columns"
data-qa="process-instance-log-milestones"
onClick={() => {
resetFilters();
searchParams.set('events', 'false');
setSearchParams(searchParams);
}}
>
Milestones
</Tab>
<Tab
title="Show all logs for this process instance, and show extra columns that may be useful for debugging"
data-qa="process-instance-log-events"
onClick={() => {
resetFilters();
searchParams.set('events', 'true');
setSearchParams(searchParams);
}}
>
Events
</Tab>
</TabList>
</Tabs>
);
};
const { page, perPage } = getPageInfoFromSearchParams(searchParams); const { page, perPage } = getPageInfoFromSearchParams(searchParams);
if (clearAll) { if (clearAll) {
return <p>Page cleared 👍</p>; return <p>Page cleared 👍</p>;
} }
return ( return (
<> <>
<ProcessBreadcrumb
hotCrumbs={[
['Process Groups', '/admin'],
{
entityToExplode: params.process_model_id || '',
entityType: 'process-model-id',
linkLastItem: true,
},
[
`Process Instance: ${params.process_instance_id}`,
`${processInstanceShowPageBaseUrl}/${params.process_instance_id}`,
],
['Logs'],
]}
/>
{tabs()}
{errorEventModal()} {errorEventModal()}
<Filters <Filters
filterOptions={filterOptions} filterOptions={filterOptions}

314
spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
View File

@ -20,18 +20,15 @@ import {
Grid, Grid,
Column, Column,
Button, Button,
ButtonSet,
Tag, Tag,
Modal, Modal,
Dropdown, Dropdown,
Stack, Stack,
Loading, Loading,
Tabs,
Tab,
TabList,
TabPanels,
TabPanel,
// @ts-ignore // @ts-ignore
} from '@carbon/react'; } from '@carbon/react';
import { Can } from '@casl/react';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb'; import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import ReactDiagramEditor from '../components/ReactDiagramEditor'; import ReactDiagramEditor from '../components/ReactDiagramEditor';
@ -48,6 +45,7 @@ import {
PermissionsToCheck, PermissionsToCheck,
ProcessData, ProcessData,
ProcessInstance, ProcessInstance,
ProcessInstanceMetadata,
Task, Task,
TaskDefinitionPropertiesJson, TaskDefinitionPropertiesJson,
} from '../interfaces'; } from '../interfaces';
@ -56,8 +54,6 @@ import ProcessInstanceClass from '../classes/ProcessInstanceClass';
import TaskListTable from '../components/TaskListTable'; import TaskListTable from '../components/TaskListTable';
import useAPIError from '../hooks/UseApiError'; import useAPIError from '../hooks/UseApiError';
import ProcessInterstitial from '../components/ProcessInterstitial'; import ProcessInterstitial from '../components/ProcessInterstitial';
import ProcessInstanceLogList from '../components/ProcessInstanceLogList';
import MessageInstanceList from '../components/MessageInstanceList';
type OwnProps = { type OwnProps = {
variant: string; variant: string;
@ -88,6 +84,8 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
const [eventPayload, setEventPayload] = useState<string>('{}'); const [eventPayload, setEventPayload] = useState<string>('{}');
const [eventTextEditorEnabled, setEventTextEditorEnabled] = const [eventTextEditorEnabled, setEventTextEditorEnabled] =
useState<boolean>(false); useState<boolean>(false);
const [showProcessInstanceMetadata, setShowProcessInstanceMetadata] =
useState<boolean>(false);
const { addError, removeError } = useAPIError(); const { addError, removeError } = useAPIError();
const unModifiedProcessModelId = unModifyProcessIdentifierForPathParam( const unModifiedProcessModelId = unModifyProcessIdentifierForPathParam(
@ -126,9 +124,11 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
}; };
let processInstanceShowPageBaseUrl = `/admin/process-instances/for-me/${params.process_model_id}/${params.process_instance_id}`; let processInstanceShowPageBaseUrl = `/admin/process-instances/for-me/${params.process_model_id}/${params.process_instance_id}`;
let processInstanceLogListPageBaseUrl = `/admin/logs/for-me/${params.process_model_id}/${params.process_instance_id}`;
const processInstanceShowPageBaseUrlAllVariant = `/admin/process-instances/${params.process_model_id}/${params.process_instance_id}`; const processInstanceShowPageBaseUrlAllVariant = `/admin/process-instances/${params.process_model_id}/${params.process_instance_id}`;
if (variant === 'all') { if (variant === 'all') {
processInstanceShowPageBaseUrl = processInstanceShowPageBaseUrlAllVariant; processInstanceShowPageBaseUrl = processInstanceShowPageBaseUrlAllVariant;
processInstanceLogListPageBaseUrl = `/admin/logs/${params.process_model_id}/${params.process_instance_id}`;
} }
const handleAddErrorInUseEffect = useCallback((value: ErrorForDisplay) => { const handleAddErrorInUseEffect = useCallback((value: ErrorForDisplay) => {
@ -313,7 +313,7 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
} }
const lastUpdatedTimeTag = ( const lastUpdatedTimeTag = (
<Grid condensed fullWidth> <Grid condensed fullWidth>
<Column sm={2} md={2} lg={4} className="grid-list-title"> <Column sm={1} md={1} lg={2} className="grid-list-title">
{lastUpdatedTimeLabel}:{' '} {lastUpdatedTimeLabel}:{' '}
</Column> </Column>
<Column sm={3} md={3} lg={3} className="grid-date"> <Column sm={3} md={3} lg={3} className="grid-date">
@ -323,33 +323,20 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
); );
let statusIcon = <InProgress />; let statusIcon = <InProgress />;
let statusColor = 'gray';
if (processInstance.status === 'suspended') { if (processInstance.status === 'suspended') {
statusIcon = <PauseOutline />; statusIcon = <PauseOutline />;
} else if (processInstance.status === 'complete') { } else if (processInstance.status === 'complete') {
statusIcon = <Checkmark />; statusIcon = <Checkmark />;
statusColor = 'green';
} else if (processInstance.status === 'terminated') { } else if (processInstance.status === 'terminated') {
statusIcon = <StopOutline />; statusIcon = <StopOutline />;
} else if (processInstance.status === 'error') { } else if (processInstance.status === 'error') {
statusIcon = <Warning />; statusIcon = <Warning />;
statusColor = 'red';
} }
return ( return (
<> <>
<Grid condensed fullWidth> <Grid condensed fullWidth>
<Column sm={2} md={2} lg={4} className="grid-list-title"> <Column sm={1} md={1} lg={2} className="grid-list-title">
Status:{' '}
</Column>
<Column sm={3} md={3} lg={3}>
<Tag type={statusColor} size="sm" className="span-tag">
{processInstance.status} {statusIcon}
</Tag>
</Column>
</Grid>
<Grid condensed fullWidth>
<Column sm={2} md={2} lg={4} className="grid-list-title">
Started By:{' '} Started By:{' '}
</Column> </Column>
<Column sm={3} md={3} lg={3} className="grid-date"> <Column sm={3} md={3} lg={3} className="grid-date">
@ -358,7 +345,7 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
</Grid> </Grid>
{processInstance.process_model_with_diagram_identifier ? ( {processInstance.process_model_with_diagram_identifier ? (
<Grid condensed fullWidth> <Grid condensed fullWidth>
<Column sm={2} md={2} lg={4} className="grid-list-title"> <Column sm={1} md={1} lg={2} className="grid-list-title">
Current Diagram:{' '} Current Diagram:{' '}
</Column> </Column>
<Column sm={4} md={6} lg={8} className="grid-date"> <Column sm={4} md={6} lg={8} className="grid-date">
@ -374,7 +361,7 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
</Grid> </Grid>
) : null} ) : null}
<Grid condensed fullWidth> <Grid condensed fullWidth>
<Column sm={2} md={2} lg={4} className="grid-list-title"> <Column sm={1} md={1} lg={2} className="grid-list-title">
Started:{' '} Started:{' '}
</Column> </Column>
<Column <Column
@ -393,7 +380,7 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
</Grid> </Grid>
{lastUpdatedTimeTag} {lastUpdatedTimeTag}
<Grid condensed fullWidth> <Grid condensed fullWidth>
<Column sm={2} md={2} lg={4} className="grid-list-title"> <Column sm={1} md={1} lg={2} className="grid-list-title">
Process model revision:{' '} Process model revision:{' '}
</Column> </Column>
<Column sm={3} md={3} lg={3} className="grid-date"> <Column sm={3} md={3} lg={3} className="grid-date">
@ -401,18 +388,64 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
{processInstance.bpmn_version_control_type}) {processInstance.bpmn_version_control_type})
</Column> </Column>
</Grid> </Grid>
{(processInstance.process_metadata || []).map( <Grid condensed fullWidth>
(processInstanceMetadata) => ( <Column sm={1} md={1} lg={2} className="grid-list-title">
<Grid condensed fullWidth> Status:{' '}
<Column sm={2} md={2} lg={4} className="grid-list-title"> </Column>
{processInstanceMetadata.key}: <Column sm={3} md={3} lg={3}>
</Column> <Tag type="gray" size="sm" className="span-tag">
<Column sm={3} md={3} lg={3} className="grid-date"> {processInstance.status} {statusIcon}
{processInstanceMetadata.value} </Tag>
</Column> </Column>
</Grid> </Grid>
) <br />
)} <Grid condensed fullWidth>
<Column sm={2} md={2} lg={2}>
<ButtonSet>
<Can
I="GET"
a={targetUris.processInstanceLogListPath}
ability={ability}
>
<Button
size="sm"
className="button-white-background"
data-qa="process-instance-log-list-link"
href={`${processInstanceLogListPageBaseUrl}`}
>
Logs
</Button>
</Can>
<Can
I="GET"
a={targetUris.messageInstanceListPath}
ability={ability}
>
<Button
size="sm"
className="button-white-background"
data-qa="process-instance-message-instance-list-link"
href={`/admin/messages?process_model_id=${params.process_model_id}&process_instance_id=${params.process_instance_id}`}
>
Messages
</Button>
</Can>
{processInstance.process_metadata &&
processInstance.process_metadata.length > 0 ? (
<Button
size="sm"
className="button-white-background"
data-qa="process-instance-show-metadata"
onClick={() => {
setShowProcessInstanceMetadata(true);
}}
>
Details
</Button>
) : null}
</ButtonSet>
</Column>
</Grid>
</> </>
); );
}; };
@ -910,6 +943,41 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
); );
}; };
const processInstanceMetadataArea = () => {
if (
!processInstance ||
(processInstance.process_metadata &&
processInstance.process_metadata.length < 1)
) {
return null;
}
const metadataComponents: any[] = [];
(processInstance.process_metadata || []).forEach(
(processInstanceMetadata: ProcessInstanceMetadata) => {
metadataComponents.push(
<Grid condensed fullWidth>
<Column sm={3} md={3} lg={5} className="grid-list-title">
{processInstanceMetadata.key}
</Column>
<Column sm={3} md={3} lg={3} className="grid-date">
{processInstanceMetadata.value}
</Column>
</Grid>
);
}
);
return (
<Modal
open={showProcessInstanceMetadata}
modalHeading="Details"
passiveModal
onRequestClose={() => setShowProcessInstanceMetadata(false)}
>
{metadataComponents}
</Modal>
);
};
const taskUpdateDisplayArea = () => { const taskUpdateDisplayArea = () => {
if (!taskToDisplay) { if (!taskToDisplay) {
return null; return null;
@ -1026,120 +1094,76 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
); );
}; };
if (processInstance && (tasks || tasksCallHadError) && permissionsLoaded) { if (processInstance && (tasks || tasksCallHadError)) {
const processModelId = unModifyProcessIdentifierForPathParam( const processModelId = unModifyProcessIdentifierForPathParam(
params.process_model_id ? params.process_model_id : '' params.process_model_id ? params.process_model_id : ''
); );
const getTabs = () => {
const canViewLogs = ability.can(
'GET',
targetUris.processInstanceLogListPath
);
const canViewMsgs = ability.can(
'GET',
targetUris.messageInstanceListPath
);
return (
<Tabs>
<TabList aria-label="List of tabs">
<Tab>Diagram</Tab>
<Tab disabled={!canViewLogs}>Milestones</Tab>
<Tab disabled={!canViewLogs}>Events</Tab>
<Tab disabled={!canViewMsgs}>Messages</Tab>
</TabList>
<TabPanels>
<TabPanel>
<ReactDiagramEditor
processModelId={processModelId || ''}
diagramXML={processInstance.bpmn_xml_file_contents || ''}
fileName={processInstance.bpmn_xml_file_contents || ''}
tasks={tasks}
diagramType="readonly"
onElementClick={handleClickedDiagramTask}
/>
<div id="diagram-container" />
</TabPanel>
<TabPanel>
<ProcessInstanceLogList
variant={variant}
isEventsView={false}
processModelId={modifiedProcessModelId || ''}
processInstanceId={processInstance.id}
/>
</TabPanel>
<TabPanel>
<ProcessInstanceLogList
variant={variant}
isEventsView
processModelId={modifiedProcessModelId || ''}
processInstanceId={processInstance.id}
/>
</TabPanel>
<TabPanel>
<MessageInstanceList processInstanceId={processInstance.id} />
</TabPanel>
</TabPanels>
</Tabs>
);
};
return ( return (
<> <>
<div className="show-page"> <ProcessBreadcrumb
<ProcessBreadcrumb hotCrumbs={[
hotCrumbs={[ ['Process Groups', '/admin'],
['Process Groups', '/admin'], {
{ entityToExplode: processModelId,
entityToExplode: processModelId, entityType: 'process-model-id',
entityType: 'process-model-id', linkLastItem: true,
linkLastItem: true, },
}, [`Process Instance Id: ${processInstance.id}`],
[`Process Instance Id: ${processInstance.id}`], ]}
]} />
/> <Stack orientation="horizontal" gap={1}>
<Stack orientation="horizontal" gap={1}> <h1 className="with-icons">
<h1 className="with-icons"> Process Instance Id: {processInstance.id}
Process Instance Id: {processInstance.id} </h1>
</h1> {buttonIcons()}
{buttonIcons()} </Stack>
</Stack> <ProcessInterstitial
{getInfoTag()} processInstanceId={processInstance.id}
<ProcessInterstitial processInstanceShowPageUrl={processInstanceShowPageBaseUrl}
processInstanceId={processInstance.id} allowRedirect={false}
processInstanceShowPageUrl={processInstanceShowPageBaseUrl} smallSpinner
allowRedirect={false} />
smallSpinner <br />
collapsableInstructions <br />
/> <Grid condensed fullWidth>
<Grid condensed fullWidth> <Column md={6} lg={8} sm={4}>
<Column md={6} lg={8} sm={4}> <TaskListTable
<TaskListTable apiPath="/tasks"
apiPath="/tasks" additionalParams={`process_instance_id=${processInstance.id}`}
additionalParams={`process_instance_id=${processInstance.id}`} tableTitle="Tasks I can complete"
tableTitle="Tasks I can complete" tableDescription="These are tasks that can be completed by you, either because they were assigned to a group you are in, or because they were assigned directly to you."
tableDescription="These are tasks that can be completed by you, either because they were assigned to a group you are in, or because they were assigned directly to you." paginationClassName="with-large-bottom-margin"
paginationClassName="with-large-bottom-margin" textToShowIfEmpty="There are no tasks you can complete for this process instance."
textToShowIfEmpty="There are no tasks you can complete for this process instance." shouldPaginateTable={false}
shouldPaginateTable={false} showProcessModelIdentifier={false}
showProcessModelIdentifier={false} showProcessId={false}
showProcessId={false} showStartedBy={false}
showStartedBy={false} showTableDescriptionAsTooltip
showTableDescriptionAsTooltip showDateStarted={false}
showDateStarted={false} showLastUpdated={false}
showLastUpdated={false} hideIfNoTasks
hideIfNoTasks canCompleteAllTasks
canCompleteAllTasks />
/> </Column>
</Column> </Grid>
</Grid> {getInfoTag()}
{taskUpdateDisplayArea()} <br />
{processDataDisplayArea()} {taskUpdateDisplayArea()}
<br /> {processDataDisplayArea()}
{viewMostRecentStateComponent()} {processInstanceMetadataArea()}
</div> <br />
{getTabs()} {viewMostRecentStateComponent()}
<ReactDiagramEditor
processModelId={processModelId || ''}
diagramXML={processInstance.bpmn_xml_file_contents || ''}
fileName={processInstance.bpmn_xml_file_contents || ''}
tasks={tasks}
diagramType="readonly"
onElementClick={handleClickedDiagramTask}
/>
<div id="diagram-container" />
</> </>
); );
} }

4
spiffworkflow-frontend/src/routes/ProcessInterstitialPage.tsx
View File

@ -16,7 +16,7 @@ export default function ProcessInterstitialPage({ variant }: OwnProps) {
} }
return ( return (
<div className="show-page"> <>
<ProcessBreadcrumb <ProcessBreadcrumb
hotCrumbs={[ hotCrumbs={[
['Process Groups', '/admin'], ['Process Groups', '/admin'],
@ -36,6 +36,6 @@ export default function ProcessInterstitialPage({ variant }: OwnProps) {
processInstanceShowPageUrl={processInstanceShowPageUrl} processInstanceShowPageUrl={processInstanceShowPageUrl}
allowRedirect allowRedirect
/> />
</div> </>
); );
} }

4
spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
View File

@ -615,7 +615,7 @@ export default function ProcessModelShow() {
if (processModel) { if (processModel) {
return ( return (
<div className="show-page"> <>
{fileUploadModal()} {fileUploadModal()}
{confirmOverwriteFileDialog()} {confirmOverwriteFileDialog()}
<ProcessBreadcrumb <ProcessBreadcrumb
@ -713,7 +713,7 @@ export default function ProcessModelShow() {
/> />
<span data-qa="process-model-show-permissions-loaded" /> <span data-qa="process-model-show-permissions-loaded" />
</Can> </Can>
</div> </>
); );
} }
return null; return null;

4
spiffworkflow-frontend/src/routes/TaskShow.tsx
View File

@ -454,7 +454,7 @@ export default function TaskShow() {
} }
return ( return (
<div className="show-page"> <main>
<ProcessBreadcrumb <ProcessBreadcrumb
hotCrumbs={[ hotCrumbs={[
[ [
@ -473,7 +473,7 @@ export default function TaskShow() {
</h3> </h3>
<InstructionsForEndUser task={task} /> <InstructionsForEndUser task={task} />
{formElement()} {formElement()}
</div> </main>
); );
} }