Schema now merges properly with form in fieldsets

Author: davidlgj

karma.conf.js

@@ -15,8 +15,8 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'http://code.jquery.com/jquery-2.1.0.min.js',
-      'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.14/angular.min.js',
-      'http://code.angularjs.org/1.2.14/angular-mocks.js',
+      'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js',
+      'https://code.angularjs.org/1.2.16/angular-mocks.js',
       'bower_components/tv4/tv4.js',
       'src/module.js',
       'src/services/*.js',
@@ -81,7 +81,7 @@ module.exports = function(config) {
     // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
     // - PhantomJS
     // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
-    browsers: ['PhantomJS'],
+    browsers: [],
 
 
     // If browser does not capture in given timeout [ms], kill it

src/directives/decorators/bootstrap/fieldset.html

@@ -1,4 +1,4 @@
 <fieldset ng-disabled="form.readonly">
   <legend ng-show="form.title">{{ form.title }}</legend>
-  <bootstrap-decorator ng-repeat="item in form.items" form="item"></bootstrap-decorator>
+  <sf-decorator ng-repeat="item in form.items" form="item"></sf-decorator>
 </fieldset>

src/services/schema-form.js

@@ -5,7 +5,7 @@
  */
 angular.module('schemaForm').factory('schemaForm',[function(){
   var service = {};
-  
+
   service.merge = function(schema,form,ignore) {
     form  = form || ["*"];
 
@@ -24,12 +24,18 @@ angular.module('schemaForm').factory('schemaForm',[function(){
     //We look at the supplied form and extend it with schema standards
     var lookup = stdForm.lookup;
     return form.map(function(obj){
-        
+
       //handle the shortcut with just a name
       if (typeof obj === 'string') {
         obj = { key: obj };
       }
 
+      //if it's a type with items, merge 'em!
+      if (obj.items) {
+        obj.items = service.merge(schema,obj.items,ignore);
+      }
+
+
       //extend with std form from schema.
       if (obj.key && lookup[obj.key]) {
         return angular.extend(lookup[obj.key],obj);
@@ -133,6 +139,7 @@ angular.module('schemaForm').factory('schemaForm',[function(){
       var f   = stdFormObj(schema,options);
       f.type  = 'fieldset';
       f.items = [];
+      options.lookup[options.path] = f;
 
       //recurse down into properties
       angular.forEach(schema.properties,function(v,k){

test/schema-form-test.js

@@ -468,6 +468,65 @@ describe('Schema form',function(){
       });
     });
 
+    it('should handle schema form defaults in deep structure',function(){
+
+      inject(function($compile,$rootScope){
+        var scope = $rootScope.$new();
+        scope.person = {
+          name: 'Foobar'
+        };
+
+        scope.schema = {
+          "type": "object",
+          "properties": {
+            "props" : {
+              "type": "object",
+              "title": "Person",
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "title": "Name"
+                },
+                "nick": {
+                  "type": "string",
+                  "title": "Nick"
+                },
+                "alias": {
+                  "type": "string",
+                  "title": "Alias"
+                }
+              }
+            }
+          }
+        };
+
+        //The form defines a fieldset for person, and changes the order of fields
+        //but titles should come from the schema
+        scope.form = [{
+          type: 'fieldset',
+          key:  'props',
+          items: [
+            'props.nick',
+            'props.name',
+            'props.alias'
+          ]
+        }];
+
+        var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="person"></form>');
+
+        $compile(tmpl)(scope);
+        $rootScope.$apply();
+
+        tmpl.children().length.should.be.eq(1);
+        var labels = tmpl.children().children().find('label');
+        labels.eq(0).text().should.equal('Nick');
+        labels.eq(1).text().should.equal('Name');
+        labels.eq(2).text().should.equal('Alias');
+
+      });
+    });
+
+
     it('should skip title if form says "notitle"',function(){
 
       inject(function($compile,$rootScope){