From d34217ef9714452160bfb7e311e8fc21909ca7c3 Mon Sep 17 00:00:00 2001
From: michellethomas <michelle.q.thomas@gmail.com>
Date: Thu, 1 Nov 2018 09:43:04 -0700
Subject: [PATCH] Dashboard filter box default (#6236)

* Setting default FilterBox date filter to No Filter

* Adding test for FilterBox
---
 .../explore/visualizations/filter_box.js      | 25 +++++++++++++++++++
 .../explore/visualizations/index.test.js      |  2 ++
 .../visualizations/FilterBox/FilterBox.jsx    |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 superset/assets/cypress/integration/explore/visualizations/filter_box.js

diff --git a/superset/assets/cypress/integration/explore/visualizations/filter_box.js b/superset/assets/cypress/integration/explore/visualizations/filter_box.js
new file mode 100644
index 0000000000..4bba77a90d
--- /dev/null
+++ b/superset/assets/cypress/integration/explore/visualizations/filter_box.js
@@ -0,0 +1,25 @@
+import { FORM_DATA_DEFAULTS } from './shared.helper';
+
+export default () => describe('FilterBox', () => {
+  const VIZ_DEFAULTS = { ...FORM_DATA_DEFAULTS, viz_type: 'filter_box' };
+
+  function verify(formData) {
+    cy.visitChartByParams(JSON.stringify(formData));
+    cy.verifySliceSuccess({ waitAlias: '@getJson' });
+  }
+
+  beforeEach(() => {
+    cy.server();
+    cy.login();
+    cy.route('POST', '/superset/explore_json/**').as('getJson');
+  });
+
+  it('should work with default date filter', () => {
+    verify(VIZ_DEFAULTS);
+    // Filter box should default to having a date filter with no filter selected
+    cy.get('div.filter_box').within(() => {
+      cy.get('span').contains('No filter');
+    });
+  });
+
+});
diff --git a/superset/assets/cypress/integration/explore/visualizations/index.test.js b/superset/assets/cypress/integration/explore/visualizations/index.test.js
index 2f28083209..7e140b1346 100644
--- a/superset/assets/cypress/integration/explore/visualizations/index.test.js
+++ b/superset/assets/cypress/integration/explore/visualizations/index.test.js
@@ -5,6 +5,7 @@ import BubbleTest from './bubble';
 import CompareTest from './compare';
 import DistBarTest from './dist_bar';
 import DualLineTest from './dual_line';
+import FilterBox from './filter_box';
 import HistogramTest from './histogram';
 import LineTest from './line';
 import PieTest from './pie';
@@ -23,6 +24,7 @@ describe('All Visualizations', () => {
   CompareTest();
   DistBarTest();
   DualLineTest();
+  FilterBox();
   HistogramTest();
   LineTest();
   PieTest();
diff --git a/superset/assets/src/visualizations/FilterBox/FilterBox.jsx b/superset/assets/src/visualizations/FilterBox/FilterBox.jsx
index aa4071e644..f5a63f2802 100644
--- a/superset/assets/src/visualizations/FilterBox/FilterBox.jsx
+++ b/superset/assets/src/visualizations/FilterBox/FilterBox.jsx
@@ -123,7 +123,7 @@ class FilterBox extends React.Component {
               label={t('Time range')}
               description={t('Select start and end date')}
               onChange={(...args) => { this.changeFilter(TIME_RANGE, ...args); }}
-              value={this.state.selectedValues[TIME_RANGE]}
+              value={this.state.selectedValues[TIME_RANGE] || 'No filter'}
             />
           </div>
         </div>