From commits-return-2000-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Thu Jan 3 23:07:15 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 60D0B180608 for ; Thu, 3 Jan 2019 23:07:15 +0100 (CET) Received: (qmail 47356 invoked by uid 500); 3 Jan 2019 22:07:14 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 47321 invoked by uid 99); 3 Jan 2019 22:07:14 -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, 03 Jan 2019 22:07:14 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E8569821B0; Thu, 3 Jan 2019 22:07:13 +0000 (UTC) Date: Thu, 03 Jan 2019 22:07:14 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] 01/01: Merge pull request #6524 from conglei/conglei_querycontext_improvement MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: ccwilliams@apache.org In-Reply-To: <154655323326.17451.2477306980613833302@gitbox.apache.org> References: <154655323326.17451.2477306980613833302@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/heads/feature--embeddable-charts-pilot X-Git-Reftype: branch X-Git-Rev: 22d04d4c3097667d0563b1ea5597e6f19f53235e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190103220713.E8569821B0@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. ccwilliams pushed a commit to branch feature--embeddable-charts-pilot in repository https://gitbox.apache.org/repos/asf/incubator-superset.git commit 22d04d4c3097667d0563b1ea5597e6f19f53235e Merge: f366bbe f949126 Author: Chris Williams AuthorDate: Thu Jan 3 16:07:06 2019 -0600 Merge pull request #6524 from conglei/conglei_querycontext_improvement [SIP 6] Querycontext improvement superset/assets/cypress/fixtures/example.json | 5 + .../assets/spec/javascripts/explore/utils_spec.jsx | 22 +- .../superset-ui/WordCloudBuildQuery.test.ts | 3 +- superset/assets/src/chart/chartAction.js | 4 +- .../assets/src/explore/actions/saveModalActions.js | 2 +- .../src/explore/components/DisplayQueryButton.jsx | 2 +- .../src/explore/components/EmbedCodeButton.jsx | 5 +- .../explore/components/ExploreActionButtons.jsx | 2 +- .../explore/components/ExploreViewContainer.jsx | 2 +- superset/assets/src/explore/exploreUtils.js | 28 ++- .../src/visualizations/deckgl/Multi/Multi.jsx | 2 +- .../visualizations/nvd3/LineMulti/LineMulti.jsx | 2 +- .../src/visualizations/wordcloud/FormData.ts | 2 + .../src/visualizations/wordcloud/buildQuery.ts | 1 + .../src/visualizations/wordcloud/transformProps.js | 16 +- superset/common/query_context.py | 223 ++++++++++++++++++++- superset/common/query_object.py | 67 ++++++- superset/connectors/druid/models.py | 9 +- superset/connectors/sqla/models.py | 7 +- superset/utils/core.py | 1 + superset/views/api.py | 37 +++- superset/viz.py | 191 +++++++++--------- tests/druid_func_tests.py | 95 +++++++-- tests/viz_tests.py | 16 +- 24 files changed, 567 insertions(+), 177 deletions(-)