You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/09/22 00:04:56 UTC
[camel-karavan] branch main updated (b6225c2 -> e8b1ef0)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from b6225c2 Update patternfly
new 7fc5e4f Set theme for Expression editor
new e8b1ef0 Expression editor in VSCode
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/designer/rest/RestDesigner.tsx | 2 +-
.../src/designer/route/DslProperties.tsx | 7 +-
.../src/designer/route/RouteDesigner.tsx | 2 +-
.../designer/route/property/DataFormatField.tsx | 2 +
.../designer/route/property/DslPropertyField.tsx | 22 +-
.../designer/route/property/ExpressionField.tsx | 2 +
.../src/designer/route/property/ObjectField.tsx | 4 +-
karavan-vscode/package-lock.json | 252 +++++++++++----------
karavan-vscode/package.json | 12 +-
9 files changed, 170 insertions(+), 135 deletions(-)
[camel-karavan] 02/02: Expression editor in VSCode
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit e8b1ef09612a37f802ac8c2d7793dd279c05c85e
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Sep 21 20:04:48 2022 -0400
Expression editor in VSCode
---
karavan-vscode/package-lock.json | 252 +++++++++++++++++++++------------------
karavan-vscode/package.json | 12 +-
2 files changed, 140 insertions(+), 124 deletions(-)
diff --git a/karavan-vscode/package-lock.json b/karavan-vscode/package-lock.json
index 786eaf0..8017296 100644
--- a/karavan-vscode/package-lock.json
+++ b/karavan-vscode/package-lock.json
@@ -1,17 +1,18 @@
{
"name": "karavan",
- "version": "3.18.3",
+ "version": "3.18.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "karavan",
- "version": "3.18.3",
+ "version": "3.18.4",
"license": "Apache-2.0",
"dependencies": {
- "@patternfly/patternfly": "4.194.4",
- "@patternfly/react-core": "4.214.1",
- "@patternfly/react-table": "^4.83.1",
+ "@monaco-editor/react": "4.3.1",
+ "@patternfly/patternfly": "4.215.1",
+ "@patternfly/react-core": "4.239.0",
+ "@patternfly/react-table": "4.108.0",
"@reactour/tour": "^2.10.2",
"@types/js-yaml": "^4.0.5",
"@types/uuid": "8.3.4",
@@ -45,6 +46,7 @@
"file-loader": "^6.2.0",
"mini-css-extract-plugin": "^1.6.0",
"mocha": "^10.0.0",
+ "monaco-editor": "0.29.1",
"prettier": "2.3.0",
"run-script-os": "^1.1.6",
"static-site-generator-webpack-plugin": "^3.4.2",
@@ -2069,6 +2071,31 @@
"@jridgewell/sourcemap-codec": "^1.4.10"
}
},
+ "node_modules/@monaco-editor/loader": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.3.2.tgz",
+ "integrity": "sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g==",
+ "dependencies": {
+ "state-local": "^1.0.6"
+ },
+ "peerDependencies": {
+ "monaco-editor": ">= 0.21.0 < 1"
+ }
+ },
+ "node_modules/@monaco-editor/react": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.3.1.tgz",
+ "integrity": "sha512-f+0BK1PP/W5I50hHHmwf11+Ea92E5H1VZXs+wvKplWUWOfyMa1VVwqkJrXjRvbcqHL+XdIGYWhWNdi4McEvnZg==",
+ "dependencies": {
+ "@monaco-editor/loader": "^1.2.0",
+ "prop-types": "^15.7.2"
+ },
+ "peerDependencies": {
+ "monaco-editor": ">= 0.25.0 < 1",
+ "react": "^16.8.0 || ^17.0.0",
+ "react-dom": "^16.8.0 || ^17.0.0"
+ }
+ },
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2105,19 +2132,19 @@
}
},
"node_modules/@patternfly/patternfly": {
- "version": "4.194.4",
- "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.194.4.tgz",
- "integrity": "sha512-SJxr502v0xXk1N5OiPLunD9pdKvHp5XXJLXcD5lIPrimjjUcy46m48X8YONjDvnC/Y5xV92UI2KxoCVucE34eA=="
+ "version": "4.215.1",
+ "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.215.1.tgz",
+ "integrity": "sha512-coOipHiQs92OYYO+pWfukEKOkY+VUL6ptusTxh98DvIu/tQYzJDJxEmzYXmwqxORM19oLxAJEGktPoLNKElj6A=="
},
"node_modules/@patternfly/react-core": {
- "version": "4.214.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.214.1.tgz",
- "integrity": "sha512-XHEqXpnBEDyLVdAEDOYlGqFHnN43eNLSD5HABB99xO6541JV9MRnbxs0+v9iYnfhcKh/8bhA9ITXnUi3f2PEvg==",
- "dependencies": {
- "@patternfly/react-icons": "^4.65.1",
- "@patternfly/react-styles": "^4.64.1",
- "@patternfly/react-tokens": "^4.66.1",
- "focus-trap": "6.2.2",
+ "version": "4.239.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.239.0.tgz",
+ "integrity": "sha512-6CmYABCJLUXTlzCk6C3WouMNZpS0BCT+aHU8CvYpFQ/NrpYp3MJaDsYbqgCRWV42rmIO5iXun/4WhXBJzJEoQg==",
+ "dependencies": {
+ "@patternfly/react-icons": "^4.90.0",
+ "@patternfly/react-styles": "^4.89.0",
+ "@patternfly/react-tokens": "^4.91.0",
+ "focus-trap": "6.9.2",
"react-dropzone": "9.0.0",
"tippy.js": "5.1.2",
"tslib": "^2.0.0"
@@ -2128,28 +2155,28 @@
}
},
"node_modules/@patternfly/react-icons": {
- "version": "4.75.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.75.1.tgz",
- "integrity": "sha512-1ly8SVi/kcc0zkiViOjUd8D5BEr7GeqWGmDPuDSBtD60l1dYf3hZc44IWFVkRM/oHZML/musdrJkLfh4MDqX9w==",
+ "version": "4.90.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.90.0.tgz",
+ "integrity": "sha512-qEnQKbxbUgyiosiKSkeKEBwmhgJwWEqniIAFyoxj+kpzAdeu7ueWe5iBbqo06mvDOedecFiM5mIE1N0MXwk8Yw==",
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0"
}
},
"node_modules/@patternfly/react-styles": {
- "version": "4.74.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.74.1.tgz",
- "integrity": "sha512-9eWvKrjtrJ3qhJkhY2GQKyYA13u/J0mU1befH49SYbvxZtkbuHdpKmXBAeQoHmcx1hcOKtiYXeKb+dVoRRNx0A=="
+ "version": "4.89.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.89.0.tgz",
+ "integrity": "sha512-SkT+qx3Xqu70T5s+i/AUT2hI2sKAPDX4ffeiJIUDu/oyWiFdk+/9DEivnLSyJMruroXXN33zKibvzb5rH7DKTQ=="
},
"node_modules/@patternfly/react-table": {
- "version": "4.93.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.93.1.tgz",
- "integrity": "sha512-N/zHkNsY3X3yUXPg6COwdZKAFmTCbWm25qCY2aHjrXlIlE2OKWaYvVag0CcTwPiQhIuCumztr9Y2Uw9uvv0Fsw==",
- "dependencies": {
- "@patternfly/react-core": "^4.224.1",
- "@patternfly/react-icons": "^4.75.1",
- "@patternfly/react-styles": "^4.74.1",
- "@patternfly/react-tokens": "^4.76.1",
+ "version": "4.108.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.108.0.tgz",
+ "integrity": "sha512-EUvd3rlkE1UXobAm7L6JHgNE3TW8IYTaVwwH/px4Mkn5mBayDO6f+w6QM3OeoDQVZcXK6IYFe7QQaYd/vWIJCQ==",
+ "dependencies": {
+ "@patternfly/react-core": "^4.239.0",
+ "@patternfly/react-icons": "^4.90.0",
+ "@patternfly/react-styles": "^4.89.0",
+ "@patternfly/react-tokens": "^4.91.0",
"lodash": "^4.17.19",
"tslib": "^2.0.0"
},
@@ -2158,36 +2185,10 @@
"react-dom": "^16.8.0 || ^17.0.0"
}
},
- "node_modules/@patternfly/react-table/node_modules/@patternfly/react-core": {
- "version": "4.224.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.224.1.tgz",
- "integrity": "sha512-v8wGGNoMGndAScAoE5jeOA5jVgymlLSwttPjQk/Idr0k7roSpOrsM39oXUR5DEgkZee45DW00WKTgmg50PP3FQ==",
- "dependencies": {
- "@patternfly/react-icons": "^4.75.1",
- "@patternfly/react-styles": "^4.74.1",
- "@patternfly/react-tokens": "^4.76.1",
- "focus-trap": "6.9.2",
- "react-dropzone": "9.0.0",
- "tippy.js": "5.1.2",
- "tslib": "^2.0.0"
- },
- "peerDependencies": {
- "react": "^16.8.0 || ^17.0.0",
- "react-dom": "^16.8.0 || ^17.0.0"
- }
- },
- "node_modules/@patternfly/react-table/node_modules/focus-trap": {
- "version": "6.9.2",
- "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz",
- "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==",
- "dependencies": {
- "tabbable": "^5.3.2"
- }
- },
"node_modules/@patternfly/react-tokens": {
- "version": "4.76.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.76.1.tgz",
- "integrity": "sha512-gLEezRSzQeflaPu3SCgYmWtuiqDIRtxNNFP1+ES7P2o56YHXJ5o1Pki7LpNCPk/VOzHy2+vRFE/7l+hBEweugw=="
+ "version": "4.91.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.91.0.tgz",
+ "integrity": "sha512-QeQCy8o8E/16fAr8mxqXIYRmpTsjCHJXi5p5jmgEDFmYMesN6Pqfv6N5D0FHb+CIaNOZWRps7GkWvlIMIE81sw=="
},
"node_modules/@react-aria/focus": {
"version": "3.6.1",
@@ -5021,11 +5022,11 @@
"dev": true
},
"node_modules/focus-trap": {
- "version": "6.2.2",
- "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.2.2.tgz",
- "integrity": "sha512-qWovH9+LGoKqREvJaTCzJyO0hphQYGz+ap5Hc4NqXHNhZBdxCi5uBPPcaOUw66fHmzXLVwvETLvFgpwPILqKpg==",
+ "version": "6.9.2",
+ "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz",
+ "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==",
"dependencies": {
- "tabbable": "^5.1.4"
+ "tabbable": "^5.3.2"
}
},
"node_modules/fs.realpath": {
@@ -6371,6 +6372,11 @@
"url": "https://github.com/chalk/supports-color?sponsor=1"
}
},
+ "node_modules/monaco-editor": {
+ "version": "0.29.1",
+ "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.29.1.tgz",
+ "integrity": "sha512-rguaEG/zrPQSaKzQB7IfX/PpNa0qxF1FY8ZXRkN4WIl8qZdTQRSRJCtRto7IMcSgrU6H53RXI+fTcywOBC4aVw=="
+ },
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -7566,6 +7572,11 @@
"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
"dev": true
},
+ "node_modules/state-local": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz",
+ "integrity": "sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w=="
+ },
"node_modules/static-site-generator-webpack-plugin": {
"version": "3.4.2",
"resolved": "https://registry.npmjs.org/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-3.4.2.tgz",
@@ -10269,6 +10280,23 @@
"@jridgewell/sourcemap-codec": "^1.4.10"
}
},
+ "@monaco-editor/loader": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.3.2.tgz",
+ "integrity": "sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g==",
+ "requires": {
+ "state-local": "^1.0.6"
+ }
+ },
+ "@monaco-editor/react": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.3.1.tgz",
+ "integrity": "sha512-f+0BK1PP/W5I50hHHmwf11+Ea92E5H1VZXs+wvKplWUWOfyMa1VVwqkJrXjRvbcqHL+XdIGYWhWNdi4McEvnZg==",
+ "requires": {
+ "@monaco-editor/loader": "^1.2.0",
+ "prop-types": "^15.7.2"
+ }
+ },
"@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -10296,76 +10324,52 @@
}
},
"@patternfly/patternfly": {
- "version": "4.194.4",
- "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.194.4.tgz",
- "integrity": "sha512-SJxr502v0xXk1N5OiPLunD9pdKvHp5XXJLXcD5lIPrimjjUcy46m48X8YONjDvnC/Y5xV92UI2KxoCVucE34eA=="
+ "version": "4.215.1",
+ "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.215.1.tgz",
+ "integrity": "sha512-coOipHiQs92OYYO+pWfukEKOkY+VUL6ptusTxh98DvIu/tQYzJDJxEmzYXmwqxORM19oLxAJEGktPoLNKElj6A=="
},
"@patternfly/react-core": {
- "version": "4.214.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.214.1.tgz",
- "integrity": "sha512-XHEqXpnBEDyLVdAEDOYlGqFHnN43eNLSD5HABB99xO6541JV9MRnbxs0+v9iYnfhcKh/8bhA9ITXnUi3f2PEvg==",
- "requires": {
- "@patternfly/react-icons": "^4.65.1",
- "@patternfly/react-styles": "^4.64.1",
- "@patternfly/react-tokens": "^4.66.1",
- "focus-trap": "6.2.2",
+ "version": "4.239.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.239.0.tgz",
+ "integrity": "sha512-6CmYABCJLUXTlzCk6C3WouMNZpS0BCT+aHU8CvYpFQ/NrpYp3MJaDsYbqgCRWV42rmIO5iXun/4WhXBJzJEoQg==",
+ "requires": {
+ "@patternfly/react-icons": "^4.90.0",
+ "@patternfly/react-styles": "^4.89.0",
+ "@patternfly/react-tokens": "^4.91.0",
+ "focus-trap": "6.9.2",
"react-dropzone": "9.0.0",
"tippy.js": "5.1.2",
"tslib": "^2.0.0"
}
},
"@patternfly/react-icons": {
- "version": "4.75.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.75.1.tgz",
- "integrity": "sha512-1ly8SVi/kcc0zkiViOjUd8D5BEr7GeqWGmDPuDSBtD60l1dYf3hZc44IWFVkRM/oHZML/musdrJkLfh4MDqX9w==",
+ "version": "4.90.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.90.0.tgz",
+ "integrity": "sha512-qEnQKbxbUgyiosiKSkeKEBwmhgJwWEqniIAFyoxj+kpzAdeu7ueWe5iBbqo06mvDOedecFiM5mIE1N0MXwk8Yw==",
"requires": {}
},
"@patternfly/react-styles": {
- "version": "4.74.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.74.1.tgz",
- "integrity": "sha512-9eWvKrjtrJ3qhJkhY2GQKyYA13u/J0mU1befH49SYbvxZtkbuHdpKmXBAeQoHmcx1hcOKtiYXeKb+dVoRRNx0A=="
+ "version": "4.89.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.89.0.tgz",
+ "integrity": "sha512-SkT+qx3Xqu70T5s+i/AUT2hI2sKAPDX4ffeiJIUDu/oyWiFdk+/9DEivnLSyJMruroXXN33zKibvzb5rH7DKTQ=="
},
"@patternfly/react-table": {
- "version": "4.93.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.93.1.tgz",
- "integrity": "sha512-N/zHkNsY3X3yUXPg6COwdZKAFmTCbWm25qCY2aHjrXlIlE2OKWaYvVag0CcTwPiQhIuCumztr9Y2Uw9uvv0Fsw==",
- "requires": {
- "@patternfly/react-core": "^4.224.1",
- "@patternfly/react-icons": "^4.75.1",
- "@patternfly/react-styles": "^4.74.1",
- "@patternfly/react-tokens": "^4.76.1",
+ "version": "4.108.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.108.0.tgz",
+ "integrity": "sha512-EUvd3rlkE1UXobAm7L6JHgNE3TW8IYTaVwwH/px4Mkn5mBayDO6f+w6QM3OeoDQVZcXK6IYFe7QQaYd/vWIJCQ==",
+ "requires": {
+ "@patternfly/react-core": "^4.239.0",
+ "@patternfly/react-icons": "^4.90.0",
+ "@patternfly/react-styles": "^4.89.0",
+ "@patternfly/react-tokens": "^4.91.0",
"lodash": "^4.17.19",
"tslib": "^2.0.0"
- },
- "dependencies": {
- "@patternfly/react-core": {
- "version": "4.224.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.224.1.tgz",
- "integrity": "sha512-v8wGGNoMGndAScAoE5jeOA5jVgymlLSwttPjQk/Idr0k7roSpOrsM39oXUR5DEgkZee45DW00WKTgmg50PP3FQ==",
- "requires": {
- "@patternfly/react-icons": "^4.75.1",
- "@patternfly/react-styles": "^4.74.1",
- "@patternfly/react-tokens": "^4.76.1",
- "focus-trap": "6.9.2",
- "react-dropzone": "9.0.0",
- "tippy.js": "5.1.2",
- "tslib": "^2.0.0"
- }
- },
- "focus-trap": {
- "version": "6.9.2",
- "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz",
- "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==",
- "requires": {
- "tabbable": "^5.3.2"
- }
- }
}
},
"@patternfly/react-tokens": {
- "version": "4.76.1",
- "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.76.1.tgz",
- "integrity": "sha512-gLEezRSzQeflaPu3SCgYmWtuiqDIRtxNNFP1+ES7P2o56YHXJ5o1Pki7LpNCPk/VOzHy2+vRFE/7l+hBEweugw=="
+ "version": "4.91.0",
+ "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.91.0.tgz",
+ "integrity": "sha512-QeQCy8o8E/16fAr8mxqXIYRmpTsjCHJXi5p5jmgEDFmYMesN6Pqfv6N5D0FHb+CIaNOZWRps7GkWvlIMIE81sw=="
},
"@react-aria/focus": {
"version": "3.6.1",
@@ -12467,11 +12471,11 @@
"dev": true
},
"focus-trap": {
- "version": "6.2.2",
- "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.2.2.tgz",
- "integrity": "sha512-qWovH9+LGoKqREvJaTCzJyO0hphQYGz+ap5Hc4NqXHNhZBdxCi5uBPPcaOUw66fHmzXLVwvETLvFgpwPILqKpg==",
+ "version": "6.9.2",
+ "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz",
+ "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==",
"requires": {
- "tabbable": "^5.1.4"
+ "tabbable": "^5.3.2"
}
},
"fs.realpath": {
@@ -13478,6 +13482,11 @@
}
}
},
+ "monaco-editor": {
+ "version": "0.29.1",
+ "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.29.1.tgz",
+ "integrity": "sha512-rguaEG/zrPQSaKzQB7IfX/PpNa0qxF1FY8ZXRkN4WIl8qZdTQRSRJCtRto7IMcSgrU6H53RXI+fTcywOBC4aVw=="
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -14335,6 +14344,11 @@
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
+ "state-local": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz",
+ "integrity": "sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w=="
+ },
"static-site-generator-webpack-plugin": {
"version": "3.4.2",
"resolved": "https://registry.npmjs.org/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-3.4.2.tgz",
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 537710f..77e0a66 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -429,12 +429,13 @@
"url-loader": "^4.1.1",
"vscode-test": "^1.5.0",
"webpack": "5.74.0",
- "webpack-cli": "^4.4.0"
+ "webpack-cli": "^4.4.0",
+ "monaco-editor": "0.29.1"
},
"dependencies": {
- "@patternfly/patternfly": "4.194.4",
- "@patternfly/react-core": "4.214.1",
- "@patternfly/react-table": "^4.83.1",
+ "@patternfly/patternfly": "4.215.1",
+ "@patternfly/react-core": "4.239.0",
+ "@patternfly/react-table": "4.108.0",
"@reactour/tour": "^2.10.2",
"@types/js-yaml": "^4.0.5",
"@types/uuid": "8.3.4",
@@ -444,6 +445,7 @@
"react-dom": "^17.0.2",
"rxjs": "7.5.2",
"shelljs": "^0.8.5",
- "uuid": "8.3.2"
+ "uuid": "8.3.2",
+ "@monaco-editor/react": "4.3.1"
}
}
[camel-karavan] 01/02: Set theme for Expression editor
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 7fc5e4f0d8ab3120a522608d558af03c7cff9187
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Sep 21 20:00:20 2022 -0400
Set theme for Expression editor
---
.../src/designer/rest/RestDesigner.tsx | 2 +-
.../src/designer/route/DslProperties.tsx | 7 +++++--
.../src/designer/route/RouteDesigner.tsx | 2 +-
.../designer/route/property/DataFormatField.tsx | 2 ++
.../designer/route/property/DslPropertyField.tsx | 22 ++++++++++++++++------
.../designer/route/property/ExpressionField.tsx | 2 ++
.../src/designer/route/property/ObjectField.tsx | 4 +++-
7 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/karavan-designer/src/designer/rest/RestDesigner.tsx b/karavan-designer/src/designer/rest/RestDesigner.tsx
index 5f733a8..bc32cc9 100644
--- a/karavan-designer/src/designer/rest/RestDesigner.tsx
+++ b/karavan-designer/src/designer/rest/RestDesigner.tsx
@@ -243,7 +243,7 @@ export class RestDesigner extends React.Component<Props, State> {
clipboardStep={undefined}
isRouteDesigner={false}
onClone={this.cloneRest}
- />
+ dark={this.props.dark}/>
</DrawerPanelContent>
)
}
diff --git a/karavan-designer/src/designer/route/DslProperties.tsx b/karavan-designer/src/designer/route/DslProperties.tsx
index 38b7db8..71e15f1 100644
--- a/karavan-designer/src/designer/route/DslProperties.tsx
+++ b/karavan-designer/src/designer/route/DslProperties.tsx
@@ -49,6 +49,7 @@ interface Props {
onSaveClipboardStep?: (element?: CamelElement) => void
onClone?: (element: CamelElement) => void
isRouteDesigner: boolean
+ dark: boolean
}
interface State {
@@ -193,7 +194,8 @@ export class DslProperties extends React.Component<Props, State> {
onExpressionChange={this.expressionChanged}
onParameterChange={this.parametersChanged}
onDataFormatChange={this.dataFormatChanged}
- onChange={this.propertyChanged}/>
+ onChange={this.propertyChanged}
+ dark={this.props.dark}/>
)}
</>)
}
@@ -224,7 +226,8 @@ export class DslProperties extends React.Component<Props, State> {
integration={this.props.integration}
dslName={this.state.step.dslName}
value={this.state.step}
- onDataFormatChange={this.dataFormatChanged}/>
+ onDataFormatChange={this.dataFormatChanged}
+ dark={this.props.dark}/>
}
</Form>
</div>
diff --git a/karavan-designer/src/designer/route/RouteDesigner.tsx b/karavan-designer/src/designer/route/RouteDesigner.tsx
index 77bed14..80a03e4 100644
--- a/karavan-designer/src/designer/route/RouteDesigner.tsx
+++ b/karavan-designer/src/designer/route/RouteDesigner.tsx
@@ -356,7 +356,7 @@ export class RouteDesigner extends React.Component<Props, State> {
clipboardStep={this.state.clipboardStep}
isRouteDesigner={true}
onSaveClipboardStep={this.saveToClipboard}
- />
+ dark={this.props.dark}/>
</DrawerPanelContent>
)
}
diff --git a/karavan-designer/src/designer/route/property/DataFormatField.tsx b/karavan-designer/src/designer/route/property/DataFormatField.tsx
index ba27c3f..8eac5c0 100644
--- a/karavan-designer/src/designer/route/property/DataFormatField.tsx
+++ b/karavan-designer/src/designer/route/property/DataFormatField.tsx
@@ -37,6 +37,7 @@ interface Props {
value: CamelElement,
onDataFormatChange?: (value: DataFormatDefinition) => void
integration: Integration,
+ dark: boolean,
}
interface State {
@@ -109,6 +110,7 @@ export class DataFormatField extends React.Component<Props, State> {
onDataFormatChange={dataFormat => {
console.log(dataFormat)
}}
+ dark={this.props.dark}
onChange={this.propertyChanged}/>
)}
</>)
diff --git a/karavan-designer/src/designer/route/property/DslPropertyField.tsx b/karavan-designer/src/designer/route/property/DslPropertyField.tsx
index a47d824..37cadab 100644
--- a/karavan-designer/src/designer/route/property/DslPropertyField.tsx
+++ b/karavan-designer/src/designer/route/property/DslPropertyField.tsx
@@ -77,7 +77,8 @@ interface Props {
element?: CamelElement
integration: Integration,
hideLabel?: boolean,
- dslLanguage?: string
+ dslLanguage?: string,
+ dark: boolean
}
interface State {
@@ -243,7 +244,7 @@ export class DslPropertyField extends React.Component<Props, State> {
}
getTextArea = (property: PropertyMeta, value: any) => {
- const lang = this.props.dslLanguage;
+ const {dslLanguage, dark} = this.props;
const showEditor = this.state.showEditor;
return (
<InputGroup>
@@ -275,7 +276,7 @@ export class DslPropertyField extends React.Component<Props, State> {
width="100%"
defaultLanguage={'java'}
language={'java'}
- theme={'light'}
+ theme={dark ? 'vs-dark' : 'light'}
options={{lineNumbers:"off", folding:false, lineNumbersMinChars:10, showUnused:false, fontSize:12, minimap:{enabled:false}}}
value={value?.toString()}
className={'code-editor'}
@@ -293,7 +294,11 @@ export class DslPropertyField extends React.Component<Props, State> {
getExpressionField = (property: PropertyMeta, value: any) => {
return (
<div className="expression">
- <ExpressionField property={property} value={value} onExpressionChange={this.props.onExpressionChange} integration={this.props.integration}/>
+ <ExpressionField property={property}
+ value={value}
+ onExpressionChange={this.props.onExpressionChange}
+ integration={this.props.integration}
+ dark={this.props.dark}/>
</div>
)
}
@@ -301,7 +306,11 @@ export class DslPropertyField extends React.Component<Props, State> {
getObjectField = (property: PropertyMeta, value: any) => {
return (
<div className="object">
- {value && <ObjectField property={property} value={value} onPropertyUpdate={this.props.onChange} integration={this.props.integration}/>}
+ {value && <ObjectField property={property}
+ value={value}
+ onPropertyUpdate={this.props.onChange}
+ integration={this.props.integration}
+ dark={this.props.dark}/>}
</div>
)
}
@@ -471,7 +480,8 @@ export class DslPropertyField extends React.Component<Props, State> {
hideLabel={hideLabel}
value={v}
onPropertyUpdate={(f, v) => this.onMultiValueObjectUpdate(index, f, v)}
- integration={this.props.integration}/>}
+ integration={this.props.integration}
+ dark={this.props.dark}/>}
</div>
<Button variant="link" className="delete-button" onClick={e => {
const v = Array.from(value);
diff --git a/karavan-designer/src/designer/route/property/ExpressionField.tsx b/karavan-designer/src/designer/route/property/ExpressionField.tsx
index 5f6d0dc..79e0177 100644
--- a/karavan-designer/src/designer/route/property/ExpressionField.tsx
+++ b/karavan-designer/src/designer/route/property/ExpressionField.tsx
@@ -39,6 +39,7 @@ interface Props {
value: CamelElement,
onExpressionChange?: (propertyName: string, exp: ExpressionDefinition) => void
integration: Integration,
+ dark: boolean,
}
interface State {
@@ -154,6 +155,7 @@ export class ExpressionField extends React.Component<Props, State> {
onParameterChange={parameter => {console.log(parameter)}}
onDataFormatChange={dataFormat => {console.log(dataFormat)}}
onChange={this.propertyChanged}
+ dark={this.props.dark}
dslLanguage={dslLanguage?.[0]}/>
)}
</FormGroup>
diff --git a/karavan-designer/src/designer/route/property/ObjectField.tsx b/karavan-designer/src/designer/route/property/ObjectField.tsx
index 28918b2..a72019b 100644
--- a/karavan-designer/src/designer/route/property/ObjectField.tsx
+++ b/karavan-designer/src/designer/route/property/ObjectField.tsx
@@ -32,6 +32,7 @@ interface Props {
onPropertyUpdate?: (fieldId: string, value: CamelElement) => void
integration: Integration,
hideLabel?: boolean
+ dark: boolean
}
interface State {
@@ -84,7 +85,8 @@ export class ObjectField extends React.Component<Props, State> {
onExpressionChange={this.expressionChanged}
onParameterChange={(parameter, value) => this.propertyChanged(property.name, value)}
onDataFormatChange={value1 => {}}
- onChange={(fieldId, value) => this.propertyChanged(property.name, value)} />
+ onChange={(fieldId, value) => this.propertyChanged(property.name, value)}
+ dark={this.props.dark}/>
)}
</div>
)