support smart completion of root containers (and use nested "input-at…

…tributes" map to easily configure any <input> control), and default the root container if there's only 1
hawtio · Oct 1, 2013 · efabf95 · efabf95
1 parent 3e7922c
commit efabf95
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 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
@@ -87,6 +87,14 @@ module Fabric {
         });
 
         Forms.defaultValues($scope.entity, $scope.schema);
+
+        if ($scope.selectedProvider.id === 'child' && !$scope.entity["parent"]) {
+          // lets default a parent container if we have a single root container
+          var rootContainers = $scope.rootContainers();
+          if (rootContainers && rootContainers.length === 1) {
+            $scope.entity["parent"] = rootContainers[0];
+          }
+        }
       }
     }, true);
 
@@ -133,6 +141,10 @@ module Fabric {
     });
 
 
+    $scope.rootContainers = () => {
+      return Fabric.getRootContainers(jolokia);
+    };
+
     $scope.init = () => {
 
       var tab = $location.search()['tab'];

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/helpers.ts b/hawtio-web/src/main/webapp/app/fabric/js/helpers.ts
@@ -455,6 +455,13 @@ module Fabric {
   }
 
 
+  export function getRootContainers(jolokia) {
+    var fields = ["id", "root"];
+    var answer = jolokia.execute(Fabric.managerMBean, "containers(java.util.List)", fields, { method: 'POST' });
+    return answer.filter({root: true}).map(v => v["id"]);
+  }
+
+
   export function filterProfiles(jolokia, versionId, profileIds) {
     var profiles = jolokia.execute(Fabric.managerMBean, "getProfiles(java.lang.String, java.util.List)", versionId, ['id', 'hidden', 'abstract'], { method: 'POST' });
 

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/schemaConfigure.ts b/hawtio-web/src/main/webapp/app/fabric/js/schemaConfigure.ts
@@ -39,6 +39,11 @@ module Fabric {
           'type': 'boolean'
         };
 
+        Core.pathSet(schema.properties, ['parent', 'label'], 'Parent Container');
+        Core.pathSet(schema.properties, ['parent', 'tooltip'], 'The name of the parent container used to create the child container');
+        Core.pathSet(schema.properties, ['parent', 'input-attributes', 'typeahead'], "title for title in rootContainers() | filter:$viewValue");
+        Core.pathSet(schema.properties, ['parent', 'input-attributes', 'typeahead-editable'], "false");
+
         bulkSet(schema, ["jmxUser", "jmxPassword", "parent"], 'required', true);
         schema['tabs'] = {
           'Default': ['name', 'parent', 'jmxUser', 'jmxPassword', 'saveJmxCredentials', 'number', '*']

diff --git a/hawtio-web/src/main/webapp/app/forms/js/mappingRegistry.ts b/hawtio-web/src/main/webapp/app/forms/js/mappingRegistry.ts
@@ -10,6 +10,15 @@ module Forms {
     var group = null;
 
     function copyAttributes() {
+      var propertyAttributes = property["input-attributes"];
+      if (propertyAttributes) {
+        angular.forEach(propertyAttributes, function (value, key) {
+          if (angular.isString(value)) {
+            var html = Core.escapeHtml(value);
+            input.attr(key, html);
+          }
+        });
+      }
       angular.forEach(property, function (value, key) {
         if (angular.isString(value) && key.indexOf("$") < 0 && key !== "type") {
           var html = Core.escapeHtml(value);