From 53576b0a7a041e65dbce457732d64bbc59540d57 Mon Sep 17 00:00:00 2001 From: Aniket Katkar Date: Tue, 17 Oct 2023 21:31:28 +0530 Subject: [PATCH] fix(ui): removed the persona settings option for non-admin users (#13605) * removed the persona settings option for non-admin users * replaced the grid container on my data page --- .../pages/MyDataPage/MyDataPageV1.component.tsx | 14 ++++++-------- .../resources/ui/src/utils/GlobalSettingsUtils.tsx | 5 +---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx index ff3aac9a32e..ed65ea2f608 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx @@ -21,7 +21,7 @@ import React, { useRef, useState, } from 'react'; -import { Responsive, WidthProvider } from 'react-grid-layout'; +import RGL, { WidthProvider } from 'react-grid-layout'; import { useLocation } from 'react-router-dom'; import AppState from '../../AppState'; import ActivityFeedProvider from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; @@ -45,7 +45,7 @@ import { showErrorToast } from '../../utils/ToastUtils'; import { WidgetConfig } from '../CustomizablePage/CustomizablePage.interface'; import './my-data.less'; -const ResponsiveGridLayout = WidthProvider(Responsive); +const ReactGridLayout = WidthProvider(RGL); const MyDataPageV1 = () => { const location = useLocation(); @@ -245,12 +245,10 @@ const MyDataPageV1 = () => { {isLoading ? ( ) : ( - { ]} rowHeight={100}> {widgets} - + )} diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx index 9a266dcd2f8..276ac827ccb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx @@ -104,10 +104,7 @@ export const getGlobalSettingsMenuWithPermission = ( { label: i18next.t('label.persona-plural'), - isProtected: userPermissions.hasViewPermissions( - ResourceEntity.USER, - permissions - ), + isProtected: Boolean(isAdminUser), key: 'members.persona', icon: , },