You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@artemis.apache.org by br...@apache.org on 2026/02/23 08:32:17 UTC
(artemis-console) branch main updated (bb05024 -> 1480e8e)
This is an automated email from the ASF dual-hosted git repository.
brusdev pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/artemis-console.git
from bb05024 ARTEMIS-5888 - handle the case where mbean names are delimited with backslashes
new 5db39f4 ARTEMIS-5777 - Upgrade to @hawtio/react 1.12.3 with fixed MBean name parsing
new 1480e8e ARTEMIS-5777 - Use Hawtio version of MBean parsing and quoting
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:
.../artemis-extension/app/package.json | 16 +-
.../artemis-extension/package.json | 2 +-
.../packages/artemis-console-plugin/package.json | 8 +-
.../src/artemis-service.test.ts | 4 +-
.../artemis-console-plugin/src/artemis-service.ts | 54 +-
.../src/artemis-tree-processor.ts | 14 +-
.../packages/artemis-console-plugin/src/context.ts | 16 +-
.../artemis-console-plugin/src/util/jmx.ts | 43 +-
.../src/views/ArtemisJMXTabView.tsx | 8 +-
.../artemis-extension/yarn.lock | 682 +++++++++++++++------
10 files changed, 556 insertions(+), 291 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org
(artemis-console) 01/02: ARTEMIS-5777 - Upgrade to @hawtio/react 1.12.3 with fixed MBean name parsing
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brusdev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis-console.git
commit 5db39f47da0953d2e59246a34bc0a357b489839f
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Thu Feb 19 11:28:49 2026 +0100
ARTEMIS-5777 - Upgrade to @hawtio/react 1.12.3 with fixed MBean name parsing
---
.../artemis-extension/app/package.json | 16 +-
.../artemis-extension/package.json | 2 +-
.../packages/artemis-console-plugin/package.json | 8 +-
.../artemis-extension/yarn.lock | 682 +++++++++++++++------
4 files changed, 491 insertions(+), 217 deletions(-)
diff --git a/artemis-console-extension/artemis-extension/app/package.json b/artemis-console-extension/artemis-extension/app/package.json
index 9fa4597..308437f 100644
--- a/artemis-console-extension/artemis-extension/app/package.json
+++ b/artemis-console-extension/artemis-extension/app/package.json
@@ -11,7 +11,7 @@
"replace-doc-version": "replace __PACKAGE_VERSION_PLACEHOLDER__ $npm_package_version ./build/hawtconfig.json"
},
"dependencies": {
- "@hawtio/react": "^1.12.0",
+ "@hawtio/react": "^1.12.3",
"@monaco-editor/react": "^4.6.0",
"@patternfly/react-charts": "^7.4.9",
"@patternfly/react-code-editor": "^5.4.18",
@@ -26,17 +26,17 @@
"monaco-editor": "^0.52.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
- "react-router-dom": "^6.30.2"
+ "react-router-dom": "^6.30.3"
},
"devDependencies": {
"@hawtio/backend-middleware": "^1.0.8",
- "@swc/core": "^1.15.3",
+ "@swc/core": "^1.15.11",
"@types/react": "^18.3.27",
- "body-parser": "^2.2.1",
+ "body-parser": "^2.2.2",
"copy-webpack-plugin": "^13.0.1",
"css-loader": "^7.1.2",
"css-minimizer-webpack-plugin": "^7.0.2",
- "html-webpack-plugin": "^5.6.5",
+ "html-webpack-plugin": "^5.6.6",
"mini-css-extract-plugin": "^2.9.4",
"monaco-editor-webpack-plugin": "^7.1.1",
"os-browserify": "^0.3.0",
@@ -44,11 +44,11 @@
"replace": "^1.2.2",
"source-map-loader": "^5.0.0",
"style-loader": "^4.0.0",
- "swc-loader": "^0.2.6",
+ "swc-loader": "^0.2.7",
"terser-webpack-plugin": "^5.3.14",
- "webpack": "^5.103.0",
+ "webpack": "^5.105.2",
"webpack-cli": "^6.0.1",
- "webpack-dev-server": "^5.2.2",
+ "webpack-dev-server": "^5.2.3",
"webpack-manifest-plugin": "^5.0.1"
},
"eslintConfig": {
diff --git a/artemis-console-extension/artemis-extension/package.json b/artemis-console-extension/artemis-extension/package.json
index 5899443..2a4bfb9 100644
--- a/artemis-console-extension/artemis-extension/package.json
+++ b/artemis-console-extension/artemis-extension/package.json
@@ -27,7 +27,7 @@
"semver": "7.7.2",
"serialize-javascript": "6.0.2",
"tough-cookie": "5.1.2",
- "webpack": "5.102.1",
+ "webpack": "5.105.2",
"ws": "8.18.3",
"js-yaml": "3.14.2",
"node-forge": "1.3.2",
diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json
index 0292d96..f178d33 100644
--- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json
+++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/package.json
@@ -25,7 +25,7 @@
"xml-formatter": "^3.6.7"
},
"devDependencies": {
- "@hawtio/react": "^1.12.0",
+ "@hawtio/react": "^1.12.3",
"@monaco-editor/react": "^4.6.0",
"@patternfly/react-charts": "^7.4.9",
"@patternfly/react-code-editor": "^5.4.18",
@@ -48,16 +48,16 @@
"monaco-editor": "^0.52.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
- "react-router-dom": "^6.30.2",
+ "react-router-dom": "^6.30.3",
"replace": "^1.2.2",
"ts-jest": "^29.4.6",
"ts-node": "^10.9.2",
"tsup": "^8.5.1",
"typescript": "^5.8.3",
- "webpack": "^5.103.0"
+ "webpack": "^5.105.2"
},
"peerDependencies": {
- "@hawtio/react": "^1.11",
+ "@hawtio/react": "^1.12",
"@monaco-editor/react": "^4",
"@patternfly/react-charts": "^7",
"@patternfly/react-code-editor": "^5",
diff --git a/artemis-console-extension/artemis-extension/yarn.lock b/artemis-console-extension/artemis-extension/yarn.lock
index a4db3e6..d616ca1 100644
--- a/artemis-console-extension/artemis-extension/yarn.lock
+++ b/artemis-console-extension/artemis-extension/yarn.lock
@@ -741,24 +741,24 @@ __metadata:
languageName: node
linkType: hard
-"@hawtio/react@npm:^1.12.0":
- version: 1.12.0
- resolution: "@hawtio/react@npm:1.12.0"
+"@hawtio/react@npm:^1.12.3":
+ version: 1.12.3
+ resolution: "@hawtio/react@npm:1.12.3"
dependencies:
"@hawtio/camel-model-v4_10": "npm:@hawtio/camel-model@~4.10.7"
"@hawtio/camel-model-v4_14": "npm:@hawtio/camel-model@~4.14.1"
"@jolokia.js/simple": "npm:^2.4.2"
- "@module-federation/utilities": "npm:^3.1.77"
+ "@module-federation/utilities": "npm:^3.1.83"
"@monaco-editor/react": "npm:^4.6.0"
- "@thumbmarkjs/thumbmarkjs": "npm:^1.5.1"
+ "@thumbmarkjs/thumbmarkjs": "npm:^1.7.0"
dagre: "npm:^0.8.5"
- dompurify: "npm:^3.3.0"
- eventemitter3: "npm:^5.0.1"
+ dompurify: "npm:^3.3.1"
+ eventemitter3: "npm:^5.0.4"
jolokia.js: "npm:^2.4.2"
js-logger: "npm:^1.6.1"
jwt-decode: "npm:^4.0.0"
- keycloak-js: "npm:^26.2.1"
- oauth4webapi: "npm:^3.8.3"
+ keycloak-js: "npm:^26.2.3"
+ oauth4webapi: "npm:^3.8.4"
react-markdown: "npm:^10.1.0"
react-split: "npm:^2.0.14"
reactflow: "npm:^11.11.4"
@@ -776,7 +776,7 @@ __metadata:
react: ^17 || ^18
react-dom: ^17 || ^18
react-router-dom: ^6.30
- checksum: 10c0/cae2023e07283730c1daaf1b14d8d07a8fd21c91aae4782f36d7c2c4c6e1ba63cf92834c4ae3a6e453c312484a3ca021886161e5bacc25350b09c5423d33f9ad
+ checksum: 10c0/5a2f59dda77fa2def857c30392905d028d6bfbcb363e432d75978ec2bf7e6969e960108a6add93cdd9d457d59eca6e8347e6c03e90c7cf7d9a72c390f36ab877
languageName: node
linkType: hard
@@ -1266,18 +1266,18 @@ __metadata:
languageName: node
linkType: hard
-"@module-federation/sdk@npm:0.21.6":
- version: 0.21.6
- resolution: "@module-federation/sdk@npm:0.21.6"
- checksum: 10c0/54f33fb48e1f3db09e03b529af9f28fcd8007c4dbd8b197cb0691c392f3eb143961c526e1ecd400f1d652451976a378da962edbb961f5859f33f56edda527f88
+"@module-federation/sdk@npm:2.0.0":
+ version: 2.0.0
+ resolution: "@module-federation/sdk@npm:2.0.0"
+ checksum: 10c0/abead51fbc3b7403fe8b85c744da0e0c2ec28e3035c94d6e6a8d16a17d763ef5bf95395c745825c2682b443cf71c22f4725da5c52907e4235982f2cac40bff2a
languageName: node
linkType: hard
-"@module-federation/utilities@npm:^3.1.77":
- version: 3.1.77
- resolution: "@module-federation/utilities@npm:3.1.77"
+"@module-federation/utilities@npm:^3.1.83":
+ version: 3.1.83
+ resolution: "@module-federation/utilities@npm:3.1.83"
dependencies:
- "@module-federation/sdk": "npm:0.21.6"
+ "@module-federation/sdk": "npm:2.0.0"
peerDependencies:
react: ^16 || ^17 || ^18
react-dom: ^16 || ^17 || ^18
@@ -1289,7 +1289,7 @@ __metadata:
optional: true
react-dom:
optional: true
- checksum: 10c0/89b49fff6c41775028a74c8424bdc50afa2453d23a2e609d844c4f84f78924adfbc8dbed6a46fe295fadf55f85c5b5fa7192757b1adf80b602ecf7bcbd5671f9
+ checksum: 10c0/bc502c0824da62fa7df1450c6e39105a736a61f29ff9d2f2b196189b566d8c8a3bb10716984465ee5690f569261c163c4dbd294a9e7be017b1747840e664cd58
languageName: node
linkType: hard
@@ -1326,6 +1326,13 @@ __metadata:
languageName: node
linkType: hard
+"@noble/hashes@npm:1.4.0":
+ version: 1.4.0
+ resolution: "@noble/hashes@npm:1.4.0"
+ checksum: 10c0/8c3f005ee72e7b8f9cff756dfae1241485187254e3f743873e22073d63906863df5d4f13d441b7530ea614b7a093f0d889309f28b59850f33b66cb26a779a4a5
+ languageName: node
+ linkType: hard
+
"@npmcli/agent@npm:^3.0.0":
version: 3.0.0
resolution: "@npmcli/agent@npm:3.0.0"
@@ -1482,6 +1489,151 @@ __metadata:
languageName: node
linkType: hard
+"@peculiar/asn1-cms@npm:^2.6.0, @peculiar/asn1-cms@npm:^2.6.1":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-cms@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.1"
+ "@peculiar/asn1-x509-attr": "npm:^2.6.1"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/682e952fb35dec229bf54ecaff58bdf56281c1d718b5bcc2da103d67b5be302452c6275300c9f9fce1ed02f03792dab3ebe98c903117e0a5b0d9e5d861356280
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-csr@npm:^2.6.0":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-csr@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.1"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/5ea1ef27bf3879c793acb0b370b9fc1cb45df244b4706cecf075e45b58d19d65e612f4777eb12aa37f2037c1c725e96543ab9caf41d5a92378c5069071deae1f
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-ecc@npm:^2.6.0":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-ecc@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.1"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/7804600f12a8993085232839ea020f51a329a195ce991ebbce077668d9ee1e57301bf97d5ef9657bd81717888f36f51f7aed3a9eee59fe4345c55d04eff89927
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-pfx@npm:^2.6.1":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-pfx@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-cms": "npm:^2.6.1"
+ "@peculiar/asn1-pkcs8": "npm:^2.6.1"
+ "@peculiar/asn1-rsa": "npm:^2.6.1"
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/69c86ed339b945f7c77173da06207af71553a5b033cc1f2bde262085e7b5870543f358a29efd8981ca7247ec7f1c5d722a014cc0979679045909cb13e2ca527e
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-pkcs8@npm:^2.6.1":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-pkcs8@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.1"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/d712dc79ab877152f20c1772cbe065f5beb2a20e3dcae7892cc72f3227a1d3f7ae8eecba8bc29cf2b77cfdd8a01b0660f5390a416ca78ca7147f0e3c13d4d755
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-pkcs9@npm:^2.6.0":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-pkcs9@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-cms": "npm:^2.6.1"
+ "@peculiar/asn1-pfx": "npm:^2.6.1"
+ "@peculiar/asn1-pkcs8": "npm:^2.6.1"
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.1"
+ "@peculiar/asn1-x509-attr": "npm:^2.6.1"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/4a2f815bbeee3f65aea391d5e2287a19701d757d2781b3ecfd908a67028f2752796bd22f8ba3eb486911fcc34b52b0f7c1ff3e3b7d7f04ef58767be9ddbc851d
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-rsa@npm:^2.6.0, @peculiar/asn1-rsa@npm:^2.6.1":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-rsa@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.1"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/4d7c71c5bddf7be3b0270c4d95b8274a392185cad4939a7a837d9c4c612601fee1a1ccabe414383b26629fb2013608e60a58ecd665c371617c1f177431a88ff2
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-schema@npm:^2.6.0":
+ version: 2.6.0
+ resolution: "@peculiar/asn1-schema@npm:2.6.0"
+ dependencies:
+ asn1js: "npm:^3.0.6"
+ pvtsutils: "npm:^1.3.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/8c283b10a2e4aca4cb20d242cde773c9a798ea15a6c221d1474ef483e182d48195aeb5dde3f7b518f236eceb7808ae4438539d41a3aa9ed6d20aa4d36a21a0c2
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-x509-attr@npm:^2.6.1":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-x509-attr@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.1"
+ asn1js: "npm:^3.0.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/de8634ec12ef34b430e5a458151e856f954e15fe9e08d056dca51db6962e849a951820ab66d291e2452799576c44221b40087b9350dc3728d3770a46fcdeffc5
+ languageName: node
+ linkType: hard
+
+"@peculiar/asn1-x509@npm:^2.6.0, @peculiar/asn1-x509@npm:^2.6.1":
+ version: 2.6.1
+ resolution: "@peculiar/asn1-x509@npm:2.6.1"
+ dependencies:
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ asn1js: "npm:^3.0.6"
+ pvtsutils: "npm:^1.3.6"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/2e73a0ce6521eeb2d876e0b52e9fae2de4e2d183be5fba77d5fae9b7724de446d02c0b4e5fb04d4fedb50eed0de842f29f4d7cf2e998eaed6a2d2952f5c52d2c
+ languageName: node
+ linkType: hard
+
+"@peculiar/x509@npm:^1.14.2":
+ version: 1.14.3
+ resolution: "@peculiar/x509@npm:1.14.3"
+ dependencies:
+ "@peculiar/asn1-cms": "npm:^2.6.0"
+ "@peculiar/asn1-csr": "npm:^2.6.0"
+ "@peculiar/asn1-ecc": "npm:^2.6.0"
+ "@peculiar/asn1-pkcs9": "npm:^2.6.0"
+ "@peculiar/asn1-rsa": "npm:^2.6.0"
+ "@peculiar/asn1-schema": "npm:^2.6.0"
+ "@peculiar/asn1-x509": "npm:^2.6.0"
+ pvtsutils: "npm:^1.3.6"
+ reflect-metadata: "npm:^0.2.2"
+ tslib: "npm:^2.8.1"
+ tsyringe: "npm:^4.10.0"
+ checksum: 10c0/949231ca9daf84534bfe255f28a856df497302fed294d227c6a28e50f5cfb67ed1d91afe6db787b88294ce042295243dbcb44455fe2efa5ed07428a74392eec9
+ languageName: node
+ linkType: hard
+
"@pkgjs/parseargs@npm:^0.11.0":
version: 0.11.0
resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -1771,90 +1923,90 @@ __metadata:
languageName: node
linkType: hard
-"@swc/core-darwin-arm64@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-darwin-arm64@npm:1.15.3"
+"@swc/core-darwin-arm64@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-darwin-arm64@npm:1.15.11"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
-"@swc/core-darwin-x64@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-darwin-x64@npm:1.15.3"
+"@swc/core-darwin-x64@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-darwin-x64@npm:1.15.11"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
-"@swc/core-linux-arm-gnueabihf@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-linux-arm-gnueabihf@npm:1.15.3"
+"@swc/core-linux-arm-gnueabihf@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-linux-arm-gnueabihf@npm:1.15.11"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard
-"@swc/core-linux-arm64-gnu@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-linux-arm64-gnu@npm:1.15.3"
+"@swc/core-linux-arm64-gnu@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-linux-arm64-gnu@npm:1.15.11"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
-"@swc/core-linux-arm64-musl@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-linux-arm64-musl@npm:1.15.3"
+"@swc/core-linux-arm64-musl@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-linux-arm64-musl@npm:1.15.11"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
-"@swc/core-linux-x64-gnu@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-linux-x64-gnu@npm:1.15.3"
+"@swc/core-linux-x64-gnu@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-linux-x64-gnu@npm:1.15.11"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
-"@swc/core-linux-x64-musl@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-linux-x64-musl@npm:1.15.3"
+"@swc/core-linux-x64-musl@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-linux-x64-musl@npm:1.15.11"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
-"@swc/core-win32-arm64-msvc@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-win32-arm64-msvc@npm:1.15.3"
+"@swc/core-win32-arm64-msvc@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-win32-arm64-msvc@npm:1.15.11"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
-"@swc/core-win32-ia32-msvc@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-win32-ia32-msvc@npm:1.15.3"
+"@swc/core-win32-ia32-msvc@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-win32-ia32-msvc@npm:1.15.11"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
-"@swc/core-win32-x64-msvc@npm:1.15.3":
- version: 1.15.3
- resolution: "@swc/core-win32-x64-msvc@npm:1.15.3"
+"@swc/core-win32-x64-msvc@npm:1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core-win32-x64-msvc@npm:1.15.11"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
-"@swc/core@npm:^1.15.3":
- version: 1.15.3
- resolution: "@swc/core@npm:1.15.3"
+"@swc/core@npm:^1.15.11":
+ version: 1.15.11
+ resolution: "@swc/core@npm:1.15.11"
dependencies:
- "@swc/core-darwin-arm64": "npm:1.15.3"
- "@swc/core-darwin-x64": "npm:1.15.3"
- "@swc/core-linux-arm-gnueabihf": "npm:1.15.3"
- "@swc/core-linux-arm64-gnu": "npm:1.15.3"
- "@swc/core-linux-arm64-musl": "npm:1.15.3"
- "@swc/core-linux-x64-gnu": "npm:1.15.3"
- "@swc/core-linux-x64-musl": "npm:1.15.3"
- "@swc/core-win32-arm64-msvc": "npm:1.15.3"
- "@swc/core-win32-ia32-msvc": "npm:1.15.3"
- "@swc/core-win32-x64-msvc": "npm:1.15.3"
+ "@swc/core-darwin-arm64": "npm:1.15.11"
+ "@swc/core-darwin-x64": "npm:1.15.11"
+ "@swc/core-linux-arm-gnueabihf": "npm:1.15.11"
+ "@swc/core-linux-arm64-gnu": "npm:1.15.11"
+ "@swc/core-linux-arm64-musl": "npm:1.15.11"
+ "@swc/core-linux-x64-gnu": "npm:1.15.11"
+ "@swc/core-linux-x64-musl": "npm:1.15.11"
+ "@swc/core-win32-arm64-msvc": "npm:1.15.11"
+ "@swc/core-win32-ia32-msvc": "npm:1.15.11"
+ "@swc/core-win32-x64-msvc": "npm:1.15.11"
"@swc/counter": "npm:^0.1.3"
"@swc/types": "npm:^0.1.25"
peerDependencies:
@@ -1883,7 +2035,7 @@ __metadata:
peerDependenciesMeta:
"@swc/helpers":
optional: true
- checksum: 10c0/79e087b15ffb85089d0a8394646d1ec322bdab070e4b79b761fc0693e80b9a44b85fd9654f49a2a5572779ff6d248ea31de0dd24a9273e326e3774bfebfcc60a
+ checksum: 10c0/84b9dbed8d4d39da9941b796f97f84a52a3ab1a5e002b0395e98d0c3368acab4dde84051eb97c47c85b67c5fc29e3e9b7a646cf238a96df93fc7c54177925c3e
languageName: node
linkType: hard
@@ -1933,10 +2085,10 @@ __metadata:
languageName: node
linkType: hard
-"@thumbmarkjs/thumbmarkjs@npm:^1.5.1":
- version: 1.5.1
- resolution: "@thumbmarkjs/thumbmarkjs@npm:1.5.1"
- checksum: 10c0/8fc6b54d6f1392e3caf22f8eb36fe1de59ff2eb77d429a51d4322409979218cc0ea8bd074d6ebcf42bad01db61631ff0e7dcb335fceb637cb10284b1320b2a4f
+"@thumbmarkjs/thumbmarkjs@npm:^1.7.0":
+ version: 1.7.1
+ resolution: "@thumbmarkjs/thumbmarkjs@npm:1.7.1"
+ checksum: 10c0/dce6d44dc7f06c96a6c140aefabe989e3d3372bdb843bc2955819a1f7318f7fa40641b8e73107a8f634b3434a638064cc8010fcd208d84adc8ad72a736571474
languageName: node
linkType: hard
@@ -2422,15 +2574,15 @@ __metadata:
languageName: node
linkType: hard
-"@types/express@npm:^4.17.21":
- version: 4.17.23
- resolution: "@types/express@npm:4.17.23"
+"@types/express@npm:^4.17.25":
+ version: 4.17.25
+ resolution: "@types/express@npm:4.17.25"
dependencies:
"@types/body-parser": "npm:*"
"@types/express-serve-static-core": "npm:^4.17.33"
"@types/qs": "npm:*"
- "@types/serve-static": "npm:*"
- checksum: 10c0/60490cd4f73085007247e7d4fafad0a7abdafa34fa3caba2757512564ca5e094ece7459f0f324030a63d513f967bb86579a8682af76ae2fd718e889b0a2a4fe8
+ "@types/serve-static": "npm:^1"
+ checksum: 10c0/f42b616d2c9dbc50352c820db7de182f64ebbfa8dba6fb6c98e5f8f0e2ef3edde0131719d9dc6874803d25ad9ca2d53471d0fec2fbc60a6003a43d015bab72c4
languageName: node
linkType: hard
@@ -2556,15 +2708,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/node-forge@npm:^1.3.0":
- version: 1.3.13
- resolution: "@types/node-forge@npm:1.3.13"
- dependencies:
- "@types/node": "npm:*"
- checksum: 10c0/95d004c2af465f27c3eefc805d4de5a4a9bfb8f715b3e733ca085f7cd4e33b23cde1928ad7a14691957c40d86ca7c7678790d34ebf3223aecf8bda38327cb714
- languageName: node
- linkType: hard
-
"@types/node@npm:*":
version: 24.1.0
resolution: "@types/node@npm:24.1.0"
@@ -2679,6 +2822,16 @@ __metadata:
languageName: node
linkType: hard
+"@types/send@npm:<1":
+ version: 0.17.6
+ resolution: "@types/send@npm:0.17.6"
+ dependencies:
+ "@types/mime": "npm:^1"
+ "@types/node": "npm:*"
+ checksum: 10c0/a9d76797f0637738062f1b974e0fcf3d396a28c5dc18c3f95ecec5dabda82e223afbc2d56a0bca46b6326fd7bb229979916cea40de2270a98128fd94441b87c2
+ languageName: node
+ linkType: hard
+
"@types/serve-index@npm:^1.9.4":
version: 1.9.4
resolution: "@types/serve-index@npm:1.9.4"
@@ -2699,6 +2852,17 @@ __metadata:
languageName: node
linkType: hard
+"@types/serve-static@npm:^1":
+ version: 1.15.10
+ resolution: "@types/serve-static@npm:1.15.10"
+ dependencies:
+ "@types/http-errors": "npm:*"
+ "@types/node": "npm:*"
+ "@types/send": "npm:<1"
+ checksum: 10c0/842fca14c9e80468f89b6cea361773f2dcd685d4616a9f59013b55e1e83f536e4c93d6d8e3ba5072d40c4e7e64085210edd6646b15d538ded94512940a23021f
+ languageName: node
+ linkType: hard
+
"@types/sockjs@npm:^0.3.36":
version: 0.3.36
resolution: "@types/sockjs@npm:0.3.36"
@@ -3331,7 +3495,7 @@ __metadata:
resolution: "artemis-console-app@workspace:app"
dependencies:
"@hawtio/backend-middleware": "npm:^1.0.8"
- "@hawtio/react": "npm:^1.12.0"
+ "@hawtio/react": "npm:^1.12.3"
"@monaco-editor/react": "npm:^4.6.0"
"@patternfly/react-charts": "npm:^7.4.9"
"@patternfly/react-code-editor": "npm:^5.4.18"
@@ -3341,15 +3505,15 @@ __metadata:
"@patternfly/react-table": "npm:^5.4.16"
"@patternfly/react-tokens": "npm:^5.4.1"
"@patternfly/react-topology": "npm:^5.4.1"
- "@swc/core": "npm:^1.15.3"
+ "@swc/core": "npm:^1.15.11"
"@types/react": "npm:^18.3.27"
artemis-console-plugin: "workspace:*"
- body-parser: "npm:^2.2.1"
+ body-parser: "npm:^2.2.2"
copy-webpack-plugin: "npm:^13.0.1"
css-loader: "npm:^7.1.2"
css-minimizer-webpack-plugin: "npm:^7.0.2"
d3: "npm:^7.9.0"
- html-webpack-plugin: "npm:^5.6.5"
+ html-webpack-plugin: "npm:^5.6.6"
mini-css-extract-plugin: "npm:^2.9.4"
monaco-editor: "npm:^0.52.2"
monaco-editor-webpack-plugin: "npm:^7.1.1"
@@ -3357,15 +3521,15 @@ __metadata:
path-browserify: "npm:^1.0.1"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
- react-router-dom: "npm:^6.30.2"
+ react-router-dom: "npm:^6.30.3"
replace: "npm:^1.2.2"
source-map-loader: "npm:^5.0.0"
style-loader: "npm:^4.0.0"
- swc-loader: "npm:^0.2.6"
+ swc-loader: "npm:^0.2.7"
terser-webpack-plugin: "npm:^5.3.14"
- webpack: "npm:^5.103.0"
+ webpack: "npm:^5.105.2"
webpack-cli: "npm:^6.0.1"
- webpack-dev-server: "npm:^5.2.2"
+ webpack-dev-server: "npm:^5.2.3"
webpack-manifest-plugin: "npm:^5.0.1"
languageName: unknown
linkType: soft
@@ -3380,7 +3544,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "artemis-console-plugin@workspace:packages/artemis-console-plugin"
dependencies:
- "@hawtio/react": "npm:^1.12.0"
+ "@hawtio/react": "npm:^1.12.3"
"@monaco-editor/react": "npm:^4.6.0"
"@patternfly/react-charts": "npm:^7.4.9"
"@patternfly/react-code-editor": "npm:^5.4.18"
@@ -3403,17 +3567,17 @@ __metadata:
monaco-editor: "npm:^0.52.2"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
- react-router-dom: "npm:^6.30.2"
+ react-router-dom: "npm:^6.30.3"
react-split: "npm:^2.0.14"
replace: "npm:^1.2.2"
ts-jest: "npm:^29.4.6"
ts-node: "npm:^10.9.2"
tsup: "npm:^8.5.1"
typescript: "npm:^5.8.3"
- webpack: "npm:^5.103.0"
+ webpack: "npm:^5.105.2"
xml-formatter: "npm:^3.6.7"
peerDependencies:
- "@hawtio/react": ^1.11
+ "@hawtio/react": ^1.12
"@monaco-editor/react": ^4
"@patternfly/react-charts": ^7
"@patternfly/react-code-editor": ^5
@@ -3431,6 +3595,17 @@ __metadata:
languageName: unknown
linkType: soft
+"asn1js@npm:^3.0.6":
+ version: 3.0.7
+ resolution: "asn1js@npm:3.0.7"
+ dependencies:
+ pvtsutils: "npm:^1.3.6"
+ pvutils: "npm:^1.1.3"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/7e79795edf1bcc86532c4084aa7c8c0ebc57f7dd6f964ad6de956abf617329722f6964b7af3a5d1c4554dd61b4b148ae1580e63e3ec2e70e7fba34f6df072b29
+ languageName: node
+ linkType: hard
+
"asynckit@npm:^0.4.0":
version: 0.4.0
resolution: "asynckit@npm:0.4.0"
@@ -3546,12 +3721,12 @@ __metadata:
languageName: node
linkType: hard
-"baseline-browser-mapping@npm:^2.8.19":
- version: 2.8.23
- resolution: "baseline-browser-mapping@npm:2.8.23"
+"baseline-browser-mapping@npm:^2.9.0":
+ version: 2.9.19
+ resolution: "baseline-browser-mapping@npm:2.9.19"
bin:
baseline-browser-mapping: dist/cli.js
- checksum: 10c0/5a63c1c241d288e5c79aa32a1cbea335b5af899172161aa9f9701a67c5b9b55ea3b3945a70a842385374627dde1de27504641bc95257d8c2e81f0c593c719121
+ checksum: 10c0/569928db78bcd081953d7db79e4243a59a579a34b4ae1806b9b42d3b7f84e5bc40e6e82ae4fa06e7bef8291bf747b33b3f9ef5d3c6e1e420cb129d9295536129
languageName: node
linkType: hard
@@ -3593,6 +3768,23 @@ __metadata:
languageName: node
linkType: hard
+"body-parser@npm:^2.2.2":
+ version: 2.2.2
+ resolution: "body-parser@npm:2.2.2"
+ dependencies:
+ bytes: "npm:^3.1.2"
+ content-type: "npm:^1.0.5"
+ debug: "npm:^4.4.3"
+ http-errors: "npm:^2.0.0"
+ iconv-lite: "npm:^0.7.0"
+ on-finished: "npm:^2.4.1"
+ qs: "npm:^6.14.1"
+ raw-body: "npm:^3.0.1"
+ type-is: "npm:^2.0.1"
+ checksum: 10c0/95a830a003b38654b75166ca765358aa92ee3d561bf0e41d6ccdde0e1a0c9783cab6b90b20eb635d23172c010b59d3563a137a738e74da4ba714463510d05137
+ languageName: node
+ linkType: hard
+
"body-parser@npm:~1.20.3":
version: 1.20.4
resolution: "body-parser@npm:1.20.4"
@@ -3672,18 +3864,18 @@ __metadata:
languageName: node
linkType: hard
-"browserslist@npm:^4.26.3":
- version: 4.27.0
- resolution: "browserslist@npm:4.27.0"
+"browserslist@npm:^4.28.1":
+ version: 4.28.1
+ resolution: "browserslist@npm:4.28.1"
dependencies:
- baseline-browser-mapping: "npm:^2.8.19"
- caniuse-lite: "npm:^1.0.30001751"
- electron-to-chromium: "npm:^1.5.238"
- node-releases: "npm:^2.0.26"
- update-browserslist-db: "npm:^1.1.4"
+ baseline-browser-mapping: "npm:^2.9.0"
+ caniuse-lite: "npm:^1.0.30001759"
+ electron-to-chromium: "npm:^1.5.263"
+ node-releases: "npm:^2.0.27"
+ update-browserslist-db: "npm:^1.2.0"
bin:
browserslist: cli.js
- checksum: 10c0/395611e54374da9171cdbe7e3704ab426e0f1d622751392df6d6cbf60c539bf06cf2407e9dd769bc01ee2abca6a14af6509a2e0bbb448ba75a054db6c1840643
+ checksum: 10c0/545a5fa9d7234e3777a7177ec1e9134bb2ba60a69e6b95683f6982b1473aad347c77c1264ccf2ac5dea609a9731fbfbda6b85782bdca70f80f86e28a402504bd
languageName: node
linkType: hard
@@ -3739,6 +3931,13 @@ __metadata:
languageName: node
linkType: hard
+"bytestreamjs@npm:^2.0.1":
+ version: 2.0.1
+ resolution: "bytestreamjs@npm:2.0.1"
+ checksum: 10c0/edd66b7ca3f94aae99a1009304a42d82ca4c2085eb934192ff47a81f59215c975dc9d3cd8f23c40a2f43ef5b2fa6f01ace70b10ad247766cec6ec641b89eab48
+ languageName: node
+ linkType: hard
+
"cac@npm:^6.7.14":
version: 6.7.14
resolution: "cac@npm:6.7.14"
@@ -3829,13 +4028,20 @@ __metadata:
languageName: node
linkType: hard
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001726, caniuse-lite@npm:^1.0.30001751":
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001726":
version: 1.0.30001762
resolution: "caniuse-lite@npm:1.0.30001762"
checksum: 10c0/93707eac5b0240af3f2ce6e2d7ab504a6fefcf9c2f9cd8fb9d488e496a333c61e557dab0472c1b00c17bc386a5dbb792aa4c778cda2d768e17f986617d7aec53
languageName: node
linkType: hard
+"caniuse-lite@npm:^1.0.30001759":
+ version: 1.0.30001770
+ resolution: "caniuse-lite@npm:1.0.30001770"
+ checksum: 10c0/02d15a8b723af65318cb4d888a52bb090076898da7b0de99e8676d537f8d1d2ae4797e81518e1e30cbfe84c33b048c322e8bfafc5b23cfee8defb0d2bf271149
+ languageName: node
+ linkType: hard
+
"ccount@npm:^2.0.0":
version: 2.0.1
resolution: "ccount@npm:2.0.1"
@@ -4138,7 +4344,7 @@ __metadata:
languageName: node
linkType: hard
-"compression@npm:^1.7.4":
+"compression@npm:^1.8.1":
version: 1.8.1
resolution: "compression@npm:1.8.1"
dependencies:
@@ -5159,15 +5365,15 @@ __metadata:
languageName: node
linkType: hard
-"dompurify@npm:^3.3.0":
- version: 3.3.0
- resolution: "dompurify@npm:3.3.0"
+"dompurify@npm:^3.3.1":
+ version: 3.3.1
+ resolution: "dompurify@npm:3.3.1"
dependencies:
"@types/trusted-types": "npm:^2.0.7"
dependenciesMeta:
"@types/trusted-types":
optional: true
- checksum: 10c0/66b1787b0bc8250d8f58e13284cf7f5f6bb400a0a55515e7a2a030316a4bb0d8306fdb669c17ed86ed58ff7e53c62b5da4488c2f261d11c58870fe01b8fcc486
+ checksum: 10c0/fa0a8c55a436ba0d54389195e3d2337e311f56de709a2fc9efc98dbbc7746fa53bb4b74b6ac043b77a279a8f2ebd8685f0ebaa6e58c9e32e92051d529bc0baf8
languageName: node
linkType: hard
@@ -5235,10 +5441,10 @@ __metadata:
languageName: node
linkType: hard
-"electron-to-chromium@npm:^1.5.238":
- version: 1.5.244
- resolution: "electron-to-chromium@npm:1.5.244"
- checksum: 10c0/a3cbc8c9c9415234f97e92724924f943fcb82494b3a2f9ae998954d22496e86f7eaf5e2fceca8aa8be098b0693f508332ec2d3b4b39a42cd2de1fac4d048a19f
+"electron-to-chromium@npm:^1.5.263":
+ version: 1.5.286
+ resolution: "electron-to-chromium@npm:1.5.286"
+ checksum: 10c0/5384510f9682d7e46f98fa48b874c3901d9639de96e9e387afce1fe010fbac31376df0534524edc15f66e9902bfacee54037a5e598004e9c6a617884e379926d
languageName: node
linkType: hard
@@ -5293,13 +5499,13 @@ __metadata:
languageName: node
linkType: hard
-"enhanced-resolve@npm:^5.17.3":
- version: 5.18.3
- resolution: "enhanced-resolve@npm:5.18.3"
+"enhanced-resolve@npm:^5.19.0":
+ version: 5.19.0
+ resolution: "enhanced-resolve@npm:5.19.0"
dependencies:
graceful-fs: "npm:^4.2.4"
- tapable: "npm:^2.2.0"
- checksum: 10c0/d413c23c2d494e4c1c9c9ac7d60b812083dc6d446699ed495e69c920988af0a3c66bf3f8d0e7a45cb1686c2d4c1df9f4e7352d973f5b56fe63d8d711dd0ccc54
+ tapable: "npm:^2.3.0"
+ checksum: 10c0/966b1dffb82d5f6a4d6a86e904e812104a999066aa29f9223040aaa751e7c453b462a3f5ef91f8bd4408131ff6f7f90651dd1c804bdcb7944e2099a9c2e45ee2
languageName: node
linkType: hard
@@ -5370,10 +5576,10 @@ __metadata:
languageName: node
linkType: hard
-"es-module-lexer@npm:^1.2.1":
- version: 1.7.0
- resolution: "es-module-lexer@npm:1.7.0"
- checksum: 10c0/4c935affcbfeba7fb4533e1da10fa8568043df1e3574b869385980de9e2d475ddc36769891936dbb07036edb3c3786a8b78ccf44964cd130dedc1f2c984b6c7b
+"es-module-lexer@npm:^2.0.0":
+ version: 2.0.0
+ resolution: "es-module-lexer@npm:2.0.0"
+ checksum: 10c0/ae78dbbd43035a4b972c46cfb6877e374ea290adfc62bc2f5a083fea242c0b2baaab25c5886af86be55f092f4a326741cb94334cd3c478c383fdc8a9ec5ff817
languageName: node
linkType: hard
@@ -5579,10 +5785,10 @@ __metadata:
languageName: node
linkType: hard
-"eventemitter3@npm:^5.0.1":
- version: 5.0.1
- resolution: "eventemitter3@npm:5.0.1"
- checksum: 10c0/4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814
+"eventemitter3@npm:^5.0.4":
+ version: 5.0.4
+ resolution: "eventemitter3@npm:5.0.4"
+ checksum: 10c0/575b8cac8d709e1473da46f8f15ef311b57ff7609445a7c71af5cd42598583eee6f098fa7a593e30f27e94b8865642baa0689e8fa97c016f742abdb3b1bf6d9a
languageName: node
linkType: hard
@@ -5652,7 +5858,7 @@ __metadata:
languageName: node
linkType: hard
-"express@npm:^4.21.2":
+"express@npm:^4.22.1":
version: 4.22.1
resolution: "express@npm:4.22.1"
dependencies:
@@ -6269,9 +6475,9 @@ __metadata:
languageName: node
linkType: hard
-"html-webpack-plugin@npm:^5.6.5":
- version: 5.6.5
- resolution: "html-webpack-plugin@npm:5.6.5"
+"html-webpack-plugin@npm:^5.6.6":
+ version: 5.6.6
+ resolution: "html-webpack-plugin@npm:5.6.6"
dependencies:
"@types/html-minifier-terser": "npm:^6.0.0"
html-minifier-terser: "npm:^6.0.2"
@@ -6286,7 +6492,7 @@ __metadata:
optional: true
webpack:
optional: true
- checksum: 10c0/4ae0ae48fec6337e4eb055e730e46340172ec1967bd383d897d03cb3c4e385a8128e8d5179c4658536b00e432c2d3f026d97eb5fdb4cf9dc710498d2e871b84e
+ checksum: 10c0/30c07c46c6125d51f9779e4fc3dd1bf30ebd0ef78e9628d918f8e4c45e116e79a31ca5ba3444d2743833335405616b8772a68d6183b0663f016529802422ca9e
languageName: node
linkType: hard
@@ -7502,10 +7708,10 @@ __metadata:
languageName: node
linkType: hard
-"keycloak-js@npm:^26.2.1":
- version: 26.2.1
- resolution: "keycloak-js@npm:26.2.1"
- checksum: 10c0/d1ed30960a51c11f72b1a260407b012cdee56d685b7b0e74ea52f90882b760a39a234f136f1c05b77c736db21474327034396d47ca427dcdf1ccb59358135132
+"keycloak-js@npm:^26.2.3":
+ version: 26.2.3
+ resolution: "keycloak-js@npm:26.2.3"
+ checksum: 10c0/9c08a24c9667d31e0a599f19fc8f475499fe212fc399103a1d22c4a3aa87f5a9f43f62ed9a88929ae52ef9626ba695f02d97ab736d238668834e3f9a9de2096d
languageName: node
linkType: hard
@@ -7554,10 +7760,10 @@ __metadata:
languageName: node
linkType: hard
-"loader-runner@npm:^4.2.0":
- version: 4.3.0
- resolution: "loader-runner@npm:4.3.0"
- checksum: 10c0/a44d78aae0907a72f73966fe8b82d1439c8c485238bd5a864b1b9a2a3257832effa858790241e6b37876b5446a78889adf2fcc8dd897ce54c089ecc0a0ce0bf0
+"loader-runner@npm:^4.3.1":
+ version: 4.3.1
+ resolution: "loader-runner@npm:4.3.1"
+ checksum: 10c0/a523b6329f114e0a98317158e30a7dfce044b731521be5399464010472a93a15ece44757d1eaed1d8845019869c5390218bc1c7c3110f4eeaef5157394486eac
languageName: node
linkType: hard
@@ -8535,13 +8741,6 @@ __metadata:
languageName: node
linkType: hard
-"node-forge@npm:1.3.2":
- version: 1.3.2
- resolution: "node-forge@npm:1.3.2"
- checksum: 10c0/1def35652c93a588718a6d0d0b4f33e3e7de283aa6f4c00d01d1605d6ccce23fb3b59bcbfb6434014acd23a251cfcc2736052b406f53d94e1b19c09d289d0176
- languageName: node
- linkType: hard
-
"node-gyp@npm:latest":
version: 11.2.0
resolution: "node-gyp@npm:11.2.0"
@@ -8576,7 +8775,7 @@ __metadata:
languageName: node
linkType: hard
-"node-releases@npm:^2.0.26":
+"node-releases@npm:^2.0.27":
version: 2.0.27
resolution: "node-releases@npm:2.0.27"
checksum: 10c0/f1e6583b7833ea81880627748d28a3a7ff5703d5409328c216ae57befbced10ce2c991bea86434e8ec39003bd017f70481e2e5f8c1f7e0a7663241f81d6e00e2
@@ -8626,10 +8825,10 @@ __metadata:
languageName: node
linkType: hard
-"oauth4webapi@npm:^3.8.3":
- version: 3.8.3
- resolution: "oauth4webapi@npm:3.8.3"
- checksum: 10c0/9730a3231304c419ca26b3bce238d437e763a87645a9761b4a1a044eccc120660ea6b4fbba4a86f6411eaaabc8a59777f60f2afff888d7a3b784c5ce5dddfa09
+"oauth4webapi@npm:^3.8.4":
+ version: 3.8.4
+ resolution: "oauth4webapi@npm:3.8.4"
+ checksum: 10c0/961d82ecb44b994b116616f7f60b2c6ba03dfccb36815e4b8976597e98da1938521ed6465807d6941029ea69488ea146de2bf210eb69a435c109e18a6f46ec80
languageName: node
linkType: hard
@@ -8936,6 +9135,20 @@ __metadata:
languageName: node
linkType: hard
+"pkijs@npm:^3.3.3":
+ version: 3.3.3
+ resolution: "pkijs@npm:3.3.3"
+ dependencies:
+ "@noble/hashes": "npm:1.4.0"
+ asn1js: "npm:^3.0.6"
+ bytestreamjs: "npm:^2.0.1"
+ pvtsutils: "npm:^1.3.6"
+ pvutils: "npm:^1.1.3"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/7b60f3398c35538ce05b613b5ff86c0df6b7e236e2ba6063fec2f89a80eb214d45c175e19cf13e20bed0c474000f1d3653a5234efc42e9528d1912d2edae5914
+ languageName: node
+ linkType: hard
+
"point-in-svg-path@npm:^1.0.1":
version: 1.0.2
resolution: "point-in-svg-path@npm:1.0.2"
@@ -9475,6 +9688,22 @@ __metadata:
languageName: node
linkType: hard
+"pvtsutils@npm:^1.3.6":
+ version: 1.3.6
+ resolution: "pvtsutils@npm:1.3.6"
+ dependencies:
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/b1b42646370505ccae536dcffa662303b2c553995211330c8e39dec9ab8c197585d7751c2c5b9ab2f186feda0219d9bb23c34ee1e565573be96450f79d89a13c
+ languageName: node
+ linkType: hard
+
+"pvutils@npm:^1.1.3":
+ version: 1.1.5
+ resolution: "pvutils@npm:1.1.5"
+ checksum: 10c0/e968b07b78a58fec9377fe7aa6342c8cfa21c8fb4afc4e51e1489bd42bec6dc71b8a52541d0aede0aea17adec7ca3f89f29f56efdc31d0083cc02e9bb5721bcf
+ languageName: node
+ linkType: hard
+
"qs@npm:6.14.1":
version: 6.14.1
resolution: "qs@npm:6.14.1"
@@ -9627,27 +9856,27 @@ __metadata:
languageName: node
linkType: hard
-"react-router-dom@npm:^6.30.2":
- version: 6.30.2
- resolution: "react-router-dom@npm:6.30.2"
+"react-router-dom@npm:^6.30.3":
+ version: 6.30.3
+ resolution: "react-router-dom@npm:6.30.3"
dependencies:
- "@remix-run/router": "npm:1.23.1"
- react-router: "npm:6.30.2"
+ "@remix-run/router": "npm:1.23.2"
+ react-router: "npm:6.30.3"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
- checksum: 10c0/d0c6edf4e2aa7639b4a4f64a7747f03d8861bdf4857e8981b1cff1451b7cb91fcdcd7e315a6e3df910271b2f5071825d2aec218d5f7890f2269fc074f198e42a
+ checksum: 10c0/e8a1e13c662ed6ee71a785bd3418ba04b700bcd8aff6ea7b32524371e8abb1c85568cd4fe9b9e9d555b8101fd415f6f1796531f593da60be179ce75b37038657
languageName: node
linkType: hard
-"react-router@npm:6.30.2":
- version: 6.30.2
- resolution: "react-router@npm:6.30.2"
+"react-router@npm:6.30.3":
+ version: 6.30.3
+ resolution: "react-router@npm:6.30.3"
dependencies:
- "@remix-run/router": "npm:1.23.1"
+ "@remix-run/router": "npm:1.23.2"
peerDependencies:
react: ">=16.8"
- checksum: 10c0/cff5ea92d248d2230adc46d4e2ed3fbeddfaf1ae2e63411da8b7ea6ddc207d71dbc522c05c492e671e553e2153934f4ab180ac02bd36205b274e097f2cfe6fc4
+ checksum: 10c0/a0a74bf5a933cf0abd47e0eac1d3a505cd66b866e3ee8f20d8016885d3b4361ba3ba72dee026248c6125e631b191ba6ad109184c892281cea6cb747c71bf5940
languageName: node
linkType: hard
@@ -9750,6 +9979,13 @@ __metadata:
languageName: node
linkType: hard
+"reflect-metadata@npm:^0.2.2":
+ version: 0.2.2
+ resolution: "reflect-metadata@npm:0.2.2"
+ checksum: 10c0/1cd93a15ea291e420204955544637c264c216e7aac527470e393d54b4bb075f10a17e60d8168ec96600c7e0b9fcc0cb0bb6e91c3fbf5b0d8c9056f04e6ac1ec2
+ languageName: node
+ linkType: hard
+
"relateurl@npm:^0.2.7":
version: 0.2.7
resolution: "relateurl@npm:0.2.7"
@@ -10093,13 +10329,13 @@ __metadata:
languageName: node
linkType: hard
-"selfsigned@npm:^2.4.1":
- version: 2.4.1
- resolution: "selfsigned@npm:2.4.1"
+"selfsigned@npm:^5.5.0":
+ version: 5.5.0
+ resolution: "selfsigned@npm:5.5.0"
dependencies:
- "@types/node-forge": "npm:^1.3.0"
- node-forge: "npm:^1"
- checksum: 10c0/521829ec36ea042f7e9963bf1da2ed040a815cf774422544b112ec53b7edc0bc50a0f8cc2ae7aa6cc19afa967c641fd96a15de0fc650c68651e41277d2e1df09
+ "@peculiar/x509": "npm:^1.14.2"
+ pkijs: "npm:^3.3.3"
+ checksum: 10c0/a31e9d928e22cd6f4e14759a099feba79d9d789c852c7cf65ff8e2f62d7f6313fe477639590e7ed06115b4516a4bebbe0dec5d072a2d01cc372a9cfd58eb893b
languageName: node
linkType: hard
@@ -10766,15 +11002,15 @@ __metadata:
languageName: node
linkType: hard
-"swc-loader@npm:^0.2.6":
- version: 0.2.6
- resolution: "swc-loader@npm:0.2.6"
+"swc-loader@npm:^0.2.7":
+ version: 0.2.7
+ resolution: "swc-loader@npm:0.2.7"
dependencies:
"@swc/counter": "npm:^0.1.3"
peerDependencies:
"@swc/core": ^1.2.147
webpack: ">=2"
- checksum: 10c0/b06926c5cb153931589c2166aa4c7c052cc53c68758acdda480d1eb59ecddf7d74b168e33166c4f807cc9dbae4395de9d80a14ad43e265fffaa775638abf71ce
+ checksum: 10c0/9c1b275adf9b83d7245e0e30a1dd41b0f6dbb0164267f772f855adc325a615c30a9d343e7362b585834350e2d9632ecd2239e03fa8f15a2d2e699a99e438d363
languageName: node
linkType: hard
@@ -10801,7 +11037,7 @@ __metadata:
languageName: node
linkType: hard
-"tapable@npm:^2.0.0, tapable@npm:^2.2.0, tapable@npm:^2.2.1":
+"tapable@npm:^2.0.0, tapable@npm:^2.2.1":
version: 2.2.2
resolution: "tapable@npm:2.2.2"
checksum: 10c0/8ad130aa705cab6486ad89e42233569a1fb1ff21af115f59cebe9f2b45e9e7995efceaa9cc5062510cdb4ec673b527924b2ab812e3579c55ad659ae92117011e
@@ -10828,7 +11064,7 @@ __metadata:
languageName: node
linkType: hard
-"terser-webpack-plugin@npm:^5.3.11, terser-webpack-plugin@npm:^5.3.14":
+"terser-webpack-plugin@npm:^5.3.14":
version: 5.3.14
resolution: "terser-webpack-plugin@npm:5.3.14"
dependencies:
@@ -10850,6 +11086,28 @@ __metadata:
languageName: node
linkType: hard
+"terser-webpack-plugin@npm:^5.3.16":
+ version: 5.3.16
+ resolution: "terser-webpack-plugin@npm:5.3.16"
+ dependencies:
+ "@jridgewell/trace-mapping": "npm:^0.3.25"
+ jest-worker: "npm:^27.4.5"
+ schema-utils: "npm:^4.3.0"
+ serialize-javascript: "npm:^6.0.2"
+ terser: "npm:^5.31.1"
+ peerDependencies:
+ webpack: ^5.1.0
+ peerDependenciesMeta:
+ "@swc/core":
+ optional: true
+ esbuild:
+ optional: true
+ uglify-js:
+ optional: true
+ checksum: 10c0/39e37c5b3015c1a5354a3633f77235677bfa06eac2608ce26d258b1d1a74070a99910319a6f2f2c437eb61dc321f66434febe01d78e73fa96b4d4393b813f4cf
+ languageName: node
+ linkType: hard
+
"terser@npm:^5.10.0, terser@npm:^5.31.1":
version: 5.43.1
resolution: "terser@npm:5.43.1"
@@ -11109,7 +11367,14 @@ __metadata:
languageName: node
linkType: hard
-"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.4.0, tslib@npm:^2.7.0":
+"tslib@npm:^1.9.3":
+ version: 1.14.1
+ resolution: "tslib@npm:1.14.1"
+ checksum: 10c0/69ae09c49eea644bc5ebe1bca4fa4cc2c82b7b3e02f43b84bd891504edf66dbc6b2ec0eef31a957042de2269139e4acff911e6d186a258fb14069cd7f6febce2
+ languageName: node
+ linkType: hard
+
+"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.4.0, tslib@npm:^2.7.0, tslib@npm:^2.8.1":
version: 2.8.1
resolution: "tslib@npm:2.8.1"
checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
@@ -11158,6 +11423,15 @@ __metadata:
languageName: node
linkType: hard
+"tsyringe@npm:^4.10.0":
+ version: 4.10.0
+ resolution: "tsyringe@npm:4.10.0"
+ dependencies:
+ tslib: "npm:^1.9.3"
+ checksum: 10c0/918594b4dfac97beb8be2c041c6ec45f078ef3768ed4edfe35ae2c709ab503e2e6b454b2b37e692c658572d1972a428fbfdbc0a2b42fee727a83c1c685fbe5e1
+ languageName: node
+ linkType: hard
+
"type-detect@npm:4.0.8":
version: 4.0.8
resolution: "type-detect@npm:4.0.8"
@@ -11419,9 +11693,9 @@ __metadata:
languageName: node
linkType: hard
-"update-browserslist-db@npm:^1.1.4":
- version: 1.1.4
- resolution: "update-browserslist-db@npm:1.1.4"
+"update-browserslist-db@npm:^1.2.0":
+ version: 1.2.3
+ resolution: "update-browserslist-db@npm:1.2.3"
dependencies:
escalade: "npm:^3.2.0"
picocolors: "npm:^1.1.1"
@@ -11429,7 +11703,7 @@ __metadata:
browserslist: ">= 4.21.0"
bin:
update-browserslist-db: cli.js
- checksum: 10c0/db0c9aaecf1258a6acda5e937fc27a7996ccca7a7580a1b4aa8bba6a9b0e283e5e65c49ebbd74ec29288ef083f1b88d4da13e3d4d326c1e5fc55bf72d7390702
+ checksum: 10c0/13a00355ea822388f68af57410ce3255941d5fb9b7c49342c4709a07c9f230bbef7f7499ae0ca7e0de532e79a82cc0c4edbd125f1a323a1845bf914efddf8bec
languageName: node
linkType: hard
@@ -11834,13 +12108,13 @@ __metadata:
languageName: node
linkType: hard
-"watchpack@npm:^2.4.4":
- version: 2.4.4
- resolution: "watchpack@npm:2.4.4"
+"watchpack@npm:^2.5.1":
+ version: 2.5.1
+ resolution: "watchpack@npm:2.5.1"
dependencies:
glob-to-regexp: "npm:^0.4.1"
graceful-fs: "npm:^4.1.2"
- checksum: 10c0/6c0901f75ce245d33991225af915eea1c5ae4ba087f3aee2b70dd377d4cacb34bef02a48daf109da9d59b2d31ec6463d924a0d72f8618ae1643dd07b95de5275
+ checksum: 10c0/dffbb483d1f61be90dc570630a1eb308581e2227d507d783b1d94a57ac7b705ecd9a1a4b73d73c15eab596d39874e5276a3d9cb88bbb698bafc3f8d08c34cf17
languageName: node
linkType: hard
@@ -11928,13 +12202,13 @@ __metadata:
languageName: node
linkType: hard
-"webpack-dev-server@npm:^5.2.2":
- version: 5.2.2
- resolution: "webpack-dev-server@npm:5.2.2"
+"webpack-dev-server@npm:^5.2.3":
+ version: 5.2.3
+ resolution: "webpack-dev-server@npm:5.2.3"
dependencies:
"@types/bonjour": "npm:^3.5.13"
"@types/connect-history-api-fallback": "npm:^1.5.4"
- "@types/express": "npm:^4.17.21"
+ "@types/express": "npm:^4.17.25"
"@types/express-serve-static-core": "npm:^4.17.21"
"@types/serve-index": "npm:^1.9.4"
"@types/serve-static": "npm:^1.15.5"
@@ -11944,9 +12218,9 @@ __metadata:
bonjour-service: "npm:^1.2.1"
chokidar: "npm:^3.6.0"
colorette: "npm:^2.0.10"
- compression: "npm:^1.7.4"
+ compression: "npm:^1.8.1"
connect-history-api-fallback: "npm:^2.0.0"
- express: "npm:^4.21.2"
+ express: "npm:^4.22.1"
graceful-fs: "npm:^4.2.6"
http-proxy-middleware: "npm:^2.0.9"
ipaddr.js: "npm:^2.1.0"
@@ -11954,7 +12228,7 @@ __metadata:
open: "npm:^10.0.3"
p-retry: "npm:^6.2.0"
schema-utils: "npm:^4.2.0"
- selfsigned: "npm:^2.4.1"
+ selfsigned: "npm:^5.5.0"
serve-index: "npm:^1.9.1"
sockjs: "npm:^0.3.24"
spdy: "npm:^4.0.2"
@@ -11969,7 +12243,7 @@ __metadata:
optional: true
bin:
webpack-dev-server: bin/webpack-dev-server.js
- checksum: 10c0/58d7ddb054cdbba22ddfa3d6644194abf6197c14530e1e64ccd7f0b670787245eea966ee72e95abd551c54313627bde0d227a0d2a1e2557102b1a3504ac0b7f1
+ checksum: 10c0/a716f1d509635ad9f2779baf242657740e6ad516ce210fe094cbf3b16f25f114e477c45a751ad2bbf1c601cbbe67b6ba9b8b43159b7c01fc3342c95b985fe963
languageName: node
linkType: hard
@@ -12013,9 +12287,9 @@ __metadata:
languageName: node
linkType: hard
-"webpack@npm:5.102.1":
- version: 5.102.1
- resolution: "webpack@npm:5.102.1"
+"webpack@npm:5.105.2":
+ version: 5.105.2
+ resolution: "webpack@npm:5.105.2"
dependencies:
"@types/eslint-scope": "npm:^3.7.7"
"@types/estree": "npm:^1.0.8"
@@ -12025,29 +12299,29 @@ __metadata:
"@webassemblyjs/wasm-parser": "npm:^1.14.1"
acorn: "npm:^8.15.0"
acorn-import-phases: "npm:^1.0.3"
- browserslist: "npm:^4.26.3"
+ browserslist: "npm:^4.28.1"
chrome-trace-event: "npm:^1.0.2"
- enhanced-resolve: "npm:^5.17.3"
- es-module-lexer: "npm:^1.2.1"
+ enhanced-resolve: "npm:^5.19.0"
+ es-module-lexer: "npm:^2.0.0"
eslint-scope: "npm:5.1.1"
events: "npm:^3.2.0"
glob-to-regexp: "npm:^0.4.1"
graceful-fs: "npm:^4.2.11"
json-parse-even-better-errors: "npm:^2.3.1"
- loader-runner: "npm:^4.2.0"
+ loader-runner: "npm:^4.3.1"
mime-types: "npm:^2.1.27"
neo-async: "npm:^2.6.2"
schema-utils: "npm:^4.3.3"
tapable: "npm:^2.3.0"
- terser-webpack-plugin: "npm:^5.3.11"
- watchpack: "npm:^2.4.4"
+ terser-webpack-plugin: "npm:^5.3.16"
+ watchpack: "npm:^2.5.1"
webpack-sources: "npm:^3.3.3"
peerDependenciesMeta:
webpack-cli:
optional: true
bin:
webpack: bin/webpack.js
- checksum: 10c0/74c3afeef50a5414e58399f1c0123fe5cdb3d8d081c206fae74b8334097d5ff6b729147154dbb4af48e662ba756a89e06d550b3390917153fa1d7ce285f96777
+ checksum: 10c0/565df8072c00d72e0a22e136971862b7eac7beb8b8d39a2ae4ab00838941ea58acc5b49dd7ea268e3d839810756cb86ba5c272b3a25904f6db7807cfa8ed0b29
languageName: node
linkType: hard
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org
(artemis-console) 02/02: ARTEMIS-5777 - Use Hawtio version of MBean parsing and quoting
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brusdev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis-console.git
commit 1480e8e79aadaaabf3bdfb67a167c990cda46cae
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Thu Feb 19 13:52:29 2026 +0100
ARTEMIS-5777 - Use Hawtio version of MBean parsing and quoting
---
.../src/artemis-service.test.ts | 4 +-
.../artemis-console-plugin/src/artemis-service.ts | 54 +---------------------
.../src/artemis-tree-processor.ts | 14 +++++-
.../packages/artemis-console-plugin/src/context.ts | 16 ++++---
.../artemis-console-plugin/src/util/jmx.ts | 43 ++++++++++++++---
.../src/views/ArtemisJMXTabView.tsx | 8 ++--
6 files changed, 65 insertions(+), 74 deletions(-)
diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.test.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.test.ts
index d043919..fbf9d88 100644
--- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.test.ts
+++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.test.ts
@@ -15,9 +15,9 @@
* limitations under the License.
*/
import { beforeAll, describe, expect, test } from "@jest/globals"
-import { artemisService, parseMBeanName } from "./artemis-service";
+import { artemisService } from "./artemis-service";
import { SortDirection } from './table/ArtemisTable'
-import { userService } from '@hawtio/react'
+import { userService, parseMBeanName } from '@hawtio/react'
beforeAll(async () => {
// needed to determine Jolokia URL
diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts
index ea8c665..a268300 100644
--- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts
+++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { ActiveSort, Filter } from './table/ArtemisTable'
-import { eventService, jolokiaService, MBeanNode, workspace } from '@hawtio/react'
+import { eventService, jolokiaService, MBeanNode, parseMBeanName, workspace } from '@hawtio/react'
import { createAddressObjectName, createQueueObjectName } from './util/jmx'
import { log } from './globals'
import { Message } from './messages/MessageView'
@@ -783,61 +783,11 @@ class ArtemisService {
}
}
-export function parseMBeanName(name: string): { domain: string, properties: Record<string, string> } {
- const colon = name.indexOf(":")
- if (colon === -1) {
- throw new Error("Illegal ObjectName")
- }
-
- const domain = name.substring(0, colon)
- const propsString = name.substring(colon + 1)
-
- let i = 0
- const len = propsString.length
- const props: Record<string, string> = {}
-
- while (i < len) {
- let key = ""
- while (i < len && propsString[i] !== "=") {
- key += propsString[i++]
- }
-
- // skip '='
- i++
-
- let value = ""
- if (propsString[i] === '"') {
- // quoted value - only double quote
- i++
- while (i < len) {
- const ch = propsString[i++]
- if (ch === '"') {
- break
- }
- value += ch
- }
- } else {
- // unquoted value can be empty
- while (i < len && propsString[i] !== ",") {
- value += propsString[i++]
- }
- }
-
- props[key.trim()] = value.trim()
-
- if (propsString[i] === ",") {
- i++
- }
- }
-
- return { domain, properties: props };
-}
-
export async function findMBeanInfo(brokerObjectName: string): Promise<MBeanNode | null> {
const tree = await workspace.getTree()
const parsed = parseMBeanName(brokerObjectName)
- const matching = tree.findMBeans(parsed.domain, parsed.properties)
+ const matching = parsed.domain && tree.findMBeans(parsed.domain, parsed.properties)
if (!matching) {
return null
}
diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-tree-processor.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-tree-processor.ts
index 84b3865..64862b3 100644
--- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-tree-processor.ts
+++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/artemis-tree-processor.ts
@@ -92,10 +92,20 @@ function findBrokers(children: MBeanNode[] | undefined): MBeanNode[] {
for (const c of children) {
if (c.id.endsWith('-folder')) {
if (oldBrokers.has(c.name)) {
- const newBrokerNode = oldBrokers.get(c.name)!.copyTo(`Broker ${c.name}`)
- newBrokerNode.children = c.children
+ const oldBrokerNode = oldBrokers.get(c.name)!
+ const newBrokerNode = new MBeanNode(null, `Broker ${c.name}`, true)
newBrokerNode.icon = c.icon
newBrokerNode.expandedIcon = c.expandedIcon
+ newBrokerNode.children = []
+ // newBrokerNode.metadata = oldBrokerNode.metadata
+ newBrokerNode.objectName = oldBrokerNode.objectName
+ newBrokerNode.mbean = oldBrokerNode.mbean
+ newBrokerNode.propertyList = oldBrokerNode.propertyList
+
+ const children = [...c.children!]
+ children.forEach(c => {
+ newBrokerNode.adopt(c)
+ })
brokers.push(newBrokerNode)
}
}
diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts
index ae772a7..1d9c1ae 100644
--- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts
+++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/context.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
import { eventService, EVENT_REFRESH,MBeanNode, MBeanTree, PluginNodeSelectionContext, workspace } from "@hawtio/react";
-import { TreeViewDataItem } from "@patternfly/react-core";
-import { createContext, useContext, useEffect, useState } from "react";
+import { createContext, useContext, useEffect, useRef, useState } from "react";
import { useNavigate } from 'react-router-dom'
import { artemisPluginName } from "./globals";
import { configManager } from "./config-manager";
@@ -32,6 +31,8 @@ export function useArtemisTree() {
const { selectedNode, setSelectedNode } = useContext(PluginNodeSelectionContext)
const navigate = useNavigate();
+ const refSelectedNode = useRef<MBeanNode | null>()
+ refSelectedNode.current = selectedNode
const populateTree = async () => {
const wkspTree: MBeanTree = await workspace.getTree();
@@ -43,11 +44,12 @@ export function useArtemisTree() {
setBrokerNode(rootNode.children[0]);
}
// Expand the nodes to redisplay the path
- if (selectedNode) {
- rootNode.forEach(selectedNode?.path(), (node: MBeanNode) => {
- const tvd = node as TreeViewDataItem
- tvd.defaultExpanded = true
- })
+ if (refSelectedNode.current) {
+ let curr: MBeanNode | null = refSelectedNode.current
+ while (curr) {
+ curr.defaultExpanded = true
+ curr = curr.parent
+ }
}
const subTree: MBeanTree = MBeanTree.createFromNodes(artemisPluginName, [rootNode])
setTree(subTree)
diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/util/jmx.ts b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/util/jmx.ts
index 2c215ea..a310c07 100644
--- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/util/jmx.ts
+++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/util/jmx.ts
@@ -28,16 +28,45 @@ const ADDRESS_COMPONENT = "component=addresses";
* "127.0.0.1",component=addresses,address="q1",subcomponent=queues,routing-type="anycast",queue="q1"
*/
export function createQueueObjectName(brokerMBean: string, address: string, routingType: string, queue: string): string {
- var queueMBeanName = queue;
- if(queueMBeanName.includes('\\')){
- //it may have a client id with /. in the name which is delimeted in the mbean name
- queueMBeanName = queueMBeanName.replaceAll('\\', '\\\\');
- }
- return brokerMBean + ADDRESS_COMPONENT_PART + address + ADDRESS_SUBCOMPONENT_PART + routingType.toLowerCase() + ADDRESS_TYPE_PART + queueMBeanName + STRING_DELIMETER;
+ let addressMBeanName = mbeanEscape(address);
+ let queueMBeanName = mbeanEscape(queue);
+ return brokerMBean + ADDRESS_COMPONENT_PART + addressMBeanName + ADDRESS_SUBCOMPONENT_PART + routingType.toLowerCase() + ADDRESS_TYPE_PART + queueMBeanName + STRING_DELIMETER;
}
export function createAddressObjectName(brokerMBean: string, address: string) {
- return brokerMBean + ADDRESS_COMPONENT_PART + address + STRING_DELIMETER;
+ return brokerMBean + ADDRESS_COMPONENT_PART + mbeanEscape(address) + STRING_DELIMETER;
+}
+
+/**
+ * This function is an equivalent of `javax.management.ObjectName.quote()`
+ * @param value
+ */
+function mbeanEscape(value: string): string {
+ let res = value
+ // it may have a client id with \. in the name which is delimited in the mbean name
+ // according to javax.management.ObjectName.quote() javadoc, we have to replace:
+ res = res.replaceAll('\\', '\\\\');
+ res = res.replaceAll('*', '\\*');
+ res = res.replaceAll('"', '\\"');
+ res = res.replaceAll('?', '\\?');
+ return res
+}
+
+/**
+ * This function should behave like `javax.management.ObjectName.unquote()` for quoted values
+ * and should not change the value when it's not quoted
+ * @param value
+ */
+export function mbeanUnescape(value: string): string {
+ if (!value || !value.startsWith('"') || !value.endsWith('"')) {
+ return value
+ }
+ let res = value.substring(1, value.length - 1);
+ res = res.replaceAll('\\"', '"');
+ res = res.replaceAll('\\*', '*');
+ res = res.replaceAll('\\?', '?');
+ res = res.replaceAll('\\\\', '\\');
+ return res
}
export function isQueue(node: MBeanNode): boolean {
diff --git a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx
index 356f672..ad90951 100644
--- a/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx
+++ b/artemis-console-extension/artemis-extension/packages/artemis-console-plugin/src/views/ArtemisJMXTabView.tsx
@@ -19,7 +19,7 @@ import { Tabs, Tab, TabTitleText, Button, Modal, ModalVariant, PageSection } fro
import { Attributes, Chart, MBeanNode, Operations } from '@hawtio/react';
import { CreateQueue } from '../queues/CreateQueue';
import { DeleteAddress } from '../addresses/DeleteAddress';
-import { isAddress as isAnAddress, isQueue } from '../util/jmx'
+import { isAddress as isAnAddress, isQueue, mbeanUnescape } from '../util/jmx'
import { MessagesTable } from '../messages/MessagesTable';
import { SendMessage } from '../messages/SendMessage';
import { Message, MessageView } from '../messages/MessageView';
@@ -58,11 +58,11 @@ export const ArtemisJMXTabs: React.FunctionComponent = () => {
const isAQueue = isQueue(selectedNode);
let prop = selectedNode.getProperty("routing-type");
- const routingType: string = prop === undefined?'':prop;
+ const routingType: string = mbeanUnescape(prop === undefined?'':prop);
prop = selectedNode.getProperty("address");
- const address: string | undefined = prop === undefined?'':prop;
+ const address: string | undefined = mbeanUnescape(prop === undefined?'':prop);
prop = selectedNode.getProperty("queue");
- const queue: string | undefined = prop === undefined?'':prop;
+ const queue: string | undefined = mbeanUnescape(prop === undefined?'':prop);
const handleTabClick = ( event: React.MouseEvent<any> | React.KeyboardEvent | MouseEvent, tabIndex: string | number
) => {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@artemis.apache.org
For additional commands, e-mail: commits-help@artemis.apache.org