fix(forms): store models instead of controls within the collection of errors

Author: matsko

lib/directive/ng_control.dart

@@ -20,9 +20,9 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
   final NgAnimate _animate;
   dom.Element _element;
 
-  final Map<String, List<NgControl>> errors   = new Map<String, List<NgControl>>();
-  final List<NgControl> _controls             = new List<NgControl>();
-  final Map<String, List<NgControl>> _controlByName = new Map<String, List<NgControl>>();
+  final errors = new Map<String, Set<NgModel>>();
+  final _controls = new List<NgControl>();
+  final _controlByName = new Map<String, List<NgControl>>();
 
   NgControl(dom.Element this._element, Injector injector,
       NgAnimate this._animate)
@@ -172,30 +172,23 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
    * * [isValid] - Whether the given error is valid or not (false would mean the
    * error is real).
    */
-  updateControlValidity(NgControl control, String errorType, bool isValid) {
-    List queue = errors[errorType];
-
+  updateControlValidity(NgControl ngModel, String errorType, bool isValid) {
     if (isValid) {
-      if (queue != null) {
-        queue.remove(control);
-        if (queue.isEmpty) {
+      if (errors.containsKey(errorType)) {
+        Set errorsByName = errors[errorType];
+        errorsByName.remove(ngModel);
+        if (errorsByName.isEmpty) {
           errors.remove(errorType);
-          _parentControl.updateControlValidity(this, errorType, true);
         }
       }
       if (errors.isEmpty) {
         valid = true;
       }
     } else {
-      if (queue == null) {
-        queue = new List<NgControl>();
-        errors[errorType] = queue;
-        _parentControl.updateControlValidity(this, errorType, false);
-      } else if (queue.contains(control)) return;
-
-      queue.add(control);
+      errors.putIfAbsent(errorType, () => new Set()).add(ngModel);
       invalid = true;
     }
+    _parentControl.updateControlValidity(ngModel, errorType, valid);
   }
 }
 

test/directive/ng_form_spec.dart

@@ -152,6 +152,31 @@ void main() {
         expect(form.invalid).toBe(false);
       }));
 
+      it('should collect the invalid models upon failed validation', inject((Scope scope, TestBed _) {
+        var element = $('<form name="myForm">'
+                        '  <input type="text" ng-model="one" name="one" />' +
+                        '  <input type="text" ng-model="two" name="two" />' +
+                        '  <input type="text" ng-model="three" name="three" />' +
+                        '</form>');
+
+        _.compile(element);
+        scope.apply();
+
+        var form = scope.context['myForm'];
+        NgModel one = form['one'];
+        NgModel two = form['two'];
+        NgModel three = form['three'];
+
+        one.setValidity("email", false);
+        two.setValidity("number", true);
+        three.setValidity("format", false);
+
+        expect(form.errors.keys.length).toBe(2);
+        expect(form.errors['email'].elementAt(0)).toBe(one);
+        expect(form.errors['format'].elementAt(0)).toBe(three);
+      }));
+
+
       it('should not handle the control errorType pair more than once', inject((Scope scope, TestBed _) {
         var element = $('<form name="myForm">'
                         '  <input type="text" ng-model="one" name="one" />' +