fix user reference

apache · Apr 29, 2022 · c409a23 · c409a23
1 parent e6bdf93
commit c409a23
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -91,6 +91,11 @@ export const PRIMARY_COLOR = { r: 0, g: 122, b: 135, a: 1 };
 const ROW_LIMIT_OPTIONS = [10, 50, 100, 250, 500, 1000, 5000, 10000, 50000];
 const SERIES_LIMITS = [5, 10, 25, 50, 100, 500];
 
+const appContainer = document.getElementById('app');
+const { user } = JSON.parse(
+  appContainer?.getAttribute('data-bootstrap') || '{}',
+);
+
 type Control = {
   savedMetrics?: Metric[] | null;
   default?: unknown;
@@ -167,6 +172,7 @@ const datasourceControl: SharedControlConfig<'DatasourceControl'> = {
   mapStateToProps: ({ datasource, form_data }) => ({
     datasource,
     form_data,
+    user,
   }),
 };
 

diff --git a/...set-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.jsx b/...set-frontend/src/explore/components/controls/DatasourceControl/DatasourceControl.test.jsx
@@ -29,6 +29,7 @@ import {
 import DatasourceControl from 'src/explore/components/controls/DatasourceControl';
 import Icons from 'src/components/Icons';
 import { Tooltip } from 'src/components/Tooltip';
+import { user } from 'src/SqlLab/fixtures';
 
 const defaultProps = {
   name: 'datasource',
@@ -52,6 +53,7 @@ const defaultProps = {
     setDatasource: sinon.spy(),
   },
   onChange: sinon.spy(),
+  user,
 };
 
 describe('DatasourceControl', () => {

diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
@@ -196,11 +196,9 @@ class DatasourceControl extends React.PureComponent {
       }
     }
 
+    console.log(this.props);
     const isSqlSupported = datasource.type === 'table';
-    const appContainer = document.getElementById('app');
-    const { user } = JSON.parse(
-      appContainer?.getAttribute('data-bootstrap') || '{}',
-    );
+    const { user } = this.props;
     const allowEdit =
       datasource.owners.map(o => o.id).includes(user.userId) ||
       isUserAdmin(user);