Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager.js Mon May 2 15:57:52 2016 @@ -46,249 +46,272 @@ define(["dojo/dom", "dijit/form/Form", "dijit/form/DateTextBox", "dojo/domReady!"], - function (dom, parser, query, construct, connect, win, event, json, registry, util, properties, UpdatableStore, EnhancedGrid, template, addUserTemplate, setPasswordTemplate) - { - function DatabaseAuthManager(containerNode, authProviderObj, controller) - { - var node = construct.create("div", null, containerNode, "last"); - var that = this; - this.name = authProviderObj.name; - this.modelObj = authProviderObj; - this.management = controller.management; - node.innerHTML = template; - parser.parse(node).then(function (instances) - { - that.init(node, authProviderObj, controller); - }); - } - - DatabaseAuthManager.prototype.update = function () - { - this.authDatabaseUpdater.update(); - }; - - DatabaseAuthManager.prototype.close = function () - { - updater.remove(this.authDatabaseUpdater); - }; - - DatabaseAuthManager.prototype.init = function (node, authProviderObj, controller) - { - this.controller = controller; - var that = this; - - that.authProviderData = {}; - - var userDiv = query(".users")[0]; - - var gridProperties = { - height: 400, - keepSelection: true, - plugins: { - pagination: { - pageSizes: ["10", "25", "50", "100"], - description: true, - sizeSwitch: true, - pageStepper: true, - gotoButton: true, - maxPageStep: 4, - position: "bottom" - }, - indirectSelection: true - - } - }; - - that.usersGrid = new UpdatableStore(that.authProviderData.users, userDiv, [{ - name: "User Name", - field: "name", - width: "100%" - }], function (obj) - { - connect.connect(obj.grid, "onRowDblClick", obj.grid, function (evt) - { - var idx = evt.rowIndex, theItem = this.getItem(idx); - var name = obj.dataStore.getValue(theItem, "name"); - var id = obj.dataStore.getValue(theItem, "id"); - setPassword.show(that.management, - that.modelObj, - { - name: name, - id: id - }); - }); - }, gridProperties, EnhancedGrid); - - var addUserButton = query(".addUserButton", node)[0]; - connect.connect(registry.byNode(addUserButton), "onClick", function (evt) - { - addUser.show(that.management, that.modelObj) - }); - - var deleteUserButton = query(".deleteUserButton", node)[0]; - var deleteWidget = registry.byNode(deleteUserButton); - connect.connect(deleteWidget, "onClick", function (evt) - { - event.stop(evt); - that.deleteUsers(); - }); - } - - DatabaseAuthManager.prototype.deleteUsers = function () - { - var grid = this.usersGrid.grid; - var data = grid.selection.getSelected(); - if (data.length) - { - var that = this; - if (confirm("Delete " + data.length + " users?")) - { - var i; - var parameters = {id: []}; - for (i = 0; i < data.length; i++) - { - parameters.id.push(data[i].id); - } - - that.success = true - this.management.remove({ - type: "user", - parent: this.modelObj - }, parameters).then(function (data) - { - grid.setQuery({id: "*"}); - grid.selection.deselectAll(); - }, util.xhrErrorHandler); - } - } - }; - - DatabaseAuthManager.prototype.update = function (data) - { - this.authProviderData = data; - this.name = data.name - this.usersGrid.update(this.authProviderData.users); - }; - - var addUser = {}; - - var node = construct.create("div", null, win.body(), "last"); - - var convertToUser = function convertToUser(formValues) - { - var newUser = {}; - newUser.name = formValues.name; - for (var propName in formValues) - { - if (formValues.hasOwnProperty(propName)) - { - if (formValues[propName] !== "") - { - newUser[propName] = formValues[propName]; - } - } - } - - return newUser; - }; - - node.innerHTML = addUserTemplate; - addUser.dialogNode = dom.byId("addUser"); - parser.parse(node).then(function (instances) - { - var theForm; - theForm = registry.byId("formAddUser"); - theForm.on("submit", function (e) - { - - event.stop(e); - if (theForm.validate()) - { - - var newUser = convertToUser(theForm.getValues()); - - addUser.management.create("user", addUser.authProvider, newUser) - .then(function (x) - { - registry.byId("addUser").hide(); - }); - return false; - - } - else - { - alert('Form contains invalid data. Please correct first'); - return false; - } - - }); - }); - - addUser.show = function (management, authProvider) - { - addUser.management = management; - addUser.authProvider = authProvider; - registry.byId("formAddUser").reset(); - registry.byId("addUser").show(); - }; - - var setPassword = {}; - - var setPasswordNode = construct.create("div", null, win.body(), "last"); - - setPasswordNode.innerHTML = setPasswordTemplate; - setPassword.dialogNode = dom.byId("setPassword"); - parser.parse(setPasswordNode).then(function (instances) - { - var theForm = registry.byId("formSetPassword"); - theForm.on("submit", function (e) - { - - event.stop(e); - if (theForm.validate()) - { - - var newUser = convertToUser(theForm.getValues()); - newUser.name = setPassword.name; - newUser.id = setPassword.id; - - var model = { - type: "user", - name: setPassword.name, - parent: setPassword.authProvider - }; - setPassword.management.update(model, newUser) - .then(function (x) - { - registry.byId("setPassword").hide(); - }); - return false; - - } - else - { - alert('Form contains invalid data. Please correct first'); - return false; - } - - }); - }); - - setPassword.show = function (management, authProvider, user) - { - setPassword.management = management; - setPassword.authProvider = authProvider; - setPassword.name = user.name; - setPassword.id = user.id; - registry.byId("formSetPassword").reset(); - - var namebox = registry.byId("formSetPassword.name"); - namebox.set("value", user.name); - namebox.set("disabled", true); + function (dom, + parser, + query, + construct, + connect, + win, + event, + json, + registry, + util, + properties, + UpdatableStore, + EnhancedGrid, + template, + addUserTemplate, + setPasswordTemplate) + { + function DatabaseAuthManager(containerNode, authProviderObj, controller) + { + var node = construct.create("div", null, containerNode, "last"); + var that = this; + this.name = authProviderObj.name; + this.modelObj = authProviderObj; + this.management = controller.management; + node.innerHTML = template; + parser.parse(node) + .then(function (instances) + { + that.init(node, authProviderObj, controller); + }); + } + + DatabaseAuthManager.prototype.update = function () + { + this.authDatabaseUpdater.update(); + }; + + DatabaseAuthManager.prototype.close = function () + { + updater.remove(this.authDatabaseUpdater); + }; + + DatabaseAuthManager.prototype.init = function (node, authProviderObj, controller) + { + this.controller = controller; + var that = this; + + that.authProviderData = {}; + + var userDiv = query(".users")[0]; + + var gridProperties = { + height: 400, + keepSelection: true, + plugins: { + pagination: { + pageSizes: ["10", "25", "50", "100"], + description: true, + sizeSwitch: true, + pageStepper: true, + gotoButton: true, + maxPageStep: 4, + position: "bottom" + }, + indirectSelection: true + + } + }; + + that.usersGrid = new UpdatableStore(that.authProviderData.users, userDiv, [{ + name: "User Name", + field: "name", + width: "100%" + }], function (obj) + { + connect.connect(obj.grid, "onRowDblClick", obj.grid, function (evt) + { + var idx = evt.rowIndex, theItem = this.getItem(idx); + var name = obj.dataStore.getValue(theItem, "name"); + var id = obj.dataStore.getValue(theItem, "id"); + setPassword.show(that.management, that.modelObj, { + name: name, + id: id + }); + }); + }, gridProperties, EnhancedGrid); + + var addUserButton = query(".addUserButton", node)[0]; + connect.connect(registry.byNode(addUserButton), "onClick", function (evt) + { + addUser.show(that.management, that.modelObj) + }); + + var deleteUserButton = query(".deleteUserButton", node)[0]; + var deleteWidget = registry.byNode(deleteUserButton); + connect.connect(deleteWidget, "onClick", function (evt) + { + event.stop(evt); + that.deleteUsers(); + }); + } + + DatabaseAuthManager.prototype.deleteUsers = function () + { + var grid = this.usersGrid.grid; + var data = grid.selection.getSelected(); + if (data.length) + { + var that = this; + if (confirm("Delete " + data.length + " users?")) + { + var i; + var parameters = {id: []}; + for (i = 0; i < data.length; i++) + { + parameters.id.push(data[i].id); + } + + that.success = true + this.management.remove({ + type: "user", + parent: this.modelObj + }, parameters) + .then(function (data) + { + grid.setQuery({id: "*"}); + grid.selection.deselectAll(); + }, util.xhrErrorHandler); + } + } + }; + + DatabaseAuthManager.prototype.update = function (data) + { + this.authProviderData = data; + this.name = data.name + this.usersGrid.update(this.authProviderData.users); + }; + + var addUser = {}; + + var node = construct.create("div", null, win.body(), "last"); + + var convertToUser = function convertToUser(formValues) + { + var newUser = {}; + newUser.name = formValues.name; + for (var propName in formValues) + { + if (formValues.hasOwnProperty(propName)) + { + if (formValues[propName] !== "") + { + newUser[propName] = formValues[propName]; + } + } + } + + return newUser; + }; + + node.innerHTML = addUserTemplate; + addUser.dialogNode = dom.byId("addUser"); + parser.parse(node) + .then(function (instances) + { + var theForm; + theForm = registry.byId("formAddUser"); + theForm.on("submit", function (e) + { + + event.stop(e); + if (theForm.validate()) + { + + var newUser = convertToUser(theForm.getValues()); + + addUser.management.create("user", addUser.authProvider, newUser) + .then(function (x) + { + registry.byId("addUser") + .hide(); + }); + return false; + + } + else + { + alert('Form contains invalid data. Please correct first'); + return false; + } + + }); + }); + + addUser.show = function (management, authProvider) + { + addUser.management = management; + addUser.authProvider = authProvider; + registry.byId("formAddUser") + .reset(); + registry.byId("addUser") + .show(); + }; + + var setPassword = {}; + + var setPasswordNode = construct.create("div", null, win.body(), "last"); + + setPasswordNode.innerHTML = setPasswordTemplate; + setPassword.dialogNode = dom.byId("setPassword"); + parser.parse(setPasswordNode) + .then(function (instances) + { + var theForm = registry.byId("formSetPassword"); + theForm.on("submit", function (e) + { + + event.stop(e); + if (theForm.validate()) + { + + var newUser = convertToUser(theForm.getValues()); + newUser.name = setPassword.name; + newUser.id = setPassword.id; + + var model = { + type: "user", + name: setPassword.name, + parent: setPassword.authProvider + }; + setPassword.management.update(model, newUser) + .then(function (x) + { + registry.byId("setPassword") + .hide(); + }); + return false; + + } + else + { + alert('Form contains invalid data. Please correct first'); + return false; + } + + }); + }); + + setPassword.show = function (management, authProvider, user) + { + setPassword.management = management; + setPassword.authProvider = authProvider; + setPassword.name = user.name; + setPassword.id = user.id; + registry.byId("formSetPassword") + .reset(); + + var namebox = registry.byId("formSetPassword.name"); + namebox.set("value", user.name); + namebox.set("disabled", true); - registry.byId("setPassword").show(); + registry.byId("setPassword") + .show(); - }; + }; - return DatabaseAuthManager; - }); + return DatabaseAuthManager; + });
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/add.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/add.js Mon May 2 15:57:52 2016 @@ -26,39 +26,39 @@ define(["dojo/dom", "dojo/parser", "dojo/text!authenticationprovider/oauth2/add.html", "dojo/domReady!"], function (dom, query, array, registry, util, parser, template) - { - var addAuthenticationProvier = { - show: function (data) - { - var that = this; - util.parse(data.containerNode, template, function () - { - that._postParse(data); - }); - }, - _postParse: function (data) - { - var identityResolverType = registry.byId("addAuthenticationProvider.identityResolverType"); - var validValues = data.metadata.getMetaData(data.category, - data.type).attributes.identityResolverType.validValues; - var validValueStore = util.makeTypeStore(validValues); - identityResolverType.set("store", validValueStore); +{ + var addAuthenticationProvier = { + show: function (data) + { + var that = this; + util.parse(data.containerNode, template, function () + { + that._postParse(data); + }); + }, + _postParse: function (data) + { + var identityResolverType = registry.byId("addAuthenticationProvider.identityResolverType"); + var validValues = data.metadata.getMetaData(data.category, + data.type).attributes.identityResolverType.validValues; + var validValueStore = util.makeTypeStore(validValues); + identityResolverType.set("store", validValueStore); - util.makeInstanceStore(data.parent.management, "Broker", "TrustStore", function (trustStoresStore) - { - var trustStore = registry.byNode(query(".trustStore", data.containerNode)[0]); - trustStore.set("store", trustStoresStore); - if (data.data) - { - util.initialiseFields(data.data, - data.containerNode, - data.metadata, - "AuthenticationProvider", - "OAuth2"); - } - }); - } - }; + util.makeInstanceStore(data.parent.management, "Broker", "TrustStore", function (trustStoresStore) + { + var trustStore = registry.byNode(query(".trustStore", data.containerNode)[0]); + trustStore.set("store", trustStoresStore); + if (data.data) + { + util.initialiseFields(data.data, + data.containerNode, + data.metadata, + "AuthenticationProvider", + "OAuth2"); + } + }); + } + }; - return addAuthenticationProvier; - }); + return addAuthenticationProvier; +}); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js Mon May 2 15:57:52 2016 @@ -23,31 +23,27 @@ define(["qpid/common/util", "dojo/_base/lang", "dojo/text!authenticationprovider/oauth2/show.html", "dojo/domReady!"], function (util, query, lang, template) - { - var fieldNames = ["authorizationEndpointURI", - "tokenEndpointURI", - "tokenEndpointNeedsAuth", - "identityResolverEndpointURI", - "identityResolverType", - "clientId", - "scope", - "trustStore", - "postLogoutURI"]; +{ + var fieldNames = ["authorizationEndpointURI", + "tokenEndpointURI", + "tokenEndpointNeedsAuth", + "identityResolverEndpointURI", + "identityResolverType", + "clientId", + "scope", + "trustStore", + "postLogoutURI"]; - function AuthenticationProvider(params) - { - util.buildUI(params.containerNode, - params.parent, - "authenticationprovider/oauth2/show.html", - fieldNames, - this); - } + function AuthenticationProvider(params) + { + util.buildUI(params.containerNode, params.parent, "authenticationprovider/oauth2/show.html", fieldNames, this); + } - AuthenticationProvider.prototype.update = function (restData) - { - var data = restData || {}; - util.updateUI(data, fieldNames, this); - } + AuthenticationProvider.prototype.update = function (restData) + { + var data = restData || {}; + util.updateUI(data, fieldNames, this); + } - return AuthenticationProvider; - }); + return AuthenticationProvider; +}); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/simpleldap/add.js Mon May 2 15:57:52 2016 @@ -25,72 +25,71 @@ define(["dojo/query", "dijit/form/FilteringSelect", "dijit/form/ValidationTextBox", "dijit/form/CheckBox"], function (query, registry, util, Memory) - { - return { - show: function (data) - { - var that = this; - util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/simpleldap/add.html", function () - { - that._postParse(data); - }); - }, - _postParse: function (data) - { - var that = this; - var obj = { - type: "truststore", - parent: {type: "broker"} - }; - data.parent.management.load(obj).then(function (trustStores) - { - that._initTrustStores(trustStores, data.containerNode); - if (data.data) - { - that._initFields(data.data, - data.containerNode, - data.parent.management.metadata); - } - }, util.xhrErrorHandler); +{ + return { + show: function (data) + { + var that = this; + util.parseHtmlIntoDiv(data.containerNode, "authenticationprovider/simpleldap/add.html", function () + { + that._postParse(data); + }); + }, + _postParse: function (data) + { + var that = this; + var obj = { + type: "truststore", + parent: {type: "broker"} + }; + data.parent.management.load(obj) + .then(function (trustStores) + { + that._initTrustStores(trustStores, data.containerNode); + if (data.data) + { + that._initFields(data.data, data.containerNode, data.parent.management.metadata); + } + }, util.xhrErrorHandler); - }, - _initTrustStores: function (trustStores, containerNode) - { - var data = []; - for (var i = 0; i < trustStores.length; i++) - { - data.push({ - id: trustStores[i].name, - name: trustStores[i].name - }); - } - var trustStoresStore = new Memory({data: data}); + }, + _initTrustStores: function (trustStores, containerNode) + { + var data = []; + for (var i = 0; i < trustStores.length; i++) + { + data.push({ + id: trustStores[i].name, + name: trustStores[i].name + }); + } + var trustStoresStore = new Memory({data: data}); - var trustStore = registry.byNode(query(".trustStore", containerNode)[0]); - trustStore.set("store", trustStoresStore); - }, - _initFields: function (data, containerNode, metadata) - { - var attributes = metadata.getMetaData("AuthenticationProvider", "SimpleLDAP").attributes; - for (var name in attributes) - { - var domNode = query("." + name, containerNode)[0]; - if (domNode) - { - var widget = registry.byNode(domNode); - if (widget) - { - if (widget instanceof dijit.form.CheckBox) - { - widget.set("checked", data[name]); - } - else - { - widget.set("value", data[name]); - } - } - } - } - } - }; - }); + var trustStore = registry.byNode(query(".trustStore", containerNode)[0]); + trustStore.set("store", trustStoresStore); + }, + _initFields: function (data, containerNode, metadata) + { + var attributes = metadata.getMetaData("AuthenticationProvider", "SimpleLDAP").attributes; + for (var name in attributes) + { + var domNode = query("." + name, containerNode)[0]; + if (domNode) + { + var widget = registry.byNode(domNode); + if (widget) + { + if (widget instanceof dijit.form.CheckBox) + { + widget.set("checked", data[name]); + } + else + { + widget.set("value", data[name]); + } + } + } + } + } + }; +}); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js Mon May 2 15:57:52 2016 @@ -43,128 +43,150 @@ define(["dojo/dom", "dojo/ready", "dojox/uuid/generateRandomUuid", "dojo/domReady!"], - function (dom, registry, ContentPane, CheckBox, entities, Broker, VirtualHost, Exchange, Queue, Connection, AuthProvider, GroupProvider, Group, KeyStore, TrustStore, AccessControlProvider, Port, Plugin, PreferencesProvider, VirtualHostNode, Logger, QueryTab, ready) - { - var controller = {}; - - var constructors = { - broker: Broker, - virtualhost: VirtualHost, - exchange: Exchange, - queue: Queue, - connection: Connection, - authenticationprovider: AuthProvider, - groupprovider: GroupProvider, - group: Group, - keystore: KeyStore, - truststore: TrustStore, - accesscontrolprovider: AccessControlProvider, - port: Port, - plugin: Plugin, - preferencesprovider: PreferencesProvider, - virtualhostnode: VirtualHostNode, - brokerlogger: Logger, - virtualhostlogger: Logger, - queryTab: QueryTab - }; - - var tabDiv = dom.byId("managedViews"); - - ready(function () - { - controller.tabContainer = registry.byId("managedViews"); - }); - - controller.viewedObjects = {}; - - controller.show = function (objType, name, parent, objectId) - { - - function generateName(obj) - { - if (obj) - { - var name = obj.type + (obj.type == "broker" ? "" : ":" + obj.name); - if (obj.parent) - { - name = generateName(obj.parent) + "/" + name; - } - return name; - } - return ""; - } - - var that = this; - var objId = (parent ? generateName(parent) + "/" : "") + objType + ":" + (name ? name : "-" - + dojox.uuid.generateRandomUuid()); - - var obj = this.viewedObjects[objId]; - if (obj) - { - this.tabContainer.selectChild(obj.contentPane); - } - else - { - var Constructor = constructors[objType]; - if (Constructor) - { - obj = new Constructor(name, parent, this); - obj.tabData = { - objectId: objectId, - objectType: objType - }; - this.viewedObjects[objId] = obj; - - var contentPane = new ContentPane({ - region: "center", - title: entities.encode(obj.getTitle()), - closable: true, - onClose: function () - { - obj.close(); - delete that.viewedObjects[objId]; - return true; - } - }); - this.tabContainer.addChild(contentPane); - var userPreferences = this.management.userPreferences; - if (objType != "broker" && name) - { - var preferencesCheckBox = new dijit.form.CheckBox({ - checked: userPreferences.isTabStored(obj.tabData), - title: "If checked the tab is saved in user preferences and restored on next login" - }); - var tabs = this.tabContainer.tablist.getChildren(); - preferencesCheckBox.placeAt(tabs[tabs.length - 1].titleNode, "first"); - preferencesCheckBox.on("change", function (value) - { - if (value) - { - userPreferences.appendTab(obj.tabData); - } - else - { - userPreferences.removeTab(obj.tabData); - } - }); - } - obj.open(contentPane); - contentPane.startup(); - if (obj.startup) - { - obj.startup(); - } - this.tabContainer.selectChild(contentPane); - } - - } - - }; - - controller.init = function (management) - { - controller.management = management; - } + function (dom, + registry, + ContentPane, + CheckBox, + entities, + Broker, + VirtualHost, + Exchange, + Queue, + Connection, + AuthProvider, + GroupProvider, + Group, + KeyStore, + TrustStore, + AccessControlProvider, + Port, + Plugin, + PreferencesProvider, + VirtualHostNode, + Logger, + QueryTab, + ready) + { + var controller = {}; + + var constructors = { + broker: Broker, + virtualhost: VirtualHost, + exchange: Exchange, + queue: Queue, + connection: Connection, + authenticationprovider: AuthProvider, + groupprovider: GroupProvider, + group: Group, + keystore: KeyStore, + truststore: TrustStore, + accesscontrolprovider: AccessControlProvider, + port: Port, + plugin: Plugin, + preferencesprovider: PreferencesProvider, + virtualhostnode: VirtualHostNode, + brokerlogger: Logger, + virtualhostlogger: Logger, + queryTab: QueryTab + }; + + var tabDiv = dom.byId("managedViews"); + + ready(function () + { + controller.tabContainer = registry.byId("managedViews"); + }); + + controller.viewedObjects = {}; + + controller.show = function (objType, name, parent, objectId) + { + + function generateName(obj) + { + if (obj) + { + var name = obj.type + (obj.type == "broker" ? "" : ":" + obj.name); + if (obj.parent) + { + name = generateName(obj.parent) + "/" + name; + } + return name; + } + return ""; + } + + var that = this; + var objId = (parent ? generateName(parent) + "/" : "") + objType + ":" + (name ? name : "-" + + dojox.uuid.generateRandomUuid()); + + var obj = this.viewedObjects[objId]; + if (obj) + { + this.tabContainer.selectChild(obj.contentPane); + } + else + { + var Constructor = constructors[objType]; + if (Constructor) + { + obj = new Constructor(name, parent, this); + obj.tabData = { + objectId: objectId, + objectType: objType + }; + this.viewedObjects[objId] = obj; + + var contentPane = new ContentPane({ + region: "center", + title: entities.encode(obj.getTitle()), + closable: true, + onClose: function () + { + obj.close(); + delete that.viewedObjects[objId]; + return true; + } + }); + this.tabContainer.addChild(contentPane); + var userPreferences = this.management.userPreferences; + if (objType != "broker" && name) + { + var preferencesCheckBox = new dijit.form.CheckBox({ + checked: userPreferences.isTabStored(obj.tabData), + title: "If checked the tab is saved in user preferences and restored on next login" + }); + var tabs = this.tabContainer.tablist.getChildren(); + preferencesCheckBox.placeAt(tabs[tabs.length - 1].titleNode, "first"); + preferencesCheckBox.on("change", function (value) + { + if (value) + { + userPreferences.appendTab(obj.tabData); + } + else + { + userPreferences.removeTab(obj.tabData); + } + }); + } + obj.open(contentPane); + contentPane.startup(); + if (obj.startup) + { + obj.startup(); + } + this.tabContainer.selectChild(contentPane); + } + + } + + }; + + controller.init = function (management) + { + controller.management = management; + } - return controller; - }); + return controller; + }); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js Mon May 2 15:57:52 2016 @@ -43,142 +43,159 @@ define(["dojox/html/entities", "dojox/validate/us", "dojox/validate/web", "dojo/domReady!"], - function (entities, array, event, lang, win, dom, domConstruct, registry, parser, json, query, Memory, ObjectStore, util, template) - { - var numericFieldNames = ["statisticsReportingPeriod", - "connection.sessionCountLimit", - "connection.heartBeatDelay"]; - - var brokerEditor = { - init: function () - { - var that = this; - this.containerNode = domConstruct.create("div", {innerHTML: template}); - parser.parse(this.containerNode).then(function (instances) - { - that._postParse(); - }); - }, - _postParse: function () - { - var that = this; - this.dialog = registry.byId("editBrokerDialog"); - this.saveButton = registry.byId("editBroker.saveButton"); - this.cancelButton = registry.byId("editBroker.cancelButton"); - this.cancelButton.on("click", function (e) - { - that._cancel(e); - }); - this.saveButton.on("click", function (e) - { - that._save(e); - }); - this.form = registry.byId("editBrokerForm"); - this.form.on("submit", function () - { - return false; - }); - this.context = registry.byId("editBroker.context"); - }, - show: function (management, brokerData) - { - this.management = management; - var that = this; - this.dialog.set("title", "Edit Broker - " + entities.encode(String(brokerData.name))); - var typeMetaData = management.metadata.getMetaData("Broker", "Broker"); - var encrypters = typeMetaData.attributes.confidentialConfigurationEncryptionProvider.validValues; - var encrypterTypesData = []; - encrypterTypesData.push({ - id: undefined, - name: "None" - }); - array.forEach(encrypters, function (item) - { - encrypterTypesData.push({ - id: item, - name: item - }); - }); - - var encrytperTypesStore = new Memory({data: encrypterTypesData}); - var encrypterControl = registry.byId("editBroker.confidentialConfigurationEncryptionProvider"); - encrypterControl.set("store", encrytperTypesStore); - encrypterControl.set("value", undefined); - - management.load({type: "broker"}, {actuals: true}).then(function (data) - { - that._show(data[0], brokerData); - }); - }, - destroy: function () - { - if (this.dialog) - { - this.dialog.destroyRecursive(); - this.dialog = null; - } - - if (this.containerNode) - { - domConstruct.destroy(this.containerNode); - this.containerNode = null; - } - }, - _cancel: function (e) - { - this.dialog.hide(); - }, - _save: function (e) - { - event.stop(e); - if (this.form.validate()) - { - var data = util.getFormWidgetValues(this.form, this.initialData); - var context = this.context.get("value"); - if (context && !util.equals(context, this.initialData.context)) - { - data["context"] = context; - } - - var that = this; - this.management.update({type: "broker"}, data).then(function (x) - { - that.dialog.hide(); - }); - } - else - { - alert('Form contains invalid data. Please correct first'); - } - }, - _show: function (actualData, effectiveData) - { - this.initialData = actualData; - util.applyToWidgets(dom.byId("editBroker.allFields"), - "Broker", - "Broker", - actualData, - this.management.metadata); - util.setContextData(this.context, management, {type: "broker"}, actualData, effectiveData); - - // Add regexp to the numeric fields - for (var i = 0; i < numericFieldNames.length; i++) - { - registry.byId("editBroker." + numericFieldNames[i]) - .set("regExpGen", util.numericOrContextVarRegexp); - } - - this.dialog.startup(); - this.dialog.show(); - if (!this.resizeEventRegistered) - { - this.resizeEventRegistered = true; - util.resizeContentAreaAndRepositionDialog(dom.byId("editBroker.contentPane"), this.dialog); - } - } - }; + function (entities, + array, + event, + lang, + win, + dom, + domConstruct, + registry, + parser, + json, + query, + Memory, + ObjectStore, + util, + template) + { + var numericFieldNames = ["statisticsReportingPeriod", + "connection.sessionCountLimit", + "connection.heartBeatDelay"]; + + var brokerEditor = { + init: function () + { + var that = this; + this.containerNode = domConstruct.create("div", {innerHTML: template}); + parser.parse(this.containerNode) + .then(function (instances) + { + that._postParse(); + }); + }, + _postParse: function () + { + var that = this; + this.dialog = registry.byId("editBrokerDialog"); + this.saveButton = registry.byId("editBroker.saveButton"); + this.cancelButton = registry.byId("editBroker.cancelButton"); + this.cancelButton.on("click", function (e) + { + that._cancel(e); + }); + this.saveButton.on("click", function (e) + { + that._save(e); + }); + this.form = registry.byId("editBrokerForm"); + this.form.on("submit", function () + { + return false; + }); + this.context = registry.byId("editBroker.context"); + }, + show: function (management, brokerData) + { + this.management = management; + var that = this; + this.dialog.set("title", "Edit Broker - " + entities.encode(String(brokerData.name))); + var typeMetaData = management.metadata.getMetaData("Broker", "Broker"); + var encrypters = typeMetaData.attributes.confidentialConfigurationEncryptionProvider.validValues; + var encrypterTypesData = []; + encrypterTypesData.push({ + id: undefined, + name: "None" + }); + array.forEach(encrypters, function (item) + { + encrypterTypesData.push({ + id: item, + name: item + }); + }); + + var encrytperTypesStore = new Memory({data: encrypterTypesData}); + var encrypterControl = registry.byId("editBroker.confidentialConfigurationEncryptionProvider"); + encrypterControl.set("store", encrytperTypesStore); + encrypterControl.set("value", undefined); + + management.load({type: "broker"}, {actuals: true}) + .then(function (data) + { + that._show(data[0], brokerData); + }); + }, + destroy: function () + { + if (this.dialog) + { + this.dialog.destroyRecursive(); + this.dialog = null; + } + + if (this.containerNode) + { + domConstruct.destroy(this.containerNode); + this.containerNode = null; + } + }, + _cancel: function (e) + { + this.dialog.hide(); + }, + _save: function (e) + { + event.stop(e); + if (this.form.validate()) + { + var data = util.getFormWidgetValues(this.form, this.initialData); + var context = this.context.get("value"); + if (context && !util.equals(context, this.initialData.context)) + { + data["context"] = context; + } + + var that = this; + this.management.update({type: "broker"}, data) + .then(function (x) + { + that.dialog.hide(); + }); + } + else + { + alert('Form contains invalid data. Please correct first'); + } + }, + _show: function (actualData, effectiveData) + { + this.initialData = actualData; + util.applyToWidgets(dom.byId("editBroker.allFields"), + "Broker", + "Broker", + actualData, + this.management.metadata); + util.setContextData(this.context, management, {type: "broker"}, actualData, effectiveData); + + // Add regexp to the numeric fields + for (var i = 0; i < numericFieldNames.length; i++) + { + registry.byId("editBroker." + numericFieldNames[i]) + .set("regExpGen", util.numericOrContextVarRegexp); + } + + this.dialog.startup(); + this.dialog.show(); + if (!this.resizeEventRegistered) + { + this.resizeEventRegistered = true; + util.resizeContentAreaAndRepositionDialog(dom.byId("editBroker.contentPane"), this.dialog); + } + } + }; - brokerEditor.init(); + brokerEditor.init(); - return brokerEditor; - }); + return brokerEditor; + }); Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js?rev=1741993&r1=1741992&r2=1741993&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js Mon May 2 15:57:52 2016 @@ -41,165 +41,165 @@ define(["dojox/html/entities", "dojox/validate/us", "dojox/validate/web", "dojo/domReady!"], - function (entities, array, event, lang, win, dom, domConstruct, registry, parser, json, query, util, template) - { + function (entities, array, event, lang, win, dom, domConstruct, registry, parser, json, query, util, template) + { - var numericFieldNames = ["maximumMessageTtl", - "minimumMessageTtl", - "queueFlowControlSizeBytes", - "queueFlowResumeSizeBytes", - "alertThresholdQueueDepthMessages", - "alertThresholdQueueDepthBytes", - "alertThresholdMessageAge", - "alertThresholdMessageSize", - "alertRepeatGap", - "maximumDeliveryAttempts"]; - - var queueEditor = { - init: function () - { - var that = this; - this.containerNode = domConstruct.create("div", {innerHTML: template}); - parser.parse(this.containerNode).then(function (instances) - { - that._postParse(); - }); - }, - _postParse: function () - { - var that = this; - this.allFieldsContainer = dom.byId("formEditQueue.allFields"); - this.dialog = registry.byId("editQueue"); - this.saveButton = registry.byId("formEditQueue.saveButton"); - this.cancelButton = registry.byId("formEditQueue.cancelButton"); - this.cancelButton.on("click", function (e) - { - that._cancel(e); - }); - this.saveButton.on("click", function (e) - { - that._save(e); - }); - this.form = registry.byId("formEditQueue"); - this.form.on("submit", function () - { - return false; - }); - this.typeSelector = registry.byId("formEditQueue.type"); - }, - show: function (management, modelObj) - { - var that = this; - this.management = management; - this.modelObj = modelObj; - if (!this.context) - { - this.context = new qpid.common.ContextVariablesEditor({ - name: 'context', - title: 'Context variables' - }); - this.context.placeAt(dom.byId("formEditQueue.context")); - } - this.dialog.set("title", "Edit Queue - " + entities.encode(String(modelObj.name))); - management.load(modelObj, {actuals: true}).then(function (actualData) - { - management.load(modelObj) - .then(function (effectiveData) - { - that._show(actualData[0], - effectiveData[0]); - }, util.xhrErrorHandler); - }); - }, - destroy: function () - { - if (this.dialog) - { - this.dialog.destroyRecursive(); - this.dialog = null; - } - - if (this.containerNode) - { - domConstruct.destroy(this.containerNode); - this.containerNode = null; - } - }, - _cancel: function (e) - { - this.dialog.hide(); - }, - _save: function (e) - { - event.stop(e); - if (this.form.validate()) - { - var data = util.getFormWidgetValues(this.form, this.initialData); - var context = this.context.get("value"); - if (context && !util.equals(context, this.initialData.context)) - { - data["context"] = context; - } - var that = this; - this.management.update(that.modelObj, data).then(function (x) - { - that.dialog.hide() - }); - } - else - { - alert('Form contains invalid data. Please correct first'); - } - }, - _show: function (actualData, effectiveData) - { - - this.initialData = actualData; - this.form.reset(); - - var that = this; - util.applyToWidgets(that.allFieldsContainer, - "Queue", - actualData.type, - actualData, - this.management.metadata); - - util.setContextData(this.context, this.management, this.modelObj, actualData, effectiveData); - - // Add regexp to the numeric fields - for (var i = 0; i < numericFieldNames.length; i++) - { - registry.byId("formEditQueue." + numericFieldNames[i]) - .set("regExpGen", util.numericOrContextVarRegexp); - } - - var queueType = this.typeSelector.get("value"); - query(".typeSpecificDiv").forEach(function (node, index, arr) - { - if (node.id === "formEditQueueType:" + queueType) - { - node.style.display = "block"; - util.applyMetadataToWidgets(node, - "Queue", - queueType, - that.management.metadata); - } - else - { - node.style.display = "none"; - } - }); - this.dialog.startup(); - this.dialog.show(); - if (!this.resizeEventRegistered) - { - this.resizeEventRegistered = true; - util.resizeContentAreaAndRepositionDialog(dom.byId("formEditQueue.contentPane"), this.dialog); - } - } - }; + var numericFieldNames = ["maximumMessageTtl", + "minimumMessageTtl", + "queueFlowControlSizeBytes", + "queueFlowResumeSizeBytes", + "alertThresholdQueueDepthMessages", + "alertThresholdQueueDepthBytes", + "alertThresholdMessageAge", + "alertThresholdMessageSize", + "alertRepeatGap", + "maximumDeliveryAttempts"]; + + var queueEditor = { + init: function () + { + var that = this; + this.containerNode = domConstruct.create("div", {innerHTML: template}); + parser.parse(this.containerNode) + .then(function (instances) + { + that._postParse(); + }); + }, + _postParse: function () + { + var that = this; + this.allFieldsContainer = dom.byId("formEditQueue.allFields"); + this.dialog = registry.byId("editQueue"); + this.saveButton = registry.byId("formEditQueue.saveButton"); + this.cancelButton = registry.byId("formEditQueue.cancelButton"); + this.cancelButton.on("click", function (e) + { + that._cancel(e); + }); + this.saveButton.on("click", function (e) + { + that._save(e); + }); + this.form = registry.byId("formEditQueue"); + this.form.on("submit", function () + { + return false; + }); + this.typeSelector = registry.byId("formEditQueue.type"); + }, + show: function (management, modelObj) + { + var that = this; + this.management = management; + this.modelObj = modelObj; + if (!this.context) + { + this.context = new qpid.common.ContextVariablesEditor({ + name: 'context', + title: 'Context variables' + }); + this.context.placeAt(dom.byId("formEditQueue.context")); + } + this.dialog.set("title", "Edit Queue - " + entities.encode(String(modelObj.name))); + management.load(modelObj, {actuals: true}) + .then(function (actualData) + { + management.load(modelObj) + .then(function (effectiveData) + { + that._show(actualData[0], effectiveData[0]); + }, util.xhrErrorHandler); + }); + }, + destroy: function () + { + if (this.dialog) + { + this.dialog.destroyRecursive(); + this.dialog = null; + } + + if (this.containerNode) + { + domConstruct.destroy(this.containerNode); + this.containerNode = null; + } + }, + _cancel: function (e) + { + this.dialog.hide(); + }, + _save: function (e) + { + event.stop(e); + if (this.form.validate()) + { + var data = util.getFormWidgetValues(this.form, this.initialData); + var context = this.context.get("value"); + if (context && !util.equals(context, this.initialData.context)) + { + data["context"] = context; + } + var that = this; + this.management.update(that.modelObj, data) + .then(function (x) + { + that.dialog.hide() + }); + } + else + { + alert('Form contains invalid data. Please correct first'); + } + }, + _show: function (actualData, effectiveData) + { + + this.initialData = actualData; + this.form.reset(); + + var that = this; + util.applyToWidgets(that.allFieldsContainer, + "Queue", + actualData.type, + actualData, + this.management.metadata); + + util.setContextData(this.context, this.management, this.modelObj, actualData, effectiveData); + + // Add regexp to the numeric fields + for (var i = 0; i < numericFieldNames.length; i++) + { + registry.byId("formEditQueue." + numericFieldNames[i]) + .set("regExpGen", util.numericOrContextVarRegexp); + } + + var queueType = this.typeSelector.get("value"); + query(".typeSpecificDiv") + .forEach(function (node, index, arr) + { + if (node.id === "formEditQueueType:" + queueType) + { + node.style.display = "block"; + util.applyMetadataToWidgets(node, "Queue", queueType, that.management.metadata); + } + else + { + node.style.display = "none"; + } + }); + this.dialog.startup(); + this.dialog.show(); + if (!this.resizeEventRegistered) + { + this.resizeEventRegistered = true; + util.resizeContentAreaAndRepositionDialog(dom.byId("formEditQueue.contentPane"), this.dialog); + } + } + }; - queueEditor.init(); + queueEditor.init(); - return queueEditor; - }); + return queueEditor; + }); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
