Skip to content

Commit

Permalink
kie-issues#639: Upgrade kie-tools to 0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
pefernan committed Oct 25, 2023
1 parent 734bf1e commit 4e9e4e1
Show file tree
Hide file tree
Showing 63 changed files with 9,613 additions and 3,919 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@
<include>form-displayer.js</include>
<include>serverless-workflow-combined-editor-envelope.html</include>
<include>serverless-workflow-combined-editor-envelope.js</include>
<include>serverless-workflow-mermaid-viewer-envelope.html</include>
<include>serverless-workflow-mermaid-viewer-envelope.js</include>
<include>serverless-workflow-text-editor-envelope.html</include>
<include>serverless-workflow-text-editor-envelope.js</include>
<include>serverless-workflow-diagram-editor-envelope.html</include>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
diagramPreviewSize: {
width: 1000,
height: 1000
},
isStunnerEnabled: {config:property('kogito.swf.stunner.enabled') ?: true}
}
})
</script>
{/body} {/include}
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
diagramPreviewSize: {
width: 1000,
height: 1000
},
isStunnerEnabled: {config:property('kogito.swf.stunner.enabled') ?: true}
}
})
</script>
{/body} {/include}
2 changes: 1 addition & 1 deletion ui-packages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"prepare": "cd .. && husky install"
},
"devDependencies": {
"@kie-tools/dashbuilder-client": "^0.30.0",
"@kie-tools/dashbuilder-client": "^0.32.0",
"@kie/lock-treatment-tool": "^0.2.4",
"@types/node": "^18.16.19",
"@typescript-eslint/eslint-plugin": "^4.33.0",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/cloud-event-form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-code-editor": "4.82.113",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/custom-dashboard-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-core": "^4.276.8",
Expand Down
6 changes: 3 additions & 3 deletions ui-packages/packages/custom-dashboard-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-core": "^4.276.8",
Expand All @@ -40,7 +40,7 @@
},
"devDependencies": {
"@babel/core": "^7.22.8",
"@kie-tools/dashbuilder-client": "^0.30.0",
"@kie-tools/dashbuilder-client": "^0.32.0",
"@kogito-apps/ouia-tools": "workspace:*",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^11.2.6",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/form-details/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@kogito-apps/form-displayer": "workspace:*",
"@kogito-apps/forms-list": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/form-displayer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"dependencies": {
"@babel/standalone": "7.15.3",
"@emotion/core": "^10.3.1",
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-core": "^4.276.8",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/forms-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-core": "^4.276.8",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/jobs-management/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@kogito-apps/management-console-shared": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/management-console-shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.24.0",
"@kie-tools-core/envelope-bus": "0.24.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@patternfly/react-core": "^4.276.8",
"@patternfly/react-icons": "^4.93.6",
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/process-definition-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
"@patternfly/react-core": "^4.276.8",
Expand Down
10 changes: 5 additions & 5 deletions ui-packages/packages/process-details/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/editor": "0.30.0",
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools/serverless-workflow-combined-editor": "0.30.0",
"@kie-tools/serverless-workflow-diagram-editor-assets": "0.30.0",
"@kie-tools-core/editor": "0.32.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kie-tools/serverless-workflow-combined-editor": "0.32.0",
"@kie-tools/serverless-workflow-diagram-editor-assets": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@kogito-apps/management-console-shared": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export interface ProcessDetailsInitArgs {
omittedProcessTimelineEvents?: string[];
diagramPreviewSize?: DiagramPreviewSize;
showSwfDiagram: boolean;
isStunnerEnabled?: boolean;
singularProcessLabel: string;
pluralProcessLabel: string;
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export interface Props {
omittedProcessTimelineEvents?: string[];
diagramPreviewSize?: DiagramPreviewSize;
showSwfDiagram: boolean;
isStunnerEnabled?: boolean;
singularProcessLabel: string;
pluralProcessLabel: string;
}
Expand Down Expand Up @@ -89,7 +88,6 @@ export const EmbeddedProcessDetails = React.forwardRef(
omittedProcessTimelineEvents: props.omittedProcessTimelineEvents,
diagramPreviewSize: props.diagramPreviewSize,
showSwfDiagram: props.showSwfDiagram,
isStunnerEnabled: props.isStunnerEnabled,
singularProcessLabel: props.singularProcessLabel,
pluralProcessLabel: props.pluralProcessLabel
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export const ProcessDetailsEnvelopeView = React.forwardRef<
const [diagramPreviewSize, setDiagramPreviewSize] =
useState<DiagramPreviewSize>();
const [showSwfDiagram, setShowSwfDiagram] = useState<boolean>(false);
const [isStunnerEnabled, setIsStunnerEnabled] = useState<boolean>(false);
const [singularProcessLabel, setSingularProcessLabel] = useState<string>('');
const [pluralProcessLabel, setPluralProcessLabel] = useState<string>('');
useImperativeHandle(
Expand All @@ -62,7 +61,6 @@ export const ProcessDetailsEnvelopeView = React.forwardRef<
setOmittedProcessTimelineEvents(initArgs.omittedProcessTimelineEvents);
setDiagramPreviewSize(initArgs.diagramPreviewSize);
setShowSwfDiagram(initArgs.showSwfDiagram);
setIsStunnerEnabled(initArgs.isStunnerEnabled);
setSingularProcessLabel(initArgs.singularProcessLabel);
setPluralProcessLabel(initArgs.pluralProcessLabel);
setEnvelopeConnectedToChannel(true);
Expand All @@ -80,7 +78,6 @@ export const ProcessDetailsEnvelopeView = React.forwardRef<
omittedProcessTimelineEvents={omittedProcessTimelineEvents}
diagramPreviewSize={diagramPreviewSize}
showSwfDiagram={showSwfDiagram}
isStunnerEnabled={isStunnerEnabled}
singularProcessLabel={singularProcessLabel}
pluralProcessLabel={pluralProcessLabel}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ interface ProcessDetailsProps {
omittedProcessTimelineEvents: string[];
diagramPreviewSize?: DiagramPreviewSize;
showSwfDiagram: boolean;
isStunnerEnabled?: boolean;
singularProcessLabel: string;
pluralProcessLabel: string;
}
Expand All @@ -86,8 +85,7 @@ const ProcessDetails: React.FC<ProcessDetailsProps> = ({
diagramPreviewSize,
showSwfDiagram,
singularProcessLabel,
pluralProcessLabel,
isStunnerEnabled
pluralProcessLabel
}) => {
const [data, setData] = useState<ProcessInstance>({} as ProcessInstance);
const [jobs, setJobs] = useState<Job[]>([]);
Expand Down Expand Up @@ -324,7 +322,6 @@ const ProcessDetails: React.FC<ProcessDetailsProps> = ({
<Flex>
<FlexItem>
<SwfCombinedEditor
isStunnerEnabled={isStunnerEnabled}
height={diagramPreviewSize?.height}
width={diagramPreviewSize?.width}
workflowInstance={data}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,21 @@ import {
} from '@kie-tools-core/editor/dist/channel';
import {
SwfCombinedEditorChannelApiImpl,
SwfFeatureToggleChannelApiImpl,
SwfPreviewOptionsChannelApiImpl
} from '@kie-tools/serverless-workflow-combined-editor/dist/impl';
} from '@kie-tools/serverless-workflow-combined-editor/dist/channel';
import { useController } from '../../../hooks/useController';
import { ProcessInstance } from '@kogito-apps/management-console-shared/dist/types';
import { MessageBusClientApi } from '@kie-tools-core/envelope-bus/dist/api';
import { ServerlessWorkflowCombinedEditorChannelApi } from '@kie-tools/serverless-workflow-combined-editor/dist/api';
import { ServerlessWorkflowCombinedEditorEnvelopeApi } from '@kie-tools/serverless-workflow-combined-editor/dist/api/ServerlessWorkflowCombinedEditorEnvelopeApi';
interface ISwfCombinedEditorProps {
workflowInstance: Pick<ProcessInstance, 'source' | 'nodes' | 'error'>;
isStunnerEnabled: boolean;
width?: number;
height?: number;
}

const SwfCombinedEditor: React.FC<ISwfCombinedEditorProps & OUIAProps> = ({
workflowInstance,
isStunnerEnabled,
width,
height,
ouiaId,
Expand Down Expand Up @@ -131,14 +128,6 @@ const SwfCombinedEditor: React.FC<ISwfCombinedEditorProps & OUIAProps> = ({
[stateControl, embeddedFile]
);

const swfFeatureToggleChannelApiImpl = useMemo(
() =>
new SwfFeatureToggleChannelApiImpl({
stunnerEnabled: isStunnerEnabled
}),
[isStunnerEnabled]
);

const swfPreviewOptionsChannelApiImpl = useMemo(
() =>
new SwfPreviewOptionsChannelApiImpl({
Expand All @@ -149,19 +138,11 @@ const SwfCombinedEditor: React.FC<ISwfCombinedEditorProps & OUIAProps> = ({

const apiImpl = useMemo(
() =>
new SwfCombinedEditorChannelApiImpl(
channelApiImpl,
swfFeatureToggleChannelApiImpl,
null,
null,
swfPreviewOptionsChannelApiImpl,
null
),
[
channelApiImpl,
swfFeatureToggleChannelApiImpl,
swfPreviewOptionsChannelApiImpl
]
new SwfCombinedEditorChannelApiImpl({
defaultApiImpl: channelApiImpl,
swfPreviewOptionsChannelApiImpl
}),
[channelApiImpl, swfPreviewOptionsChannelApiImpl]
);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ describe('SwfCombinedEditor component tests', () => {
]
},
height: 600,
width: 600,
isStunnerEnabled: true
width: 600
};
const container = render(<SwfCombinedEditor {...props} />).container;
expect(container).toMatchSnapshot();
Expand All @@ -68,8 +67,7 @@ describe('SwfCombinedEditor component tests', () => {
nodes: []
},
height: 600,
width: 600,
isStunnerEnabled: true
width: 600
};
const container = render(<SwfCombinedEditor {...props} />).container;
expect(container).toMatchSnapshot();
Expand Down
4 changes: 2 additions & 2 deletions ui-packages/packages/process-form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@kogito-apps/task-console-shared": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
Expand Down
6 changes: 3 additions & 3 deletions ui-packages/packages/process-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"clean": "rimraf dist"
},
"dependencies": {
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kogito-apps/components-common": "workspace:*",
"@kogito-apps/management-console-shared": "workspace:*",
"@patternfly/patternfly": "^4.224.2",
Expand All @@ -48,8 +48,8 @@
"@babel/preset-env": "^7.22.7",
"@babel/preset-react": "^7.22.5",
"@kogito-apps/ouia-tools": "workspace:*",
"@testing-library/react": "^11.2.6",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^11.2.6",
"@types/jest": "^26.0.24",
"@types/react": "17.0.5",
"@types/react-dom": "^17.0.20",
Expand Down
17 changes: 8 additions & 9 deletions ui-packages/packages/runtime-tools-dev-ui-webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,14 @@
"dependencies": {
"@apidevtools/swagger-parser": "^10.1.0",
"@babel/standalone": "^7.22.8",
"@kie-tools-core/editor": "0.30.0",
"@kie-tools-core/envelope": "0.30.0",
"@kie-tools-core/envelope-bus": "0.30.0",
"@kie-tools-core/keyboard-shortcuts": "0.30.0",
"@kie-tools/serverless-workflow-combined-editor": "0.30.0",
"@kie-tools/serverless-workflow-diagram-editor-assets": "0.30.0",
"@kie-tools/serverless-workflow-diagram-editor-envelope": "0.30.0",
"@kie-tools/serverless-workflow-mermaid-viewer": "0.30.0",
"@kie-tools/serverless-workflow-text-editor": "0.30.0",
"@kie-tools-core/editor": "0.32.0",
"@kie-tools-core/envelope": "0.32.0",
"@kie-tools-core/envelope-bus": "0.32.0",
"@kie-tools-core/keyboard-shortcuts": "0.32.0",
"@kie-tools/serverless-workflow-combined-editor": "0.32.0",
"@kie-tools/serverless-workflow-diagram-editor-assets": "0.32.0",
"@kie-tools/serverless-workflow-diagram-editor-envelope": "0.32.0",
"@kie-tools/serverless-workflow-text-editor": "0.32.0",
"@kogito-apps/cloud-event-form": "workspace:*",
"@kogito-apps/components-common": "workspace:*",
"@kogito-apps/consoles-common": "workspace:*",
Expand Down
Loading

0 comments on commit 4e9e4e1

Please sign in to comment.