You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by hu...@apache.org on 2020/12/17 00:48:59 UTC
[incubator-superset] branch hxgh/ch3985 updated (16d47e0 -> 6eea966)
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a change to branch hxgh/ch3985
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git.
omit 16d47e0 Merge branch 'master' of https://github.com/apache/incubator-superset into feat-sql-toolbar
omit 83c5e5f feat: New Limit Selector (#12065)
omit 77cae64 feat: Add new default dashboard (#12044)
omit 5e811a1 feat: load examples from config instead of code (#12026)
omit e0079bb fix: small fixes to the new import/export (#12064)
omit 52e970a fix(annotation layers): remove redirect on layer edit (#12063)
new 6eea966 fix view in sqllab issue
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (16d47e0)
\
N -- N -- N refs/heads/hxgh/ch3985 (6eea966)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
setup.cfg | 2 +-
.../spec/javascripts/sqllab/LimitControl_spec.jsx | 128 +++++++
.../spec/javascripts/sqllab/SqlEditor_spec.jsx | 18 +-
.../src/SqlLab/components/LimitControl.tsx | 161 ++++++++
.../src/SqlLab/components/SqlEditor.jsx | 54 +--
.../src/SqlLab/components/TabbedSqlEditors.jsx | 9 +-
.../CRUD/annotationlayers/AnnotationLayerModal.tsx | 4 +
superset/charts/commands/export.py | 2 +-
superset/cli.py | 6 +-
superset/commands/importers/v1/__init__.py | 19 +-
superset/commands/importers/v1/examples.py | 119 ------
superset/commands/importers/v1/utils.py | 2 +-
superset/dashboards/commands/export.py | 2 +-
.../dashboards/commands/importers/v1/__init__.py | 14 +-
superset/dashboards/commands/importers/v1/utils.py | 13 +-
superset/databases/commands/export.py | 2 +-
superset/datasets/commands/export.py | 18 +-
superset/datasets/commands/importers/v1/utils.py | 85 -----
superset/datasets/schemas.py | 9 +-
superset/db_engine_specs/sqlite.py | 9 -
superset/examples/__init__.py | 2 +-
superset/examples/configs/charts/Filter.yaml | 48 ---
.../Number_of_Deals_for_each_Combination.yaml | 56 ---
.../charts/Overall_Sales_By_Product_Line.yaml | 70 ----
.../Proportion_of_Revenue_by_Product_Line.yaml | 78 ----
.../examples/configs/charts/Quarterly_Sales.yaml | 89 -----
.../charts/Quarterly_Sales_By_Product_Line.yaml | 92 -----
.../configs/charts/Revenue_by_Deal_Size.yaml | 79 ----
.../Seasonality_of_Revenue_per_Product_Line.yaml | 62 ---
.../examples/configs/charts/Total_Items_Sold.yaml | 57 ---
.../charts/Total_Items_Sold_By_Product_Line.yaml | 68 ----
.../examples/configs/charts/Total_Revenue.yaml | 58 ---
.../examples/configs/charts/Unicode_Cloud.yaml | 40 --
.../configs/dashboards/Sales_Dashboard.yaml | 415 ---------------------
.../examples/configs/dashboards/Unicode_Test.yaml | 52 ---
.../datasets/examples/Cleaned_Sales_Data.yaml | 293 ---------------
.../configs/datasets/examples/unicode_test.yaml | 93 -----
superset/examples/configs/metadata.yaml | 18 -
superset/examples/unicode_test_data.py | 167 +++++++++
superset/examples/utils.py | 51 ---
40 files changed, 544 insertions(+), 2020 deletions(-)
create mode 100644 superset-frontend/spec/javascripts/sqllab/LimitControl_spec.jsx
create mode 100644 superset-frontend/src/SqlLab/components/LimitControl.tsx
delete mode 100644 superset/commands/importers/v1/examples.py
delete mode 100644 superset/examples/configs/charts/Filter.yaml
delete mode 100644 superset/examples/configs/charts/Number_of_Deals_for_each_Combination.yaml
delete mode 100644 superset/examples/configs/charts/Overall_Sales_By_Product_Line.yaml
delete mode 100644 superset/examples/configs/charts/Proportion_of_Revenue_by_Product_Line.yaml
delete mode 100644 superset/examples/configs/charts/Quarterly_Sales.yaml
delete mode 100644 superset/examples/configs/charts/Quarterly_Sales_By_Product_Line.yaml
delete mode 100644 superset/examples/configs/charts/Revenue_by_Deal_Size.yaml
delete mode 100644 superset/examples/configs/charts/Seasonality_of_Revenue_per_Product_Line.yaml
delete mode 100644 superset/examples/configs/charts/Total_Items_Sold.yaml
delete mode 100644 superset/examples/configs/charts/Total_Items_Sold_By_Product_Line.yaml
delete mode 100644 superset/examples/configs/charts/Total_Revenue.yaml
delete mode 100644 superset/examples/configs/charts/Unicode_Cloud.yaml
delete mode 100644 superset/examples/configs/dashboards/Sales_Dashboard.yaml
delete mode 100644 superset/examples/configs/dashboards/Unicode_Test.yaml
delete mode 100644 superset/examples/configs/datasets/examples/Cleaned_Sales_Data.yaml
delete mode 100644 superset/examples/configs/datasets/examples/unicode_test.yaml
delete mode 100644 superset/examples/configs/metadata.yaml
create mode 100644 superset/examples/unicode_test_data.py
delete mode 100644 superset/examples/utils.py
[incubator-superset] 01/01: fix view in sqllab issue
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch hxgh/ch3985
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 6eea966d07a9ffc68cb95fdbaef35c0acf9b3be0
Author: hughhhh <hu...@gmail.com>
AuthorDate: Wed Dec 16 19:48:07 2020 -0500
fix view in sqllab issue
---
superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx
index f0f6d48..fe8b5d0 100644
--- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx
+++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx
@@ -116,8 +116,15 @@ class TabbedSqlEditors extends React.PureComponent {
}
// merge post form data with GET search params
+ // Hack: this data should be comming from getInitialState
+ // but for some reason this data isn't being passed properly through
+ // the reducer.
+ const appContainer = document.getElementById('app');
+ const bootstrapData = JSON.parse(
+ appContainer?.getAttribute('data-bootstrap') || '{}',
+ );
const query = {
- ...this.props.requestedQuery,
+ ...bootstrapData.requested_query,
...URI(window.location).search(true),
};