Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-01 00:08:27 +01:00
Code Issues Projects Releases Wiki Activity

fix: SCIM UI flag removal (#7856)

Browse Source 
We overlooked removing this flag from UI
This commit is contained in:
Gastón Fournier 2024-08-13 14:14:14 +02:00 committed by GitHub
parent 24e25cb615
commit 3f00d3132a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/component/admin/auth/AuthSettings.tsx
View File

@ -2,7 +2,6 @@ import { Alert, Tab, Tabs } from '@mui/material';
import { PageContent } from 'component/common/PageContent/PageContent'; import { PageContent } from 'component/common/PageContent/PageContent';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import { useUiFlag } from 'hooks/useUiFlag';
import { OidcAuth } from './OidcAuth/OidcAuth'; import { OidcAuth } from './OidcAuth/OidcAuth';
import { SamlAuth } from './SamlAuth/SamlAuth'; import { SamlAuth } from './SamlAuth/SamlAuth';
import { ScimSettings } from './ScimSettings/ScimSettings'; import { ScimSettings } from './ScimSettings/ScimSettings';
@ -39,7 +38,7 @@ export const AuthSettings = () => {
(item) => uiConfig.flags?.googleAuthEnabled || item.label !== 'Google', (item) => uiConfig.flags?.googleAuthEnabled || item.label !== 'Google',
); );
if (isEnterprise() && useUiFlag('scimApi')) { if (isEnterprise()) {
tabs.push({ tabs.push({
label: 'SCIM', label: 'SCIM',
component: <ScimSettings />, component: <ScimSettings />,

4
frontend/src/hooks/api/getters/useScimSettings/useScimSettings.ts
View File

@ -3,7 +3,6 @@ import { formatApiPath } from 'utils/formatPath';
import handleErrorResponses from '../httpErrorResponseHandler'; import handleErrorResponses from '../httpErrorResponseHandler';
import { useConditionalSWR } from '../useConditionalSWR/useConditionalSWR'; import { useConditionalSWR } from '../useConditionalSWR/useConditionalSWR';
import useUiConfig from '../useUiConfig/useUiConfig'; import useUiConfig from '../useUiConfig/useUiConfig';
import { useUiFlag } from 'hooks/useUiFlag';
const ENDPOINT = 'api/admin/scim-settings'; const ENDPOINT = 'api/admin/scim-settings';
@ -21,10 +20,9 @@ const DEFAULT_DATA: ScimSettings = {
export const useScimSettings = () => { export const useScimSettings = () => {
const { isEnterprise } = useUiConfig(); const { isEnterprise } = useUiConfig();
const scimEnabled = useUiFlag('scimApi');
const { data, error, mutate } = useConditionalSWR<ScimSettings>( const { data, error, mutate } = useConditionalSWR<ScimSettings>(
isEnterprise() && scimEnabled, isEnterprise(),
DEFAULT_DATA, DEFAULT_DATA,
formatApiPath(ENDPOINT), formatApiPath(ENDPOINT),
fetcher, fetcher,

1
frontend/src/interfaces/uiConfig.ts
View File

@ -84,7 +84,6 @@ export type UiFlags = {
disableShowContextFieldSelectionValues?: boolean; disableShowContextFieldSelectionValues?: boolean;
projectOverviewRefactorFeedback?: boolean; projectOverviewRefactorFeedback?: boolean;
featureLifecycle?: boolean; featureLifecycle?: boolean;
scimApi?: boolean;
manyStrategiesPagination?: boolean; manyStrategiesPagination?: boolean;
enableLegacyVariants?: boolean; enableLegacyVariants?: boolean;
navigationSidebar?: boolean; navigationSidebar?: boolean;