From fb4ab9f09df8290c00a33c509cb26fac098ac8e6 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Thu, 7 Aug 2014 17:05:30 +0000 Subject: QPID-5972: [Java Broker] Web UI to edit actual attribute values rather than effective values Work completed by Andrew MacBean and me. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616543 13f79535-47bb-0310-9956-ffa450edef68 --- .../js/qpid/management/virtualhost/bdb/add.js | 6 +++++- .../js/qpid/management/virtualhost/bdb/edit.js | 7 +++++-- .../js/qpid/management/virtualhost/bdb_ha/edit.js | 3 +++ .../js/qpid/management/virtualhostnode/bdb/show.js | 1 - .../virtualhostnode/bdb_ha/add/existinggroup/add.js | 8 +++++++- .../virtualhostnode/bdb_ha/add/newgroup/add.js | 20 ++++++++++++-------- .../main/java/resources/virtualhost/bdb_ha/edit.html | 13 +++++-------- .../bdb_ha/add/existinggroup/add.html | 12 ++++-------- .../virtualhostnode/bdb_ha/add/newgroup/add.html | 9 +++------ .../java/resources/virtualhostnode/bdb_ha/edit.html | 6 ++---- 10 files changed, 46 insertions(+), 39 deletions(-) (limited to 'qpid/java/bdbstore') diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js index 21d377445d..7b12d10343 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/add.js @@ -24,16 +24,20 @@ define(["dojo/_base/xhr", "dojo/json", "dijit/registry", "dojo/text!virtualhost/sizemonitoring/add.html", + "qpid/common/util", "dijit/form/ValidationTextBox", "dijit/form/NumberTextBox", "dojo/domReady!"], - function (xhr, parser, dom, domConstruct, json, registry, template) + function (xhr, parser, dom, domConstruct, json, registry, template, util) { return { show: function (data) { this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); parser.parse(this.containerNode); + + registry.byId("addVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("addVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js index 5438eda926..1167d6b60e 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js @@ -16,14 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -define(["qpid/common/util", "dojo/domReady!"], - function (util) +define(["dijit/registry", "qpid/common/util", "dojo/domReady!"], + function (registry, util) { var fieldNames = ["storeUnderfullSize", "storeOverfullSize", "storePath"]; return { show: function(data) { util.buildEditUI(data.containerNode, "virtualhost/sizemonitoring/edit.html", "editVirtualHost.", fieldNames, data.data); + + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js index bc62654c56..087caf34c6 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js @@ -25,6 +25,9 @@ define(["qpid/common/util", "dijit/registry", "dojo/_base/window", "dojo/domRead { util.buildEditUI(data.containerNode, "virtualhost/bdb_ha/edit.html", "editVirtualHost.", fieldNames, data.data); + registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", util.numericOrContextVarRegexp); + registry.byId("editVirtualHost.storeOverfullSize").set("regExpGen", util.numericOrContextVarRegexp); + var widget = registry.byId("editVirtualHost.localTransactionSynchronizationPolicy-" + data.data["localTransactionSynchronizationPolicy"]); if (widget) { diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js index bef6a4214d..6f4e167e72 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/show.js @@ -31,7 +31,6 @@ define(["qpid/common/util", "dojo/domReady!"], BdbNode.prototype.update=function(data) { - this.parent.editNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED")); util.updateUI(data, fieldNames, this); }; diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js index c3a7824fa4..ee467e69e4 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/existinggroup/add.js @@ -23,16 +23,22 @@ define(["dojo/_base/xhr", "dojo/json", "dijit/registry", "dojo/text!virtualhostnode/bdb_ha/add/existinggroup/add.html", + "qpid/common/util", "dijit/form/ValidationTextBox", "dijit/form/CheckBox", "dojo/domReady!"], - function (xhr, parser, dom, domConstruct, json, registry, template) + function (xhr, parser, dom, domConstruct, json, registry, template, util) { return { show: function(data) { this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); parser.parse(this.containerNode); + + registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp); + registry.byId("addVirtualHostNode.helperNodeName").set("regExpGen", util.nameOrContextVarRegexp); + registry.byId("addVirtualHostNode.helperAddress").set("regExpGen", util.nodeAddressOrContextVarRegexp); + registry.byId("addVirtualHostNode.address").set("regExpGen", util.nodeAddressOrContextVarRegexp); } }; } diff --git a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js index 48a0677eb2..30f47417aa 100644 --- a/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js +++ b/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js @@ -24,11 +24,12 @@ define(["dojo/_base/xhr", "dojo/json", "dijit/registry", "dojo/text!virtualhostnode/bdb_ha/add/newgroup/add.html", + "qpid/common/util", "dijit/form/ValidationTextBox", "dijit/form/MultiSelect", "dijit/form/Button", "dojo/domReady!"], - function (xhr, win, parser, dom, domConstruct, json, registry, template) + function (xhr, win, parser, dom, domConstruct, json, registry, template, util) { return { show: function(data) @@ -38,12 +39,14 @@ define(["dojo/_base/xhr", this.containerNode = domConstruct.create("div", {innerHTML: template}, data.containerNode); parser.parse(this.containerNode); - // lookup field - var virtualHostNodeAddress = registry.byId("addVirtualHostNode.address"); - this.virtualHostNodeHelperAddress = registry.byId("addVirtualHostNode.helperAddress"); + this.addVirtualHostNodeAddress = registry.byId("addVirtualHostNode.address"); + this.addVirtualHostNodeAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp); + + this.addVirtualHostNodeAddress.on("change", function(address){that._changeAddress(address, that.virtualHostNodeHelperAddress);}); + this.addVirtualHostNodeAddress.on("click", function(e){that._updatePermittedNodesJson();}); - // add callback - virtualHostNodeAddress.on("change", function(address){that._changeAddress(address, that.virtualHostNodeHelperAddress);}); + this.virtualHostNodeHelperAddress = registry.byId("addVirtualHostNode.helperAddress"); + this.virtualHostNodeHelperAddress.set("regExpGen", util.nodeAddressOrContextVarRegexp); // list objects html node and dojo object this.addVirtualHostNodePermittedNodesList = dom.byId("addVirtualHostNode.permittedNodesList"); @@ -52,6 +55,7 @@ define(["dojo/_base/xhr", // permitted node text field this.addVirtualHostNodePermittedNode = registry.byId("addVirtualHostNode.permittedNode"); + this.addVirtualHostNodePermittedNode.set("regExpGen", util.nodeAddressOrContextVarRegexp); this.addVirtualHostNodePermittedNode.on("change", function(value){that._changePermittedNode(value);}); // add and remove buttons & click handlers @@ -64,8 +68,8 @@ define(["dojo/_base/xhr", // This will contain the serialised form that will go to the server this.addVirtualHostNodeVirtualhostBlueprint = registry.byId("addVirtualHostNode.virtualhostBlueprint"); - this.addVirtualHostNodeAddress = registry.byId("addVirtualHostNode.address"); - this.addVirtualHostNodeAddress.on("click", function(e){that._updatePermittedNodesJson();}); + + registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp); }, _updatePermittedNodesJson: function () { diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html index 37a4c51854..cad6b9301e 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/edit.html @@ -21,27 +21,25 @@
Store overfull size (bytes):
- + title: 'Enter ceiling (in bytes) at which store will begin to throttle sessions producing messages'"/>
Store underfull size (bytes):
- + title: 'Enter floor (in bytes) at which store will cease to throttle sessions producing messages'"/>
@@ -77,8 +75,7 @@ name: 'permittedNode', placeHolder: 'host:port', title: 'Enter address', - intermediateChanges: true, - pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" /> + intermediateChanges: true" /> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html index eb21d9faa9..b08c734e35 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html @@ -31,8 +31,7 @@ placeHolder: 'group name', required: true, missingMessage: 'The group name must be supplied', - title: 'Enter the group name', - pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" /> + title: 'Enter the group name'" />
@@ -45,8 +44,7 @@ placeHolder: 'node name from group', required: true, missingMessage: 'A node name must be supplied', - title: 'Enter a node name', - pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" /> + title: 'Enter a node name'" />
@@ -59,8 +57,7 @@ placeHolder: 'node address from group', required: true, missingMessage: 'Node host and port must be supplied', - title: 'Enter address', - pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" /> + title: 'Enter address'" />
@@ -80,8 +77,7 @@ placeHolder: 'host:port', required: true, missingMessage: 'Node host and port must be supplied', - title: 'Enter address', - pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" /> + title: 'Enter address'" />
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html index 0fedc22107..3d06d15d5c 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html @@ -28,8 +28,7 @@ placeHolder: 'group name', required: true, missingMessage: 'A group name must be supplied', - title: 'Enter a group name', - pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" /> + title: 'Enter a group name'" />
@@ -42,8 +41,7 @@ placeHolder: 'host:port', required: true, missingMessage: 'Node host and port must be supplied', - title: 'Enter address', - pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" /> + title: 'Enter address'" />
@@ -86,8 +84,7 @@ name: 'permittedNode', placeHolder: 'host:port', title: 'Enter address', - intermediateChanges: true, - pattern: '([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}'" /> + intermediateChanges: true" />
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html index 44b2a52536..c18ca34fdb 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html @@ -26,8 +26,7 @@ required: true, disabled: true, missingMessage: 'A group name must be supplied', - title: 'Enter group name', - pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" /> + title: 'Enter group name'" />
@@ -42,8 +41,7 @@ disabled: true, missingMessage: 'A Host and Port must be supplied', invalidMessage: 'Must be of the form host:port', - title: 'Enter Host and Port name', - pattern: '^([0-9a-zA-Z.-_]|::)+:[0-9]{1,5}$'" /> + title: 'Enter Host and Port name'" />
-- cgit v1.2.1