QPID-6351: [Java Broker] Remove provider name from edit UI, remove button 'Add Preferences Provider' from Authentication provider tab and fix disabled preferences provider fields in Add Authentication provider dialog

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1655975 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 9 insertions, 30 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
index 161ce4f83c..8545d2da75 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
@@ -33,12 +33,11 @@ define(["dojo/_base/xhr",
         "dojo/dom-style",
         "dojox/html/entities",
         "dojo/dom",
-        "qpid/management/addPreferencesProvider",
         "qpid/management/PreferencesProvider",
         "qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager",
         "dojo/domReady!"],
        function (xhr, parser, query, connect, properties, updater, util, UpdatableStore, EnhancedGrid,
-           addAuthenticationProvider, event, registry, domStyle, entities, dom, addPreferencesProvider, PreferencesProvider, PrincipalDatabaseAuthenticationManager) {
+           addAuthenticationProvider, event, registry, domStyle, entities, dom, PreferencesProvider, PrincipalDatabaseAuthenticationManager) {
 
            function AuthenticationProvider(name, parent, controller) {
                this.name = name;
@@ -79,14 +78,6 @@ define(["dojo/_base/xhr",
                                                 that.deleteAuthenticationProvider();
                                             });
 
-                            var addPreferencesProviderButton = query(".addPreferencesProviderButton", contentPane.containerNode)[0];
-                            var addPreferencesProviderWidget = registry.byNode(addPreferencesProviderButton);
-                            connect.connect(addPreferencesProviderWidget, "onClick",
-                                            function(evt){
-                                                event.stop(evt);
-                                                that.addPreferencesProvider();
-                                            });
-
                             authProviderUpdater.update();
                             if (util.isProviderManagingUsers(authProviderUpdater.authProviderData.type))
                             {
@@ -136,14 +127,6 @@ define(["dojo/_base/xhr",
                }
            };
 
-           AuthenticationProvider.prototype.addPreferencesProvider = function() {
-             if (this.authProviderUpdater && this.authProviderUpdater.authProviderData
-                   && (!this.authProviderUpdater.authProviderData.preferencesproviders
-                       || !this.authProviderUpdater.authProviderData.preferencesproviders[0])){
-               addPreferencesProvider.show(this.name);
-             }
-           };
-
            function AuthProviderUpdater(node, authProviderObj, controller, authenticationProvider)
            {
                this.controller = controller;
@@ -154,7 +137,6 @@ define(["dojo/_base/xhr",
                this.preferencesProviderType=dom.byId("preferencesProviderType");
                this.preferencesProviderName=dom.byId("preferencesProviderName");
                this.preferencesProviderState=dom.byId("preferencesProviderState");
-               this.addPreferencesProviderButton = query(".addPreferencesProviderButton", node)[0];
                this.editPreferencesProviderButton = query(".editPreferencesProviderButton", node)[0];
                this.deletePreferencesProviderButton = query(".deletePreferencesProviderButton", node)[0];
                this.preferencesProviderAttributes = dom.byId("preferencesProviderAttributes")
@@ -169,7 +151,6 @@ this.authenticationProviderDetailsContainer = query(".authenticationProviderDeta
            {
              if (preferencesProviderData)
              {
-               this.addPreferencesProviderButton.style.display = 'none';
                if (!this.preferencesProvider)
                {
                  var preferencesProvider =new PreferencesProvider(preferencesProviderData.name, this.authProviderData);
@@ -184,7 +165,6 @@ this.authenticationProviderDetailsContainer = query(".authenticationProviderDeta
                {
                  this.preferencesProvider.update(null);
                }
-               this.addPreferencesProviderButton.style.display = 'inline';
              }
            };
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
index 35ccbf9cae..0d40669823 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
@@ -56,7 +56,6 @@ define(["dojo/_base/xhr",
                    that.containerNode = node;
                    that.parentObject = parentObject;
                    that.preferencesProviderType=query(".preferencesProviderType", node)[0];
-                   that.preferencesProviderName=query(".preferencesProviderName", node)[0];
                    that.preferencesProviderState=query(".preferencesProviderState", node)[0];
                    that.editPreferencesProviderButton = query(".editPreferencesProviderButton", node)[0];
                    that.deletePreferencesProviderButton = query(".deletePreferencesProviderButton", node)[0];
@@ -137,7 +136,6 @@ define(["dojo/_base/xhr",
                this.editPreferencesProviderButton.style.display = 'inline';
                this.deletePreferencesProviderButton.style.display = 'inline';
                this.preferencesProviderType.innerHTML = entities.encode(String(data.type));
-               this.preferencesProviderName.innerHTML = entities.encode(String(data.name));
                this.preferencesProviderState.innerHTML = entities.encode(String(data.state));
                if (!this.details)
                {
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
index e05fc7582d..1b38c257fb 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
@@ -60,6 +60,7 @@ define(["dojo/_base/xhr",
 
                 this.authenticationProviderName = registry.byId("addAuthenticationProvider.name");
                 this.authenticationProviderName.set("regExpGen", util.nameOrContextVarRegexp);
+                this.authenticationProviderName.on("change", function(newValue){that.preferencesProviderForm.preferencesProviderNameWidget.set("value",newValue);});
 
                 this.dialog = registry.byId("addAuthenticationProvider");
                 this.addButton = registry.byId("addAuthenticationProvider.addButton");
@@ -102,7 +103,7 @@ define(["dojo/_base/xhr",
                     this.initialData = actualData;
                     this.effectiveData = effectiveData;
                     this.authenticationProviderType.set("value", actualData.type);
-                    this.authenticationProviderName.set("value", actualData.name);
+
                     this.authenticationProviderType.set("disabled", true);
                     this.authenticationProviderName.set("disabled", true);
                     if (actualData.preferencesproviders && actualData.preferencesproviders[0])
@@ -113,6 +114,7 @@ define(["dojo/_base/xhr",
                     {
                         this.preferencesProviderForm.reset();
                     }
+                    this.authenticationProviderName.set("value", actualData.name);
                 }
                 else
                 {
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
index 5eaaa89242..96c336ff2c 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
@@ -193,6 +193,10 @@ function (util, metadata, xhr, declare, array, domConstruct, win, query, json, _
         {
             this.reset();
         }
+        else
+        {
+            this._toggleWidgets(this.preferencesProviderTypeWidget.value);
+        }
     },
   });
 });
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
index 979b3abe8d..b995d4e8dd 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
@@ -23,7 +23,7 @@
     <div class="formBox">
         <fieldset>
             <legend>Preferences Provider</legend>
-            <div class="clear">
+            <div class="clear hidden">
                 <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
                 <div class="formLabel-controlCell tableContainer-valueCell">
                     <input type="text"
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
index a669d7800d..992da02027 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
@@ -37,7 +37,6 @@
         <div class="clear dijitDialogPaneActionBar">
             <button data-dojo-type="dijit.form.Button" class="editAuthenticationProviderButton" type="button" data-dojo-props="disabled: true">Edit</button>
             <button data-dojo-type="dijit.form.Button" class="deleteAuthenticationProviderButton" type="button">Delete</button>
-            <button data-dojo-type="dijit.form.Button" class="addPreferencesProviderButton">Add Preferences Provider</button>
         </div>
     </div>
     <br/>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
index 5d14aace76..49eb355ff3 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
@@ -25,10 +25,6 @@
         <div class="preferencesProviderType"></div>
      </div>
      <div class="clear">
-        <div class="formLabel-labelCell">Name:</div>
-        <div class="preferencesProviderName"></div>
-     </div>
-     <div class="clear">
         <div class="formLabel-labelCell">State:</div>
         <div class="preferencesProviderState"></div>
      </div>