DISPATCH-1161 Handle edge routers in console
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/3d79fda1 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/3d79fda1 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/3d79fda1 Branch: refs/heads/master Commit: 3d79fda11168479eb39de8f7e0fdc23daa851ef7 Parents: 0d6dbac Author: Ernest Allen <eal...@redhat.com> Authored: Thu Nov 1 15:24:41 2018 -0400 Committer: Ernest Allen <eal...@redhat.com> Committed: Thu Nov 1 15:24:41 2018 -0400 ---------------------------------------------------------------------- console/CMakeLists.txt | 3 + console/stand-alone/package-lock.json | 34 +- console/stand-alone/package.json | 4 +- console/stand-alone/plugin/css/dispatch.css | 5 +- console/stand-alone/plugin/data/countries.json | 2 + .../stand-alone/plugin/html/qdrTopology.html | 47 +++ .../stand-alone/plugin/js/amqp/connection.js | 5 +- console/stand-alone/plugin/js/amqp/topology.js | 106 ++++-- console/stand-alone/plugin/js/amqp/utilities.js | 13 +- console/stand-alone/plugin/js/chord/data.js | 2 +- console/stand-alone/plugin/js/topology/links.js | 132 ++++---- console/stand-alone/plugin/js/topology/map.js | 255 +++++++++++++++ console/stand-alone/plugin/js/topology/nodes.js | 191 ++++++++++- .../plugin/js/topology/qdrTopology.js | 325 +++++++++---------- console/stand-alone/vendor-js.txt | 4 + 15 files changed, 855 insertions(+), 273 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3d79fda1/console/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt index 0e7b248..e5eb7fa 100644 --- a/console/CMakeLists.txt +++ b/console/CMakeLists.txt @@ -131,6 +131,9 @@ if(CONSOLE_INSTALL) install(FILES ${VENDOR_FONTS} DESTINATION ${CONSOLE_STAND_ALONE_INSTALL_DIR}/fonts/ ) + install(DIRECTORY ${CONSOLE_SOURCE_DIR}/plugin/data/ + DESTINATION ${CONSOLE_STAND_ALONE_INSTALL_DIR}/plugin/data + ) else(NPX_EXE) message(STATUS "Cannot build console, npx not found.") endif(NPX_EXE) http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3d79fda1/console/stand-alone/package-lock.json ---------------------------------------------------------------------- diff --git a/console/stand-alone/package-lock.json b/console/stand-alone/package-lock.json index e9fe949..4e5e54e 100644 --- a/console/stand-alone/package-lock.json +++ b/console/stand-alone/package-lock.json @@ -1805,8 +1805,7 @@ "commander": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", - "dev": true + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" }, "component-emitter": { "version": "1.2.1", @@ -1983,6 +1982,29 @@ "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz", "integrity": "sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=" }, + "d3-array": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz", + "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==" + }, + "d3-geo": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.11.1.tgz", + "integrity": "sha512-GsG7x9G9sykseLviOVSJ3h5yjw0ItLopOtuDQKUt1TRklEegCw5WAmnIpYYiCkSH/QgUMleAeE2xZK38Qb+1+Q==", + "requires": { + "d3-array": "1.2.4" + } + }, + "d3-geo-projection": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.4.1.tgz", + "integrity": "sha512-tDoYNK3OPlyeoY0Y6ZQ7v02Y2pGg4PTzh7GoNaHnLksIggInHiwXcbiziGHkjBoLbE2bQp9iL2OPsn+n+ZO/dg==", + "requires": { + "commander": "2.15.1", + "d3-array": "1.2.4", + "d3-geo": "1.11.1" + } + }, "d3-path": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz", @@ -7393,6 +7415,14 @@ "through2": "2.0.3" } }, + "topojson-client": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.0.0.tgz", + "integrity": "sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=", + "requires": { + "commander": "2.15.1" + } + }, "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3d79fda1/console/stand-alone/package.json ---------------------------------------------------------------------- diff --git a/console/stand-alone/package.json b/console/stand-alone/package.json index 94f1dca..8c57fe1 100644 --- a/console/stand-alone/package.json +++ b/console/stand-alone/package.json @@ -36,6 +36,7 @@ "bootstrap": "^3.3.7", "c3": "^0.4.18", "d3": "^3.5.14", + "d3-geo-projection": "^2.4.1", "d3-path": "^1.0.5", "d3-queue": "^3.0.7", "d3-time-format": "^2.1.1", @@ -44,7 +45,8 @@ "jquery.fancytree": "^2.26.0", "notifyjs-browser": "^0.4.2", "patternfly": "^3.30.0", - "rhea": "^0.2.13" + "rhea": "^0.2.13", + "topojson-client": "^3.0.0" }, "devDependencies": { "@types/mocha": "^5.2.2", http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3d79fda1/console/stand-alone/plugin/css/dispatch.css ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/css/dispatch.css b/console/stand-alone/plugin/css/dispatch.css index 5f26e6e..dc56aa2 100644 --- a/console/stand-alone/plugin/css/dispatch.css +++ b/console/stand-alone/plugin/css/dispatch.css @@ -953,7 +953,7 @@ circle.node.route-container { fill: orange; } -text.console, text.on-demand, text.normal { +text.console, text.on-demand, text.normal, test.edge { font-family: FontAwesome; font-weight: normal; font-size: 16px; @@ -1115,6 +1115,9 @@ svg { circle.node.normal.out { fill: #C0F0C0; } + circle.node.edge { + fill: #C0C0FF; + } circle.node.on-demand { fill: #C0FFC0; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org