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 2023/01/24 16:51:46 UTC
[superset] 01/02: Merge branch 'master' of https://github.com/apache/superset into fix-explore-mixin
This is an automated email from the ASF dual-hosted git repository.
hugh pushed a commit to branch fix-explore-mixin
in repository https://gitbox.apache.org/repos/asf/superset.git
commit bf36bfa175fc643f99ec49f05ff99a99f498bff5
Merge: e386bc426c 3e07de7f39
Author: hughhhh <hu...@gmail.com>
AuthorDate: Tue Jan 24 18:36:43 2023 +0200
Merge branch 'master' of https://github.com/apache/superset into fix-explore-mixin
.github/ISSUE_TEMPLATE/bug_report.md | 2 +-
.github/ISSUE_TEMPLATE/feature_request.md | 14 -
.github/ISSUE_TEMPLATE/sip.md | 4 +-
.github/workflows/docker_build_push.sh | 17 +-
CONTRIBUTING.md | 10 +-
docs/docs/contributing/types-of-contributions.mdx | 8 +-
docs/docs/installation/alerts-reports.mdx | 319 ++++++---------------
.../installing-superset-using-docker-compose.mdx | 6 +-
helm/superset/Chart.yaml | 2 +-
helm/superset/README.md | 17 +-
helm/superset/templates/deployment-beat.yaml | 18 +-
helm/superset/templates/deployment-flower.yaml | 18 +-
helm/superset/templates/deployment-worker.yaml | 16 +-
helm/superset/templates/deployment-ws.yaml | 16 +-
helm/superset/templates/deployment.yaml | 16 +-
helm/superset/values.yaml | 25 +-
superset-frontend/package-lock.json | 77 ++---
superset-frontend/package.json | 6 +-
.../Datasource/DatasourceEditor.test.jsx | 18 +-
.../FilterableTable/FilterableTable.test.tsx | 14 +-
.../src/components/FilterableTable/index.tsx | 6 +-
.../Form/LabeledErrorBoundInput.test.jsx | 4 +-
.../src/components/Form/LabeledErrorBoundInput.tsx | 16 +-
.../src/components/ListView/ListView.test.jsx | 6 +-
.../HeaderReportDropdown/index.test.tsx | 6 +-
.../components/ReportModal/ReportModal.test.tsx | 6 +-
.../src/components/Select/Select.test.tsx | 13 +-
superset-frontend/src/components/Select/Select.tsx | 31 +-
superset-frontend/src/components/Select/utils.tsx | 6 +-
.../DetailsPanel/DetailsPanel.test.tsx | 22 +-
.../components/FiltersBadge/DetailsPanel/index.tsx | 17 +-
.../FilterIndicator/FilterIndicator.test.tsx | 16 +-
.../FiltersBadge/FilterIndicator/index.tsx | 12 +-
.../HeaderActionsDropdown.test.tsx | 1 +
.../Header/HeaderActionsDropdown/index.jsx | 3 +
.../src/dashboard/components/Header/index.jsx | 2 +
.../components/SliceHeader/SliceHeader.test.tsx | 1 +
.../src/dashboard/components/SliceHeader/index.tsx | 2 +
.../SliceHeaderControls.test.tsx | 1 +
.../components/SliceHeaderControls/index.tsx | 5 +
.../dashboard/components/gridComponents/Chart.jsx | 2 +
.../FilterBar/FilterSets/EditSection.tsx | 4 +-
.../FilterBar/FilterSets/FilterSetUnit.test.tsx | 2 +-
.../FilterBar/FilterSets/FilterSetUnit.tsx | 9 +-
.../DndMetricSelect.test.tsx | 13 +-
.../useExploreAdditionalActionsMenu/index.jsx | 22 +-
superset-frontend/src/logger/LogUtils.ts | 5 +
.../DatabaseConnectionForm/EncryptedField.tsx | 5 +-
.../DatabaseConnectionForm/TableCatalog.tsx | 17 +-
.../data/database/DatabaseModal/SSHTunnelForm.tsx | 6 +-
.../data/database/DatabaseModal/index.test.tsx | 35 +++
.../CRUD/data/database/DatabaseModal/index.tsx | 80 ++++--
.../CRUD/data/database/DatabaseModal/styles.ts | 6 -
superset/connectors/sqla/models.py | 37 ++-
superset/datasets/api.py | 3 +
superset/db_engine_specs/databricks.py | 13 +-
superset/db_engine_specs/hive.py | 37 ++-
superset/db_engine_specs/presto.py | 7 +-
superset/examples/birth_names.py | 4 +-
superset/models/dashboard.py | 5 -
superset/models/helpers.py | 5 +-
superset/models/sql_lab.py | 3 +-
tests/integration_tests/charts/api_tests.py | 6 +-
tests/integration_tests/databases/api_tests.py | 4 +-
tests/integration_tests/datasets/api_tests.py | 4 +-
.../db_engine_specs/hive_tests.py | 38 +++
.../unit_tests/db_engine_specs/test_databricks.py | 56 ++++
67 files changed, 751 insertions(+), 476 deletions(-)
diff --cc superset/connectors/sqla/models.py
index b363188b87,cffff73630..bfdec8b996
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@@ -131,6 -133,6 +138,8 @@@ from superset.utils.core import
remove_duplicates,
)
++from superset.models.helpers import ExploreMixin
++
config = app.config
metadata = Model.metadata # pylint: disable=no-member
logger = logging.getLogger(__name__)
diff --cc superset/models/sql_lab.py
index 5ccba99975,babea35baf..aecbb0340f
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@@ -19,7 -19,7 +19,7 @@@ import inspec
import logging
import re
from datetime import datetime
--from typing import Any, Dict, List, Optional, Type, TYPE_CHECKING
++from typing import Any, Dict, Hashable, List, Optional, Type, TYPE_CHECKING
import simplejson as json
import sqlalchemy as sqla