This is an automated email from the ASF dual-hosted git repository.
eallen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new d5889bc DISPATCH-2097: Console ignores connections with property
'qd.adaptor' defined.
d5889bc is described below
commit d5889bc3d1ba0f7c7db82d29dea49a931d072c0d
Author: Ernest Allen <eal...@redhat.com>
AuthorDate: Mon Jun 14 10:38:46 2021 -0400
DISPATCH-2097: Console ignores connections with property 'qd.adaptor'
defined.
---
console/react/package-lock.json | 133 ++++++++++++++++++++----------------
console/react/src/topology/links.js | 28 ++++----
2 files changed, 91 insertions(+), 70 deletions(-)
diff --git a/console/react/package-lock.json b/console/react/package-lock.json
index 20b4b11..a6ff401 100644
--- a/console/react/package-lock.json
+++ b/console/react/package-lock.json
@@ -6001,13 +6001,13 @@
}
},
"node_modules/cssnano": {
- "version": "4.1.10",
- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz";,
- "integrity":
"sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz";,
+ "integrity":
"sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
"dev": true,
"dependencies": {
"cosmiconfig": "^5.0.0",
- "cssnano-preset-default": "^4.0.7",
+ "cssnano-preset-default": "^4.0.8",
"is-resolvable": "^1.0.0",
"postcss": "^7.0.0"
},
@@ -6016,9 +6016,9 @@
}
},
"node_modules/cssnano-preset-default": {
- "version": "4.0.7",
- "resolved":
"https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz";,
- "integrity":
"sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+ "version": "4.0.8",
+ "resolved":
"https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz";,
+ "integrity":
"sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
"dev": true,
"dependencies": {
"css-declaration-sorter": "^4.0.1",
@@ -6049,7 +6049,7 @@
"postcss-ordered-values": "^4.1.2",
"postcss-reduce-initial": "^4.0.3",
"postcss-reduce-transforms": "^4.0.2",
- "postcss-svgo": "^4.0.2",
+ "postcss-svgo": "^4.0.3",
"postcss-unique-selectors": "^4.0.1"
},
"engines": {
@@ -6851,9 +6851,9 @@
"dev": true
},
"node_modules/dns-packet": {
- "version": "1.3.1",
- "resolved":
"https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz";,
- "integrity":
"sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+ "version": "1.3.3",
+ "resolved":
"https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.3.tgz";,
+ "integrity":
"sha512-dDwDMOJU+m6Qx+LhltSV+BWNrMaTqx3eXkAqgt/iouWTXGZMffg1rOSnG2xa3lWqmJ9xTBc7fgIe/css4S1rxA==",
"dev": true,
"dependencies": {
"ip": "^1.1.0",
@@ -9585,9 +9585,9 @@
}
},
"node_modules/hosted-git-info": {
- "version": "2.8.8",
- "resolved":
"https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";,
- "integrity":
"sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+ "version": "2.8.9",
+ "resolved":
"https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz";,
+ "integrity":
"sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
"dev": true
},
"node_modules/hpack.js": {
@@ -12991,9 +12991,9 @@
"optional": true
},
"node_modules/nanoid": {
- "version": "3.1.22",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz";,
- "integrity":
"sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
+ "version": "3.1.23",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz";,
+ "integrity":
"sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
"dev": true,
"bin": {
"nanoid": "bin/nanoid.cjs"
@@ -14534,12 +14534,11 @@
}
},
"node_modules/postcss-initial": {
- "version": "3.0.2",
- "resolved":
"https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz";,
- "integrity":
"sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==",
+ "version": "3.0.4",
+ "resolved":
"https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz";,
+ "integrity":
"sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
"dev": true,
"dependencies": {
- "lodash.template": "^4.5.0",
"postcss": "^7.0.2"
}
},
@@ -15303,17 +15302,21 @@
}
},
"node_modules/postcss-safe-parser/node_modules/postcss": {
- "version": "8.2.8",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz";,
- "integrity":
"sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz";,
+ "integrity":
"sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ==",
"dev": true,
"dependencies": {
"colorette": "^1.2.2",
- "nanoid": "^3.1.20",
- "source-map": "^0.6.1"
+ "nanoid": "^3.1.23",
+ "source-map-js": "^0.6.2"
},
"engines": {
"node": "^10 || ^12 || >=14"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/";
}
},
"node_modules/postcss-selector-matches": {
@@ -16792,9 +16795,9 @@
"dev": true
},
"node_modules/resolve-url-loader": {
- "version": "3.1.2",
- "resolved":
"https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz";,
- "integrity":
"sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
+ "version": "3.1.3",
+ "resolved":
"https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.3.tgz";,
+ "integrity":
"sha512-WbDSNFiKPPLem1ln+EVTE+bFUBdTTytfQZWbmghroaFNFaAVmGq0Saqw6F/306CwgPXsGwXVxbODE+3xAo/YbA==",
"dev": true,
"dependencies": {
"adjust-sourcemap-loader": "3.0.0",
@@ -17954,6 +17957,15 @@
"node": ">=0.10.0"
}
},
+ "node_modules/source-map-js": {
+ "version": "0.6.2",
+ "resolved":
"https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz";,
+ "integrity":
"sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/source-map-resolve": {
"version": "0.6.0",
"resolved":
"https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz";,
@@ -27341,13 +27353,13 @@
"dev": true
},
"cssnano": {
- "version": "4.1.10",
- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz";,
- "integrity":
"sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+ "version": "4.1.11",
+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz";,
+ "integrity":
"sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
"dev": true,
"requires": {
"cosmiconfig": "^5.0.0",
- "cssnano-preset-default": "^4.0.7",
+ "cssnano-preset-default": "^4.0.8",
"is-resolvable": "^1.0.0",
"postcss": "^7.0.0"
},
@@ -27393,9 +27405,9 @@
}
},
"cssnano-preset-default": {
- "version": "4.0.7",
- "resolved":
"https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz";,
- "integrity":
"sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+ "version": "4.0.8",
+ "resolved":
"https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz";,
+ "integrity":
"sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
"dev": true,
"requires": {
"css-declaration-sorter": "^4.0.1",
@@ -27426,7 +27438,7 @@
"postcss-ordered-values": "^4.1.2",
"postcss-reduce-initial": "^4.0.3",
"postcss-reduce-transforms": "^4.0.2",
- "postcss-svgo": "^4.0.2",
+ "postcss-svgo": "^4.0.3",
"postcss-unique-selectors": "^4.0.1"
}
},
@@ -28082,9 +28094,9 @@
"dev": true
},
"dns-packet": {
- "version": "1.3.1",
- "resolved":
"https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz";,
- "integrity":
"sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+ "version": "1.3.3",
+ "resolved":
"https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.3.tgz";,
+ "integrity":
"sha512-dDwDMOJU+m6Qx+LhltSV+BWNrMaTqx3eXkAqgt/iouWTXGZMffg1rOSnG2xa3lWqmJ9xTBc7fgIe/css4S1rxA==",
"dev": true,
"requires": {
"ip": "^1.1.0",
@@ -30399,9 +30411,9 @@
"dev": true
},
"hosted-git-info": {
- "version": "2.8.8",
- "resolved":
"https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";,
- "integrity":
"sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+ "version": "2.8.9",
+ "resolved":
"https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz";,
+ "integrity":
"sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
"dev": true
},
"hpack.js": {
@@ -33228,9 +33240,9 @@
"optional": true
},
"nanoid": {
- "version": "3.1.22",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz";,
- "integrity":
"sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
+ "version": "3.1.23",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz";,
+ "integrity":
"sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
"dev": true
},
"nanomatch": {
@@ -34574,12 +34586,11 @@
}
},
"postcss-initial": {
- "version": "3.0.2",
- "resolved":
"https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz";,
- "integrity":
"sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==",
+ "version": "3.0.4",
+ "resolved":
"https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz";,
+ "integrity":
"sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
"dev": true,
"requires": {
- "lodash.template": "^4.5.0",
"postcss": "^7.0.2"
}
},
@@ -35243,14 +35254,14 @@
},
"dependencies": {
"postcss": {
- "version": "8.2.8",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz";,
- "integrity":
"sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz";,
+ "integrity":
"sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ==",
"dev": true,
"requires": {
"colorette": "^1.2.2",
- "nanoid": "^3.1.20",
- "source-map": "^0.6.1"
+ "nanoid": "^3.1.23",
+ "source-map-js": "^0.6.2"
}
}
}
@@ -36435,9 +36446,9 @@
"dev": true
},
"resolve-url-loader": {
- "version": "3.1.2",
- "resolved":
"https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz";,
- "integrity":
"sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
+ "version": "3.1.3",
+ "resolved":
"https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.3.tgz";,
+ "integrity":
"sha512-WbDSNFiKPPLem1ln+EVTE+bFUBdTTytfQZWbmghroaFNFaAVmGq0Saqw6F/306CwgPXsGwXVxbODE+3xAo/YbA==",
"dev": true,
"requires": {
"adjust-sourcemap-loader": "3.0.0",
@@ -37448,6 +37459,12 @@
"integrity":
"sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
},
+ "source-map-js": {
+ "version": "0.6.2",
+ "resolved":
"https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz";,
+ "integrity":
"sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+ "dev": true
+ },
"source-map-resolve": {
"version": "0.6.0",
"resolved":
"https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz";,
diff --git a/console/react/src/topology/links.js
b/console/react/src/topology/links.js
index eacbf48..4b095ba 100644
--- a/console/react/src/topology/links.js
+++ b/console/react/src/topology/links.js
@@ -100,7 +100,7 @@ export class Links {
x: Math.round(nodes.get(source).x + 40 * Math.sin(client / (Math.PI *
2.0))),
y: Math.round(nodes.get(source).y + 40 * Math.cos(client / (Math.PI *
2.0))),
fixed: false,
- animate: true
+ animate: true,
};
} else position.animate = false;
if (position.y > height) {
@@ -133,15 +133,19 @@ export class Links {
!onode.connection ||
!onode.connection.results ||
onode.connection.results.length === 0
- )
+ ) {
continue;
-
+ }
for (let c = 0; c < onode.connection.results.length; c++) {
let connection = utils.flatten(
onode.connection.attributeNames,
onode.connection.results[c]
);
+ // ignore internal only connections
+ if (connection.properties["qd.adaptor"]) {
+ continue;
+ }
// we need a unique connection.container
if (connection.container === "") {
connection.container = connection.name.replace("/", "").replace(":",
"-");
@@ -171,7 +175,7 @@ export class Links {
source: source,
linksDir: linksDir,
connection: connection,
- resultsIndex: c
+ resultsIndex: c,
});
}
}
@@ -182,7 +186,7 @@ export class Links {
if (!unique[key])
unique[key] = {
c: [],
- nodes: []
+ nodes: [],
};
unique[key].c.push(container);
}
@@ -214,7 +218,7 @@ export class Links {
connectionContainer: container.connection.container,
resultIndex: container.resultsIndex,
fixed: position.fixed,
- properties: container.connection.properties
+ properties: container.connection.properties,
});
node.host = container.connection.host;
node.cdir = container.linksDir;
@@ -229,7 +233,7 @@ export class Links {
node.alsoConnectsTo.push({
key: nodeIds[connections[c].source],
cdir: connections[c].linksDir,
- connectionId: connections[c].connection.identity
+ connectionId: connections[c].connection.identity,
});
}
unique[key].nodes.push(node);
@@ -260,7 +264,7 @@ export class Links {
}
}
-var getContainerIndex = function(_id, nodeInfo) {
+var getContainerIndex = function (_id, nodeInfo) {
let nodeIndex = 0;
for (let id in nodeInfo) {
if (utils.nameFromId(id) === _id) return nodeIndex;
@@ -269,7 +273,7 @@ var getContainerIndex = function(_id, nodeInfo) {
return -1;
};
-var getLinkDir = function(connection, onode) {
+var getLinkDir = function (connection, onode) {
let links = onode["router.link"];
if (!links) {
return "unknown";
@@ -279,7 +283,7 @@ var getLinkDir = function(connection, onode) {
let typeIndex = links.attributeNames.indexOf("linkType");
let connectionIdIndex = links.attributeNames.indexOf("connectionId");
let dirIndex = links.attributeNames.indexOf("linkDir");
- links.results.forEach(function(linkResult) {
+ links.results.forEach(function (linkResult) {
if (
linkResult[typeIndex] === "endpoint" &&
linkResult[connectionIdIndex] === connection.identity
@@ -293,12 +297,12 @@ var getLinkDir = function(connection, onode) {
return "unknown";
};
-var getKey = function(containers) {
+var getKey = function (containers) {
let parts = {};
let connection = containers[0].connection;
let d = {
nodeType: connection.role,
- properties: connection.properties || {}
+ properties: connection.properties || {},
};
let connectionType = "client";
if (utils.isConsole(connection)) connectionType = "console";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
