diff --git a/frontend/src/component/admin/auth/AuthSettings.tsx b/frontend/src/component/admin/auth/AuthSettings.tsx index 6cb5ad82d7..3f9629c1ed 100644 --- a/frontend/src/component/admin/auth/AuthSettings.tsx +++ b/frontend/src/component/admin/auth/AuthSettings.tsx @@ -2,7 +2,6 @@ import { Alert, Tab, Tabs } from '@mui/material'; import { PageContent } from 'component/common/PageContent/PageContent'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; -import { useUiFlag } from 'hooks/useUiFlag'; import { OidcAuth } from './OidcAuth/OidcAuth'; import { SamlAuth } from './SamlAuth/SamlAuth'; import { ScimSettings } from './ScimSettings/ScimSettings'; @@ -39,7 +38,7 @@ export const AuthSettings = () => { (item) => uiConfig.flags?.googleAuthEnabled || item.label !== 'Google', ); - if (isEnterprise() && useUiFlag('scimApi')) { + if (isEnterprise()) { tabs.push({ label: 'SCIM', component: , diff --git a/frontend/src/hooks/api/getters/useScimSettings/useScimSettings.ts b/frontend/src/hooks/api/getters/useScimSettings/useScimSettings.ts index 123fce0c41..cdfd4300c7 100644 --- a/frontend/src/hooks/api/getters/useScimSettings/useScimSettings.ts +++ b/frontend/src/hooks/api/getters/useScimSettings/useScimSettings.ts @@ -3,7 +3,6 @@ import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { useConditionalSWR } from '../useConditionalSWR/useConditionalSWR'; import useUiConfig from '../useUiConfig/useUiConfig'; -import { useUiFlag } from 'hooks/useUiFlag'; const ENDPOINT = 'api/admin/scim-settings'; @@ -21,10 +20,9 @@ const DEFAULT_DATA: ScimSettings = { export const useScimSettings = () => { const { isEnterprise } = useUiConfig(); - const scimEnabled = useUiFlag('scimApi'); const { data, error, mutate } = useConditionalSWR( - isEnterprise() && scimEnabled, + isEnterprise(), DEFAULT_DATA, formatApiPath(ENDPOINT), fetcher, diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index aa7f23a6b6..1b8cb7d763 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -84,7 +84,6 @@ export type UiFlags = { disableShowContextFieldSelectionValues?: boolean; projectOverviewRefactorFeedback?: boolean; featureLifecycle?: boolean; - scimApi?: boolean; manyStrategiesPagination?: boolean; enableLegacyVariants?: boolean; navigationSidebar?: boolean;