[superset] 01/01: pull from master

[hu...@apache.org]

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

hugh pushed a commit to branch hugh/allow-imgs-via-s2text
in repository https://gitbox.apache.org/repos/asf/superset.git

commit d2e31aa128de1e602d4eda4d27b821c2dc5252e9
Merge: b8a54c7 f2b8b04
Author: hughhhh <hu...@gmail.com>
AuthorDate: Mon Jun 7 13:20:57 2021 -0400

    pull from master

 docs/installation.rst                              |   6 +-
 docs/src/pages/docs/installation/configuring.mdx   |   8 +-
 docs/src/pages/docs/installation/index.mdx         |   2 +-
 .../DashboardBuilder/DashboardBuilder.tsx          |  50 ++----
 .../dashboard/components/DashboardBuilder/state.ts |  93 ++++++++++++
 .../FilterBar/FilterControls/FilterValue.tsx       |   2 +-
 .../components/nativeFilters/FilterBar/index.tsx   |  21 ++-
 .../components/nativeFilters/FilterBar/state.ts    |   6 +
 .../FiltersConfigForm/FiltersConfigForm.tsx        |   9 +-
 .../FiltersConfigForm/getControlItemsMap.tsx       | 100 +++++++-----
 .../nativeFilters/FiltersConfigModal/types.ts      |   3 +
 .../nativeFilters/FiltersConfigModal/utils.ts      |   3 +
 .../dashboard/components/nativeFilters/types.ts    |   1 +
 superset-frontend/src/dataMask/reducer.ts          |   2 +-
 .../components/Select/SelectFilterPlugin.test.tsx  |  70 +++++----
 .../components/Select/SelectFilterPlugin.tsx       | 133 ++++++++--------
 .../src/filters/components/Select/controlPanel.ts  |   5 +-
 .../src/filters/components/Select/types.ts         |   2 +-
 .../DatabaseModal/DatabaseConnectionForm.tsx       | 167 +++++++++++++++++++--
 .../CRUD/data/database/DatabaseModal/index.tsx     |  64 ++++----
 .../CRUD/data/database/DatabaseModal/styles.ts     |  51 +++++++
 .../src/views/CRUD/data/database/types.ts          |   1 +
 superset/connectors/sqla/models.py                 |   4 +-
 superset/db_engine_specs/bigquery.py               |   4 +-
 tests/datasource_tests.py                          |  19 +++
 25 files changed, 604 insertions(+), 222 deletions(-)

diff --cc superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index c001e3c,a3221f7..7b1be56
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@@ -43,12 -47,8 +48,9 @@@ import 
    DatabaseForm,
    CONFIGURATION_METHOD,
  } from 'src/views/CRUD/data/database/types';
 +import Label from 'src/components/Label';
- import supersetText from 'src/utils/textUtils';
- import { cos } from 'mathjs';
  import ExtraOptions from './ExtraOptions';
  import SqlAlchemyForm from './SqlAlchemyForm';
- 
  import DatabaseConnectionForm from './DatabaseConnectionForm';
  import {
    antDAlertStyles,
@@@ -345,13 -354,12 +363,13 @@@ const DatabaseModal: FunctionComponent<
    const renderPreferredSelector = () => (
      <div className="preferred">
        {availableDbs?.databases
-         ?.filter(db => db.preferred)
-         .map(database => (
+         ?.filter((db: DatabaseForm) => db.preferred)
+         .map((database: DatabaseForm) => (
            <IconButton
-             className="preferred-item"
+             icon="preferred-item"
              onClick={() => setDatabaseModel(database.engine)}
              buttonText={database.name}
 +            icon={getPreferredImage('postgresql')}
            />
          ))}
      </div>