kie-issues#639: Upgrade kie-tools to 0.32 (apache#1899)

* kie-issues#639: Upgrade kie-tools to 0.32 * - fixed webapp resources path * - fix monaco-editor versions conflicts * - snapshot updates
kiegroup · Dec 13, 2023 · f525535 · f525535
1 parent 6e19808
commit f525535
Show file tree

Hide file tree

Showing 70 changed files with 660 additions and 1,086 deletions.
diff --git a/...verless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml b/...verless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui-deployment/pom.xml
@@ -133,7 +133,11 @@
               <outputDirectory>${basedir}/target/classes/dev-static/webapp</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${path.to.webapp.app}/dist</directory>
+                  <directory>${path.to.webapp.app}/dist/resources/webapp</directory>
+                  <filtering>false</filtering>
+                </resource>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/webapp</directory>
                   <filtering>false</filtering>
                 </resource>
               </resources>
@@ -155,17 +159,15 @@
                     <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>
                     <include>serverless-workflow-diagram-editor-envelope.js</include>
                   </includes>
                 </resource>
                 <!--copy diagram into the dev-static-->
-                 <resource>
-                  <directory>${path.to.webapp.app}/dist</directory>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/resources</directory>
                   <includes>
                     <include>diagram/</include>
                   </includes>

diff --git a/...kus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html b/...kus-serverless-workflow-devui-deployment/src/main/resources/dev-templates/monitoring.html
@@ -41,8 +41,7 @@
       diagramPreviewSize: {
           width: 1000,
           height: 1000
-      },
-      isStunnerEnabled: {config:property('kogito.swf.stunner.enabled') ?: true}
+      }
   })
 </script>
 {/body} {/include}
diff --git a/...verless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html b/...verless-workflow-devui-deployment/src/main/resources/dev-templates/workflowInstances.html
@@ -41,8 +41,7 @@
       diagramPreviewSize: {
           width: 1000,
           height: 1000
-      },
-      isStunnerEnabled: {config:property('kogito.swf.stunner.enabled') ?: true}
+      }
   })
 </script>
 {/body} {/include}
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension-deployment/pom.xml
@@ -136,6 +136,10 @@
                   <directory>${path.to.webapp.app}/dist/resources/webapp</directory>
                   <filtering>false</filtering>
                 </resource>
+                <resource>
+                  <directory>${path.to.webapp.app}/dist/webapp</directory>
+                  <filtering>false</filtering>
+                </resource>
               </resources>
             </configuration>
           </execution>

diff --git a/...n/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java b/...n/java/org/kie/kogito/runtime/tools/quarkus/extension/deployment/DevConsoleProcessor.java
@@ -46,6 +46,7 @@
 public class DevConsoleProcessor {
 
     private static final String STATIC_RESOURCES_PATH = "dev-static/";
+    private static final String BASE_RELATIVE_URL = "/q/dev/org.kie.kogito.runtime-tools-quarkus-extension";
     private static final String DATA_INDEX_CAPABILITY = "org.kie.kogito.data-index";
 
     @SuppressWarnings("unused")
@@ -77,7 +78,13 @@ public void deployStaticResources(final DevConsoleRecorder recorder,
                 true);
 
         routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
-                .route("/q/dev/org.kie.kogito.runtime-tools-quarkus-extension/resources/*")
+                .route(BASE_RELATIVE_URL + "/resources/*")
+                .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
+                        shutdownContext))
+                .build());
+
+        routeBuildItemBuildProducer.produce(new RouteBuildItem.Builder()
+                .route(BASE_RELATIVE_URL + "/*")
                 .handler(recorder.devConsoleHandler(devConsoleStaticResourcesDeploymentPath.toString(),
                         shutdownContext))
                 .build());

diff --git a/ui-packages/package.json b/ui-packages/package.json
@@ -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",
@@ -47,7 +47,10 @@
     "minimatch": "^3.0.5",
     "@types/react": "17.0.5",
     "ua-parser-js": "0.7.35",
