Also remove empty values when creating a fabric

hawtio · Dec 3, 2013 · 827904b · 827904b
1 parent a4db410
commit 827904b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/js/createContainer.ts b/hawtio-web/src/main/webapp/app/fabric/js/createContainer.ts
@@ -303,11 +303,7 @@ module Fabric {
       }
 
       // remove possibly dodgy values if they are blank
-      angular.forEach(json, (value, key) => {
-        if (value === "") {
-          delete json[key];
-        }
-      });
+      json = Fabric.sanitizeJson(json);
       delete json.saveJmxCredentials;
 
       if ( json.number === 1 ) {

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/createFabric.ts b/hawtio-web/src/main/webapp/app/fabric/js/createFabric.ts
@@ -36,6 +36,8 @@ module Fabric {
 
     $scope.onSubmit = (json, form) => {
 
+      json = Fabric.sanitizeJson(json);
+
       setTimeout(() => {
 
         jolokia.execute(Fabric.clusterBootstrapManagerMBean, 'createCluster(java.util.Map)', angular.toJson(json), {

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricHelpers.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricHelpers.ts
@@ -978,4 +978,21 @@ module Fabric {
     return fn ? answer : onResults(answer);
   }
 
+  /**
+   * Removes any attributes from the object that are set to an empty string.
+   *
+   * @method sanitizeJson
+   * @for Fabric
+   * @param {Object} json
+   * @return {Object}
+   */
+  export function sanitizeJson(json:Object) {
+    angular.forEach(json, (value, key) => {
+      if (value === "") {
+        delete json[key];
+      }
+    });
+    return json;
+  }
+
 }