DataGrid - Hides the 'between' operation for a lookup column (T889066)

js/ui/filter_builder/utils.js

@@ -30,6 +30,7 @@ const DEFAULT_FORMAT = {
     'datetime': 'shortDateShortTime'
 };
 const LOOKUP_OPERATIONS = ['=', '<>', 'isblank', 'isnotblank'];
+const FORBIDDEN_LOOKUP_OPERATIONS = ['between'];
 const AVAILABLE_FIELD_PROPERTIES = [
     'caption',
     'customizeText',
@@ -196,7 +197,9 @@ function getAvailableOperations(field, filterOperationDescriptions, customOperat
     const filterOperations = getFilterOperations(field);
 
     customOperations.forEach(function(customOperation) {
-        if(!field.filterOperations && filterOperations.indexOf(customOperation.name) === -1) {
+        const isLookupField = !!field.lookup;
+        const isOperationForbidden = isLookupField ? FORBIDDEN_LOOKUP_OPERATIONS.indexOf(customOperation.name) >= 0 : false;
+        if(!field.filterOperations && !isOperationForbidden && filterOperations.indexOf(customOperation.name) === -1) {
             const dataTypes = customOperation && customOperation.dataTypes;
             if(dataTypes && dataTypes.indexOf(field.dataType || DEFAULT_DATA_TYPE) >= 0) {
                 filterOperations.push(customOperation.name);

testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js

@@ -23,18 +23,19 @@ const groupOperations = [{
     value: '!or'
 }];
 const filterOperationsDescriptions = {
+    between: 'Is between',
+    contains: 'Contains',
+    endsWith: 'Ends with',
     equal: 'Equals',
-    notEqual: 'Does not equal',
-    lessThan: 'Is less than',
-    lessThanOrEqual: 'Is less than or equal to',
     greaterThan: 'Is greater than',
     greaterThanOrEqual: 'Is greater than or equal to',
-    startsWith: 'Starts with',
-    contains: 'Contains',
-    notContains: 'Does not contain',
-    endsWith: 'Ends with',
     isBlank: 'Is blank',
-    isNotBlank: 'Is not blank'
+    isNotBlank: 'Is not blank',
+    lessThan: 'Is less than',
+    lessThanOrEqual: 'Is less than or equal to',
+    notContains: 'Does not contain',
+    notEqual: 'Does not equal',
+    startsWith: 'Starts with'
 };
 
 QUnit.module('Errors', function() {
@@ -1121,6 +1122,32 @@ QUnit.module('getAvailableOperations', {
         // assert
         assert.strictEqual(operations[0].text, 'Last Days');
     });
+
+    // T889066
+    QUnit.test('the \'between\' operation should not be listed for a lookup field (dataType === number)', function(assert) {
+        // arrange, act
+        const customOperations = [
+            {
+                name: 'between',
+                dataTypes: ['number']
+            },
+            {
+                name: 'anyof',
+                dataTypes: ['number']
+            }
+        ];
+        const field = {
+            dataField: 'test',
+            dataType: 'number',
+            lookup: {}
+        };
+
+        const operations = utils.getAvailableOperations(field, filterOperationsDescriptions, customOperations);
+        const betweenOperation = operations.filter(operation => operation.value === 'between');
+
+        // assert
+        assert.equal(betweenOperation.length, 0, 'the \'between\' operation should not be found');
+    });
 });
 
 QUnit.module('Custom filter expressions', {