Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 31E11200CB6 for ; Thu, 29 Jun 2017 21:07:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 30D55160BED; Thu, 29 Jun 2017 19:07:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5185B160BC6 for ; Thu, 29 Jun 2017 21:07:35 +0200 (CEST) Received: (qmail 89241 invoked by uid 500); 29 Jun 2017 19:07:34 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 89232 invoked by uid 99); 29 Jun 2017 19:07:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jun 2017 19:07:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 69FC7E0E1E; Thu, 29 Jun 2017 19:07:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eallen@apache.org To: commits@qpid.apache.org Message-Id: <5039af20a20f47a99dbd505a5be9490c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: qpid-dispatch git commit: DISPATCH-791 Ensure topology graph draws correctly with one node when returning to page after navigating away Date: Thu, 29 Jun 2017 19:07:34 +0000 (UTC) archived-at: Thu, 29 Jun 2017 19:07:36 -0000 Repository: qpid-dispatch Updated Branches: refs/heads/master 0a35d713c -> b846756d7 DISPATCH-791 Ensure topology graph draws correctly with one node when returning to page after navigating away Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/b846756d Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/b846756d Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/b846756d Branch: refs/heads/master Commit: b846756d7bc899f303860970dbfe6690ead89d14 Parents: 0a35d71 Author: Ernest Allen Authored: Thu Jun 29 15:07:21 2017 -0400 Committer: Ernest Allen Committed: Thu Jun 29 15:07:21 2017 -0400 ---------------------------------------------------------------------- .../hawtio/src/main/webapp/plugin/js/qdrTopology.js | 8 +++----- console/stand-alone/plugin/js/qdrService.js | 10 ++++------ console/stand-alone/plugin/js/qdrTopology.js | 16 +++++++--------- 3 files changed, 14 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b846756d/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js ---------------------------------------------------------------------- diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js index 871d0c8..fcb2eb0 100644 --- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js +++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js @@ -989,10 +989,8 @@ QDR.log.debug("attr.description " + attr.description) unknownNodes[unknowns[i].key] = 1 } unknownNodes = Object.keys(unknownNodes) - //QDR.log.debug("there were " + unknownNodes.length + " connections with normal links") - //console.dump(unknownNodes) - - QDRService.ensureEntities(unknownNodes, {entity: ".router.link", attrs: ["linkType","connectionId","linkDir"], force: true}, function () { + //QDR.log.info("-- resolveUnknowns: ensuring .connection and .router.link are present for each node") + QDRService.ensureEntities(unknownNodes, [{entity: ".connection", force: true}, {entity: ".router.link", attrs: ["linkType","connectionId","linkDir"], force: true}], function () { initializeLinks(nodeInfo, []) // collapse any router-container nodes that are duplicates animate = true; @@ -2100,7 +2098,7 @@ QDR.log.debug("attr.description " + attr.description) savedKeys[key] = nodeInfo[key]['.connection'].results.length; } //QDR.log.debug("saving current keys"); - console.dump(savedKeys); + //console.dump(savedKeys); }; // we are about to leave the page, save the node positions $rootScope.$on('$locationChangeStart', function(event, newUrl, oldUrl) { http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b846756d/console/stand-alone/plugin/js/qdrService.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js index e64eaf2..da1044d 100644 --- a/console/stand-alone/plugin/js/qdrService.js +++ b/console/stand-alone/plugin/js/qdrService.js @@ -120,7 +120,7 @@ console.dump(e) notifyTopologyDone: function() { if (!self.gotTopology) { QDR.log.debug("topology was just initialized"); - console.dump(self.topology._nodeInfo) + //console.dump(self.topology._nodeInfo) self.gotTopology = true; //$rootScope.$apply(); } else { @@ -541,10 +541,8 @@ console.dump(e) self.topology._getTimer = null } - //QDR.log.debug("starting get topology with correlator.depth of " + self.correlator.depth()) - //self.topology._lastNodeInfo = angular.copy(self.topology._nodeInfo); + //QDR.log.info("starting get topology with correlator.depth of " + self.correlator.depth()) self.topology._gettingTopo = true; - self.errorText = undefined; // get the list of nodes to query. @@ -564,8 +562,8 @@ console.dump(e) var parts = self.receiver.remote.attach.source.address.split('/') parts[4] = '$management' response.push(parts.join('/')) - QDR.log.debug("GET-MGMT-NODES returned an empty list. Using ") - console.dump(response) + //QDR.log.info("GET-MGMT-NODES returned an empty list. Using ") + //console.dump(response) } for (var i=0; i