chore: move passwords needed message (#12002)

apache · Dec 10, 2020 · 9e07e10 · 9e07e10
1 parent 3a62541
commit 9e07e10
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 27 deletions.
diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
@@ -51,6 +51,13 @@ import TooltipWrapper from 'src/components/TooltipWrapper';
 import ChartCard from './ChartCard';
 
 const PAGE_SIZE = 25;
+const PASSWORDS_NEEDED_MESSAGE = t(
+  'The passwords for the databases below are needed in order to ' +
+    'import them together with the charts. Please note that the ' +
+    '"Secure Extra" and "Certificate" sections of ' +
+    'the database configuration are not present in export files, and ' +
+    'should be added manually after the import if they are needed.',
+);
 
 const createFetchDatasets = (handleError: (err: Response) => void) => async (
   filterValue = '',
@@ -574,13 +581,7 @@ function ChartList(props: ChartListProps) {
         resourceName="chart"
         resourceLabel={t('chart')}
         icon={<StyledIcon name="nav-charts" />}
-        passwordsNeededMessage={t(
-          'The passwords for the databases below are needed in order to ' +
-            'import them together with the charts. Please note that the ' +
-            '"Secure Extra" and "Certificate" sections of ' +
-            'the database configuration are not present in export files, and ' +
-            'should be added manually after the import if they are needed.',
-        )}
+        passwordsNeededMessage={PASSWORDS_NEEDED_MESSAGE}
         addDangerToast={addDangerToast}
         addSuccessToast={addSuccessToast}
         onModelImport={handleChartImport}

diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
@@ -45,6 +45,13 @@ import Dashboard from 'src/dashboard/containers/Dashboard';
 import DashboardCard from './DashboardCard';
 
 const PAGE_SIZE = 25;
+const PASSWORDS_NEEDED_MESSAGE = t(
+  'The passwords for the databases below are needed in order to ' +
+    'import them together with the dashboards. Please note that the ' +
+    '"Secure Extra" and "Certificate" sections of ' +
+    'the database configuration are not present in export files, and ' +
+    'should be added manually after the import if they are needed.',
+);
 
 interface DashboardListProps {
   addDangerToast: (msg: string) => void;
@@ -535,13 +542,7 @@ function DashboardList(props: DashboardListProps) {
         resourceName="dashboard"
         resourceLabel={t('dashboard')}
         icon={<StyledIcon name="nav-dashboard" />}
-        passwordsNeededMessage={t(
-          'The passwords for the databases below are needed in order to ' +
-            'import them together with the dashboards. Please note that the ' +
-            '"Secure Extra" and "Certificate" sections of ' +
-            'the database configuration are not present in export files, and ' +
-            'should be added manually after the import if they are needed.',
-        )}
+        passwordsNeededMessage={PASSWORDS_NEEDED_MESSAGE}
         addDangerToast={addDangerToast}
         addSuccessToast={addSuccessToast}
         onModelImport={handleDashboardImport}

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
@@ -36,6 +36,12 @@ import DatabaseModal from './DatabaseModal';
 import { DatabaseObject } from './types';
 
 const PAGE_SIZE = 25;
+const PASSWORDS_NEEDED_MESSAGE = t(
+  'The passwords for the databases below are needed in order to ' +
+    'import them. Please note that the "Secure Extra" and "Certificate" ' +
+    'sections of the database configuration are not present in export ' +
+    'files, and should be added manually after the import if they are needed.',
+);
 
 interface DatabaseDeleteObject extends DatabaseObject {
   chart_count: number;
@@ -431,12 +437,7 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
         resourceName="database"
         resourceLabel={t('database')}
         icon={<StyledIcon name="database" />}
-        passwordsNeededMessage={t(
-          'The passwords for the databases below are needed in order to ' +
-            'import them. Please note that the "Secure Extra" and "Certificate" ' +
-            'sections of the database configuration are not present in export ' +
-            'files, and should be added manually after the import if they are needed.',
-        )}
+        passwordsNeededMessage={PASSWORDS_NEEDED_MESSAGE}
         addDangerToast={addDangerToast}
         addSuccessToast={addSuccessToast}
         onModelImport={handleDatabaseImport}

diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
@@ -52,6 +52,13 @@ import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 import AddDatasetModal from './AddDatasetModal';
 
 const PAGE_SIZE = 25;
+const PASSWORDS_NEEDED_MESSAGE = t(
+  'The passwords for the databases below are needed in order to ' +
+    'import them together with the datasets. Please note that the ' +
+    '"Secure Extra" and "Certificate" sections of ' +
+    'the database configuration are not present in export files, and ' +
+    'should be added manually after the import if they are needed.',
+);
 
 const FlexRowContainer = styled.div`
   align-items: center;
@@ -653,13 +660,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         resourceName="dataset"
         resourceLabel={t('dataset')}
         icon={<StyledIcon name="table" />}
-        passwordsNeededMessage={t(
-          'The passwords for the databases below are needed in order to ' +
-            'import them together with the datasets. Please note that the ' +
-            '"Secure Extra" and "Certificate" sections of ' +
-            'the database configuration are not present in export files, and ' +
-            'should be added manually after the import if they are needed.',
-        )}
+        passwordsNeededMessage={PASSWORDS_NEEDED_MESSAGE}
         addDangerToast={addDangerToast}
         addSuccessToast={addSuccessToast}
         onModelImport={handleDatasetImport}