Repository: qpid-dispatch Updated Branches: refs/heads/master 0e2a34abd -> 5beb135da
No Jira - hiding Quiesce buttons in console's overview and topology pages Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/5beb135d Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/5beb135d Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/5beb135d Branch: refs/heads/master Commit: 5beb135dae20c65a27d4f2fb015645a88ea930c3 Parents: 0e2a34a Author: Ernest Allen <[email protected]> Authored: Mon Sep 26 15:25:04 2016 -0400 Committer: Ernest Allen <[email protected]> Committed: Mon Sep 26 15:25:04 2016 -0400 ---------------------------------------------------------------------- console/stand-alone/plugin/js/qdrList.js | 6 ++-- console/stand-alone/plugin/js/qdrOverview.js | 38 +++++++++++++---------- console/stand-alone/plugin/js/qdrService.js | 11 ++++--- console/stand-alone/plugin/js/qdrTopology.js | 4 +-- 4 files changed, 33 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5beb135d/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 9e88dba..15303fc 100644 --- a/console/stand-alone/plugin/js/qdrList.js +++ b/console/stand-alone/plugin/js/qdrList.js @@ -91,7 +91,7 @@ var QDR = (function(QDR) { $scope.logResults = []; $scope.fetchingLog = true; var entity; // undefined since it is not supported in the GET-LOG call - QDRService.sendMethod($scope.currentNode.id, entity, {}, $scope.currentMode.op, function (nodeName, entity, response, context) { + QDRService.sendMethod($scope.currentNode.id, entity, {}, {}, $scope.currentMode.op, function (nodeName, entity, response, context) { $scope.fetchingLog = false; var statusCode = context.message.application_properties.statusCode; if (statusCode < 200 || statusCode >= 300) { @@ -720,11 +720,11 @@ var QDR = (function(QDR) { attributes[field.name] = value } }) - QDRService.sendMethod($scope.currentNode.id, $scope.selectedEntity, attributes, $scope.currentMode.op, gotMethodResponse) + QDRService.sendMethod($scope.currentNode.id, $scope.selectedEntity, attributes, $scope.currentMode.op, undefined, gotMethodResponse) } $scope.remove = function () { var attributes = {type: $scope.selectedEntity, name: $scope.selectedRecordName} - QDRService.sendMethod($scope.currentNode.id, $scope.selectedEntity, attributes, $scope.currentMode.op, gotMethodResponse) + QDRService.sendMethod($scope.currentNode.id, $scope.selectedEntity, attributes, $scope.currentMode.op, undefined, gotMethodResponse) } function doDialog(chart) { http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5beb135d/console/stand-alone/plugin/js/qdrOverview.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrOverview.js b/console/stand-alone/plugin/js/qdrOverview.js index e685bef..297f122 100644 --- a/console/stand-alone/plugin/js/qdrOverview.js +++ b/console/stand-alone/plugin/js/qdrOverview.js @@ -461,13 +461,13 @@ var QDR = (function (QDR) { displayName: 'Address', groupable: false, width: '15%' - }, + }/*, { displayName: 'Quiesce', cellClass: 'gridCellButton', cellTemplate: '<button title="{{quiesceLinkText(row)}} this link" type="button" ng-class="quiesceLinkClass(row)" class="btn" ng-click="quiesceLink(row, $event)" ng-disabled="quiesceLinkDisabled(row)">{{quiesceLinkText(row)}}</button>', width: '10%' - } + }*/ ], enableColumnResize: true, enableColumnReordering: true, @@ -502,8 +502,10 @@ var QDR = (function (QDR) { if (columns) { var cols = JSON.parse(columns); cols.forEach( function (col, index) { - grid.columnDefs[index].width = col[0]; - grid.columnDefs[index].visible = col[1] + if (grid.columnDefs[index]) { + grid.columnDefs[index].width = col[0]; + grid.columnDefs[index].visible = col[1] + } }) } } @@ -610,29 +612,31 @@ var QDR = (function (QDR) { operStatus: operStatus, adminStatus:adminStatus, owningAddr: addresses[0], - rawAddress: addresses[1], + + acceptedCount: prettyVal("acceptedCount"), + modifiedCount: prettyVal("modifiedCount"), + presettledCount: prettyVal("presettledCount"), + rejectedCount: prettyVal("rejectedCount"), + releasedCount: prettyVal("releasedCount"), deliveryCount:prettyVal("deliveryCount") + " ", + + rate: QDRService.pretty(rate(linkName, response, result)), + capacity: QDRService.valFor(response.attributeNames, result, "capacity"), + undeliveredCount: QDRService.valFor(response.attributeNames, result, "undeliveredCount"), + unsettledCount: QDRService.valFor(response.attributeNames, result, "unsettledCount"), + + rawAddress: addresses[1], rawDeliveryCount: QDRService.valFor(response.attributeNames, result, "deliveryCount"), name: QDRService.valFor(response.attributeNames, result, "name"), linkName: QDRService.valFor(response.attributeNames, result, "linkName"), - capacity: QDRService.valFor(response.attributeNames, result, "capacity"), connectionId: QDRService.valFor(response.attributeNames, result, "connectionId"), linkDir: QDRService.valFor(response.attributeNames, result, "linkDir"), linkType: linkType, peer: QDRService.valFor(response.attributeNames, result, "peer"), type: QDRService.valFor(response.attributeNames, result, "type"), - undeliveredCount: QDRService.valFor(response.attributeNames, result, "undeliveredCount"), - unsettledCount: QDRService.valFor(response.attributeNames, result, "unsettledCount"), - - acceptedCount: prettyVal("acceptedCount"), - modifiedCount: prettyVal("modifiedCount"), - presettledCount: prettyVal("presettledCount"), - rejectedCount: prettyVal("rejectedCount"), - releasedCount: prettyVal("releasedCount"), uid: linkName, timestamp: now, - rate: QDRService.pretty(rate(linkName, response, result)), nodeId: nodeName, identity: QDRService.valFor(response.attributeNames, result, "identity") }) @@ -835,7 +839,7 @@ var QDR = (function (QDR) { $scope.singleLinkFields = []; var fields = Object.keys(link.data.fields) - var excludeFields = ["title", "uid", "uncounts", "rawDeliveryCount", "timestamp"] + var excludeFields = ["title", "uid", "uncounts", "rawDeliveryCount", "timestamp", "rawAddress"] fields.forEach( function (field) { if (excludeFields.indexOf(field) == -1) $scope.singleLinkFields.push({attribute: field, value: link.data.fields[field]}) @@ -1069,7 +1073,7 @@ var QDR = (function (QDR) { } } nodeIds.forEach( function (node) { - QDRService.sendMethod(node, undefined, {}, "GET-LOG", gotLogInfo) + QDRService.sendMethod(node, undefined, {}, "GET-LOG", {}, gotLogInfo) }) } http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5beb135d/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 c68d0bb..7854cec 100644 --- a/console/stand-alone/plugin/js/qdrService.js +++ b/console/stand-alone/plugin/js/qdrService.js @@ -323,7 +323,7 @@ var QDR = (function(QDR) { } } var attributes = {adminStatus: 'disabled', name: name}; - self.sendMethod(nodeId, "router.link", attributes, "UPDATE", gotMethodResponse) + self.sendMethod(nodeId, "router.link", attributes, "UPDATE", undefined, gotMethodResponse) }, addr_text: function (addr) { if (!addr) @@ -682,10 +682,10 @@ var QDR = (function(QDR) { }, ret.error); }, - sendMethod: function (nodeId, entity, attrs, operation, callback) { + sendMethod: function (nodeId, entity, attrs, operation, props, callback) { var ret; self.correlator.request( - ret = self._sendMethod(nodeId, entity, attrs, operation) + ret = self._sendMethod(nodeId, entity, attrs, operation, props) ).then(ret.id, function (response, context) { callback(nodeId, entity, response, context); }, ret.error); @@ -702,7 +702,7 @@ var QDR = (function(QDR) { return fullAddr; }, - _sendMethod: function (toAddr, entity, attrs, operation) { + _sendMethod: function (toAddr, entity, attrs, operation, props) { var fullAddr = self._fullAddr(toAddr); var ret = {id: self.correlator.corr()}; if (!self.sender || !self.sendable) { @@ -720,6 +720,9 @@ var QDR = (function(QDR) { } if (attrs.name) application_properties.name = attrs.name; + if (props) { + jQuery.extend(application_properties, props); + } var msg = { body: attrs, properties: { http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5beb135d/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 223ebe9..d617815 100644 --- a/console/stand-alone/plugin/js/qdrTopology.js +++ b/console/stand-alone/plugin/js/qdrTopology.js @@ -252,11 +252,11 @@ var QDR = (function (QDR) { displayName: 'Outstanding', headerCellTemplate: 'titleHeaderCellTemplate.html', cellClass: 'grid-values' - }, + }/*, { cellClass: 'gridCellButton', cellTemplate: '<button title="{{quiesceLinkText(row)}} this link" type="button" ng-class="quiesceLinkClass(row)" class="btn" ng-click="quiesceLink(row)" ng-disabled="quiesceLinkDisabled(row)">{{quiesceLinkText(row)}}</button>' - } + }*/ ] } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
