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/11/18 02:33:00 UTC

[incubator-superset] 01/01: fix merge conflicts

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

hugh pushed a commit to branch hugh/SO-1117-modal
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git

commit b8fe70e490fec3272127abc5d950cfd6adbd6916
Merge: 0c7810a 1371939
Author: hughhhh <hu...@gmail.com>
AuthorDate: Tue Nov 17 18:26:04 2020 -0800

    fix merge conflicts

 .github/dependabot.yml                             |   17 +
 .github/workflows/docker.yml                       |   18 +
 .github/workflows/docker_build_push.sh             |   77 +
 .github/workflows/superset-e2e.yml                 |    8 +-
 .github/workflows/superset-python.yml              |   16 +-
 .github/workflows/superset-translations.yml        |    2 +-
 .github/workflows/test-docker.yml                  |   22 -
 .github/workflows/test-hive.yml                    |    2 +-
 .github/workflows/test-presto.yml                  |    2 +-
 .gitignore                                         |    1 +
 .rat-excludes                                      |    1 +
 CONTRIBUTING.md                                    |   35 +-
 Dockerfile-dev                                     |   32 -
 INTHEWILD.md                                       |    2 +
 UPDATING.md                                        |  344 +-
 docker-compose.yml                                 |   14 +-
 docs/gatsby-config.js                              |   11 +
 docs/installation.rst                              |   17 +-
 docs/package-lock.json                             | 5291 +++++++-------
 docs/package.json                                  |   36 +-
 docs/src/pages/docs/installation/caching.mdx       |   22 +-
 helm/superset/templates/_helpers.tpl               |    1 +
 .../{deployment.yaml => deployment-worker.yaml}    |   23 +-
 helm/superset/templates/deployment.yaml            |    5 +
 helm/superset/templates/init-job.yaml              |    3 +
 helm/superset/values.yaml                          |   22 +-
 requirements/base.txt                              |    2 +-
 setup.py                                           |    2 +-
 superset-frontend/.nvmrc                           |    1 +
 superset-frontend/cypress-base/cypress.json        |    3 +-
 .../integration/chart_list/card_view.test.ts       |    3 +-
 .../cypress/integration/dashboard/controls.test.js |   83 +-
 .../integration/dashboard/edit_mode.test.js        |    5 +-
 .../integration/dashboard/edit_properties.test.ts  |    4 +-
 .../cypress/integration/dashboard/filter.test.ts   |   58 +-
 .../cypress/integration/dashboard/load.test.js     |   34 +-
 .../cypress/integration/dashboard/markdown.test.ts |    5 +
 .../cypress/integration/dashboard/tabs.test.js     |   27 +-
 .../integration/dashboard/url_params.test.js       |   23 +-
 .../integration/dashboard_list/card_view.test.ts   |   82 +-
 .../integration/dashboard_list/filter.test.ts      |   36 +-
 .../integration/dashboard_list/list_view.test.ts   |   34 +-
 .../cypress/integration/database/helper.ts}        |    2 +-
 .../cypress/integration/database/modal.test.ts     |   73 +
 .../integration/explore/AdhocFilters.test.ts       |   27 +-
 .../integration/explore/AdhocMetrics.test.ts       |   18 +
 .../cypress/integration/explore/control.test.ts    |    4 +-
 .../cypress/integration/explore/link.test.js       |    4 +-
 .../explore/visualizations/box_plot.test.js        |   28 +-
 .../explore/visualizations/bubble.test.js          |   29 +-
 .../integration/explore/visualizations/pie.test.js |    2 +-
 .../cypress-base/cypress/support/index.ts          |   20 +-
 .../cypress-base/cypress/utils/vizPlugins.ts       |   51 +
 superset-frontend/cypress-base/package-lock.json   | 1443 ++--
 superset-frontend/cypress-base/package.json        |    8 +-
 superset-frontend/cypress_build.sh                 |    9 +-
 superset-frontend/fonts/FiraCode/specimen.less     |   59 -
 .../fonts/FiraCode/woff/FiraCode-Bold.woff         |  Bin 159636 -> 0 bytes
 .../fonts/FiraCode/woff/FiraCode-Light.woff        |  Bin 144956 -> 0 bytes
 .../fonts/FiraCode/woff/FiraCode-Medium.woff       |  Bin 146332 -> 0 bytes
 .../fonts/FiraCode/woff/FiraCode-Regular.woff      |  Bin 146868 -> 0 bytes
 .../fonts/FiraCode/woff/FiraCode-Retina.woff       |  Bin 145500 -> 0 bytes
 .../fonts/FiraCode/woff/FiraCode-VF.woff           |  Bin 130108 -> 0 bytes
 .../fonts/FiraCode/woff2/FiraCode-Bold.woff2       |  Bin 122208 -> 0 bytes
 .../fonts/FiraCode/woff2/FiraCode-Light.woff2      |  Bin 113032 -> 0 bytes
 .../fonts/FiraCode/woff2/FiraCode-Medium.woff2     |  Bin 113720 -> 0 bytes
 .../fonts/FiraCode/woff2/FiraCode-Regular.woff2    |  Bin 114456 -> 0 bytes
 .../fonts/FiraCode/woff2/FiraCode-Retina.woff2     |  Bin 113088 -> 0 bytes
 .../fonts/FiraCode/woff2/FiraCode-VF.woff2         |  Bin 106584 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Black.woff   |  Bin 140036 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Black.woff2  |  Bin 104524 -> 0 bytes
 .../fonts/InterUI/Inter-BlackItalic.woff           |  Bin 145924 -> 0 bytes
 .../fonts/InterUI/Inter-BlackItalic.woff2          |  Bin 109900 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Bold.woff    |  Bin 143708 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Bold.woff2   |  Bin 107400 -> 0 bytes
 .../fonts/InterUI/Inter-BoldItalic.woff            |  Bin 149420 -> 0 bytes
 .../fonts/InterUI/Inter-BoldItalic.woff2           |  Bin 112580 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraBold.woff             |  Bin 143552 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraBold.woff2            |  Bin 107552 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraBoldItalic.woff       |  Bin 149196 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraBoldItalic.woff2      |  Bin 112876 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraLight.woff            |  Bin 141864 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraLight.woff2           |  Bin 105960 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraLightItalic.woff      |  Bin 148688 -> 0 bytes
 .../fonts/InterUI/Inter-ExtraLightItalic.woff2     |  Bin 112056 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Italic.woff  |  Bin 142744 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Italic.woff2 |  Bin 107508 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Light.woff   |  Bin 141528 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Light.woff2  |  Bin 105640 -> 0 bytes
 .../fonts/InterUI/Inter-LightItalic.woff           |  Bin 148436 -> 0 bytes
 .../fonts/InterUI/Inter-LightItalic.woff2          |  Bin 111968 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Medium.woff  |  Bin 142836 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Medium.woff2 |  Bin 106720 -> 0 bytes
 .../fonts/InterUI/Inter-MediumItalic.woff          |  Bin 149184 -> 0 bytes
 .../fonts/InterUI/Inter-MediumItalic.woff2         |  Bin 112504 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Regular.woff |  Bin 134652 -> 0 bytes
 .../fonts/InterUI/Inter-Regular.woff2              |  Bin 100124 -> 0 bytes
 .../fonts/InterUI/Inter-SemiBold.woff              |  Bin 143248 -> 0 bytes
 .../fonts/InterUI/Inter-SemiBold.woff2             |  Bin 107232 -> 0 bytes
 .../fonts/InterUI/Inter-SemiBoldItalic.woff        |  Bin 149276 -> 0 bytes
 .../fonts/InterUI/Inter-SemiBoldItalic.woff2       |  Bin 112552 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Thin.woff    |  Bin 136952 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter-Thin.woff2   |  Bin 101408 -> 0 bytes
 .../fonts/InterUI/Inter-ThinItalic.woff            |  Bin 144412 -> 0 bytes
 .../fonts/InterUI/Inter-ThinItalic.woff2           |  Bin 107496 -> 0 bytes
 .../fonts/InterUI/Inter-italic.var.woff2           |  Bin 240688 -> 0 bytes
 .../fonts/InterUI/Inter-roman.var.woff2            |  Bin 226368 -> 0 bytes
 superset-frontend/fonts/InterUI/Inter.var.woff2    |  Bin 316604 -> 0 bytes
 superset-frontend/images/chart-card-fallback.png   |  Bin 3183 -> 0 bytes
 superset-frontend/images/chart-card-fallback.svg   |   27 +
 .../images/dashboard-card-fallback.png             |  Bin 2621 -> 0 bytes
 .../images/dashboard-card-fallback.svg             |   22 +
 superset-frontend/images/empty-charts.png          |  Bin 2274 -> 0 bytes
 superset-frontend/images/empty-charts.svg          |   30 +
 superset-frontend/images/empty-dashboard.png       |  Bin 1467 -> 0 bytes
 superset-frontend/images/empty-dashboard.svg       |   26 +
 superset-frontend/images/empty-queries.png         |  Bin 1791 -> 0 bytes
 superset-frontend/images/empty-queries.svg         |   35 +
 superset-frontend/images/icons/import.svg          |   22 +
 superset-frontend/images/icons/offline.svg         |   21 +
 superset-frontend/images/icons/queued.svg          |   23 +
 superset-frontend/images/icons/running.svg         |   21 +
 superset-frontend/images/star-circle.png           |  Bin 2705 -> 0 bytes
 superset-frontend/images/star-circle.svg           |   22 +
 superset-frontend/images/union.png                 |  Bin 1694 -> 3199 bytes
 superset-frontend/images/union.svg                 |   22 +
 superset-frontend/package-lock.json                | 7517 +++++++++++---------
 superset-frontend/package.json                     |   78 +-
 .../spec/javascripts/components/Menu_spec.jsx      |    7 +-
 .../spec/javascripts/components/SubMenu_spec.jsx   |    6 +-
 .../dashboard/components/DashboardBuilder_spec.jsx |    3 +-
 .../components/HeaderActionsDropdown_spec.jsx      |   85 +-
 .../dashboard/components/PropertiesModal_spec.jsx  |    9 +-
 .../components/gridComponents/Chart_spec.jsx       |    2 +-
 .../components/gridComponents/Header_spec.jsx      |    2 +-
 .../components/gridComponents/Markdown_spec.jsx    |    2 +-
 .../components/gridComponents/Tab_spec.jsx         |   38 -
 .../components/gridComponents/Tabs_spec.jsx        |   52 +-
 .../dashboard/reducers/dashboardState_spec.js      |   15 +-
 .../datasource/DatasourceModal_spec.jsx            |    4 +-
 .../explore/components/AdhocFilterControl_spec.jsx |   14 +-
 ...AdhocFilterEditPopoverSimpleTabContent_spec.jsx |   12 -
 .../components/AdhocFilterEditPopover_spec.jsx     |    4 +-
 .../components/AdhocMetricEditPopover_spec.jsx     |    4 +-
 .../explore/components/DateFilterControl_spec.jsx  |   13 +
 .../explore/components/DisplayQueryButton_spec.jsx |    6 +-
 .../explore/components/MetricsControl_spec.jsx     |   26 +-
 .../explore/components/SaveModal_spec.jsx          |    7 +-
 .../explore/components/SelectControl_spec.jsx      |  156 +-
 .../explore/components/VizTypeControl_spec.jsx     |    8 +-
 .../components/withAsyncVerification_spec.tsx      |  142 +
 .../explore/components/withVerification_spec.jsx   |  127 -
 .../views/CRUD/annotation/AnnotationList_spec.jsx  |   58 +-
 .../views/CRUD/annotation/AnnotationModal_spec.jsx |   97 +
 .../annotationlayers/AnnotationLayersList_spec.jsx |   50 +-
 .../views/CRUD/welcome/ActivityTable_spec.tsx      |   49 +-
 .../views/CRUD/welcome/ChartTable_spec.tsx         |    9 +-
 .../views/CRUD/welcome/DashboardTable_spec.tsx     |   33 +-
 .../views/CRUD/welcome/SavedQueries_spec.tsx       |   32 +-
 .../views/CRUD/welcome/Welcome_spec.tsx            |   45 +-
 superset-frontend/src/SqlLab/components/App.jsx    |    9 +-
 .../SqlLab/components/EstimateQueryCostButton.jsx  |  100 +-
 .../SqlLab/components/ExploreCtasResultsButton.jsx |    6 -
 .../src/SqlLab/components/ExploreResultsButton.jsx |    7 +-
 superset-frontend/src/SqlLab/main.less             |    3 +-
 superset-frontend/src/chart/Chart.jsx              |    2 -
 superset-frontend/src/chart/chartAction.js         |    9 +-
 .../index.ts => common/components/DatePicker.tsx}  |    5 +-
 .../src/common/components/InfoTooltip.tsx          |   80 +
 .../src/common/components/Modal/Modal.tsx          |   22 +-
 .../src/common/components/Tabs/Tabs.tsx            |   55 +-
 .../src/common/components/common.stories.tsx       |   62 +
 superset-frontend/src/common/components/index.tsx  |   54 +-
 superset-frontend/src/components/Button/index.tsx  |   18 +-
 .../src/components/CopyToClipboard.jsx             |   29 +-
 .../src/components/FacePile/index.tsx              |    4 +-
 superset-frontend/src/components/FaveStar.tsx      |    6 +-
 superset-frontend/src/components/Icon/index.tsx    |  152 +-
 .../src/components/ListView/Filters.tsx            |    1 +
 .../src/components/ListView/ListView.tsx           |   19 +-
 .../src/components/ListViewCard/ImageLoader.tsx    |    7 +-
 .../ListViewCard/ListViewCard.stories.tsx          |    4 +-
 .../src/components/ListViewCard/index.tsx          |   58 +-
 .../src/components/Menu/LanguagePicker.tsx         |   30 +-
 superset-frontend/src/components/Menu/Menu.tsx     |  147 +-
 .../src/components/Menu/MenuObject.tsx             |   37 +-
 superset-frontend/src/components/Menu/NewMenu.tsx  |   16 +-
 superset-frontend/src/components/Menu/SubMenu.tsx  |   23 +-
 superset-frontend/src/components/ModalTrigger.jsx  |   11 -
 .../src/components/NavDropdown/index.tsx           |    9 -
 .../src/components/Select/Select.stories.tsx       |  129 +
 superset-frontend/src/components/Select/styles.tsx |   49 +-
 .../src/components/TableView/index.ts              |    1 +
 .../src/components/URLShortLinkButton.jsx          |    3 +-
 .../src/components/URLShortLinkModal.jsx           |    2 -
 .../components/dataViewCommon/TableCollection.tsx  |    2 +
 .../TableView/index.ts => constants.ts}            |    4 +-
 .../src/dashboard/actions/dashboardState.js        |   18 +-
 .../src/dashboard/actions/sliceEntities.js         |   43 +-
 .../src/dashboard/components/CssEditor.jsx         |    1 -
 .../src/dashboard/components/DashboardBuilder.jsx  |   10 +-
 .../src/dashboard/components/DashboardGrid.jsx     |    2 +-
 .../components/FiltersBadge/DetailsPanel.tsx       |   42 +-
 .../dashboard/components/FiltersBadge/Styles.tsx   |   31 +-
 .../dashboard/components/HeaderActionsDropdown.jsx |  172 +-
 .../src/dashboard/components/PropertiesModal.jsx   |  112 +-
 .../dashboard/components/RefreshIntervalModal.jsx  |    1 -
 .../src/dashboard/components/SaveModal.jsx         |    3 -
 .../src/dashboard/components/SliceAdder.jsx        |   38 +-
 .../dashboard/components/SliceHeaderControls.jsx   |  197 +-
 .../dashboard/components/gridComponents/Chart.jsx  |   27 +-
 .../dashboard/components/gridComponents/Tab.jsx    |   54 +-
 .../dashboard/components/gridComponents/Tabs.jsx   |  141 +-
 .../dashboard/components/menu/PopoverDropdown.jsx  |   62 +-
 .../src/dashboard/containers/DashboardBuilder.jsx  |    2 -
 .../dashboard/containers/DashboardComponent.jsx    |    3 +-
 .../src/dashboard/reducers/dashboardInfo.js        |    3 +-
 .../src/dashboard/reducers/dashboardState.js       |   14 +-
 .../dashboard/stylesheets/components/chart.less    |   12 -
 .../dashboard/stylesheets/components/index.less    |    1 -
 .../dashboard/stylesheets/components/markdown.less |    8 -
 .../src/dashboard/stylesheets/components/tabs.less |  106 -
 .../src/dashboard/stylesheets/dashboard.less       |   49 +-
 .../src/dashboard/stylesheets/dnd.less             |   23 +-
 .../stylesheets/filter-scope-selector.less         |    1 +
 .../src/dashboard/stylesheets/popover-menu.less    |    6 +-
 superset-frontend/src/dashboard/util/constants.ts  |    3 -
 .../src/datasource/DatasourceModal.tsx             |   30 +-
 .../src/explore/actions/exploreActions.ts          |    3 +-
 .../explore/components/AdhocFilterEditPopover.jsx  |   17 +-
 .../AdhocFilterEditPopoverSimpleTabContent.jsx     |   51 +-
 .../AdhocFilterEditPopoverSqlTabContent.jsx        |    2 +-
 .../src/explore/components/AdhocFilterOption.jsx   |   19 +-
 .../explore/components/AdhocMetricEditPopover.jsx  |   45 +-
 .../src/explore/components/AdhocMetricOption.jsx   |   19 +-
 .../src/explore/components/Control.tsx             |    2 +-
 .../explore/components/ControlPanelsContainer.jsx  |    1 +
 .../src/explore/components/DisplayQueryButton.jsx  |  379 +-
 .../src/explore/components/ExploreChartHeader.jsx  |   96 +-
 .../explore/components/ExploreViewContainer.jsx    |    1 -
 .../src/explore/components/PropertiesModal.tsx     |  106 +-
 .../src/explore/components/QueryAndSaveBtns.jsx    |    1 +
 .../src/explore/components/SaveModal.jsx           |   81 +-
 .../components/controls/AdhocFilterControl.jsx     |    9 +-
 .../components/controls/AnnotationLayer.jsx        |    4 +-
 .../components/controls/DatasourceControl.jsx      |   23 +-
 .../components/controls/DateFilterControl.jsx      |  230 +-
 .../explore/components/controls/MetricsControl.jsx |   23 +-
 .../explore/components/controls/SelectControl.jsx  |   95 +-
 .../explore/components/controls/VizTypeControl.jsx |  215 +-
 .../src/explore/components/controls/index.js       |   16 -
 .../components/controls/withAsyncVerification.tsx  |  224 +
 .../components/controls/withVerification.jsx       |   92 -
 .../src/explore/controlPanels/DeckArc.js           |  143 -
 .../src/explore/controlPanels/DeckGeojson.js       |  101 -
 .../src/explore/controlPanels/DeckGrid.js          |   70 -
 .../src/explore/controlPanels/DeckHex.js           |  100 -
 .../src/explore/controlPanels/DeckMulti.js         |   66 -
 .../src/explore/controlPanels/DeckPath.js          |   74 -
 .../src/explore/controlPanels/DeckPolygon.js       |  166 -
 .../src/explore/controlPanels/DeckScatter.js       |  165 -
 .../src/explore/controlPanels/DeckScreengrid.js    |   75 -
 .../src/explore/controlPanels/Shared_DeckGL.jsx    |  377 -
 superset-frontend/src/featureFlags.ts              |    2 +
 .../src/messageToasts/actions/index.ts             |   47 +-
 .../src/messageToasts/reducers/index.js            |    6 +-
 superset-frontend/src/messageToasts/types.ts       |    3 +
 superset-frontend/src/setup/setupPlugins.ts        |   20 +-
 .../src/utils/getClientErrorObject.ts              |    2 +
 superset-frontend/src/views/App.tsx                |    6 +
 .../src/views/CRUD/annotation/AnnotationList.tsx   |  222 +-
 .../src/views/CRUD/annotation/AnnotationModal.tsx  |  336 +
 .../src/views/CRUD/annotation/types.ts             |   10 +-
 .../CRUD/annotationlayers/AnnotationLayerModal.tsx |    4 +-
 .../CRUD/annotationlayers/AnnotationLayersList.tsx |  155 +-
 .../src/views/CRUD/chart/ChartCard.tsx             |   94 +-
 .../src/views/CRUD/chart/ChartList.tsx             |  106 +-
 .../src/views/CRUD/dashboard/DashboardCard.tsx     |   96 +-
 .../src/views/CRUD/dashboard/DashboardList.tsx     |   48 +-
 superset-frontend/src/views/CRUD/data/common.ts    |    7 +
 .../src/views/CRUD/data/database/DatabaseList.tsx  |   67 +-
 .../src/views/CRUD/data/database/DatabaseModal.tsx |  103 +-
 .../src/views/CRUD/data/dataset/DatasetList.tsx    |   63 +-
 .../src/views/CRUD/data/query/QueryList.test.tsx   |  100 +
 .../src/views/CRUD/data/query/QueryList.tsx        |  349 +
 .../views/CRUD/data/savedquery/SavedQueryList.tsx  |   18 +-
 .../data/savedquery/SavedQueryPreviewModal.tsx     |    2 +-
 superset-frontend/src/views/CRUD/hooks.ts          |  139 +-
 superset-frontend/src/views/CRUD/types.ts          |   16 +-
 superset-frontend/src/views/CRUD/utils.tsx         |   89 +-
 .../src/views/CRUD/welcome/ActivityTable.tsx       |  114 +-
 .../src/views/CRUD/welcome/ChartTable.tsx          |   48 +-
 .../src/views/CRUD/welcome/DashboardTable.tsx      |   67 +-
 .../src/views/CRUD/welcome/EmptyState.tsx          |  107 +-
 .../src/views/CRUD/welcome/SavedQueries.tsx        |  135 +-
 .../src/views/CRUD/welcome/Welcome.tsx             |   97 +-
 .../src/visualizations/FilterBox/FilterBox.less    |    6 +-
 .../src/visualizations/presets/MainPreset.js       |    4 +-
 .../stylesheets/less/font_specimens/fira_code.less |   63 -
 .../stylesheets/less/font_specimens/inter_ui.less  |  225 -
 superset-frontend/stylesheets/less/fonts.less      |    9 +-
 superset-frontend/stylesheets/less/variables.less  |    2 +-
 superset-frontend/stylesheets/superset.less        |    6 -
 superset-frontend/webpack.config.js                |   30 +-
 superset/__init__.py                               |    4 +-
 superset/annotation_layers/annotations/api.py      |    2 +
 superset/app.py                                    |   13 +-
 superset/cachekeys/api.py                          |    6 +
 superset/charts/api.py                             |   52 +-
 superset/charts/commands/export.py                 |    9 +-
 superset/charts/dao.py                             |   15 +
 superset/charts/schemas.py                         |   94 +-
 superset/cli.py                                    |   41 +-
 superset/commands/exceptions.py                    |    2 +-
 .../commands/base.py => commands/export.py}        |    4 +-
 .../importers/exceptions.py}                       |   29 +-
 .../importers/v1/__init__.py}                      |   28 -
 superset/commands/importers/v1/utils.py            |   67 +
 superset/common/query_context.py                   |   12 +-
 superset/config.py                                 |   45 +-
 superset/connectors/druid/models.py                |   58 +-
 superset/connectors/sqla/models.py                 |   97 +-
 superset/connectors/sqla/views.py                  |    1 -
 superset/constants.py                              |    1 +
 superset/dao/base.py                               |    4 +-
 superset/dashboards/api.py                         |   52 +
 superset/dashboards/commands/export.py             |    9 +-
 .../commands/importers/__init__.py}                |   28 -
 superset/dashboards/commands/importers/v0.py       |  338 +
 superset/dashboards/dao.py                         |   17 +
 superset/dashboards/schemas.py                     |   13 +
 superset/databases/api.py                          |   56 +
 superset/databases/commands/create.py              |    9 +-
 superset/databases/commands/export.py              |   13 +-
 .../commands/importers/__init__.py}                |   28 -
 .../databases/commands/importers/dispatcher.py     |   68 +
 .../databases/commands/importers/v1/__init__.py    |  116 +
 .../commands/importers/v1/utils.py}                |   40 +-
 superset/databases/schemas.py                      |   30 +-
 superset/datasets/api.py                           |   56 +
 superset/datasets/commands/export.py               |   13 +-
 .../commands/importers/__init__.py}                |   28 -
 superset/datasets/commands/importers/dispatcher.py |   73 +
 superset/datasets/commands/importers/v0.py         |  321 +
 .../datasets/commands/importers/v1/__init__.py     |  121 +
 .../commands/importers/v1/utils.py}                |   40 +-
 superset/datasets/schemas.py                       |   45 +
 superset/db_engine_specs/hive.py                   |    5 +-
 superset/db_engine_specs/kylin.py                  |    6 +-
 superset/db_engine_specs/presto.py                 |    6 +-
 superset/extensions.py                             |   39 +-
 superset/jinja_context.py                          |  187 +-
 .../versions/49b5a32daba5_add_report_schedules.py  |  133 +
 superset/models/core.py                            |   35 +-
 superset/models/dashboard.py                       |  221 +-
 superset/models/helpers.py                         |    2 +-
 superset/models/reports.py                         |  180 +
 superset/models/slice.py                           |   47 +-
 superset/queries/api.py                            |    3 +-
 superset/queries/saved_queries/commands/export.py  |   15 +-
 .../cache_manager.py => reports/__init__.py}       |   28 -
 superset/reports/api.py                            |  386 +
 .../commands/__init__.py}                          |   28 -
 superset/reports/commands/base.py                  |   63 +
 superset/reports/commands/bulk_delete.py           |   53 +
 superset/reports/commands/create.py                |   98 +
 superset/reports/commands/delete.py                |   54 +
 superset/reports/commands/exceptions.py            |  112 +
 superset/reports/commands/update.py                |  101 +
 superset/reports/dao.py                            |  137 +
 .../{utils/cache_manager.py => reports/filters.py} |   43 +-
 .../cache_manager.py => reports/logs/__init__.py}  |   28 -
 superset/reports/logs/api.py                       |  196 +
 .../cache_manager.py => reports/logs/schemas.py}   |   38 +-
 superset/reports/schemas.py                        |  209 +
 superset/security/manager.py                       |    2 +
 superset/stats_logger.py                           |   16 +-
 superset/utils/cache.py                            |  140 +-
 superset/utils/cache_manager.py                    |   30 +-
 superset/utils/core.py                             |   10 +
 superset/utils/dashboard_import_export.py          |   67 -
 superset/utils/decorators.py                       |   91 -
 superset/utils/dict_import_export.py               |   42 +-
 superset/utils/import_datasource.py                |  105 -
 superset/utils/pandas_postprocessing.py            |  179 +-
 superset/utils/screenshots.py                      |    2 +-
 superset/views/annotations.py                      |   10 +-
 superset/views/base.py                             |   31 +-
 superset/views/base_api.py                         |   25 +-
 superset/views/core.py                             |   35 +-
 superset/views/database/views.py                   |    4 +-
 superset/viz.py                                    |  113 +-
 superset/viz_sip38.py                              |   18 +-
 tests/annotation_layers/api_tests.py               |    1 +
 tests/cache_tests.py                               |   51 +-
 tests/charts/api_tests.py                          |   31 +-
 tests/charts/commands_tests.py                     |    6 +-
 .../cache_manager.py => tests/commands_test.py     |   32 +-
 tests/core_tests.py                                |   93 +-
 tests/dashboard_tests.py                           |    3 +-
 tests/dashboards/api_tests.py                      |   31 +-
 tests/dashboards/commands_tests.py                 |   27 +-
 tests/databases/api_tests.py                       |  134 +-
 tests/databases/commands_tests.py                  |  209 +-
 tests/datasets/api_tests.py                        |  106 +-
 tests/datasets/commands_tests.py                   |  161 +-
 tests/fixtures/dataframes.py                       |   10 +
 tests/fixtures/importexport.py                     |   90 +
 tests/fixtures/query_context.py                    |    2 +-
 tests/import_export_tests.py                       |   62 +-
 tests/jinja_context_tests.py                       |  197 +-
 tests/pandas_postprocessing_tests.py               |  114 +-
 tests/queries/api_tests.py                         |    8 +-
 tests/queries/saved_queries/commands_tests.py      |    6 +-
 .../cache_manager.py => tests/reports/__init__.py  |   28 -
 tests/reports/api_tests.py                         |  864 +++
 tests/stats_logger_tests.py                        |    4 +-
 tests/superset_test_config.py                      |   14 +-
 tox.ini                                            |   63 +-
 419 files changed, 20124 insertions(+), 13384 deletions(-)