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

hugh pushed a commit to branch fix-csv-upload-array
in repository https://gitbox.apache.org/repos/asf/superset.git

commit 67b253538d03d2f6d88897b31929d9ec0e07eb24
Merge: a550324 e9383e6
Author: hughhhh <[email protected]>
AuthorDate: Fri Jul 16 17:17:52 2021 -0400

    Merge branch 'master' of https://github.com/apache/superset

 CONTRIBUTING.md                                    |  12 +
 Makefile                                           |   8 +-
 docs/src/pages/docs/Connecting to Databases/ui.mdx |  77 +++
 .../integration/dashboard/edit_mode.test.js        |   4 +-
 .../integration/dashboard/edit_properties.test.ts  |   2 +-
 .../cypress/integration/dashboard/markdown.test.ts |   2 +-
 .../cypress/integration/dashboard/save.test.js     |   6 +-
 superset-frontend/package-lock.json                | 654 ++++++++++-----------
 superset-frontend/package.json                     |  57 +-
 superset-frontend/spec/helpers/testing-library.tsx |  16 +-
 .../dashboard/util/getDashboardUrl_spec.js         |   2 +-
 .../datasource/DatasourceEditor_spec.jsx           |   3 +-
 superset-frontend/src/SqlLab/actions/sqlLab.js     |  24 +-
 .../src/SqlLab/components/HighlightedSql.tsx       |   2 +-
 .../src/SqlLab/components/QueryTable/index.jsx     | 132 ++---
 .../src/SqlLab/components/SqlEditor.jsx            |  13 +
 superset-frontend/src/SqlLab/reducers/sqlLab.js    |   5 +-
 superset-frontend/src/chart/Chart.jsx              |   2 +-
 superset-frontend/src/chart/ChartRenderer.jsx      |   5 +-
 superset-frontend/src/common/components/index.tsx  |  11 +-
 .../src/common/hooks/apiResources/dashboards.ts    |   7 +-
 .../CopyToClipboard/CopyToClipboard.stories.tsx    |   6 +-
 .../ErrorMessage/BasicErrorAlert.test.tsx          |   7 -
 .../components/ErrorMessage/ErrorAlert.test.tsx    |   7 -
 .../src/components/FaveStar/FaveStar.test.tsx      |   7 -
 .../src/components/Icon/icon.stories.jsx           |  84 ---
 superset-frontend/src/components/Icon/index.tsx    | 440 --------------
 .../src/components/IconButton/index.tsx            |  22 +-
 .../src/components/ListView/ActionsBar.tsx         |   3 +-
 .../src/components/ListViewCard/index.tsx          |  15 +-
 .../src/components/Menu/LanguagePicker.tsx         |   4 +-
 .../src/components/Menu/Menu.test.tsx              |   3 +
 superset-frontend/src/components/Menu/Menu.tsx     |  57 +-
 .../src/components/Menu/MenuRight.tsx              |  18 +-
 .../actions/{datasources.js => datasources.ts}     |  50 +-
 superset-frontend/src/dashboard/actions/hydrate.js |   5 +-
 .../DashboardBuilder/DashboardBuilder.tsx          |   7 +-
 .../dashboard/components/DashboardBuilder/state.ts |   7 +-
 .../src/dashboard/components/Header/index.jsx      |   7 +-
 .../components/SliceHeader/SliceHeader.test.tsx    |  12 +-
 .../src/dashboard/components/SliceHeader/index.tsx |  38 +-
 .../SliceHeaderControls.test.tsx                   |  12 -
 .../components/SliceHeaderControls/index.tsx       |  41 +-
 .../dashboard/components/gridComponents/Chart.jsx  |  18 +-
 .../nativeFilters/FilterBar/FilterBar.test.tsx     |  24 +-
 .../FilterBar/FilterControls/FilterValue.tsx       |  14 +-
 .../FilterBar/FilterControls/utils.ts              |  17 +
 .../nativeFilters/FilterBar/Header/Header.test.tsx |   1 +
 .../nativeFilters/FilterBar/Header/index.tsx       |  17 +-
 .../components/nativeFilters/FilterBar/index.tsx   |  81 ++-
 .../FiltersConfigModal/FiltersConfigModal.tsx      |  10 +
 .../dashboard/components/nativeFilters/state.ts    |  11 -
 .../src/dashboard/containers/Dashboard.ts          |  17 +-
 .../src/dashboard/containers/DashboardPage.tsx     |  77 +--
 .../reducers/datasources.ts}                       |  45 +-
 superset-frontend/src/dashboard/types.ts           |  14 +-
 .../dashboard/util/activeAllDashboardFilters.ts    |   2 +-
 .../src/dashboard/util/getDashboardUrl.ts          |  13 +-
 .../replaceUndefinedByNull.ts}                     |  39 +-
 superset-frontend/src/dataMask/reducer.ts          |   6 +-
 .../src/explore/components/Control.tsx             |  75 +--
 .../ConditionalFormattingControl.tsx               | 184 ++++++
 .../FormattingPopover.tsx                          |  61 ++
 .../FormattingPopoverContent.tsx                   | 221 +++++++
 .../ConditionalFormattingControl/index.ts}         |  24 +-
 .../controls/ConditionalFormattingControl/types.ts |  68 +++
 .../DndColumnSelectControl/DndColumnSelect.tsx     |  44 +-
 .../DndColumnSelectControl/utils/optionSelector.ts |  21 +-
 .../MetricControl/AdhocMetricPopoverTrigger.tsx    |   1 -
 .../src/explore/components/controls/index.js       |   2 +
 .../src/explore/exploreUtils/index.js              |   9 +
 .../filters/components/Range/RangeFilterPlugin.tsx |  64 +-
 .../components/Select/SelectFilterPlugin.tsx       |   3 +-
 .../TimeColumn/TimeColumnFilterPlugin.tsx          |  12 +-
 .../components/TimeGrain/TimeGrainFilterPlugin.tsx |  12 +-
 superset-frontend/src/setup/setupErrorMessages.ts  |   4 +
 superset-frontend/src/types/Dashboard.ts           |   4 +-
 .../data/database/DatabaseModal/ExtraOptions.tsx   |  22 +-
 .../data/database/DatabaseModal/index.test.jsx     |  34 +-
 .../CRUD/data/database/DatabaseModal/index.tsx     |  13 +-
 .../src/views/CRUD/data/database/types.ts          |   1 +
 .../src/views/CRUD/welcome/Welcome.tsx             |  31 +-
 superset/config.py                                 |  12 +-
 superset/connectors/base/models.py                 |   3 +-
 superset/connectors/sqla/models.py                 |   9 +-
 superset/databases/api.py                          |   1 +
 superset/db_engine_specs/base.py                   |  25 +
 superset/db_engine_specs/mysql.py                  |  32 +
 superset/db_engine_specs/postgres.py               |  38 +-
 superset/db_engine_specs/snowflake.py              |  32 +
 superset/exceptions.py                             |   4 +
 ...9248280_add_creation_method_to_reports_model.py |  48 ++
 superset/models/dashboard.py                       |  47 +-
 superset/models/reports.py                         |   9 +
 superset/reports/api.py                            |  11 +-
 superset/reports/schemas.py                        |  18 +
 superset/sql_lab.py                                |  51 +-
 superset/translations/zh/LC_MESSAGES/messages.json |   6 +-
 superset/utils/mock_data.py                        |   9 +-
 superset/utils/webdriver.py                        |   5 +
 superset/views/base.py                             |   7 +
 superset/views/core.py                             |  25 +-
 tests/integration_tests/databases/api_tests.py     |   1 +
 .../db_engine_specs/mysql_tests.py                 |  20 +
 .../db_engine_specs/postgres_tests.py              |  22 +-
 .../db_engine_specs/snowflake_tests.py             |  21 +
 tests/integration_tests/reports/api_tests.py       |  92 +++
 tests/integration_tests/thumbnails_tests.py        |  15 +
 108 files changed, 2218 insertions(+), 1557 deletions(-)

Reply via email to