From bfa40bd360021874628477ee3eb2272033cd2d54 Mon Sep 17 00:00:00 2001
From: yamdraco <yamdraco@yahoo.com>
Date: Tue, 23 May 2017 12:15:10 +0800
Subject: [PATCH] [hotfix] 'filter box from and to date filter #2649' (#2785)

---
 superset/assets/javascripts/dashboard/Dashboard.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/superset/assets/javascripts/dashboard/Dashboard.jsx b/superset/assets/javascripts/dashboard/Dashboard.jsx
index d451bbb4a96ac..3abde441c16ad 100644
--- a/superset/assets/javascripts/dashboard/Dashboard.jsx
+++ b/superset/assets/javascripts/dashboard/Dashboard.jsx
@@ -196,8 +196,13 @@ export function dashboardContainer(dashboard, datasources, userid) {
       }
       if (!(col in this.filters[sliceId]) || !merge) {
         this.filters[sliceId][col] = vals;
-      } else {
+
+        // d3.merge pass in array of arrays while some value form filter components
+        // from and to filter box require string to be process and return
+      } else if (this.filters[sliceId][col] instanceof Array) {
         this.filters[sliceId][col] = d3.merge([this.filters[sliceId][col], vals]);
+      } else {
+        this.filters[sliceId][col] = d3.merge([[this.filters[sliceId][col]], vals])[0] || '';
       }
       if (refresh) {
         this.refreshExcept(sliceId);