This is an automated email from the ASF dual-hosted git repository.
caponetto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new de8f28eedff KOGITO-9946: Wrong arrow symbol in zoom widget (#2054)
de8f28eedff is described below
commit de8f28eedff522faba4fb45c40a998e0d8b4bf93
Author: Dmitrii Tikhomirov <[email protected]>
AuthorDate: Wed Jan 3 08:47:17 2024 -0800
KOGITO-9946: Wrong arrow symbol in zoom widget (#2054)
Co-authored-by: Guilherme Caponetto
<[email protected]>
---
.../webpack.config.js | 10 ++++++++--
.../serverless-logic-web-tools/webpack.config.ts | 10 ++++++++--
.../dev-webapp/webpack.config.js | 10 ++++++++--
.../index.d.ts | 1 +
.../index.js | 12 ++++++++++++
.../package.json | 1 +
.../sonataflow-deployment-webapp/webpack.config.js | 14 ++++++++++----
pnpm-lock.yaml | 3 +++
repo/graph.dot | 5 ++---
repo/graph.json | 21 ++++++++-------------
10 files changed, 61 insertions(+), 26 deletions(-)
diff --git
a/packages/chrome-extension-serverless-workflow-editor/webpack.config.js
b/packages/chrome-extension-serverless-workflow-editor/webpack.config.js
index 0f183f3e38f..56ca85948d1 100644
--- a/packages/chrome-extension-serverless-workflow-editor/webpack.config.js
+++ b/packages/chrome-extension-serverless-workflow-editor/webpack.config.js
@@ -26,7 +26,7 @@ const common =
require("@kie-tools-core/webpack-base/webpack.common.config");
const { EnvironmentPlugin } = require("webpack");
const path = require("path");
const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
-const swEditor =
require("@kie-tools/serverless-workflow-diagram-editor-assets");
+const swEditorAssets =
require("@kie-tools/serverless-workflow-diagram-editor-assets");
const { env } = require("./env");
const buildEnv = env;
@@ -81,10 +81,16 @@ module.exports = async (env) => {
{ from: `./rules.json`, to: "./rules.json" },
// This is used for development only.
{
- from: swEditor.swEditorPath(),
+ from: swEditorAssets.swEditorPath(),
to: "./diagram",
globOptions: { ignore: ["**/WEB-INF/**/*", "**/*.html"] },
},
+ {
+ context: swEditorAssets.swEditorFontsPath(),
+ from: "fontawesome-webfont.*",
+ to: "./fonts",
+ force: true,
+ },
],
}),
new ZipPlugin({
diff --git a/packages/serverless-logic-web-tools/webpack.config.ts
b/packages/serverless-logic-web-tools/webpack.config.ts
index 7de03b0bad9..0394b7619cb 100644
--- a/packages/serverless-logic-web-tools/webpack.config.ts
+++ b/packages/serverless-logic-web-tools/webpack.config.ts
@@ -19,7 +19,7 @@
import patternflyBase from "@kie-tools-core/patternfly-base";
import common from "@kie-tools-core/webpack-base/webpack.common.config";
-import * as swEditor from
"@kie-tools/serverless-workflow-diagram-editor-assets";
+import * as swEditorAssets from
"@kie-tools/serverless-workflow-diagram-editor-assets";
import CopyPlugin from "copy-webpack-plugin";
import HtmlWebpackPlugin from "html-webpack-plugin";
import MonacoWebpackPlugin from "monaco-editor-webpack-plugin";
@@ -140,10 +140,16 @@ export default async (env: any, argv: any) => {
{ from: "./static/favicon.svg", to: "./favicon.svg" },
// These below are used for development only.
{
- from: swEditor.swEditorPath(),
+ from: swEditorAssets.swEditorPath(),
to: "./diagram",
globOptions: { ignore: ["**/WEB-INF/**/*", "**/*.html"] },
},
+ {
+ context: swEditorAssets.swEditorFontsPath(),
+ from: "fontawesome-webfont.*",
+ to: "./fonts",
+ force: true,
+ },
{
from: "../dashbuilder-editor/dist/dashbuilder-client/",
to: "./dashbuilder-client",
diff --git
a/packages/serverless-workflow-combined-editor/dev-webapp/webpack.config.js
b/packages/serverless-workflow-combined-editor/dev-webapp/webpack.config.js
index 1cf6279ba71..82d442e7915 100644
--- a/packages/serverless-workflow-combined-editor/dev-webapp/webpack.config.js
+++ b/packages/serverless-workflow-combined-editor/dev-webapp/webpack.config.js
@@ -23,7 +23,7 @@ const { merge } = require("webpack-merge");
const common = require("@kie-tools-core/webpack-base/webpack.common.config");
const patternflyBase = require("@kie-tools-core/patternfly-base");
const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
-const swEditor =
require("@kie-tools/serverless-workflow-diagram-editor-assets");
+const swEditorAssets =
require("@kie-tools/serverless-workflow-diagram-editor-assets");
const { env } = require("../env");
const buildEnv = env;
@@ -54,10 +54,16 @@ module.exports = (env) =>
{ from: path.resolve(__dirname, "./static/index.html"), to:
"./index.html" },
{ from: path.resolve(__dirname, "./static/favicon.ico"), to:
"./favicon.ico" },
{
- from: swEditor.swEditorPath(),
+ from: swEditorAssets.swEditorPath(),
to: "./diagram",
globOptions: { ignore: ["**/WEB-INF/**/*", "**/*.html"] },
},
+ {
+ context: swEditorAssets.swEditorFontsPath(),
+ from: "fontawesome-webfont.*",
+ to: "./fonts",
+ force: true,
+ },
{
from: path.resolve(__dirname,
"./static/envelope/serverless-workflow-text-editor-envelope.html"),
to: "./serverless-workflow-text-editor-envelope.html",
diff --git a/packages/serverless-workflow-diagram-editor-assets/index.d.ts
b/packages/serverless-workflow-diagram-editor-assets/index.d.ts
index c009ffee68f..032ba72fee7 100644
--- a/packages/serverless-workflow-diagram-editor-assets/index.d.ts
+++ b/packages/serverless-workflow-diagram-editor-assets/index.d.ts
@@ -18,3 +18,4 @@
*/
export declare const swEditorPath: () => string;
+export declare const swEditorFontsPath: () => string;
diff --git a/packages/serverless-workflow-diagram-editor-assets/index.js
b/packages/serverless-workflow-diagram-editor-assets/index.js
index f7d7a4bd49e..cabce4f9e2a 100644
--- a/packages/serverless-workflow-diagram-editor-assets/index.js
+++ b/packages/serverless-workflow-diagram-editor-assets/index.js
@@ -19,6 +19,7 @@
const nodePath = require("path");
const nodeFs = require("fs");
+const gwtEditorMapping =
require("@kie-tools/serverless-workflow-diagram-editor-envelope/dist/api/GwtEditorMapping");
module.exports = {
swEditorPath: () => {
@@ -30,6 +31,17 @@ module.exports = {
console.info(`Serverless Workflow Editor :: Serverless Editor path:
${path}`);
+ return path;
+ },
+ swEditorFontsPath: () => {
+ const path = nodePath.resolve(__dirname, "dist", "sw",
gwtEditorMapping.editors.swf.name, "fonts");
+
+ if (!nodeFs.existsSync(path)) {
+ throw new Error(`Serverless Workflow Editor :: Serverless Editor fonts
path doesn't exist: ${path}`);
+ }
+
+ console.info(`Serverless Workflow Editor :: Serverless Editor fonts path:
${path}`);
+
return path;
},
};
diff --git a/packages/serverless-workflow-diagram-editor-assets/package.json
b/packages/serverless-workflow-diagram-editor-assets/package.json
index 6cddeeea101..b2ad1559793 100644
--- a/packages/serverless-workflow-diagram-editor-assets/package.json
+++ b/packages/serverless-workflow-diagram-editor-assets/package.json
@@ -26,6 +26,7 @@
},
"devDependencies": {
"@kie-tools/serverless-workflow-diagram-editor": "workspace:*",
+ "@kie-tools/serverless-workflow-diagram-editor-envelope": "workspace:*",
"cpr": "^3.0.1",
"rimraf": "^3.0.2"
}
diff --git a/packages/sonataflow-deployment-webapp/webpack.config.js
b/packages/sonataflow-deployment-webapp/webpack.config.js
index 36586614022..8de0b210ffb 100644
--- a/packages/sonataflow-deployment-webapp/webpack.config.js
+++ b/packages/sonataflow-deployment-webapp/webpack.config.js
@@ -25,7 +25,7 @@ const patternflyBase =
require("@kie-tools-core/patternfly-base");
const { merge } = require("webpack-merge");
const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
const common = require("@kie-tools-core/webpack-base/webpack.common.config");
-const swEditor =
require("@kie-tools/serverless-workflow-diagram-editor-assets");
+const swEditorAssets =
require("@kie-tools/serverless-workflow-diagram-editor-assets");
const { env } = require("./env");
const buildEnv = env;
@@ -65,13 +65,19 @@ module.exports = async (env) =>
to: "./serverless-workflow-diagram-editor-envelope.html",
},
{
- from: swEditor.swEditorPath(),
+ from:
"./static/envelope/serverless-workflow-text-editor-envelope.html",
+ to: "./serverless-workflow-text-editor-envelope.html",
+ },
+ {
+ from: swEditorAssets.swEditorPath(),
to: "./diagram",
globOptions: { ignore: ["**/WEB-INF/**/*", "**/*.html"] },
},
{
- from:
"./static/envelope/serverless-workflow-text-editor-envelope.html",
- to: "./serverless-workflow-text-editor-envelope.html",
+ context: swEditorAssets.swEditorFontsPath(),
+ from: "fontawesome-webfont.*",
+ to: "./fonts",
+ force: true,
},
],
}),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 78dad24b0e3..a873da6ee77 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8073,6 +8073,9 @@ importers:
"@kie-tools/serverless-workflow-diagram-editor":
specifier: workspace:*
version: link:../serverless-workflow-diagram-editor
+ "@kie-tools/serverless-workflow-diagram-editor-envelope":
+ specifier: workspace:*
+ version: link:../serverless-workflow-diagram-editor-envelope
cpr:
specifier: ^3.0.1
version: 3.0.1
diff --git a/repo/graph.dot b/repo/graph.dot
index c226fcc687a..588460b096a 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -140,9 +140,9 @@ digraph G {
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" [ color =
"black", fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" [ color =
"black", fontcolor = "black", style = "dashed, rounded" ];
"@kie-tools/serverless-workflow-diagram-editor-assets" [ color = "blue",
fontcolor = "blue", style = "rounded" ];
- "@kie-tools/serverless-workflow-diagram-editor-envelope" [ color = "blue",
fontcolor = "blue", style = "rounded" ];
"@kie-tools/serverless-workflow-text-editor" [ color = "blue", fontcolor =
"blue", style = "rounded" ];
"@kie-tools/serverless-workflow-diagram-editor" [ color = "black", fontcolor
= "black", style = "dashed, rounded" ];
+ "@kie-tools/serverless-workflow-diagram-editor-envelope" [ color = "blue",
fontcolor = "blue", style = "rounded" ];
"@kie-tools/serverless-workflow-jq-expressions" [ color = "blue", fontcolor
= "blue", style = "rounded" ];
"@kie-tools/serverless-workflow-service-catalog" [ color = "blue", fontcolor
= "blue", style = "rounded" ];
"@kie-tools/serverless-workflow-language-service" [ color = "blue",
fontcolor = "blue", style = "rounded" ];
@@ -434,11 +434,11 @@ digraph G {
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" ->
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" [ style =
"dashed", color = "black" ];
"@kie-tools/serverless-logic-web-tools-swf-dev-mode-image-env" ->
"@kie-tools/root-env" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-workflow-combined-editor" ->
"@kie-tools/serverless-workflow-diagram-editor-assets" [ style = "solid", color
= "blue" ];
- "@kie-tools/serverless-workflow-combined-editor" ->
"@kie-tools/serverless-workflow-diagram-editor-envelope" [ style = "solid",
color = "blue" ];
"@kie-tools/serverless-workflow-combined-editor" ->
"@kie-tools/serverless-workflow-text-editor" [ style = "solid", color = "blue"
];
"@kie-tools/serverless-workflow-diagram-editor" ->
"@kie-tools/maven-config-setup-helper" [ style = "dashed", color = "black" ];
"@kie-tools/serverless-workflow-diagram-editor" -> "@kie-tools/root-env" [
style = "dashed", color = "black" ];
"@kie-tools/serverless-workflow-diagram-editor-assets" ->
"@kie-tools/serverless-workflow-diagram-editor" [ style = "dashed", color =
"blue" ];
+ "@kie-tools/serverless-workflow-diagram-editor-assets" ->
"@kie-tools/serverless-workflow-diagram-editor-envelope" [ style = "dashed",
color = "blue" ];
"@kie-tools/serverless-workflow-diagram-editor-envelope" ->
"@kie-tools/kie-bc-editors" [ style = "solid", color = "blue" ];
"@kie-tools/serverless-workflow-jq-expressions" ->
"@kie-tools/serverless-workflow-service-catalog" [ style = "solid", color =
"blue" ];
"@kie-tools/serverless-workflow-language-service" ->
"@kie-tools/json-yaml-language-service" [ style = "solid", color = "blue" ];
@@ -449,7 +449,6 @@ digraph G {
"@kie-tools/serverless-workflow-text-editor" ->
"@kie-tools/serverless-workflow-language-service" [ style = "solid", color =
"blue" ];
"@kie-tools/serverless-workflow-text-editor" ->
"@kie-tools-core/webpack-base" [ style = "dashed", color = "blue" ];
"swf-vscode-extension" -> "@kie-tools-core/vscode-extension" [ style =
"solid", color = "blue" ];
- "swf-vscode-extension" ->
"@kie-tools/serverless-workflow-diagram-editor-envelope" [ style = "solid",
color = "blue" ];
"swf-vscode-extension" -> "@kie-tools/serverless-workflow-language-service"
[ style = "solid", color = "blue" ];
"swf-vscode-extension" -> "@kie-tools-core/webpack-base" [ style = "dashed",
color = "blue" ];
"swf-vscode-extension" ->
"@kie-tools/serverless-workflow-diagram-editor-assets" [ style = "dashed",
color = "blue" ];
diff --git a/repo/graph.json b/repo/graph.json
index 274f76a6da0..888b47dc9c6 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -61,7 +61,6 @@
{ "id": "@kie-tools/chrome-extension-test-helper" },
{ "id": "chrome-extension-serverless-workflow-editor" },
{ "id": "@kie-tools/serverless-workflow-diagram-editor-assets" },
- { "id": "@kie-tools/serverless-workflow-diagram-editor-envelope" },
{ "id": "@kie-tools/serverless-workflow-text-editor" },
{ "id": "@kie-tools/cors-proxy" },
{ "id": "@kie-tools/cors-proxy-api" },
@@ -148,6 +147,7 @@
{ "id":
"@kie-tools/serverless-logic-web-tools-swf-deployment-quarkus-app" },
{ "id": "@kie-tools/serverless-logic-web-tools-swf-dev-mode-image" },
{ "id": "@kie-tools/serverless-workflow-diagram-editor" },
+ { "id": "@kie-tools/serverless-workflow-diagram-editor-envelope" },
{ "id": "@kie-tools/serverless-workflow-language-service" },
{ "id": "@kie-tools/serverless-workflow-jq-expressions" },
{ "id": "@kie-tools/serverless-workflow-service-catalog" },
@@ -286,11 +286,6 @@
"target": "@kie-tools/serverless-workflow-diagram-editor-assets",
"weight": 1
},
- {
- "source": "@kie-tools/serverless-workflow-combined-editor",
- "target": "@kie-tools/serverless-workflow-diagram-editor-envelope",
- "weight": 1
- },
{
"source": "@kie-tools/serverless-workflow-combined-editor",
"target": "@kie-tools/serverless-workflow-text-editor",
@@ -393,8 +388,8 @@
"weight": 1
},
{
- "source": "@kie-tools/serverless-workflow-diagram-editor-envelope",
- "target": "@kie-tools/kie-bc-editors",
+ "source": "@kie-tools/serverless-workflow-diagram-editor-assets",
+ "target": "@kie-tools/serverless-workflow-diagram-editor-envelope",
"weight": 1
},
{ "source": "@kie-tools/serverless-workflow-text-editor", "target":
"@kie-tools-core/editor", "weight": 1 },
@@ -895,6 +890,11 @@
"weight": 1
},
{ "source": "@kie-tools/serverless-workflow-diagram-editor", "target":
"@kie-tools/root-env", "weight": 1 },
+ {
+ "source": "@kie-tools/serverless-workflow-diagram-editor-envelope",
+ "target": "@kie-tools/kie-bc-editors",
+ "weight": 1
+ },
{
"source": "@kie-tools/serverless-workflow-language-service",
"target": "@kie-tools/json-yaml-language-service",
@@ -916,11 +916,6 @@
"weight": 1
},
{ "source": "swf-vscode-extension", "target":
"@kie-tools-core/vscode-extension", "weight": 1 },
- {
- "source": "swf-vscode-extension",
- "target": "@kie-tools/serverless-workflow-diagram-editor-envelope",
- "weight": 1
- },
{ "source": "swf-vscode-extension", "target":
"@kie-tools/serverless-workflow-language-service", "weight": 1 },
{ "source": "swf-vscode-extension", "target":
"@kie-tools-core/webpack-base", "weight": 1 },
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
