{' '}
- {t(`The data source configuration exposed here
- affects all the charts using this datasource.
+ {t(`The dataset configuration exposed here
+ affects all the charts using this dataset.
Be mindful that changing settings
here may affect other charts
in undesirable ways.`)}
@@ -142,7 +142,7 @@ const DatasourceModal: FunctionComponent
= ({
- {t('Datasource Editor for ')}
+ {t('Edit Dataset ')}
{currentDatasource.table_name}
diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx
index 07ca75a02..046a6ed2a 100644
--- a/superset-frontend/src/explore/controls.jsx
+++ b/superset-frontend/src/explore/controls.jsx
@@ -197,7 +197,7 @@ export const controls = {
datasource: {
type: 'DatasourceControl',
- label: t('Datasource'),
+ label: t('Dataset'),
default: null,
description: null,
mapStateToProps: ({ datasource }) => ({
diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
index bf2fded8b..5406cfc29 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
@@ -220,7 +220,7 @@ function ChartList(props: ChartListProps) {
},
},
}: any) => {dsNameTxt},
- Header: t('Datasource'),
+ Header: t('Dataset'),
accessor: 'datasource_name',
},
{
@@ -345,7 +345,7 @@ function ChartList(props: ChartListProps) {
.map(k => ({ label: k, value: k })),
},
{
- Header: t('Datasource'),
+ Header: t('Dataset'),
id: 'datasource_id',
input: 'select',
operator: 'eq',
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
index c11bac5c9..8ef6b7fca 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
@@ -370,7 +370,7 @@ const DatasetList: FunctionComponent = ({
paginate: true,
},
{
- Header: t('Datasource'),
+ Header: t('Database'),
id: 'database',
input: 'select',
operator: 'rel_o_m',
diff --git a/superset/app.py b/superset/app.py
index 11cb004da..43089326e 100644
--- a/superset/app.py
+++ b/superset/app.py
@@ -209,20 +209,20 @@ class SupersetAppInitializer:
"Databases",
label=__("Databases"),
icon="fa-database",
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
category_icon="fa-database",
)
appbuilder.add_link(
- "Tables",
- label=__("Tables"),
+ "Datasets",
+ label=__("Datasets"),
href="/tablemodelview/list/?_flt_1_is_sqllab_view=y",
icon="fa-table",
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
category_icon="fa-table",
)
- appbuilder.add_separator("Sources")
+ appbuilder.add_separator("Data")
appbuilder.add_view(
SliceModelView,
"Charts",
@@ -332,8 +332,8 @@ class SupersetAppInitializer:
label=__("Upload a CSV"),
href="/csvtodatabaseview/form",
icon="fa-upload",
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
category_icon="fa-wrench",
)
try:
@@ -347,8 +347,8 @@ class SupersetAppInitializer:
label=__("Upload Excel"),
href="/exceltodatabaseview/form",
icon="fa-upload",
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
category_icon="fa-wrench",
)
except ImportError:
@@ -418,13 +418,13 @@ class SupersetAppInitializer:
# Conditionally setup Druid Views
#
if self.config["DRUID_IS_ACTIVE"]:
- appbuilder.add_separator("Sources")
+ appbuilder.add_separator("Data")
appbuilder.add_view(
DruidDatasourceModelView,
"Druid Datasources",
label=__("Druid Datasources"),
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
icon="fa-cube",
)
appbuilder.add_view(
@@ -432,8 +432,8 @@ class SupersetAppInitializer:
name="Druid Clusters",
label=__("Druid Clusters"),
icon="fa-cubes",
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
category_icon="fa-database",
)
appbuilder.add_view_no_menu(DruidMetricInlineView)
@@ -445,8 +445,8 @@ class SupersetAppInitializer:
"Scan New Datasources",
label=__("Scan New Datasources"),
href="/druid/scan_new_datasources/",
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
category_icon="fa-database",
icon="fa-refresh",
)
@@ -454,12 +454,12 @@ class SupersetAppInitializer:
"Refresh Druid Metadata",
label=__("Refresh Druid Metadata"),
href="/druid/refresh_datasources/",
- category="Sources",
- category_label=__("Sources"),
+ category="Data",
+ category_label=__("Data"),
category_icon="fa-database",
icon="fa-cog",
)
- appbuilder.add_separator("Sources")
+ appbuilder.add_separator("Data")
def init_app_in_ctx(self) -> None:
"""
diff --git a/tests/security_tests.py b/tests/security_tests.py
index fa8782295..64c6f32cc 100644
--- a/tests/security_tests.py
+++ b/tests/security_tests.py
@@ -642,8 +642,8 @@ class TestRolePermission(SupersetTestCase):
self.assertIn(("can_explore_json", "Superset"), perm_set)
self.assertIn(("can_userinfo", "UserDBModelView"), perm_set)
self.assert_can_menu("Databases", perm_set)
- self.assert_can_menu("Tables", perm_set)
- self.assert_can_menu("Sources", perm_set)
+ self.assert_can_menu("Datasets", perm_set)
+ self.assert_can_menu("Data", perm_set)
self.assert_can_menu("Charts", perm_set)
self.assert_can_menu("Dashboards", perm_set)