Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #2589

This commit is contained in:
Michael Andre Pearce 2019-04-09 22:47:42 +01:00
parent 8235fc79b0 a0631ec1da
commit f7744b5a7c
2 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/addresses.js
View File

@ -30,13 +30,13 @@ var ARTEMIS = (function(ARTEMIS) {
var objectType = "address"; var objectType = "address";
var method = 'listAddresses(java.lang.String, int, int)'; var method = 'listAddresses(java.lang.String, int, int)';
var defaultAttributes = [ var defaultAttributes = [
{ {
field: 'manage', field: 'manage',
displayName: 'manage', displayName: 'manage',
width: '*', width: '*',
cellTemplate: '<div class="ngCellText"><a ng-click="navigateToAddressAtts(row)">attributes</a>&nbsp;<a ng-click="navigateToAddressOps(row)">operations</a></div>' cellTemplate: '<div class="ngCellText"><a ng-click="navigateToAddressAtts(row)">attributes</a>&nbsp;<a ng-click="navigateToAddressOps(row)">operations</a></div>'
}, },
{ {
field: 'id', field: 'id',
displayName: 'ID', displayName: 'ID',
width: '*' width: '*'
@ -44,7 +44,8 @@ var ARTEMIS = (function(ARTEMIS) {
{ {
field: 'name', field: 'name',
displayName: 'Name', displayName: 'Name',
width: '*' width: '*',
cellTemplate: '<div class="ngCellText" title="{{row.entity.name}}">{{row.entity.name}}</div>'
}, },
{ {
field: 'routingTypes', field: 'routingTypes',
@ -56,6 +57,7 @@ var ARTEMIS = (function(ARTEMIS) {
field: 'queueCount', field: 'queueCount',
displayName: 'Queue Count', displayName: 'Queue Count',
width: '*', width: '*',
cellTemplate: '<div class="ngCellText"><a ng-click="selectQueues(row)">{{row.entity.queueCount}}</a></div>',
sortable: false sortable: false
} }
]; ];
@ -118,6 +120,10 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.navigateToAddressOps = function (row) { $scope.navigateToAddressOps = function (row) {
$location.path("jmx/operations").search({"tab": "artemis", "nid": ARTEMIS.getAddressNid(row.entity, $location)}); $location.path("jmx/operations").search({"tab": "artemis", "nid": ARTEMIS.getAddressNid(row.entity, $location)});
}; };
$scope.selectQueues = function (row) {
artemisAddress.address = row.entity;
$location.path("artemis/queues");
};
$scope.workspace = workspace; $scope.workspace = workspace;
$scope.objects = []; $scope.objects = [];
$scope.totalServerItems = 0; $scope.totalServerItems = 0;
@ -168,9 +174,9 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.loadTable(); $scope.loadTable();
}; };
$scope.loadTable = function () { $scope.loadTable = function () {
$scope.filter.values.sortColumn = $scope.sortOptions.fields[0]; $scope.filter.values.sortColumn = $scope.sortOptions.fields[0];
$scope.filter.values.sortBy = $scope.sortOptions.directions[0]; $scope.filter.values.sortBy = $scope.sortOptions.directions[0];
$scope.filter.values.sortOrder = $scope.sortOptions.directions[0]; $scope.filter.values.sortOrder = $scope.sortOptions.directions[0];
var mbean = getBrokerMBean(jolokia); var mbean = getBrokerMBean(jolokia);
if (mbean.includes("undefined")) { if (mbean.includes("undefined")) {
onBadMBean(); onBadMBean();

31
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js
View File

@ -19,7 +19,7 @@
*/ */
var ARTEMIS = (function(ARTEMIS) { var ARTEMIS = (function(ARTEMIS) {
ARTEMIS.QueuesController = function ($scope, $location, workspace, ARTEMISService, jolokia, localStorage, artemisConnection, artemisSession, artemisQueue) { ARTEMIS.QueuesController = function ($scope, $location, workspace, ARTEMISService, jolokia, localStorage, artemisConnection, artemisSession, artemisQueue, artemisAddress) {
var artemisJmxDomain = localStorage['artemisJmxDomain'] || "org.apache.activemq.artemis"; var artemisJmxDomain = localStorage['artemisJmxDomain'] || "org.apache.activemq.artemis";
@ -44,12 +44,14 @@ var ARTEMIS = (function(ARTEMIS) {
{ {
field: 'name', field: 'name',
displayName: 'Name', displayName: 'Name',
width: '*' width: '*',
cellTemplate: '<div class="ngCellText" title="{{row.entity.name}}">{{row.entity.name}}</div>'
}, },
{ {
field: 'address', field: 'address',
displayName: 'Address', displayName: 'Address',
width: '*' width: '*',
cellTemplate: '<div class="ngCellText" title="{{row.entity.address}}"><a ng-click="selectAddress(row)">{{row.entity.address}}</a></div>'
}, },
{ {
field: 'routingType', field: 'routingType',
@ -59,7 +61,8 @@ var ARTEMIS = (function(ARTEMIS) {
{ {
field: 'filter', field: 'filter',
displayName: 'Filter', displayName: 'Filter',
width: '*' width: '*',
cellTemplate: '<div class="ngCellText" title="{{row.entity.filter}}">{{row.entity.filter}}</div>'
}, },
{ {
field: 'durable', field: 'durable',
@ -89,7 +92,8 @@ var ARTEMIS = (function(ARTEMIS) {
{ {
field: 'messageCount', field: 'messageCount',
displayName: 'Message Count', displayName: 'Message Count',
width: '*' width: '*',
cellTemplate: '<div class="ngCellText"><a ng-click="navigateToBrowseQueue(row)">{{row.entity.messageCount}}</a></div>'
}, },
// Hidden // Hidden
@ -204,6 +208,12 @@ var ARTEMIS = (function(ARTEMIS) {
* *
* TODO Refactor into new separate files * TODO Refactor into new separate files
*/ */
if (artemisAddress.address) {
$scope.filter.values.field = $scope.filter.fieldOptions[3].id;
$scope.filter.values.operation = $scope.filter.operationOptions[0].id;
$scope.filter.values.value = artemisAddress.address.name;
artemisAddress.address = null;
}
if (artemisQueue.queue) { if (artemisQueue.queue) {
$scope.filter.values.field = $scope.filter.fieldOptions[1].id; $scope.filter.values.field = $scope.filter.fieldOptions[1].id;
$scope.filter.values.operation = $scope.filter.operationOptions[0].id; $scope.filter.values.operation = $scope.filter.operationOptions[0].id;
@ -218,6 +228,13 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.navigateToQueueOps = function (row) { $scope.navigateToQueueOps = function (row) {
$location.path("jmx/operations").search({"tab": "artemis", "nid": ARTEMIS.getQueueNid(row.entity, $location)}); $location.path("jmx/operations").search({"tab": "artemis", "nid": ARTEMIS.getQueueNid(row.entity, $location)});
}; };
$scope.navigateToBrowseQueue = function (row) {
$location.path("artemis/browseQueue").search({"tab": "artemis", "nid": ARTEMIS.getQueueNid(row.entity, $location)});
};
$scope.selectAddress = function (row) {
artemisAddress.address = row.entity;
$location.path("artemis/addresses");
};
$scope.workspace = workspace; $scope.workspace = workspace;
$scope.objects = []; $scope.objects = [];
$scope.totalServerItems = 0; $scope.totalServerItems = 0;
@ -268,9 +285,9 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.loadTable(); $scope.loadTable();
}; };
$scope.loadTable = function () { $scope.loadTable = function () {
$scope.filter.values.sortColumn = $scope.sortOptions.fields[0]; $scope.filter.values.sortColumn = $scope.sortOptions.fields[0];
$scope.filter.values.sortBy = $scope.sortOptions.directions[0]; $scope.filter.values.sortBy = $scope.sortOptions.directions[0];
$scope.filter.values.sortOrder = $scope.sortOptions.directions[0]; $scope.filter.values.sortOrder = $scope.sortOptions.directions[0];
var mbean = getBrokerMBean(jolokia); var mbean = getBrokerMBean(jolokia);
if (mbean.includes("undefined")) { if (mbean.includes("undefined")) {
onBadMBean(); onBadMBean();