empty lists are invalid comparators (#5160)

apache · Jun 7, 2018 · 5b35f75 · 5b35f75
1 parent 57e1256
commit 5b35f75
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/superset/assets/spec/javascripts/explore/AdhocFilter_spec.js b/superset/assets/spec/javascripts/explore/AdhocFilter_spec.js
@@ -112,6 +112,26 @@ describe('AdhocFilter', () => {
     });
     // eslint-disable-next-line no-unused-expressions
     expect(adhocFilter3.isValid()).to.be.false;
+
+    const adhocFilter4 = new AdhocFilter({
+      expressionType: EXPRESSION_TYPES.SIMPLE,
+      subject: 'value',
+      operator: 'in',
+      comparator: [],
+      clause: CLAUSES.WHERE,
+    });
+    // eslint-disable-next-line no-unused-expressions
+    expect(adhocFilter4.isValid()).to.be.false;
+
+    const adhocFilter5 = new AdhocFilter({
+      expressionType: EXPRESSION_TYPES.SIMPLE,
+      subject: 'value',
+      operator: 'in',
+      comparator: ['val1'],
+      clause: CLAUSES.WHERE,
+    });
+    // eslint-disable-next-line no-unused-expressions
+    expect(adhocFilter5.isValid()).to.be.true;
   });
 
   it('can translate from simple expressions to sql expressions', () => {

diff --git a/superset/assets/src/explore/AdhocFilter.js b/superset/assets/src/explore/AdhocFilter.js
@@ -83,7 +83,13 @@ export default class AdhocFilter {
 
   isValid() {
     if (this.expressionType === EXPRESSION_TYPES.SIMPLE) {
-      return !!(this.operator && this.subject && this.comparator && this.clause);
+      return !!(
+        this.operator &&
+        this.subject &&
+        this.comparator &&
+        this.comparator.length > 0 &&
+        this.clause
+      );
     } else if (this.expressionType === EXPRESSION_TYPES.SQL) {
       return !!(this.sqlExpression && this.clause);
     }