Fix mistic100#405 add allow_empty_value filter property

Author: mistic100

examples/index.html

@@ -180,6 +180,7 @@ <h3>Output</h3>
     type: 'string',
     optgroup: 'core',
     default_value: 'Mistic',
+    allow_empty_value: true,
     size: 30,
     unique: true
   },

src/data.js

@@ -41,15 +41,19 @@ QueryBuilder.prototype.validateValueInternal = function(rule, value) {
     for (var i = 0; i < operator.nb_inputs; i++) {
         switch (filter.input) {
             case 'radio':
-                if (value[i] === undefined) {
-                    result = ['radio_empty'];
+                if (value[i] === undefined || value[i].length === 0) {
+                    if (!filter.allow_empty_value) {
+                        result = ['radio_empty'];
+                    }
                     break;
                 }
                 break;
 
             case 'checkbox':
                 if (value[i] === undefined || value[i].length === 0) {
-                    result = ['checkbox_empty'];
+                    if (!filter.allow_empty_value) {
+                        result = ['checkbox_empty'];
+                    }
                     break;
                 }
                 else if (!operator.multiple && value[i].length > 1) {
@@ -59,29 +63,25 @@ QueryBuilder.prototype.validateValueInternal = function(rule, value) {
                 break;
 
             case 'select':
-                if (filter.multiple) {
-                    if (value[i] === undefined || value[i].length === 0 || (filter.placeholder && value[i] == filter.placeholder_value)) {
+                if (value[i] === undefined || value[i].length === 0 || (filter.placeholder && value[i] == filter.placeholder_value)) {
+                    if (!filter.allow_empty_value) {
                         result = ['select_empty'];
-                        break;
-                    }
-                    else if (!operator.multiple && value[i].length > 1) {
-                        result = ['operator_not_multiple', operator.type];
-                        break;
                     }
+                    break;
                 }
-                else {
-                    if (value[i] === undefined || (filter.placeholder && value[i] == filter.placeholder_value)) {
-                        result = ['select_empty'];
-                        break;
-                    }
+                if (filter.multiple && !operator.multiple && value[i].length > 1) {
+                    result = ['operator_not_multiple', operator.type];
+                    break;
                 }
                 break;
 
             default:
                 switch (QueryBuilder.types[filter.type]) {
                     case 'string':
                         if (value[i] === undefined || value[i].length === 0) {
-                            result = ['string_empty'];
+                            if (!filter.allow_empty_value) {
+                                result = ['string_empty'];
+                            }
                             break;
                         }
                         if (validation.min !== undefined) {
@@ -108,7 +108,13 @@ QueryBuilder.prototype.validateValueInternal = function(rule, value) {
                         break;
 
                     case 'number':
-                        if (value[i] === undefined || isNaN(value[i])) {
+                        if (value[i] === undefined || value[i].length === 0) {
+                            if (!filter.allow_empty_value) {
+                                result = ['number_nan'];
+                            }
+                            break;
+                        }
+                        if (isNaN(value[i])) {
                             result = ['number_nan'];
                             break;
                         }
@@ -147,7 +153,9 @@ QueryBuilder.prototype.validateValueInternal = function(rule, value) {
 
                     case 'datetime':
                         if (value[i] === undefined || value[i].length === 0) {
-                            result = ['datetime_empty'];
+                            if (!filter.allow_empty_value) {
+                                result = ['datetime_empty'];
+                            }
                             break;
                         }
 
@@ -180,7 +188,13 @@ QueryBuilder.prototype.validateValueInternal = function(rule, value) {
                         break;
 
                     case 'boolean':
-                        tmp = value[i].trim().toLowerCase();
+                        if (value[i] === undefined || value[i].length === 0) {
+                            if (!filter.allow_empty_value) {
+                                result = ['boolean_not_valid'];
+                            }
+                            break;
+                        }
+                        tmp = ('' + value[i]).trim().toLowerCase();
                         if (tmp !== 'true' && tmp !== 'false' && tmp !== '1' && tmp !== '0' && value[i] !== 1 && value[i] !== 0) {
                             result = ['boolean_not_valid'];
                             break;

src/public.js

@@ -249,10 +249,8 @@ QueryBuilder.prototype.setRules = function(data, options) {
             data.condition = self.settings.default_condition;
         }
         else if (self.settings.conditions.indexOf(data.condition) == -1) {
-            if (options.allow_invalid) {
-                data.condition = self.settings.default_condition;
-            }
             Utils.error(!options.allow_invalid, 'UndefinedCondition', 'Invalid condition "{0}"', data.condition);
+            data.condition = self.settings.default_condition;
         }
 
         group.condition = data.condition;
@@ -262,10 +260,8 @@ QueryBuilder.prototype.setRules = function(data, options) {
 
             if (item.rules !== undefined) {
                 if (self.settings.allow_groups !== -1 && self.settings.allow_groups < group.level) {
-                    if (!options.allow_invalid) {
-                        self.reset();
-                    }
                     Utils.error(!options.allow_invalid, 'RulesParse', 'No more than {0} groups are allowed', self.settings.allow_groups);
+                    self.reset();
                 }
                 else {
                     model = self.addGroup(group, false, item.data, self.parseGroupFlags(item));
@@ -279,10 +275,8 @@ QueryBuilder.prototype.setRules = function(data, options) {
             else {
                 if (!item.empty) {
                     if (item.id === undefined) {
-                        if (options.allow_invalid) {
-                            item.empty = true;
-                        }
                         Utils.error(!options.allow_invalid, 'RulesParse', 'Missing rule field id');
+                        item.empty = true;
                     }
                     if (item.operator === undefined) {
                         item.operator = 'equal';

tests/data.module.js

@@ -155,11 +155,6 @@ $(function(){
             /number_not_integer/
         );
 
-        assert.validationError($b,
-            { id: 'double', value: 'abc' },
-            /number_not_double/
-        );
-
         assert.validationError($b,
             { id: 'integer', value: -15 },
             /number_exceed_min/
@@ -431,6 +426,27 @@ $(function(){
         );
     });
 
+    /**
+     * Test allow_empty_value option
+     */
+    QUnit.test('allow empty value', function(assert) {
+        var filters = $.extend(true, [], basic_filters);
+        filters.forEach(function(filter) {
+           filter.allow_empty_value = true;
+        });
+
+        $b.queryBuilder({
+            filters: filters,
+            rules: empty_rules
+        });
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            empty_rules,
+            'Should allow empty value for all filters'
+        );
+    });
+
 
     var validation_filters = [{
         id: 'radio',
@@ -502,4 +518,25 @@ $(function(){
             }
         }
     }];
+
+    var empty_rules = {
+        condition: 'AND',
+        rules: [{
+            id: 'name',
+            operator: 'equal',
+            value: ''
+        }, {
+            id: 'category',
+            operator: 'equal',
+            value: []
+        }, {
+            id: 'in_stock',
+            operator: 'equal',
+            value: undefined
+        }, {
+            id: 'price',
+            operator: 'equal',
+            value: ''
+        }]
+    };
 });