qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eal...@apache.org
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 GMT
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 <eallen@redhat.com>
Authored: Thu Jun 29 15:07:21 2017 -0400
Committer: Ernest Allen <eallen@redhat.com>
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<response.length; ++i) {
                 if (!angular.isDefined(self.topology._nodeInfo[response[i]])) {

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/b846756d/console/stand-alone/plugin/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrTopology.js b/console/stand-alone/plugin/js/qdrTopology.js
index 8853d4f..71c4978 100644
--- a/console/stand-alone/plugin/js/qdrTopology.js
+++ b/console/stand-alone/plugin/js/qdrTopology.js
@@ -84,7 +84,7 @@ var QDR = (function(QDR) {
           .style("margin-left", "30px")
           .each("end", function () {
             resize()
-            $timeout(function () {QDR.log.info("done with transition. setting scope ");$scope.panelVisible
= false})
+            $timeout(function () {$scope.panelVisible = false})
           })
       }
       $scope.showLeftPane = function () {
@@ -97,7 +97,7 @@ var QDR = (function(QDR) {
           .style("margin-left", "430px")
           .each("end", function () {
             resize()
-            $timeout(function () {QDR.log.info("done with transition. setting scope ");$scope.panelVisible
= true})
+            $timeout(function () {$scope.panelVisible = true})
           })
       }
 
@@ -153,7 +153,7 @@ var QDR = (function(QDR) {
           $scope.linkData = obj.entity.linkData;
           $scope.connectionId = obj.entity.connectionId;
           var visibleLen = Math.min(obj.entity.linkData.length, 10)
-          QDR.log.debug("visibleLen is " + visibleLen)
+          //QDR.log.debug("visibleLen is " + visibleLen)
           var left = parseInt(d3.select('#multiple_details').style("left"))
           var offset = jQuery('#topology').offset();
           var detailsDiv = d3.select('#link_details')
@@ -294,7 +294,7 @@ var QDR = (function(QDR) {
       }
       // we are currently connected. setup a handler to get notified if we are ever disconnected
       var onDisconnect = function () {
-QDR.log.info("we were just disconnected while on the topology page. Setting org to redirect
back once we are connected again")
+        //QDR.log.info("we were just disconnected while on the topology page. Setting org
to redirect back once we are connected again")
         $timeout(function () {
           QDRService.redirectWhenConnected("topology")
         })
@@ -1003,10 +1003,8 @@ QDR.log.info("we were just disconnected while on the topology page.
Setting org
           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;
@@ -2117,7 +2115,7 @@ QDR.log.info("we were just disconnected while on the topology page.
Setting org
             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) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message