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

ARTEMIS-1725 fix browsing non-listing tabs under JMX

This commit is contained in:
Stanislav Knot 2018-03-02 14:18:19 +01:00 committed by Michael Andre Pearce
parent 985a8cf7e1
commit b012766b9f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js
View File

@ -105,12 +105,21 @@ var ARTEMIS = (function(ARTEMIS) {
.when('/artemis/browseQueue', { .when('/artemis/browseQueue', {
templateUrl: ARTEMIS.templatePath + 'browseQueue.html' templateUrl: ARTEMIS.templatePath + 'browseQueue.html'
}) })
.when('/jmx/browseQueue', {
templateUrl: ARTEMIS.templatePath + 'browseQueue.html'
})
.when('/artemis/diagram', { .when('/artemis/diagram', {
templateUrl: ARTEMIS.templatePath + 'brokerDiagram.html' templateUrl: ARTEMIS.templatePath + 'brokerDiagram.html'
}) })
.when('/jmx/diagram', {
templateUrl: ARTEMIS.templatePath + 'brokerDiagram.html'
})
.when('/artemis/sendMessage', { .when('/artemis/sendMessage', {
templateUrl: ARTEMIS.templatePath + 'sendMessage.html' templateUrl: ARTEMIS.templatePath + 'sendMessage.html'
}) })
.when('/jmx/sendMessage', {
templateUrl: ARTEMIS.templatePath + 'sendMessage.html'
})
.when('/artemis/connections', { .when('/artemis/connections', {
templateUrl: ARTEMIS.templatePath + 'connections.html' templateUrl: ARTEMIS.templatePath + 'connections.html'
}) })
@ -257,21 +266,21 @@ var ARTEMIS = (function(ARTEMIS) {
content: '<i class="icon-envelope"></i> Browse', content: '<i class="icon-envelope"></i> Browse',
title: "Browse the messages on the queue", title: "Browse the messages on the queue",
isValid: function (workspace) { return isQueue(workspace, artemisJmxDomain); }, isValid: function (workspace) { return isQueue(workspace, artemisJmxDomain); },
href: function () { return "#/artemis/browseQueue"; } href: function () { if (workspace.isTopTabActive("artemis")) return "#/artemis/browseQueue"; else return "#/jmx/browseQueue";}
}); });
workspace.subLevelTabs.push({ workspace.subLevelTabs.push({
content: '<i class="icon-pencil"></i> Send', content: '<i class="icon-pencil"></i> Send',
title: "Send a message to this address", title: "Send a message to this address",
isValid: function (workspace) { return isAddress(workspace, artemisJmxDomain) || isQueue(workspace, artemisJmxDomain); }, isValid: function (workspace) { return isAddress(workspace, artemisJmxDomain) || isQueue(workspace, artemisJmxDomain); },
href: function () { return "#/artemis/sendMessage"; } href: function () { if (workspace.isTopTabActive("artemis")) return "#/artemis/sendMessage"; else return "#/jmx/sendMessage";}
}); });
workspace.subLevelTabs.unshift({ workspace.subLevelTabs.unshift({
content: '<i class="icon-picture"></i> Diagram&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|', content: '<i class="icon-picture"></i> Diagram&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|',
title: "View a diagram of the producers, destinations and consumers", title: "View a diagram of the producers, destinations and consumers",
isValid: function (workspace) { return workspace.isTopTabActive("artemis") || workspace.selectionHasDomain(artemisJmxDomain); }, isValid: function (workspace) { return workspace.isTopTabActive("artemis") || workspace.selectionHasDomain(artemisJmxDomain); },
href: function () { return "#/artemis/diagram"; } href: function () { if (workspace.isTopTabActive("artemis"))return "#/artemis/diagram"; else return "#/jmx/diagram";}
}); });
workspace.subLevelTabs.unshift({ workspace.subLevelTabs.unshift({