Return-Path: <commits-return-183-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 75855200D0F
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 14 Sep 2017 18:44:08 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 738751609C6; Thu, 14 Sep 2017 16:44:08 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id C379E1609CD
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 14 Sep 2017 18:44:07 +0200 (CEST)
Received: (qmail 3423 invoked by uid 500); 14 Sep 2017 16:44:06 -0000
Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@superset.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@superset.incubator.apache.org>
List-Post: <mailto:commits@superset.incubator.apache.org>
List-Id: <commits.superset.incubator.apache.org>
Reply-To: dev@superset.incubator.apache.org
Delivered-To: mailing list commits@superset.incubator.apache.org
Received: (qmail 3414 invoked by uid 99); 14 Sep 2017 16:44:06 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Sep 2017 16:44:06 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id 234D884D16; Thu, 14 Sep 2017 16:44:06 +0000 (UTC)
Date: Thu, 14 Sep 2017 16:44:06 +0000
To: "commits@superset.apache.org" <commits@superset.apache.org>
Subject: [incubator-superset] branch master updated: Fixed dashboard filters
 carrying over to explore slice (#3461)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <150540744601.23692.11729475504473123016@gitbox.apache.org>
From: maximebeauchemin@apache.org
Reply-To: "commits@superset.apache.org" <commits@superset.apache.org>
X-Git-Host: gitbox.apache.org
X-Git-Repo: incubator-superset
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fdee06bbf2a3a9289dd92bbc88c919f68a81b9ea
X-Git-Newrev: 745784fc973741c5d1cc4a5e10b6c92a8833e8a3
X-Git-Rev: 745784fc973741c5d1cc4a5e10b6c92a8833e8a3
X-Git-NotificationType: ref_changed_plus_diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated
archived-at: Thu, 14 Sep 2017 16:44:08 -0000

This is an automated email from the ASF dual-hosted git repository.

maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 745784f  Fixed dashboard filters carrying over to explore slice (#3461)
745784f is described below

commit 745784fc973741c5d1cc4a5e10b6c92a8833e8a3
Author: Jeff Niu <jeffniu22@gmail.com>
AuthorDate: Thu Sep 14 09:44:00 2017 -0700

    Fixed dashboard filters carrying over to explore slice (#3461)
---
 .../javascripts/dashboard/components/SliceCell.jsx  | 16 +++++++++++++---
 superset/assets/javascripts/modules/superset.js     | 21 +++++++++++----------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/superset/assets/javascripts/dashboard/components/SliceCell.jsx b/superset/assets/javascripts/dashboard/components/SliceCell.jsx
index c6ddf31..0a17903 100644
--- a/superset/assets/javascripts/dashboard/components/SliceCell.jsx
+++ b/superset/assets/javascripts/dashboard/components/SliceCell.jsx
@@ -19,7 +19,7 @@ function SliceCell({ expandedSlices, removeSlice, slice }) {
             <span>{slice.slice_name}</span>
           </div>
           <div className="col-md-12 chart-controls">
-            <div className="pull-right">
+            <div id={'controls_' + slice.slice_id} className="pull-right">
               <a title="Move chart" data-toggle="tooltip">
                 <i className="fa fa-arrows drag" />
               </a>
@@ -42,10 +42,20 @@ function SliceCell({ expandedSlices, removeSlice, slice }) {
               >
                 <i className="fa fa-pencil" />
               </a>
-              <a href={getExploreUrl(slice.form_data, 'csv')} title="Export CSV" data-toggle="tooltip">
+              <a
+                className="exportCSV"
+                href={getExploreUrl(slice.form_data, 'csv')}
+                title="Export CSV"
+                data-toggle="tooltip"
+              >
                 <i className="fa fa-table" />
               </a>
-              <a href={getExploreUrl(slice.form_data)} title="Explore chart" data-toggle="tooltip">
+              <a
+                className="exploreChart"
+                href={getExploreUrl(slice.form_data)}
+                title="Explore chart"
+                data-toggle="tooltip"
+              >
                 <i className="fa fa-share" />
               </a>
               <a
diff --git a/superset/assets/javascripts/modules/superset.js b/superset/assets/javascripts/modules/superset.js
index 6b342f7..aaf1e85 100644
--- a/superset/assets/javascripts/modules/superset.js
+++ b/superset/assets/javascripts/modules/superset.js
@@ -58,6 +58,7 @@ const px = function (state) {
   }
   const Slice = function (data, datasource, controller) {
     const token = $('#token_' + data.slice_id);
+    const controls = $('#controls_' + data.slice_id);
     const containerId = 'con_' + data.slice_id;
     const selector = '#' + containerId;
     const container = $(selector);
@@ -80,16 +81,11 @@ const px = function (state) {
         };
         return Mustache.render(s, context);
       },
-      jsonEndpoint() {
-        return this.endpoint('json');
+      jsonEndpoint(data) {
+        return this.endpoint(data, 'json');
       },
-      endpoint(endpointType = 'json') {
-        const formDataExtra = Object.assign({}, formData);
-        const flts = controller.effectiveExtraFilters(sliceId);
-        if (flts) {
-          formDataExtra.extra_filters = flts;
-        }
-        let endpoint = getExploreUrl(formDataExtra, endpointType, this.force);
+      endpoint(data, endpointType = 'json') {
+        let endpoint = getExploreUrl(data, endpointType, this.force);
         if (endpoint.charAt(0) !== '/') {
           // Known issue for IE <= 11:
           // https://connect.microsoft.com/IE/feedbackdetail/view/1002846/pathname-incorrect-for-out-of-document-elements
@@ -207,11 +203,16 @@ const px = function (state) {
         } else {
           this.force = force;
         }
+        const formDataExtra = Object.assign({}, formData);
+        const extraFilters = controller.effectiveExtraFilters(sliceId);
+        formDataExtra.filters = formDataExtra.filters.concat(extraFilters);
+        controls.find('a.exploreChart').attr('href', getExploreUrl(formDataExtra));
+        controls.find('a.exportCSV').attr('href', getExploreUrl(formDataExtra, 'csv'));
         token.find('img.loading').show();
         container.fadeTo(0.5, 0.25);
         container.css('height', this.height());
         $.ajax({
-          url: this.jsonEndpoint(),
+          url: this.jsonEndpoint(formDataExtra),
           timeout: timeout * 1000,
           success: (queryResponse) => {
             try {

-- 
To stop receiving notification emails like this one, please contact
['"commits@superset.apache.org" <commits@superset.apache.org>'].