Skip to content

Commit

Permalink
fix: SCIM UI flag removal (#7856)
Browse files Browse the repository at this point in the history
We overlooked removing this flag from UI
  • Loading branch information
gastonfournier authored Aug 13, 2024
1 parent 24e25cb commit 3f00d31
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
3 changes: 1 addition & 2 deletions frontend/src/component/admin/auth/AuthSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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: <ScimSettings />,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -21,10 +20,9 @@ const DEFAULT_DATA: ScimSettings = {

export const useScimSettings = () => {
const { isEnterprise } = useUiConfig();
const scimEnabled = useUiFlag('scimApi');

const { data, error, mutate } = useConditionalSWR<ScimSettings>(
isEnterprise() && scimEnabled,
isEnterprise(),
DEFAULT_DATA,
formatApiPath(ENDPOINT),
fetcher,
Expand Down
1 change: 0 additions & 1 deletion frontend/src/interfaces/uiConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ export type UiFlags = {
disableShowContextFieldSelectionValues?: boolean;
projectOverviewRefactorFeedback?: boolean;
featureLifecycle?: boolean;
scimApi?: boolean;
manyStrategiesPagination?: boolean;
enableLegacyVariants?: boolean;
navigationSidebar?: boolean;
Expand Down

0 comments on commit 3f00d31

Please sign in to comment.