Repository: qpid-dispatch Updated Branches: refs/heads/master b846756d7 -> be9a08b19
DISPATCH-789 Adding error checks in case route changes before results arrive (user changes pages quickly) Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/be9a08b1 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/be9a08b1 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/be9a08b1 Branch: refs/heads/master Commit: be9a08b19067ebea06d28f7ad348cb2287822f98 Parents: b846756 Author: Ernest Allen <[email protected]> Authored: Thu Jun 29 16:05:01 2017 -0400 Committer: Ernest Allen <[email protected]> Committed: Thu Jun 29 16:05:01 2017 -0400 ---------------------------------------------------------------------- console/hawtio/src/main/webapp/plugin/js/qdrList.js | 10 ++++++++-- console/hawtio/src/main/webapp/plugin/js/qdrOverview.js | 3 +++ console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 6 ++++++ console/stand-alone/plugin/js/qdrList.js | 2 -- console/stand-alone/plugin/js/qdrTopology.js | 3 +++ 5 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/be9a08b1/console/hawtio/src/main/webapp/plugin/js/qdrList.js ---------------------------------------------------------------------- diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js b/console/hawtio/src/main/webapp/plugin/js/qdrList.js index 82f41ba..aae2952 100644 --- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js +++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js @@ -301,8 +301,10 @@ var QDR = (function(QDR) { if (expand && !updatedDetails && tableRows.length > 0) { var row = tableRows[0]; $scope.selectedRecordName = row.name.value; - var node = tree.getNodeByKey($scope.selectedRecordName); - node.select(true); + if (tree.getNodeByKey) { + var node = tree.getNodeByKey($scope.selectedRecordName); + node.select(true); + } updateDetails(row) // update the table on the right } scrollTreeDiv.scrollTop(scrollTop) @@ -328,6 +330,8 @@ var QDR = (function(QDR) { value.type = [] // find all the connector names and populate the select QDRService.fetchEntity(currentNode.id, '.connector', ['name'], function (nodeName, dotentity, response) { + if (!response.results) + return $scope.detailFields.some( function (field) { if (field.name === 'connector') { field.rawtype = response.results.map (function (result) {return result[0]}) @@ -458,6 +462,8 @@ var QDR = (function(QDR) { } var gotNodeInfo = function (nodeName, dotentity, response) { + if (!response.results) + return var tableRows = []; var records = response.results; var aggregates = response.aggregates; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/be9a08b1/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js ---------------------------------------------------------------------- diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js index 93dc0c6..62a3086 100644 --- a/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js +++ b/console/hawtio/src/main/webapp/plugin/js/qdrOverview.js @@ -1400,6 +1400,9 @@ QDR.log.debug("setting linkFields to [] in selectMode") var scrollTree = $('.qdr-overview.pane.left .pane-viewport') var scrollTop = scrollTree.scrollTop(); var tree = $("#overtree").dynatree("getTree") + if (!tree.getNodeByKey) { + return + } var parentNode = tree.getNodeByKey(parentKey); parentNode.removeChildren(); http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/be9a08b1/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 fcb2eb0..e5ce187 100644 --- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js +++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js @@ -707,6 +707,8 @@ QDR.log.debug("attr.description " + attr.description) var client = 1.0; for (var id in nodeInfo) { var onode = nodeInfo[id]; + if (!onode['.connection']) + return var conns = onode['.connection'].results; var attrs = onode['.connection'].attributeNames; //QDR.log.debug("external client parent is " + parent); @@ -1006,6 +1008,8 @@ QDR.log.debug("attr.description " + attr.description) {entity: '.'+entity}, {entity: '.listener', attrs: ["role", "port"]}], function () { var onode = nodeInfo[key] + if (!onode['.'+entity]) + return var nodeResults = onode['.' + entity].results[resultIndex] var nodeAttributes = onode['.' + entity].attributeNames var attributes = nodeResults.map(function(row, i) { @@ -1028,6 +1032,8 @@ QDR.log.debug("attr.description " + attr.description) // get the list of ports this router is listening on if (entity === 'router') { + if (!onode['.listener']) + return var listeners = onode['.listener'].results; var listenerAttributes = onode['.listener'].attributeNames; var normals = listeners.filter(function(listener) { http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/be9a08b1/console/stand-alone/plugin/js/qdrList.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrList.js b/console/stand-alone/plugin/js/qdrList.js index 191b361..07e79c9 100644 --- a/console/stand-alone/plugin/js/qdrList.js +++ b/console/stand-alone/plugin/js/qdrList.js @@ -791,8 +791,6 @@ QDR.log.info("we were just disconnected while on the list page. Setting org to r QDRService.setUpdateEntities([".connection"]) QDRService.startUpdating(); }) - - }]); return QDR; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/be9a08b1/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 71c4978..8d48306 100644 --- a/console/stand-alone/plugin/js/qdrTopology.js +++ b/console/stand-alone/plugin/js/qdrTopology.js @@ -721,6 +721,8 @@ var QDR = (function(QDR) { var client = 1.0; for (var id in nodeInfo) { var onode = nodeInfo[id]; + if (!onode['.connection']) + continue var conns = onode['.connection'].results; var attrs = onode['.connection'].attributeNames; //QDR.log.debug("external client parent is " + parent); @@ -2238,4 +2240,5 @@ var QDR = (function(QDR) { ]); return QDR; + }(QDR || {})); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
