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

Merge branch 'main' into deploy-app-dev

This commit is contained in:
Madhurya Liyanage 2023-07-04 20:12:54 +05:30
parent 7715c9acf2 d56809b141
commit 8d7a8a930a
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
View File

@ -23,7 +23,6 @@ import {
TableRow, TableRow,
TimePicker, TimePicker,
Tag, Tag,
Stack,
Modal, Modal,
ComboBox, ComboBox,
TextInput, TextInput,
@ -1785,7 +1784,12 @@ export default function ProcessInstanceListTable({
{processInstanceReportSaveTag()} {processInstanceReportSaveTag()}
<Grid fullWidth condensed> <Grid fullWidth condensed>
{tableTitleLine()} {tableTitleLine()}
<Column sm={{ span: 4 }} md={{ span: 8 }} lg={{ span: 16 }} style={{maxWidth:'fit-content'}}> <Column
sm={{ span: 4 }}
md={{ span: 8 }}
lg={{ span: 16 }}
style={{ maxWidth: 'fit-content' }}
>
<Filters <Filters
filterOptions={filterOptions} filterOptions={filterOptions}
showFilterOptions={showFilterOptions} showFilterOptions={showFilterOptions}
@ -1794,7 +1798,12 @@ export default function ProcessInstanceListTable({
filtersEnabled={filtersEnabled} filtersEnabled={filtersEnabled}
/> />
</Column> </Column>
<Column sm={{ span: 4 }} md={{ span: 8 }} lg={{ span: 16 }} style={{maxWidth:'fit-content', margin:'auto'}}> <Column
sm={{ span: 4 }}
md={{ span: 8 }}
lg={{ span: 16 }}
style={{ maxWidth: 'fit-content', margin: 'auto' }}
>
{resultsTable} {resultsTable}
</Column> </Column>
</Grid> </Grid>

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

@ -92,6 +92,8 @@ type OwnProps = {
activeUserElement?: React.ReactElement; activeUserElement?: React.ReactElement;
}; };
const FitViewport = 'fit-viewport';
// https://codesandbox.io/s/quizzical-lake-szfyo?file=/src/App.js was a handy reference // https://codesandbox.io/s/quizzical-lake-szfyo?file=/src/App.js was a handy reference
export default function ReactDiagramEditor({ export default function ReactDiagramEditor({
processModelId, processModelId,
@ -428,11 +430,11 @@ export default function ReactDiagramEditor({
// 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 be 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(FitViewport);
} }
if ((modeler as any).constructor.name === 'Viewer') { if ((modeler as any).constructor.name === 'Viewer') {
canvas.zoom('fit-viewport'); canvas.zoom(FitViewport);
} }
// highlighting a field // highlighting a field
@ -495,7 +497,7 @@ export default function ReactDiagramEditor({
ref.element.set(ref.property, elem); ref.element.set(ref.property, elem);
}); });
diagramModelerToUse.importDefinitions(result.rootElement); diagramModelerToUse.importDefinitions(result.rootElement);
diagramModelerToUse.get('canvas').zoom('fit-viewport'); diagramModelerToUse.get('canvas').zoom(FitViewport);
}); });
} else { } else {
diagramModelerToUse.importXML(diagramXMLToDisplay); diagramModelerToUse.importXML(diagramXMLToDisplay);

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

@ -314,7 +314,9 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
const lastUpdatedTimeTag = ( const lastUpdatedTimeTag = (
<dl> <dl>
<dt>{lastUpdatedTimeLabel}:</dt> <dt>{lastUpdatedTimeLabel}:</dt>
<dd>{convertSecondsToFormattedDateTime(lastUpdatedTime || 0) || 'N/A'}</dd> <dd>
{convertSecondsToFormattedDateTime(lastUpdatedTime || 0) || 'N/A'}
</dd>
</dl> </dl>
); );
@ -373,8 +375,10 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
{lastUpdatedTimeTag} {lastUpdatedTimeTag}
<dl> <dl>
<dt>Revision:</dt> <dt>Revision:</dt>
<dd>{processInstance.bpmn_version_control_identifier} ( <dd>
{processInstance.bpmn_version_control_type})</dd> {processInstance.bpmn_version_control_identifier} (
{processInstance.bpmn_version_control_type})
</dd>
</dl> </dl>
</Column> </Column>
<Column sm={4} md={4} lg={8}> <Column sm={4} md={4} lg={8}>