Merge branch 'main' into deploy-app-dev

This commit is contained in:
Madhurya Liyanage 2023-07-04 20:12:54 +05:30
commit 8d7a8a930a
3 changed files with 24 additions and 9 deletions

View File

@ -23,7 +23,6 @@ import {
TableRow,
TimePicker,
Tag,
Stack,
Modal,
ComboBox,
TextInput,
@ -1785,7 +1784,12 @@ export default function ProcessInstanceListTable({
{processInstanceReportSaveTag()}
<Grid fullWidth condensed>
{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
filterOptions={filterOptions}
showFilterOptions={showFilterOptions}
@ -1794,7 +1798,12 @@ export default function ProcessInstanceListTable({
filtersEnabled={filtersEnabled}
/>
</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}
</Column>
</Grid>

View File

@ -92,6 +92,8 @@ type OwnProps = {
activeUserElement?: React.ReactElement;
};
const FitViewport = 'fit-viewport';
// https://codesandbox.io/s/quizzical-lake-szfyo?file=/src/App.js was a handy reference
export default function ReactDiagramEditor({
processModelId,
@ -428,11 +430,11 @@ export default function ReactDiagramEditor({
// a Modeler and not an Editor which is what it will be when we are
// actively editing a decision table
if ((modeler as any).constructor.name === 'Modeler') {
canvas.zoom('fit-viewport');
canvas.zoom(FitViewport);
}
if ((modeler as any).constructor.name === 'Viewer') {
canvas.zoom('fit-viewport');
canvas.zoom(FitViewport);
}
// highlighting a field
@ -495,7 +497,7 @@ export default function ReactDiagramEditor({
ref.element.set(ref.property, elem);
});
diagramModelerToUse.importDefinitions(result.rootElement);
diagramModelerToUse.get('canvas').zoom('fit-viewport');
diagramModelerToUse.get('canvas').zoom(FitViewport);
});
} else {
diagramModelerToUse.importXML(diagramXMLToDisplay);

View File

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