-    "yaml": "2.3.1"
+    "yaml": "2.3.1",
+    "monaco-editor": "^0.39.0",
+    "react-monaco-editor": "^0.54.0",
+    "monaco-yaml": "^4.0.4"
   },
   "engines": {
     "node": ">=18",

diff --git a/ui-packages/packages/cloud-event-form/package.json b/ui-packages/packages/cloud-event-form/package.json
@@ -28,18 +28,16 @@
     "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",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",

diff --git a/...loud-event-form/src/envelope/tests/__snapshots__/CloudEventFormEnvelopeView.test.tsx.snap b/...loud-event-form/src/envelope/tests/__snapshots__/CloudEventFormEnvelopeView.test.tsx.snap
@@ -463,7 +463,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                           aria-hidden="true"
                           class="margin-view-overlays"
                           role="presentation"
-                          style="position: absolute; width: 51px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; height: 19px;"
+                          style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 51px; height: 19px;"
                         >
                           <div
                             style="position:absolute;top:0px;width:100%;height:19px;"
@@ -473,7 +473,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                               style="width:51px; height:19px;"
                             />
                             <div
-                              class="active-line-number line-numbers"
+                              class="line-numbers active-line-number"
                               style="left:0px;width:25px;"
                             >
                               1
@@ -495,14 +495,14 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                             aria-hidden="true"
                             class="view-overlays"
                             role="presentation"
-                            style="position: absolute; height: 0px; width: 26px;"
+                            style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; height: 0px; width: 35px;"
                           >
                             <div
                               style="position:absolute;top:0px;width:100%;height:19px;"
                             >
                               <div
                                 class="current-line"
-                                style="width:26px; height:19px;"
+                                style="width:35px; height:19px;"
                               />
                             </div>
                           </div>
@@ -522,7 +522,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                             class="view-lines monaco-mouse-cursor-text"
                             data-mprt="7"
                             role="presentation"
-                            style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; width: 26px; height: 19px;"
+                            style="position: absolute; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; width: 35px; height: 19px;"
                           >
                             <div
                               class="view-line"
@@ -545,7 +545,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                           >
                             <div
                               class="cursor monaco-mouse-cursor-text "
-                              style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; width: 2px;"
+                              style="height: 19px; top: 0px; left: 0px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; display: block; visibility: hidden; padding-left: 0px; width: 2px;"
                             />
                           </div>
                         </div>
@@ -582,7 +582,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                       <div
                         aria-hidden="true"
                         role="presentation"
-                        style="width: -17px;"
+                        style="width: -9px;"
                       />
                       <textarea
                         aria-autocomplete="both"
@@ -597,7 +597,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                         data-mprt="6"
                         role="textbox"
                         spellcheck="false"
-                        style="font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
+                        style="tab-size: 20px; font-family: Consolas, 'Courier New', monospace; font-weight: normal; font-size: 14px; font-feature-settings: \\"liga\\" off, \\"calt\\" off; font-variation-settings: normal; line-height: 19px; letter-spacing: 0px; top: 0px; left: 0px; width: 1px; height: 1px;"
                         tabindex="-1"
                         wrap="off"
                       />
@@ -609,12 +609,7 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                         class="overlayWidgets"
                         data-mprt="4"
                         style="width: 5px;"
-                      >
-                        <div
-                          style="position: absolute; top: 0px; right: 50%;"
-                          widgetid="editor.contrib.quickInputWidget"
-                        />
-                      </div>
+                      />
                       <div
                         aria-hidden="true"
                         class="minimap slider-mouseover"
@@ -639,14 +634,19 @@ exports[`CloudEventFormEnvelopeView tests Snapshot 1`] = `
                         />
                         <div
                           class="minimap-slider"
-                          style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: none; top: 0px; height: 0px;"
+                          style="position: absolute; transform: translate3d(0px, 0px, 0px); contain: strict; width: 8px; display: block; top: 0px; height: 0px;"
                         >
                           <div
                             class="minimap-slider-horizontal"
                             style="position: absolute; left: 0px; width: 8px; top: 0px; height: 0px;"
                           />
                         </div>
                       </div>
+                      <div
+                        aria-hidden="true"
+                        class="blockDecorations-container"
+                        role="presentation"
+                      />
                     </div>
                     <div
                       class="overflowingContentWidgets"

diff --git a/ui-packages/packages/custom-dashboard-list/package.json b/ui-packages/packages/custom-dashboard-list/package.json
@@ -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",

diff --git a/ui-packages/packages/custom-dashboard-view/package.json b/ui-packages/packages/custom-dashboard-view/package.json
@@ -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",
@@ -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",

diff --git a/ui-packages/packages/form-details/package.json b/ui-packages/packages/form-details/package.json
@@ -28,20 +28,18 @@
     "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:*",
     "@patternfly/patternfly": "^4.224.2",
-    "@patternfly/react-code-editor": "4.82.113",
+    "@patternfly/react-code-editor": "^4.82.113",
     "@patternfly/react-core": "^4.276.8",
     "@patternfly/react-icons": "^4.93.6",
     "lodash": "^4.17.21",
-    "monaco-yaml": "^4.0.4",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-monaco-editor": "^0.49.0"
+    "react-dom": "^17.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.22.8",

diff --git a/ui-packages/packages/form-displayer/package.json b/ui-packages/packages/form-displayer/package.json
@@ -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",

diff --git a/ui-packages/packages/forms-list/package.json b/ui-packages/packages/forms-list/package.json
@@ -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",

diff --git a/ui-packages/packages/jobs-management/package.json b/ui-packages/packages/jobs-management/package.json
@@ -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",

diff --git a/ui-packages/packages/management-console-shared/package.json b/ui-packages/packages/management-console-shared/package.json
@@ -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",

diff --git a/ui-packages/packages/process-definition-list/package.json b/ui-packages/packages/process-definition-list/package.json
@@ -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",

diff --git a/ui-packages/packages/process-details/package.json b/ui-packages/packages/process-details/package.json
@@ -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",

diff --git a/ui-packages/packages/process-details/src/api/ProcessDetailsEnvelopeApi.ts b/ui-packages/packages/process-details/src/api/ProcessDetailsEnvelopeApi.ts
@@ -40,7 +40,6 @@ export interface ProcessDetailsInitArgs {
   omittedProcessTimelineEvents?: string[];
   diagramPreviewSize?: DiagramPreviewSize;
   showSwfDiagram: boolean;
-  isStunnerEnabled?: boolean;
   singularProcessLabel: string;
   pluralProcessLabel: string;
 }
diff --git a/ui-packages/packages/process-details/src/embedded/EmbeddedProcessDetails.tsx b/ui-packages/packages/process-details/src/embedded/EmbeddedProcessDetails.tsx
@@ -41,7 +41,6 @@ export interface Props {
   omittedProcessTimelineEvents?: string[];
   diagramPreviewSize?: DiagramPreviewSize;
   showSwfDiagram: boolean;
-  isStunnerEnabled?: boolean;
   singularProcessLabel: string;
   pluralProcessLabel: string;
 }
@@ -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
           }