diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx index f08bcbe2658..9f580cbb6a9 100644 --- a/public/app/features/teams/TeamList.tsx +++ b/public/app/features/teams/TeamList.tsx @@ -5,7 +5,6 @@ import { connect, ConnectedProps } from 'react-redux'; import { GrafanaTheme2 } from '@grafana/data'; import { Trans, t } from '@grafana/i18n'; -import { config, getBackendSrv } from '@grafana/runtime'; import { Avatar, CellProps, @@ -66,7 +65,6 @@ export const TeamList = ({ changeSort, }: Props) => { const [roleOptions, setRoleOptions] = useState([]); - const [scimGroupSyncEnabled, setScimGroupSyncEnabled] = useState(false); const styles = useStyles2(getStyles); useEffect(() => { @@ -79,25 +77,6 @@ export const TeamList = ({ } }, []); - useEffect(() => { - const checkSCIMSettings = async () => { - if (!config.featureToggles.enableSCIM) { - setScimGroupSyncEnabled(false); - return; - } - try { - const scimSettings = await getBackendSrv().get( - `/apis/scim.grafana.app/v0alpha1/namespaces/${config.namespace}/config` - ); - setScimGroupSyncEnabled(scimSettings?.items[0]?.spec?.enableGroupSync || false); - } catch { - setScimGroupSyncEnabled(false); - } - }; - - checkSCIMSettings(); - }, []); - const canCreate = contextSrv.hasPermission(AccessControlAction.ActionTeamsCreate); const displayRolePicker = shouldDisplayRolePicker(); @@ -217,9 +196,7 @@ export const TeamList = ({ } const canReadTeam = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsRead, original); - const canDelete = - contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsDelete, original) && - (!scimGroupSyncEnabled || !original.isProvisioned); + const canDelete = contextSrv.hasPermissionInMetadata(AccessControlAction.ActionTeamsDelete, original); return ( {canReadTeam && ( @@ -247,7 +224,7 @@ export const TeamList = ({ }, }, ], - [displayRolePicker, hasFetched, rolesLoading, roleOptions, deleteTeam, styles, scimGroupSyncEnabled] + [displayRolePicker, hasFetched, rolesLoading, roleOptions, deleteTeam, styles] ); return (