From 7e61e0dd0977474c5d06c2e8c1b42548176c0763 Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Wed, 11 Jun 2025 08:03:34 +0200 Subject: [PATCH] Chore(1-3807)/remove flag add edit strategy take2 (#10108) Removes all usages of flag addEditStrategy and refactors code where necessary. This is only the first step of the cleanup. After this, there's still lots of code to be removed. I've got a different PR that removes ~5k lines of code (https://github.com/Unleash/unleash/pull/10105) that I want to reach in pieces to make sure that everythnig works on the way there. --- .../Changes/Change/SegmentChangeDetails.tsx | 18 +- .../ConstraintsList/ConstraintsList.tsx | 1 - .../MultipleValues/MultipleValues.tsx | 16 +- .../NewConstraintAccordionList.tsx | 41 ++--- ...FeatureStrategyConstraintAccordionList.tsx | 29 +--- .../featureStrategyFormTestSetup.ts | 1 - .../FeatureStrategyForm.tsx | 31 ---- .../FeatureStrategySegment.tsx | 5 +- .../RecentlyUsedSegments.tsx | 10 +- .../ConditionalRolloutSlider.tsx | 10 +- .../RolloutSlider/LegacyRolloutSlider.tsx | 162 ------------------ .../InsightsHeader/InsightsHeader.tsx | 2 +- .../MilestoneStrategySegment.tsx | 4 +- .../segments/SegmentFormStepTwo.test.tsx | 4 +- .../component/segments/SegmentFormStepTwo.tsx | 23 +-- .../useFeatureStrategyApi.ts | 26 ++- frontend/src/interfaces/uiConfig.ts | 1 - src/lib/types/experimental.ts | 5 - src/server-dev.ts | 1 - 19 files changed, 47 insertions(+), 343 deletions(-) delete mode 100644 frontend/src/component/feature/StrategyTypes/RolloutSlider/LegacyRolloutSlider.tsx diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx index 3b73d769b0..eaa8f215c2 100644 --- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx +++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/SegmentChangeDetails.tsx @@ -8,9 +8,9 @@ import type { } from 'component/changeRequest/changeRequest.types'; import { useSegment } from 'hooks/api/getters/useSegment/useSegment'; import { SegmentDiff, SegmentTooltipLink } from '../../SegmentTooltipLink.tsx'; -import { ConstraintAccordionList } from 'component/common/LegacyConstraintAccordion/ConstraintAccordionList/ConstraintAccordionList'; + import { ViewableConstraintsList } from 'component/common/NewConstraintAccordion/ConstraintsList/ViewableConstraintsList'; -import { useUiFlag } from 'hooks/useUiFlag'; + import { ChangeOverwriteWarning } from './ChangeOverwriteWarning/ChangeOverwriteWarning.tsx'; const ChangeItemCreateEditWrapper = styled(Box)(({ theme }) => ({ @@ -67,7 +67,6 @@ export const SegmentChangeDetails: FC<{ : currentSegment?.name; const referenceSegment = changeRequestState === 'Applied' ? snapshotSegment : currentSegment; - const addEditStrategy = useUiFlag('addEditStrategy'); return ( @@ -116,16 +115,9 @@ export const SegmentChangeDetails: FC<{
{actions}
- {addEditStrategy ? ( - - ) : ( - - )} + )} diff --git a/frontend/src/component/common/ConstraintsList/ConstraintsList.tsx b/frontend/src/component/common/ConstraintsList/ConstraintsList.tsx index f7e0cb8b1f..1ae0b6c1b4 100644 --- a/frontend/src/component/common/ConstraintsList/ConstraintsList.tsx +++ b/frontend/src/component/common/ConstraintsList/ConstraintsList.tsx @@ -33,7 +33,6 @@ export const ConstraintsList: FC<{ children: ReactNode }> = ({ children }) => { result.push( {index > 0 ? ( - // todo (addEditStrategy): change divider for edit screen (probably a new component or a prop) ) : null} {child} diff --git a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/MultipleValues/MultipleValues.tsx b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/MultipleValues/MultipleValues.tsx index 074057f42e..4bd19b97c5 100644 --- a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/MultipleValues/MultipleValues.tsx +++ b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/MultipleValues/MultipleValues.tsx @@ -3,8 +3,6 @@ import { Chip, styled } from '@mui/material'; import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender'; import StringTruncator from 'component/common/StringTruncator/StringTruncator'; import { ConstraintValueSearch as NewConstraintValueSearch } from 'component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint/ConstraintValueSearch'; -import { useUiFlag } from 'hooks/useUiFlag'; -import { ConstraintValueSearch } from 'component/common/NewConstraintAccordion/ConstraintValueSearch/ConstraintValueSearch'; interface IMultipleValuesProps { values: string[] | undefined; @@ -25,7 +23,6 @@ const SearchWrapper = styled('div')(({ theme }) => ({ export const MultipleValues = ({ values }: IMultipleValuesProps) => { const [filter, setFilter] = useState(''); - const useNewSearchComponent = useUiFlag('addEditStrategy'); if (!values || values.length === 0) return null; @@ -34,19 +31,12 @@ export const MultipleValues = ({ values }: IMultipleValuesProps) => { 20} show={ - useNewSearchComponent ? ( - - - - ) : ( - + - ) + } /> {values diff --git a/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx b/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx index ef6b4a88a4..e0b71e0701 100644 --- a/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx +++ b/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx @@ -6,9 +6,7 @@ import produce from 'immer'; import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext'; import type { IUseWeakMap } from 'hooks/useWeakMap'; import { constraintId } from 'component/common/LegacyConstraintAccordion/ConstraintAccordionList/createEmptyConstraint'; -import { NewConstraintAccordion } from 'component/common/NewConstraintAccordion/NewConstraintAccordion'; import { ConstraintsList } from 'component/common/ConstraintsList/ConstraintsList'; -import { useUiFlag } from 'hooks/useUiFlag'; import { ConstraintAccordionView } from 'component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView'; import { EditableConstraint } from 'component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint/EditableConstraint'; @@ -52,7 +50,6 @@ export const NewConstraintAccordionList = forwardRef< IConstraintList >(({ constraints, setConstraints, state }, ref) => { const { context } = useUnleashContext(); - const addEditStrategy = useUiFlag('addEditStrategy'); const onEdit = setConstraints && @@ -113,34 +110,20 @@ export const NewConstraintAccordionList = forwardRef< {constraints.map((constraint, index) => - addEditStrategy ? ( - state.get(constraint)?.editing && - Boolean(setConstraints) ? ( - onRemove(index)} - // @ts-ignore - onUpdate={onAutoSave(constraintId)} - /> - ) : ( - - ) - ) : ( - onRemove(index)} + // @ts-ignore + onUpdate={onAutoSave(constraintId)} + /> + ) : ( + ), )} diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx index 1d3fd14954..de5d38b920 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/FeatureStrategyConstraintAccordionList/FeatureStrategyConstraintAccordionList.tsx @@ -10,11 +10,9 @@ import { type IConstraintAccordionListRef, useConstraintAccordionList, } from 'component/common/LegacyConstraintAccordion/ConstraintAccordionList/ConstraintAccordionList'; -import { NewConstraintAccordionList } from 'component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList'; import { EditableConstraintsList } from 'component/common/NewConstraintAccordion/ConstraintsList/EditableConstraintsList'; import { Limit } from 'component/common/Limit/Limit'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; -import { useUiFlag } from 'hooks/useUiFlag'; import { RecentlyUsedConstraints } from '../RecentlyUsedConstraints/RecentlyUsedConstraints.tsx'; interface IConstraintAccordionListProps { @@ -58,7 +56,6 @@ export const FeatureStrategyConstraintAccordionList = forwardRef< ref as RefObject, ); const { limit, limitReached } = useConstraintLimit(constraints.length); - const addEditStrategy = useUiFlag('addEditStrategy'); if (context.length === 0) { return null; @@ -93,22 +90,13 @@ export const FeatureStrategyConstraintAccordionList = forwardRef< } /> - {addEditStrategy ? ( - setConstraints ? ( - - ) : null - ) : ( - - )} + ) : null} ({ marginTop: theme.spacing(2), @@ -134,14 +122,9 @@ export const FeatureStrategyConstraintAccordionList = forwardRef< > Add constraint - - } + } diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts index e9d9cac5d6..39147ca3d1 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/featureStrategyFormTestSetup.ts @@ -87,7 +87,6 @@ export const setupUiConfigEndpoint = () => { environment: 'enterprise', flags: { newStrategyConfiguration: true, - addEditStrategy: true, }, resourceLimits: { featureEnvironmentStrategies: 2, diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx index c7fcac4cad..494cb1ce23 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx @@ -45,10 +45,8 @@ import { FeatureStrategyEnabledDisabled } from './FeatureStrategyEnabledDisabled import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; import { BuiltInStrategies, formatStrategyName } from 'utils/strategyNames'; import { Badge } from 'component/common/Badge/Badge'; -import EnvironmentIcon from 'component/common/EnvironmentIcon/EnvironmentIcon'; import { UpgradeChangeRequests } from '../../FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/UpgradeChangeRequests/UpgradeChangeRequests.tsx'; import { ConstraintSeparator } from 'component/common/ConstraintsList/ConstraintSeparator/ConstraintSeparator'; -import { useUiFlag } from 'hooks/useUiFlag.ts'; interface IFeatureStrategyFormProps { feature: IFeatureToggle; @@ -211,7 +209,6 @@ export const FeatureStrategyForm = ({ environmentId, ); const { strategyDefinition } = useStrategy(strategy?.name); - const addEditStrategy = useUiFlag('addEditStrategy'); useEffect(() => { trackEvent('new-strategy-form', { @@ -350,35 +347,7 @@ export const FeatureStrategyForm = ({ {formatStrategyName(strategy.name || '')} - - {strategy.parameters?.rollout}% - - } - /> - {foundEnvironment && !addEditStrategy ? ( - - - Environment: - - - {' '} - - {foundEnvironment.name} - - - - ) : null} diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategySegment/FeatureStrategySegment.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategySegment/FeatureStrategySegment.tsx index 37867b2e05..ef3d8ce0bb 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategySegment/FeatureStrategySegment.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategySegment/FeatureStrategySegment.tsx @@ -10,7 +10,7 @@ import { SegmentDocsStrategyWarning } from 'component/segments/SegmentDocs'; import { useSegmentLimits } from 'hooks/api/getters/useSegmentLimits/useSegmentLimits'; import { Box, styled, Typography } from '@mui/material'; import { HelpIcon } from 'component/common/HelpIcon/HelpIcon'; -import { useUiFlag } from 'hooks/useUiFlag'; + import { RecentlyUsedSegments } from './RecentlyUsedSegments/RecentlyUsedSegments.tsx'; interface IFeatureStrategySegmentProps { @@ -31,7 +31,6 @@ export const FeatureStrategySegment = ({ setSegments: setSelectedSegments, projectId, }: IFeatureStrategySegmentProps) => { - const addEditStrategy = useUiFlag('addEditStrategy'); const { segments: allSegments } = useSegments(); const { strategySegmentsLimit } = useSegmentLimits(); @@ -99,7 +98,7 @@ export const FeatureStrategySegment = ({ options={autocompleteOptions} onChange={onChange} disabled={atStrategySegmentsLimit} - icon={addEditStrategy ? null : undefined} + icon={null} width={'175px'} /> >; @@ -32,14 +31,7 @@ export const RecentlyUsedSegments = ({ }: RecentlyUsedSegmentsProps) => { const { items: recentlyUsedSegmentIds } = useRecentlyUsedSegments(); const { segments: allSegments } = useSegments(); - const addEditStrategyEnabled = useUiFlag('addEditStrategy'); - - if ( - !addEditStrategyEnabled || - recentlyUsedSegmentIds.length === 0 || - !setSegments || - !allSegments - ) { + if (recentlyUsedSegmentIds.length === 0 || !setSegments || !allSegments) { return null; } diff --git a/frontend/src/component/feature/StrategyTypes/RolloutSlider/ConditionalRolloutSlider.tsx b/frontend/src/component/feature/StrategyTypes/RolloutSlider/ConditionalRolloutSlider.tsx index bca74ec228..5a6004d4f8 100644 --- a/frontend/src/component/feature/StrategyTypes/RolloutSlider/ConditionalRolloutSlider.tsx +++ b/frontend/src/component/feature/StrategyTypes/RolloutSlider/ConditionalRolloutSlider.tsx @@ -1,6 +1,4 @@ import RolloutSlider from './RolloutSlider.tsx'; -import LegacyRolloutSlider from './LegacyRolloutSlider.tsx'; -import { useUiFlag } from 'hooks/useUiFlag'; interface IRolloutSliderProps { name: string; @@ -12,13 +10,7 @@ interface IRolloutSliderProps { } const ConditionalRolloutSlider = (props: IRolloutSliderProps) => { - const addEditStrategy = useUiFlag('addEditStrategy'); - - if (addEditStrategy) { - return ; - } - - return ; + return ; }; export default ConditionalRolloutSlider; diff --git a/frontend/src/component/feature/StrategyTypes/RolloutSlider/LegacyRolloutSlider.tsx b/frontend/src/component/feature/StrategyTypes/RolloutSlider/LegacyRolloutSlider.tsx deleted file mode 100644 index f195734d35..0000000000 --- a/frontend/src/component/feature/StrategyTypes/RolloutSlider/LegacyRolloutSlider.tsx +++ /dev/null @@ -1,162 +0,0 @@ -import { makeStyles, withStyles } from 'tss-react/mui'; -import { Slider, Typography, Box, styled } from '@mui/material'; -import { ROLLOUT_SLIDER_ID } from 'utils/testIds'; -import { HelpIcon } from 'component/common/HelpIcon/HelpIcon'; - -const StyledSlider = withStyles(Slider, (theme) => ({ - root: { - height: 8, - }, - thumb: { - height: 24, - width: 24, - backgroundColor: theme.palette.background.paper, - border: '2px solid currentColor', - }, - active: {}, - valueLabel: {}, - track: { - height: 8, - borderRadius: theme.shape.borderRadius, - }, - rail: { - height: 8, - borderRadius: theme.shape.borderRadius, - }, -})); - -const StyledHeader = styled(Typography)(({ theme }) => ({ - marginBottom: theme.spacing(1), -})); - -const StyledSubheader = styled(Typography)(({ theme }) => ({ - marginBottom: theme.spacing(1), - marginTop: theme.spacing(1), -})); - -const StyledBox = styled(Box)(({ theme }) => ({ - display: 'flex', - alignItems: 'center', - marginBottom: theme.spacing(1), -})); - -const useStyles = makeStyles()((theme) => ({ - slider: { - width: '100%', - maxWidth: '100%', - }, - margin: { - height: theme.spacing(3), - }, -})); - -const marks = [ - { - value: 0, - label: '0%', - }, - { - value: 25, - label: '25%', - }, - { - value: 50, - label: '50%', - }, - { - value: 75, - label: '75%', - }, - { - value: 100, - label: '100%', - }, -]; - -interface IRolloutSliderProps { - name: string; - minLabel?: string; - maxLabel?: string; - value: number; - onChange: (e: Event, newValue: number | number[]) => void; - disabled?: boolean; -} - -const LegacyRolloutSlider = ({ - name, - value, - onChange, - disabled = false, -}: IRolloutSliderProps) => { - const { classes } = useStyles(); - - const valuetext = (value: number) => `${value}%`; - - return ( -
- - {name} - - - Rollout percentage - - - The rollout percentage determines the proportion - of users exposed to a feature. It's based on the - MurmurHash of a user's unique identifier, - normalized to a number between 1 and 100. If the - normalized hash is less than or equal to the - rollout percentage, the user sees the feature. - This ensures a consistent, random distribution - of the feature among users. - - - - Stickiness - - - Stickiness refers to the value used for hashing - to ensure a consistent user experience. It - determines the input for the MurmurHash, - ensuring that a user's feature exposure remains - consistent across sessions. -
- By default Unleash will use the first value - present in the context in the order of{' '} - userId, sessionId and random. - - - - GroupId - - - The groupId is used as a seed for the hash - function, ensuring consistent feature exposure - across different feature flags for a uniform - user experience. - - - } - /> - - -
- ); -}; - -export default LegacyRolloutSlider; diff --git a/frontend/src/component/insights/components/InsightsHeader/InsightsHeader.tsx b/frontend/src/component/insights/components/InsightsHeader/InsightsHeader.tsx index 5ea399549c..4265ff761f 100644 --- a/frontend/src/component/insights/components/InsightsHeader/InsightsHeader.tsx +++ b/frontend/src/component/insights/components/InsightsHeader/InsightsHeader.tsx @@ -49,7 +49,7 @@ const StyledActionsSmallScreen = styled('div')(({ theme }) => ({ export const InsightsHeader: VFC = ({ actions }) => { const showInactiveUsers = useUiFlag('showInactiveUsers'); - const pageName = useUiFlag('sideMenuCleanup') ? 'Analytics' : 'Insights'; + const pageName = 'Analytics'; const theme = useTheme(); const isSmallScreen = useMediaQuery(theme.breakpoints.down('md')); diff --git a/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm/MilestoneStrategy/MilestoneStrategySegment.tsx b/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm/MilestoneStrategy/MilestoneStrategySegment.tsx index 39baee135d..d3eaef9075 100644 --- a/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm/MilestoneStrategy/MilestoneStrategySegment.tsx +++ b/frontend/src/component/releases/ReleasePlanTemplate/TemplateForm/MilestoneStrategy/MilestoneStrategySegment.tsx @@ -9,7 +9,6 @@ import { type IAutocompleteBoxOption, } from 'component/common/AutocompleteBox/AutocompleteBox'; import { MilestoneStrategySegmentList } from './MilestoneStrategySegmentList.tsx'; -import { useUiFlag } from 'hooks/useUiFlag'; const StyledHelpIconBox = styled(Box)(({ theme }) => ({ display: 'flex', @@ -27,7 +26,6 @@ export const MilestoneStrategySegment = ({ segments: selectedSegments, setSegments: setSelectedSegments, }: IMilestoneStrategySegmentProps) => { - const addEditStrategy = useUiFlag('addEditStrategy'); const { segments: allSegments } = useSegments(); const { strategySegmentsLimit } = useSegmentLimits(); @@ -90,7 +88,7 @@ export const MilestoneStrategySegment = ({ options={autocompleteOptions} onChange={onChange} disabled={atStrategySegmentsLimit} - icon={addEditStrategy ? null : undefined} + icon={null} width={'175px'} /> { ]); testServerRoute(server, '/api/admin/ui-config', { - flags: { - addEditStrategy: true, - }, + flags: {}, }); }; diff --git a/frontend/src/component/segments/SegmentFormStepTwo.tsx b/frontend/src/component/segments/SegmentFormStepTwo.tsx index 86d843e273..ddb84cf021 100644 --- a/frontend/src/component/segments/SegmentFormStepTwo.tsx +++ b/frontend/src/component/segments/SegmentFormStepTwo.tsx @@ -15,7 +15,6 @@ import { import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext'; import type { IConstraint } from 'interfaces/strategy'; import { useNavigate } from 'react-router-dom'; -import { ConstraintAccordionList } from 'component/common/LegacyConstraintAccordion/ConstraintAccordionList/ConstraintAccordionList'; import { EditableConstraintsList } from 'component/common/NewConstraintAccordion/ConstraintsList/EditableConstraintsList'; import type { IEditableConstraintsListRef } from 'component/common/NewConstraintAccordion/ConstraintsList/EditableConstraintsList'; import type { SegmentFormStep, SegmentFormMode } from './SegmentForm.tsx'; @@ -31,7 +30,6 @@ import { useSegmentValuesCount } from 'component/segments/hooks/useSegmentValues import AccessContext from 'contexts/AccessContext'; import { useSegmentLimits } from 'hooks/api/getters/useSegmentLimits/useSegmentLimits'; import { GO_BACK } from 'constants/navigate'; -import { useUiFlag } from 'hooks/useUiFlag'; interface ISegmentFormPartTwoProps { project?: string; @@ -122,7 +120,6 @@ export const SegmentFormStepTwo: React.FC = ({ ? [CREATE_SEGMENT, UPDATE_PROJECT_SEGMENT] : [UPDATE_SEGMENT, UPDATE_PROJECT_SEGMENT]; const { segmentValuesLimit } = useSegmentLimits(); - const addEditStrategy = useUiFlag('addEditStrategy'); const overSegmentValuesLimit: boolean = Boolean( segmentValuesLimit && segmentValuesCount > segmentValuesLimit, @@ -202,25 +199,13 @@ export const SegmentFormStepTwo: React.FC = ({ } /> - {addEditStrategy ? ( - hasAccess(modePermission, project) && setConstraints ? ( - - ) : null - ) : ( - - )} + ) : null} diff --git a/frontend/src/hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi.ts b/frontend/src/hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi.ts index 7df2521bf7..cb1ed63e5c 100644 --- a/frontend/src/hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi.ts +++ b/frontend/src/hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi.ts @@ -6,7 +6,6 @@ import type { import useAPI from '../useApi/useApi.js'; import { useRecentlyUsedConstraints } from 'component/feature/FeatureStrategy/FeatureStrategyConstraints/RecentlyUsedConstraints/useRecentlyUsedConstraints'; import { useRecentlyUsedSegments } from 'component/feature/FeatureStrategy/FeatureStrategySegment/RecentlyUsedSegments/useRecentlyUsedSegments'; -import { useUiFlag } from 'hooks/useUiFlag'; const useFeatureStrategyApi = () => { const { makeRequest, createRequest, errors, loading } = useAPI({ @@ -16,7 +15,6 @@ const useFeatureStrategyApi = () => { const { addItem: addToRecentlyUsedConstraints } = useRecentlyUsedConstraints(); const { addItem: addToRecentlyUsedSegments } = useRecentlyUsedSegments(); - const addEditStrategyEnabled = useUiFlag('addEditStrategy'); const addStrategyToFeature = async ( projectId: string, @@ -24,14 +22,12 @@ const useFeatureStrategyApi = () => { environmentId: string, payload: IFeatureStrategyPayload, ): Promise => { - if (addEditStrategyEnabled) { - if (payload.constraints && payload.constraints.length > 0) { - addToRecentlyUsedConstraints(payload.constraints); - } + if (payload.constraints && payload.constraints.length > 0) { + addToRecentlyUsedConstraints(payload.constraints); + } - if (payload.segments && payload.segments.length > 0) { - addToRecentlyUsedSegments(payload.segments); - } + if (payload.segments && payload.segments.length > 0) { + addToRecentlyUsedSegments(payload.segments); } const path = `api/admin/projects/${projectId}/features/${featureId}/environments/${environmentId}/strategies`; @@ -67,14 +63,12 @@ const useFeatureStrategyApi = () => { strategyId: string, payload: IFeatureStrategyPayload, ): Promise => { - if (addEditStrategyEnabled) { - if (payload.constraints && payload.constraints.length > 0) { - addToRecentlyUsedConstraints(payload.constraints); - } + if (payload.constraints && payload.constraints.length > 0) { + addToRecentlyUsedConstraints(payload.constraints); + } - if (payload.segments && payload.segments.length > 0) { - addToRecentlyUsedSegments(payload.segments); - } + if (payload.segments && payload.segments.length > 0) { + addToRecentlyUsedSegments(payload.segments); } const path = `api/admin/projects/${projectId}/features/${featureId}/environments/${environmentId}/strategies/${strategyId}`; diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 90a9d84cbf..6de2be58fa 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -86,7 +86,6 @@ export type UiFlags = { showUserDeviceCount?: boolean; consumptionModel?: boolean; edgeObservability?: boolean; - addEditStrategy?: boolean; registerFrontendClient?: boolean; customMetrics?: boolean; lifecycleMetrics?: boolean; diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 7dd22d3db0..cb927a2cd4 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -56,7 +56,6 @@ export type IFlagKey = | 'uniqueSdkTracking' | 'consumptionModel' | 'edgeObservability' - | 'addEditStrategy' | 'registerFrontendClient' | 'reportUnknownFlags' | 'lastSeenBulkQuery' @@ -268,10 +267,6 @@ const flags: IFlags = { process.env.EXPERIMENTAL_EDGE_OBSERVABILITY, false, ), - addEditStrategy: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_ADD_EDIT_STRATEGY, - false, - ), registerFrontendClient: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_REGISTER_FRONTEND_CLIENT, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 96ee24ceb4..10c38c4f27 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -50,7 +50,6 @@ process.nextTick(async () => { showUserDeviceCount: true, deltaApi: true, uniqueSdkTracking: true, - addEditStrategy: true, strictSchemaValidation: true, registerFrontendClient: true, reportUnknownFlags: true,