Added support for key/value typed constraints #177

Author: chrisala

grails-app/assets/javascripts/forms.js

@@ -667,10 +667,10 @@ function orEmptyArray(v) {
 
     };
 
-    function applyIncludeExclude(metadata, outputModel, observable, initialConstraints) {
+    function applyIncludeExclude(metadata, outputModel, dataModelItem, initialConstraints) {
         var path = metadata.constraints.excludePath || metadata.constraints.includePath;
 
-        var currentValue = observable();
+        var currentValue = dataModelItem();
         var selectedSoFar = [];
         outputModel.eachValueForPath(path, function (val) {
             if (_.isArray(val)) {
@@ -681,11 +681,17 @@ function orEmptyArray(v) {
         });
 
         if (metadata.constraints.excludePath) {
-            return _.filter(initialConstraints, function (value) {
+            var filteredConstraints = _.filter(initialConstraints, function (value) {
+                // Handle object valued constraints - however the functions are attached after the first call to
+                // the computed observable, so we need to guard against that.
+                value = _.isFunction(dataModelItem.constraints.value) ? dataModelItem.constraints.value(value) : value;
                 var isCurrentSelection = _.isArray(currentValue) ? currentValue.indexOf(value) >= 0 : value == currentValue;
                 return (isCurrentSelection || selectedSoFar.indexOf(value) < 0);
             });
+            return filteredConstraints;
         } else {
+            // Note that the "includePath" option does not support object (key/value) typed constraints as
+            // it needs to collect values from other form selections which won't be object typed.
             var constraints = initialConstraints.concat(selectedSoFar);
             var currentSelection = _.isArray(currentValue) ? currentValue : [currentValue];
             for (var i = 0; i < currentSelection.length; i++) {

grails-app/controllers/au/org/ala/ecodata/forms/PreviewController.groovy

@@ -8,6 +8,8 @@ import org.grails.io.support.Resource
 
 class PreviewController {
 
+    static responseFormats = ['json', 'xml']
+
     private static String EXAMPLE_MODEL = 'example.json'
     private static String EXAMPLE_MODELS_PATH = '/example_models/'
     private static String EXAMPLE_DATA_PATH = '/example_data/'

src/test/js/spec/DataModelItemSpec.js

@@ -199,5 +199,11 @@ describe("DataModelItem Spec", function () {
         vals = [['1', '2'], ['3']];
         dataItem = ko.observableArray().extend({metadata:{metadata:metadata, context:customContext, config:config}});
         expect(dataItem.constraints()).toEqual(['1', '2', '3']);
+
+        vals = ['v1'];
+        metadata.constraints.default = [{text:'t1', value:'v1'}, {text:'t2', value:'v2'}];
+        dataItem = ko.observableArray().extend({metadata:{metadata:metadata, context:customContext, config:config}});
+        expect(dataItem.constraints()).toEqual(['v2']);
+
     });
 });