fix styles for disabling

apache · Apr 27, 2022 · 6d5e269 · 6d5e269
1 parent 3c500fe
commit 6d5e269
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.jsx
@@ -35,6 +35,7 @@ import Button from 'src/components/Button';
 import ErrorAlert from 'src/components/ErrorMessage/ErrorAlert';
 import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
 import { URL_PARAMS } from 'src/constants';
+import { isUserAdmin } from 'src/dashboard/util/findPermission';
 
 const propTypes = {
   actions: PropTypes.object.isRequired,
@@ -196,11 +197,23 @@ class DatasourceControl extends React.PureComponent {
     }
 
     const isSqlSupported = datasource.type === 'table';
+    const appContainer = document.getElementById('app');
+    const bootstrapData = JSON.parse(
+      appContainer?.getAttribute('data-bootstrap') || '{}',
+    );
+    const user = bootstrapData.user;
+    const allowEdit =
+      datasource.owners.map(o => o.id).includes(user.userId) ||
+      isUserAdmin(user);
 
     const datasourceMenu = (
       <Menu onClick={this.handleMenuItemClick}>
         {this.props.isEditable && (
-          <Menu.Item key={EDIT_DATASET} data-test="edit-dataset">
+          <Menu.Item
+            key={EDIT_DATASET}
+            data-test="edit-dataset"
+            disabled={!allowEdit}
+          >
             {t('Edit dataset')}
           </Menu.Item>
         )}

diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
@@ -62,8 +62,9 @@ import InfoTooltip from 'src/components/InfoTooltip';
 import ImportModelsModal from 'src/components/ImportModal/index';
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
-import AddDatasetModal from './AddDatasetModal';
 import { isUserAdmin } from 'src/dashboard/util/findPermission';
+import AddDatasetModal from './AddDatasetModal';
+
 import {
   PAGE_SIZE,
   SORT_BY,
@@ -84,11 +85,22 @@ const Actions = styled.div`
   color: ${({ theme }) => theme.colors.grayscale.base};
 
   .disabled {
+    svg,
+    i {
+      &:hover {
+        path {
+          fill: ${({ theme }) => theme.colors.grayscale.light1};
+        }
+      }
+    }
     color: ${({ theme }) => theme.colors.grayscale.light1};
     .ant-menu-item:hover {
-      color: ${({ theme }) => theme.colors.grayscale.base};
+      color: ${({ theme }) => theme.colors.grayscale.light1};
       cursor: default;
     }
+    &::after {
+      color: ${({ theme }) => theme.colors.grayscale.light1};
+    }
   }
 `;
 
@@ -178,7 +190,6 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         endpoint: `/api/v1/dataset/${id}`,
       })
         .then(({ json = {} }) => {
-          console.log(json);
           const addCertificationFields = json.result.columns.map(
             (column: ColumnObject) => {
               const {
@@ -360,15 +371,6 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
       },
       {
         Cell: ({ row: { original } }: any) => {
-          console.log(
-            'original.owners',
-            original.owners.map((o: any) => o.id),
-          );
-          console.log(
-            'allow edit',
-            original.owners.map((o: any) => o.id).includes(user.userId),
-          );
-
           // Verify owner or isAdmin
           const allowEdit =
             original.owners.map((o: any) => o.id).includes(user.userId) ||
@@ -424,7 +426,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
                           'You must be a dataset owner in order to edit. Please reach out to a dataset owner to request modifications or edit access.',
                         )
                   }
-                  placement="bottom"
+                  placement="bottomRight"
                 >
                   <span
                     role="button"

diff --git a/superset/views/datasource/views.py b/superset/views/datasource/views.py
@@ -27,7 +27,7 @@
 from sqlalchemy.exc import NoSuchTableError
 from sqlalchemy.orm.exc import NoResultFound
 
-from superset import app, db, event_logger
+from superset import db, event_logger
 from superset.commands.utils import populate_owners
 from superset.connectors.connector_registry import ConnectorRegistry
 from superset.connectors.sqla.utils import get_physical_table_metadata