Updated tests and fixed a bug with checkboxes

Author: davidlgj

dist/bootstrap-decorator.min.js

@@ -1,12 +1,12 @@
 <div class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}" ng-init="checkboxValues = {}">
   <label ng-show="showTitle()">{{form.title}}</label>
-  <div class="checkbox" ng-repeat="(value,name) in form.titleMap" >
+  <div class="checkbox" ng-repeat="value in form.schema.items.enum" >
     <label>
       <input type="checkbox"
              sf-changed="form"
              ng-model="checkboxValues[value]"
              ng-change="$$value$$ = checkboxValuesToList(checkboxValues)" >
-      <span ng-bind-html="form.name"></span>
+      <span ng-bind-html="form.titleMap[value] || value"></span>
     </label>
 
   </div>

dist/schema-form.min.js

@@ -74,7 +74,6 @@ function($compile,  schemaForm,  schemaFormDecorators, sfSelect){
           //FIXME: traverse schema and model and set default values.
 
           var merged = schemaForm.merge(schema,form,ignore);
-          console.log('merged',merged)
           var frag = document.createDocumentFragment();
 
           //make the form available to decorators

src/directives/decorators/bootstrap/checkboxes.html

@@ -246,11 +246,9 @@ angular.module('schemaForm').provider('schemaForm',[function(){
     var service = {};
 
     service.merge = function(schema,form,ignore) {
-      console.log('to merge',schema,form,ignore);
       form  = form || ["*"];
 
       var stdForm = service.defaults(schema,ignore);
-      console.log('standardform',stdForm);
 
       //simple case, we have a "*", just put the stdForm there
       var idx = form.indexOf("*");

src/directives/schema-form.js

@@ -628,11 +628,7 @@ describe('Schema form',function(){
                 "type": "string",
                 "enum": ["foo","bar"]
               }
-            },
-            "foobars": {
-              "type": "array"
-            }
-          }
+            }          }
         };
 
         scope.form = [
@@ -648,7 +644,6 @@ describe('Schema form',function(){
         //TODO: more asserts
         tmpl.children().length.should.be.equal(2);
         tmpl.children().eq(0).find('input[type=checkbox]').length.should.be.eq(2);
-        tmpl.children().eq(1).find('input[type=checkbox]').length.should.be.eq(2);
       });
     });
 
@@ -1013,6 +1008,159 @@ describe('Schema form',function(){
     });
 
 
+    it('should render a list of subforms when schema type is array',function(){
+
+      inject(function($compile,$rootScope){
+        var scope = $rootScope.$new();
+        scope.person = {};
+
+        scope.schema = {
+          "type": "object",
+          "properties": {
+            "names": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "title": "Name"
+              }
+            },
+            "subforms": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "title": "subform",
+                "properties": {
+                  "one": { "type": "string" },
+                  "two": { "type": "number", "title": "Two" }
+                }
+              }
+            },
+            "subsubforms": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "title": "subform",
+                "properties": {
+                  "one": { "type": "string" },
+                  "list": {
+                    "type": "array",
+                    "items": {
+                      "type": "number",
+                      "title": "sublist numbers"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        };
+
+        scope.form = [
+          "names",
+          {
+            key: "subforms",
+            type: "array",
+            items: [
+              "subforms[].one"
+            ]
+          },
+          "subsubforms"
+        ];
+
+        var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="person"></form>');
+
+        $compile(tmpl)(scope);
+        $rootScope.$apply();
+
+        //TODO: more asserts
+        tmpl.children().length.should.be.equal(3);
+        tmpl.children().eq(0).find('input').length.should.be.eq(1);
+        tmpl.children().eq(0).find('button').length.should.be.eq(2);
+        tmpl.children().eq(0).find('button').eq(1).text().trim().should.be.eq('Add');
+
+        tmpl.children().eq(1).find('input').length.should.be.eq(1);
+        tmpl.children().eq(1).find('fieldset').length.should.be.eq(0);
+        tmpl.children().eq(1).find('button').length.should.be.eq(2);
+        tmpl.children().eq(1).find('button').eq(1).text().trim().should.be.eq('Add');
+
+        tmpl.children().eq(2).find('input').length.should.be.eq(2);
+        tmpl.children().eq(2).find('fieldset').length.should.be.eq(1);
+        tmpl.children().eq(2).find('button').length.should.be.eq(4);
+        tmpl.children().eq(2).find('button').eq(3).text().trim().should.be.eq('Add');
+
+
+      });
+    });
+
+    it('should render a tabarray of subforms when asked',function(){
+
+      inject(function($compile,$rootScope){
+        var scope = $rootScope.$new();
+        scope.person = {
+          names: ['me','you','another']
+        };
+
+        scope.schema = {
+          "type": "object",
+          "properties": {
+            "names": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "title": "Name"
+              }
+            },
+            "subforms": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "title": "subform",
+                "properties": {
+                  "one": { "type": "string" },
+                  "two": { "type": "number", "title": "Two" }
+                }
+              }
+            }
+          }
+        };
+
+        scope.form = [
+          { key: "names", type: "tabarray" },
+          {
+            key: "subforms",
+            type: "tabarray",
+            tabType: "right",
+            items: [
+              "subforms[].one"
+            ]
+          }
+        ];
+
+        var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="person"></form>');
+
+        $compile(tmpl)(scope);
+        $rootScope.$apply();
+
+        //TODO: more asserts
+        tmpl.children().length.should.be.equal(2);
+        tmpl.children().eq(0).find('input').length.should.be.eq(3);
+        tmpl.children().eq(0).find('button').length.should.be.eq(3);
+        tmpl.children().eq(0).find('button').eq(0).text().trim().should.be.eq('Remove');
+        tmpl.children().eq(0).is('div').should.be.true;
+        tmpl.children().eq(0).attr('sf-array').should.be.thruthy;
+        tmpl.children().eq(0).find('.tabs-left').length.should.be.eq(1);
+
+        tmpl.children().eq(1).find('input').length.should.be.eq(1);
+        tmpl.children().eq(1).find('fieldset').length.should.be.eq(0);
+        tmpl.children().eq(1).find('button').length.should.be.eq(1);
+        tmpl.children().eq(1).find('button').text().trim().should.be.eq('Remove');
+        tmpl.children().eq(1).attr('sf-array').should.be.thruthy;
+        tmpl.children().eq(1).find('.tabs-left').length.should.be.eq(0);
+        tmpl.children().eq(1).find('.tabs-right').length.should.be.eq(1);
+
+      });
+    });
+
 
   });