Merge branch 'GPII-3994'

* GPII-3994: GPII-3994: Improved model component validation lifecycle and removed IoC workarounds from error binder. GPII-3921: Further insulated error binder to avoid errors during the initial validation phase. GPII-3921: Converted direct options call to use IoC. Updated forward-facing version following 2.1.0 release.
fluid-project · Jun 28, 2019 · 16355e9 · 16355e9
2 parents d193a96 + 5d7b38c
commit 16355e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gpii-json-schema",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "Support validation of JSON within the Fluid and GPII ecosystems.",
     "main": "index.js",
     "scripts": {

diff --git a/src/js/client/errorBinder.js b/src/js/client/errorBinder.js
@@ -11,7 +11,6 @@
     https://github.com/the-t-in-rtf/gpii-json-schema/blob/master/docs/validator.md
 
  */
-/* globals fluid */
 (function () {
     "use strict";
     var gpii = fluid.registerNamespace("gpii");
@@ -38,7 +37,7 @@
         invokers: {
             renderErrors: {
                 funcName: "gpii.schema.client.errorAwareForm.renderErrors",
-                args:     ["{that}", "{renderer}"]
+                args:     ["{that}", "{renderer}"] // renderer
             }
         },
         modelListeners: {
@@ -77,7 +76,7 @@
                         var bindingPath = fluid.get(value, "path") || value;
                         fluid.each(that.model.validationResults.errors, function (error) {
                             if (gpii.schema.client.elPathsEqual(error.dataPath, bindingPath)) {
-                                that.renderer.before(fieldElement, that.options.templateKeys.inlineError, error); // element, key, context
+                                renderer.before(fieldElement, that.options.templateKeys.inlineError, error); // element, key, context
                             }
                         });
                     }

diff --git a/src/js/common/schemaValidatedModelComponent.js b/src/js/common/schemaValidatedModelComponent.js
@@ -74,7 +74,13 @@ var fluid  = fluid  || require("infusion");
         },
         modelListeners: {
             "*": {
-                excludeSource: "validation",
+                excludeSource: ["init", "validation"],
+                funcName: "gpii.schema.modelComponent.validateModel",
+                args: ["{gpii.schema.validator}", "{that}"] // globalValidator, validatedModelComponent
+            }
+        },
+        listeners: {
+            "onCreate.validate": {
                 funcName: "gpii.schema.modelComponent.validateModel",
                 args: ["{gpii.schema.validator}", "{that}"] // globalValidator, validatedModelComponent
             }