diff --git a/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.test.tsx b/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.test.tsx index 387e1f0f83..6e7abbc2d8 100644 --- a/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.test.tsx +++ b/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.test.tsx @@ -18,9 +18,6 @@ const server = testServerSetup(); const setupApi = (existingTokensCount: number) => { testServerRoute(server, '/api/admin/ui-config', { - flags: { - resourceLimits: true, - }, resourceLimits: { apiTokens: 1, }, diff --git a/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.tsx b/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.tsx index a820a61008..4c0a05bb5d 100644 --- a/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.tsx +++ b/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.tsx @@ -1,8 +1,6 @@ import { useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { styled } from '@mui/material'; -import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; -import { useUiFlag } from 'hooks/useUiFlag'; import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import ApiTokenForm from '../ApiTokenForm/ApiTokenForm'; import { CreateButton } from 'component/common/CreateButton/CreateButton'; @@ -37,16 +35,14 @@ const StyledLimit = styled(Limit)(({ theme }) => ({ })); const useApiTokenLimit = () => { - const resourceLimitsEnabled = useUiFlag('resourceLimits'); const { tokens, loading: loadingTokens } = useApiTokens(); const { uiConfig, loading: loadingConfig } = useUiConfig(); const apiTokensLimit = uiConfig.resourceLimits.apiTokens; return { - resourceLimitsEnabled, limit: apiTokensLimit, currentValue: tokens.length, - limitReached: resourceLimitsEnabled && tokens.length >= apiTokensLimit, + limitReached: tokens.length >= apiTokensLimit, loading: loadingConfig || loadingTokens, }; }; @@ -58,7 +54,6 @@ export const CreateApiToken = ({ modal = false }: ICreateApiTokenProps) => { const [showConfirm, setShowConfirm] = useState(false); const [token, setToken] = useState(''); const { - resourceLimitsEnabled, limit, currentValue, limitReached, @@ -176,16 +171,11 @@ export const CreateApiToken = ({ modal = false }: ICreateApiTokenProps) => { environment={environment} setEnvironment={setEnvironment} /> - - } + { testServerRoute(server, '/api/admin/ui-config', { - flags: { - resourceLimits: true, - }, - resourceLimits: { - apiTokens: apiTokenLimit, - }, + resourceLimits: { apiTokens: apiTokenLimit }, }); testServerRoute(server, '/api/admin/api-tokens', { diff --git a/frontend/src/component/common/ApiTokenTable/CreateApiTokenButton/CreateApiTokenButton.tsx b/frontend/src/component/common/ApiTokenTable/CreateApiTokenButton/CreateApiTokenButton.tsx index f0a5fdd76e..2fb753c831 100644 --- a/frontend/src/component/common/ApiTokenTable/CreateApiTokenButton/CreateApiTokenButton.tsx +++ b/frontend/src/component/common/ApiTokenTable/CreateApiTokenButton/CreateApiTokenButton.tsx @@ -3,7 +3,6 @@ import { CREATE_API_TOKEN_BUTTON } from 'utils/testIds'; import { useNavigate } from 'react-router-dom'; import Add from '@mui/icons-material/Add'; import { useApiTokens } from 'hooks/api/getters/useApiTokens/useApiTokens'; -import { useUiFlag } from 'hooks/useUiFlag'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; interface ICreateApiTokenButton { path: string; @@ -12,9 +11,7 @@ interface ICreateApiTokenButton { } const useApiTokenLimit = (apiTokenLimit: number, apiTokenCount: number) => { - const resourceLimitsEnabled = useUiFlag('resourceLimits'); - const limitReached = - resourceLimitsEnabled && apiTokenCount >= apiTokenLimit; + const limitReached = apiTokenCount >= apiTokenLimit; return { limitReached, diff --git a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.test.tsx b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.test.tsx index e56b835f40..20b44fa652 100644 --- a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.test.tsx +++ b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.test.tsx @@ -6,15 +6,9 @@ import { FreeTextInput } from './FreeTextInput'; const server = testServerSetup(); const LIMIT = 3; - const setupApi = () => { testServerRoute(server, '/api/admin/ui-config', { - flags: { - resourceLimits: true, - }, - resourceLimits: { - constraintValues: LIMIT, - }, + resourceLimits: { constraintValues: LIMIT }, }); }; @@ -126,8 +120,8 @@ test('should show limit reached indicator', async () => { {}} - setError={(newError: string) => {}} + setValues={() => {}} + setError={() => {}} removeValue={() => {}} />, ); diff --git a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.tsx b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.tsx index c74e4d8d61..488c8f3b25 100644 --- a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.tsx +++ b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/FreeTextInput/FreeTextInput.tsx @@ -6,9 +6,7 @@ import type React from 'react'; import { useState } from 'react'; import { ConstraintFormHeader } from '../ConstraintFormHeader/ConstraintFormHeader'; import { parseParameterStrings } from 'utils/parseParameter'; -import { useUiFlag } from 'hooks/useUiFlag'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; -import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import { Limit } from 'component/common/Limit/Limit'; interface IFreeTextInputProps { @@ -72,7 +70,6 @@ export const FreeTextInput = ({ }: IFreeTextInputProps) => { const [inputValues, setInputValues] = useState(''); const { classes: styles } = useStyles(); - const resourceLimitsEnabled = useUiFlag('resourceLimits'); const { uiConfig, loading } = useUiConfig(); const constraintValuesLimit = uiConfig.resourceLimits.constraintValues; @@ -88,9 +85,7 @@ export const FreeTextInput = ({ ...values, ...parseParameterStrings(inputValues), ]); - const limitReached = Boolean( - resourceLimitsEnabled && newValues.length > constraintValuesLimit, - ); + const limitReached = Boolean(newValues.length > constraintValuesLimit); if (limitReached) { setError( @@ -148,16 +143,11 @@ export const FreeTextInput = ({ /> - - } + diff --git a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.test.tsx b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.test.tsx index c893a336ea..0765c75cae 100644 --- a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.test.tsx +++ b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.test.tsx @@ -7,14 +7,10 @@ import { ADMIN } from '../../providers/AccessProvider/permissions'; const server = testServerSetup(); const setupApi = ({ - resourceLimits, limit, environments, -}: { resourceLimits: boolean; limit: number; environments: number }) => { +}: { limit: number; environments: number }) => { testServerRoute(server, '/api/admin/ui-config', { - flags: { - resourceLimits, - }, resourceLimits: { environments: limit, }, @@ -28,7 +24,7 @@ const setupApi = ({ }; test('show limit reached info', async () => { - setupApi({ environments: 1, limit: 1, resourceLimits: true }); + setupApi({ environments: 1, limit: 1 }); render(, { permissions: [{ permission: ADMIN }] }); await screen.findByText('You have reached the limit for environments'); @@ -39,7 +35,7 @@ test('show limit reached info', async () => { }); test('show approaching limit info', async () => { - setupApi({ environments: 9, limit: 10, resourceLimits: true }); + setupApi({ environments: 9, limit: 10 }); render(, { permissions: [{ permission: ADMIN }] }); await screen.findByText('You are nearing the limit for environments'); @@ -48,10 +44,3 @@ test('show approaching limit info', async () => { }); expect(createButton).toBeEnabled(); }); - -test('show limit reached info - no resource limits component', async () => { - setupApi({ environments: 1, limit: 1, resourceLimits: false }); - render(); - - await screen.findByText('Go back'); -}); diff --git a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx index 99b93248cf..621cdc0146 100644 --- a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx +++ b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx @@ -2,27 +2,20 @@ import { useNavigate } from 'react-router-dom'; import useEnvironmentForm from '../hooks/useEnvironmentForm'; import EnvironmentForm from '../EnvironmentForm/EnvironmentForm'; import FormTemplate from 'component/common/FormTemplate/FormTemplate'; -import { Alert } from '@mui/material'; -import { Button } from '@mui/material'; import { CreateButton } from 'component/common/CreateButton/CreateButton'; import useEnvironmentApi from 'hooks/api/actions/useEnvironmentApi/useEnvironmentApi'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useToast from 'hooks/useToast'; import { useEnvironments } from 'hooks/api/getters/useEnvironments/useEnvironments'; import usePermissions from 'hooks/api/getters/usePermissions/usePermissions'; -import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; -import { PageContent } from 'component/common/PageContent/PageContent'; import { ADMIN } from 'component/providers/AccessProvider/permissions'; -import { PageHeader } from 'component/common/PageHeader/PageHeader'; import { formatUnknownError } from 'utils/formatUnknownError'; import { GO_BACK } from 'constants/navigate'; import { Limit } from 'component/common/Limit/Limit'; -import { useUiFlag } from 'hooks/useUiFlag'; const CreateEnvironment = () => { const { setToastApiError, setToastData } = useToast(); const { uiConfig } = useUiConfig(); - const resourceLimitsEnabled = useUiFlag('resourceLimits'); const environmentLimit = uiConfig.resourceLimits.environments; const navigate = useNavigate(); const { environments } = useEnvironments(); @@ -73,13 +66,10 @@ const CreateEnvironment = () => { }; return ( - - - } - /> - } - > - - - - } - elseShow={ - <> - } - > - -

- Currently Unleash does not support more than{' '} - {environmentLimit} environments. If you need - more please reach out. -

- -
- - - - } - /> + documentationLink='https://docs.getunleash.io/reference/environments' + documentationLinkLabel='Environments documentation' + formatApiCode={formatApiCode} + > + + } + > + + + ); }; diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.test.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.test.tsx index 107d38f2b5..db78c0f7ce 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.test.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.test.tsx @@ -10,9 +10,6 @@ const LIMIT = 5; const setupApi = () => { testServerRoute(server, '/api/admin/ui-config', { - flags: { - resourceLimits: true, - }, resourceLimits: { constraints: LIMIT, }, diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx index 08dc982730..fa086a8ffe 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx @@ -1,8 +1,7 @@ import type React from 'react'; import { forwardRef, type RefObject } from 'react'; -import { Box, Button, styled, Tooltip, Typography } from '@mui/material'; +import { Box, Button, styled, Typography } from '@mui/material'; import Add from '@mui/icons-material/Add'; -import HelpOutline from '@mui/icons-material/HelpOutline'; import type { IConstraint } from 'interfaces/strategy'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; @@ -13,7 +12,6 @@ import { } from 'component/common/ConstraintAccordion/ConstraintAccordionList/ConstraintAccordionList'; import { NewConstraintAccordionList } from 'component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList'; import { Limit } from 'component/common/Limit/Limit'; -import { useUiFlag } from 'hooks/useUiFlag'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; interface IConstraintAccordionListProps { @@ -32,30 +30,6 @@ const StyledContainer = styled('div')({ flexDirection: 'column', }); -const StyledHelpWrapper = styled(Tooltip)(({ theme }) => ({ - marginLeft: theme.spacing(0.75), - height: theme.spacing(1.5), -})); - -const StyledHelp = styled(HelpOutline)(({ theme }) => ({ - fill: theme.palette.action.active, - [theme.breakpoints.down(860)]: { - display: 'none', - }, -})); - -const StyledConstraintLabel = styled('p')(({ theme }) => ({ - marginBottom: theme.spacing(1), - color: theme.palette.text.secondary, -})); - -const StyledAddCustomLabel = styled('div')(({ theme }) => ({ - marginTop: theme.spacing(1), - marginBottom: theme.spacing(1), - color: theme.palette.text.primary, - display: 'flex', -})); - const StyledHelpIconBox = styled(Box)(({ theme }) => ({ display: 'flex', alignItems: 'center', @@ -64,14 +38,11 @@ const StyledHelpIconBox = styled(Box)(({ theme }) => ({ })); const useConstraintLimit = (constraintsCount: number) => { - const resourceLimitsEnabled = useUiFlag('resourceLimits'); const { uiConfig } = useUiConfig(); const constraintsLimit = uiConfig.resourceLimits?.constraints || 30; - const limitReached = - resourceLimitsEnabled && constraintsCount >= constraintsLimit; + const limitReached = constraintsCount >= constraintsLimit; return { - resourceLimitsEnabled, limit: constraintsLimit, limitReached, }; @@ -80,93 +51,81 @@ const useConstraintLimit = (constraintsCount: number) => { export const FeatureStrategyConstraintAccordionList = forwardRef< IConstraintAccordionListRef | undefined, IConstraintAccordionListProps ->( - ( - { constraints, setConstraints, showCreateButton, showLabel = true }, - ref, - ) => { - const { onAdd, state, context } = useConstraintAccordionList( - setConstraints, - ref as RefObject, - ); - const { resourceLimitsEnabled, limit, limitReached } = - useConstraintLimit(constraints.length); +>(({ constraints, setConstraints, showCreateButton }, ref) => { + const { onAdd, state, context } = useConstraintAccordionList( + setConstraints, + ref as RefObject, + ); + const { limit, limitReached } = useConstraintLimit(constraints.length); - if (context.length === 0) { - return null; - } + if (context.length === 0) { + return null; + } - return ( - - - - Constraints - - - Constraints are advanced - targeting rules that you can use - to enable a feature flag for a - subset of your users. Read more - about constraints{' '} - - here - - - - } - /> - - + + + Constraints + + + Constraints are advanced targeting + rules that you can use to enable a + feature flag for a subset of your + users. Read more about constraints{' '} + + here + + + + } /> + + - ({ - marginTop: theme.spacing(2), - marginBottom: theme.spacing(2), - })} - > - - } - /> - + ({ + marginTop: theme.spacing(2), + marginBottom: theme.spacing(2), + })} + > + + - - - } - /> - - ); - }, -); + + + } + /> + + ); +}); diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx index 25edd4794c..59b0b9607c 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx @@ -36,21 +36,15 @@ import { useSegments } from 'hooks/api/getters/useSegments/useSegments'; import { useDefaultStrategy } from '../../../project/Project/ProjectSettings/ProjectDefaultStrategySettings/ProjectEnvironment/ProjectEnvironmentDefaultStrategy/EditDefaultStrategy'; import { FeatureStrategyForm } from '../FeatureStrategyForm/FeatureStrategyForm'; import { NewStrategyVariants } from 'component/feature/StrategyTypes/NewStrategyVariants'; -import { useUiFlag } from 'hooks/useUiFlag'; import { Limit } from 'component/common/Limit/Limit'; -import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; const useStrategyLimit = (strategyCount: number) => { - const resourceLimitsEnabled = useUiFlag('resourceLimits'); const { uiConfig } = useUiConfig(); const featureEnvironmentStrategiesLimit = uiConfig.resourceLimits?.featureEnvironmentStrategies || 100; - const limitReached = - resourceLimitsEnabled && - strategyCount >= featureEnvironmentStrategiesLimit; + const limitReached = strategyCount >= featureEnvironmentStrategiesLimit; return { - resourceLimitsEnabled, limit: featureEnvironmentStrategiesLimit, limitReached, }; @@ -93,8 +87,7 @@ export const FeatureStrategyCreate = () => { (featureEnvironment) => featureEnvironment.name === environmentId, ); const strategyCount = featureEnvironment?.strategies.length || 0; - const { limit, limitReached, resourceLimitsEnabled } = - useStrategyLimit(strategyCount); + const { limit, limitReached } = useStrategyLimit(strategyCount); const ref = useRef(feature); const { isChangeRequestConfigured } = useChangeRequestsEnabled(projectId); const { refetch: refetchChangeRequests } = @@ -247,16 +240,11 @@ export const FeatureStrategyCreate = () => { /> } Limit={ - - } + } disabled={limitReached} diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts index 1ad899d567..9e3320e4a6 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts @@ -86,7 +86,6 @@ export const setupUiConfigEndpoint = () => { environment: 'enterprise', flags: { newStrategyConfiguration: true, - resourceLimits: true, }, resourceLimits: { featureEnvironmentStrategies: 2, diff --git a/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.test.tsx b/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.test.tsx index 2bff470d44..290c4a2121 100644 --- a/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.test.tsx +++ b/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.test.tsx @@ -8,12 +8,7 @@ const server = testServerSetup(); const setupApi = (existingProjectsCount: number) => { testServerRoute(server, '/api/admin/ui-config', { - flags: { - resourceLimits: true, - }, - resourceLimits: { - projects: 1, - }, + resourceLimits: { projects: 1 }, versionInfo: { current: { enterprise: 'version' }, }, diff --git a/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx b/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx index 3e45f6102a..e41143d4a4 100644 --- a/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx +++ b/frontend/src/component/project/Project/CreateProject/NewCreateProjectForm/CreateProjectDialog.tsx @@ -16,7 +16,6 @@ import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import { useNavigate } from 'react-router-dom'; import { Dialog, styled } from '@mui/material'; -import { useUiFlag } from 'hooks/useUiFlag'; import useProjects from 'hooks/api/getters/useProjects/useProjects'; import { Limit } from 'component/common/Limit/Limit'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; @@ -96,15 +95,12 @@ const configButtonData = { }; const useProjectLimit = () => { - const resourceLimitsEnabled = useUiFlag('resourceLimits'); const { projects, loading: loadingProjects } = useProjects(); const { uiConfig, loading: loadingConfig } = useUiConfig(); const projectsLimit = uiConfig.resourceLimits?.projects; - const limitReached = - resourceLimitsEnabled && projects.length >= projectsLimit; + const limitReached = projects.length >= projectsLimit; return { - resourceLimitsEnabled, limit: projectsLimit, currentValue: projects.length, limitReached, @@ -201,7 +197,6 @@ export const CreateProjectDialog = ({ }; const { - resourceLimitsEnabled, limit, currentValue, limitReached, @@ -251,15 +246,10 @@ export const CreateProjectDialog = ({ creatingProject || limitReached || loadingLimit, }} Limit={ - - } + } handleSubmit={handleSubmit} diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/CreateFeatureDialog.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/CreateFeatureDialog.tsx index 66dd34060d..f948d07985 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/CreateFeatureDialog.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/CreateFeatureDialog.tsx @@ -12,7 +12,6 @@ import { import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import { useNavigate } from 'react-router-dom'; import { Dialog, styled } from '@mui/material'; -import { useUiFlag } from 'hooks/useUiFlag'; import useProjects from 'hooks/api/getters/useProjects/useProjects'; import { Limit } from 'component/common/Limit/Limit'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; @@ -174,8 +173,6 @@ const CreateFeatureDialogContent = ({ const { project: projectInfo } = useProjectOverview(project); const { tags: allTags } = useAllTags(); - const resourceLimitsEnabled = useUiFlag('resourceLimits'); - const { globalFlagLimitReached, projectFlagLimitReached, limitMessage } = useFlagLimits({ global: { @@ -233,15 +230,10 @@ const CreateFeatureDialogContent = ({ Icon={} validateName={validateToggleName} Limit={ - - } + } name={name} diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/useFlagLimits.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/useFlagLimits.tsx index c41d26a70b..6305e3c4b7 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/useFlagLimits.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureTogglesHeader/useFlagLimits.tsx @@ -1,5 +1,3 @@ -import { useUiFlag } from 'hooks/useUiFlag'; - type FlagLimitsProps = { global: { limit: number; count: number }; project: { limit?: number; count: number }; @@ -30,8 +28,7 @@ export const useFlagLimits = ({ global, project }: FlagLimitsProps) => { }; const useGlobalFlagLimit = (flagLimit: number, flagCount: number) => { - const resourceLimitsEnabled = useUiFlag('resourceLimits'); - const limitReached = resourceLimitsEnabled && flagCount >= flagLimit; + const limitReached = flagCount >= flagLimit; return { limitReached, diff --git a/frontend/src/component/project/ProjectList/ProjectList.test.tsx b/frontend/src/component/project/ProjectList/ProjectList.test.tsx index b33a9c1d74..b3c5bc658b 100644 --- a/frontend/src/component/project/ProjectList/ProjectList.test.tsx +++ b/frontend/src/component/project/ProjectList/ProjectList.test.tsx @@ -8,12 +8,7 @@ const server = testServerSetup(); const setupApi = () => { testServerRoute(server, '/api/admin/ui-config', { - flags: { - resourceLimits: true, - }, - resourceLimits: { - projects: 1, - }, + resourceLimits: { projects: 1 }, versionInfo: { current: { enterprise: 'version' }, }, diff --git a/frontend/src/component/segments/SegmentFormStepOne.test.tsx b/frontend/src/component/segments/SegmentFormStepOne.test.tsx index a455bef761..1f0228c2ae 100644 --- a/frontend/src/component/segments/SegmentFormStepOne.test.tsx +++ b/frontend/src/component/segments/SegmentFormStepOne.test.tsx @@ -18,7 +18,6 @@ const setupRoutes = ({ testServerRoute(server, '/api/admin/ui-config', { flags: { SE: true, - resourceLimits: true, }, resourceLimits: { segments: limit, diff --git a/frontend/src/component/segments/SegmentFormStepOne.tsx b/frontend/src/component/segments/SegmentFormStepOne.tsx index cb5a8b87ef..df6523c0c3 100644 --- a/frontend/src/component/segments/SegmentFormStepOne.tsx +++ b/frontend/src/component/segments/SegmentFormStepOne.tsx @@ -20,7 +20,6 @@ import { import { SegmentProjectAlert } from './SegmentProjectAlert'; import { sortStrategiesByFeature } from './SegmentDelete/SegmentDeleteUsedSegment/sort-strategies'; import type { IFeatureStrategy } from 'interfaces/strategy'; -import { useUiFlag } from 'hooks/useUiFlag'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import { useSegments } from 'hooks/api/getters/useSegments/useSegments'; import { Limit } from '../common/Limit/Limit'; @@ -37,15 +36,15 @@ interface ISegmentFormPartOneProps { setCurrentStep: React.Dispatch>; } -const StyledForm = styled('div')(({ theme }) => ({ +const StyledForm = styled('div')({ display: 'flex', flexDirection: 'column', height: '100%', -})); +}); -const StyledContainer = styled('div')(({ theme }) => ({ +const StyledContainer = styled('div')({ maxWidth: '400px', -})); +}); const StyledInputDescription = styled('p')(({ theme }) => ({ marginBottom: theme.spacing(1), @@ -56,11 +55,11 @@ const StyledInput = styled(Input)(({ theme }) => ({ marginBottom: theme.spacing(2), })); -const StyledButtonContainer = styled('div')(({ theme }) => ({ +const StyledButtonContainer = styled('div')({ marginTop: 'auto', display: 'flex', justifyContent: 'flex-end', -})); +}); const StyledCancelButton = styled(Button)(({ theme }) => ({ marginLeft: theme.spacing(3), @@ -79,16 +78,13 @@ const useSegmentLimit = () => { const { uiConfig, loading: loadingConfig } = useUiConfig(); const segmentsLimit = uiConfig.resourceLimits.segments; const segmentsCount = segments?.length || 0; - const resourceLimitsEnabled = useUiFlag('resourceLimits'); - const limitReached = - resourceLimitsEnabled && segmentsCount >= segmentsLimit; + const limitReached = segmentsCount >= segmentsLimit; return { limit: segmentsLimit, limitReached, currentCount: segmentsCount, loading: loadingSegments || loadingConfig, - resourceLimitsEnabled, }; }; @@ -111,7 +107,6 @@ export const SegmentFormStepOne: React.FC = ({ limit, currentCount, loading: loadingSegmentLimit, - resourceLimitsEnabled, } = useSegmentLimit(); const { @@ -204,15 +199,10 @@ export const SegmentFormStepOne: React.FC = ({ - - } + diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 85a6e0994c..fd5c5854ae 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -88,7 +88,6 @@ export type UiFlags = { enableLegacyVariants?: boolean; navigationSidebar?: boolean; flagCreator?: boolean; - resourceLimits?: boolean; newEventSearch?: boolean; archiveProjects?: boolean; projectListImprovements?: boolean; diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index daa936f785..fb792676a4 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -142,7 +142,6 @@ exports[`should create default config 1`] = ` "projectOverviewRefactorFeedback": false, "queryMissingTokens": false, "removeUnsafeInlineStyleSrc": false, - "resourceLimits": false, "responseTimeMetricsFix": false, "responseTimeWithAppNameKillSwitch": false, "showInactiveUsers": false, diff --git a/src/lib/features/feature-toggle/feature-toggle-service.ts b/src/lib/features/feature-toggle/feature-toggle-service.ts index dc6d4988ba..99c06a39ac 100644 --- a/src/lib/features/feature-toggle/feature-toggle-service.ts +++ b/src/lib/features/feature-toggle/feature-toggle-service.ts @@ -378,8 +378,6 @@ class FeatureToggleService { environment: string; featureName: string; }) { - if (!this.flagResolver.isEnabled('resourceLimits')) return; - const limit = this.resourceLimits.featureEnvironmentStrategies; const existingCount = ( await this.featureStrategiesStore.getStrategiesForFeatureEnv( @@ -400,8 +398,6 @@ class FeatureToggleService { updated: IConstraint[]; existing: IConstraint[]; }) { - if (!this.flagResolver.isEnabled('resourceLimits')) return; - const { constraints: constraintsLimit, constraintValues: constraintValuesLimit, @@ -1223,15 +1219,13 @@ class FeatureToggleService { } private async validateFeatureFlagLimit() { - if (this.flagResolver.isEnabled('resourceLimits')) { - const currentFlagCount = await this.featureToggleStore.count(); - const limit = this.resourceLimits.featureFlags; - if (currentFlagCount >= limit) { - throwExceedsLimitError(this.eventBus, { - resource: 'feature flag', - limit, - }); - } + const currentFlagCount = await this.featureToggleStore.count(); + const limit = this.resourceLimits.featureFlags; + if (currentFlagCount >= limit) { + throwExceedsLimitError(this.eventBus, { + resource: 'feature flag', + limit, + }); } } diff --git a/src/lib/features/project/project-service.limit.test.ts b/src/lib/features/project/project-service.limit.test.ts index a28accf901..fcfabb4635 100644 --- a/src/lib/features/project/project-service.limit.test.ts +++ b/src/lib/features/project/project-service.limit.test.ts @@ -14,9 +14,7 @@ test('Should not allow to exceed project limit on create', async () => { const projectService = createFakeProjectService({ ...createTestConfig(), flagResolver: alwaysOnFlagResolver, - resourceLimits: { - projects: LIMIT, - }, + resourceLimits: { projects: LIMIT }, eventBus: { emit: () => {}, }, @@ -37,9 +35,7 @@ test('Should not allow to exceed project limit on revive', async () => { const projectService = createFakeProjectService({ ...createTestConfig(), flagResolver: alwaysOnFlagResolver, - resourceLimits: { - projects: LIMIT, - }, + resourceLimits: { projects: LIMIT }, eventBus: { emit: () => {}, }, diff --git a/src/lib/features/project/project-service.ts b/src/lib/features/project/project-service.ts index c5363418bc..811758177e 100644 --- a/src/lib/features/project/project-service.ts +++ b/src/lib/features/project/project-service.ts @@ -325,8 +325,6 @@ export default class ProjectService { } async validateProjectLimit() { - if (!this.flagResolver.isEnabled('resourceLimits')) return; - const limit = Math.max(this.resourceLimits.projects, 1); const projectCount = await this.projectStore.count(); diff --git a/src/lib/features/segment/segment-service.limit.test.ts b/src/lib/features/segment/segment-service.limit.test.ts index f2e2947e80..f6603ad02c 100644 --- a/src/lib/features/segment/segment-service.limit.test.ts +++ b/src/lib/features/segment/segment-service.limit.test.ts @@ -13,9 +13,7 @@ test('Should not allow to exceed segment limit', async () => { const segmentService = createFakeSegmentService({ getLogger, flagResolver: alwaysOnFlagResolver, - resourceLimits: { - segments: LIMIT, - }, + resourceLimits: { segments: LIMIT }, eventBus: { emit: () => {}, }, diff --git a/src/lib/features/segment/segment-service.ts b/src/lib/features/segment/segment-service.ts index 6ce561ca5d..38e12e6b6f 100644 --- a/src/lib/features/segment/segment-service.ts +++ b/src/lib/features/segment/segment-service.ts @@ -129,8 +129,6 @@ export class SegmentService implements ISegmentService { } async validateSegmentLimit() { - if (!this.flagResolver.isEnabled('resourceLimits')) return; - const limit = this.resourceLimits.segments; const segmentCount = await this.segmentStore.count(); diff --git a/src/lib/services/api-token-service.limit.test.ts b/src/lib/services/api-token-service.limit.test.ts index 7d83cae18e..70482a12b2 100644 --- a/src/lib/services/api-token-service.limit.test.ts +++ b/src/lib/services/api-token-service.limit.test.ts @@ -7,9 +7,7 @@ import { createFakeApiTokenService } from '../features/api-tokens/createApiToken const createServiceWithLimit = (limit: number) => { const config: IUnleashConfig = createTestConfig({ experimental: { - flags: { - resourceLimits: true, - }, + flags: {}, }, }); config.resourceLimits.apiTokens = limit; diff --git a/src/lib/services/api-token-service.ts b/src/lib/services/api-token-service.ts index 1c4e0d2f7f..4ef2d499e4 100644 --- a/src/lib/services/api-token-service.ts +++ b/src/lib/services/api-token-service.ts @@ -308,15 +308,13 @@ export class ApiTokenService { } private async validateApiTokenLimit() { - if (this.flagResolver.isEnabled('resourceLimits')) { - const currentTokenCount = await this.store.count(); - const limit = this.resourceLimits.apiTokens; - if (currentTokenCount >= limit) { - throwExceedsLimitError(this.eventBus, { - resource: 'api token', - limit, - }); - } + const currentTokenCount = await this.store.count(); + const limit = this.resourceLimits.apiTokens; + if (currentTokenCount >= limit) { + throwExceedsLimitError(this.eventBus, { + resource: 'api token', + limit, + }); } } diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 44c82e3338..ed050dafe6 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -56,7 +56,6 @@ export type IFlagKey = | 'enableLegacyVariants' | 'navigationSidebar' | 'anonymizeProjectOwners' - | 'resourceLimits' | 'extendedMetrics' | 'removeUnsafeInlineStyleSrc' | 'originMiddleware' @@ -278,10 +277,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_ANONYMIZE_PROJECT_OWNERS, false, ), - resourceLimits: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_RESOURCE_LIMITS, - false, - ), extendedMetrics: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_EXTENDED_METRICS, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 785f204207..478a1b8593 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -50,7 +50,6 @@ process.nextTick(async () => { projectOverviewRefactorFeedback: true, manyStrategiesPagination: true, enableLegacyVariants: false, - resourceLimits: true, extendedMetrics: true, originMiddleware: true, newEventSearch: true,