From dbc953b22283a344123d28374551aab8a16c649d Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Tue, 25 Mar 2025 13:36:23 +0200 Subject: [PATCH] chore: consolidate release plan flags (#9606) Removes the `releasePlanChangeRequests` flag and swaps existing references to it to the `releasePlans` flag instead --- .../FeatureStrategyMenu/FeatureStrategyMenu.tsx | 7 ++----- .../ReleasePlan/LegacyReleasePlan.tsx | 14 +++----------- .../FeatureOverview/ReleasePlan/ReleasePlan.tsx | 14 +++----------- frontend/src/interfaces/uiConfig.ts | 1 - src/lib/types/experimental.ts | 5 ----- src/server-dev.ts | 1 - 6 files changed, 8 insertions(+), 34 deletions(-) diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx index ed106e8c31..9f7228df75 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenu.tsx @@ -71,13 +71,10 @@ export const FeatureStrategyMenu = ({ usePendingChangeRequests(projectId); const { refetch } = useReleasePlans(projectId, featureId, environmentId); const { addReleasePlanToFeature } = useReleasePlansApi(); - const releasePlanChangeRequestsEnabled = useUiFlag( - 'releasePlanChangeRequests', - ); + const releasePlansEnabled = useUiFlag('releasePlans'); const crProtected = - releasePlanChangeRequestsEnabled && - isChangeRequestConfigured(environmentId); + releasePlansEnabled && isChangeRequestConfigured(environmentId); const onClose = () => { setAnchor(undefined); diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/LegacyReleasePlan.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/LegacyReleasePlan.tsx index 2aef613646..8188aa06d9 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/LegacyReleasePlan.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/LegacyReleasePlan.tsx @@ -119,9 +119,7 @@ export const ReleasePlan = ({ const { refetch: refetchChangeRequests } = usePendingChangeRequests(projectId); - const releasePlanChangeRequestsEnabled = useUiFlag( - 'releasePlanChangeRequests', - ); + const releasePlansEnabled = useUiFlag('releasePlans'); const onAddRemovePlanChangesConfirm = async () => { await addChange(projectId, environment, { @@ -163,10 +161,7 @@ export const ReleasePlan = ({ }; const confirmRemoveReleasePlan = () => { - if ( - releasePlanChangeRequestsEnabled && - isChangeRequestConfigured(environment) - ) { + if (releasePlansEnabled && isChangeRequestConfigured(environment)) { setChangeRequestDialogRemoveOpen(true); } else { setRemoveOpen(true); @@ -201,10 +196,7 @@ export const ReleasePlan = ({ }; const onStartMilestone = async (milestone: IReleasePlanMilestone) => { - if ( - releasePlanChangeRequestsEnabled && - isChangeRequestConfigured(environment) - ) { + if (releasePlansEnabled && isChangeRequestConfigured(environment)) { setMilestoneForChangeRequestDialog(milestone); setChangeRequestDialogStartMilestoneOpen(true); } else { diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx index 09757cd40b..f4241dd155 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlan.tsx @@ -122,9 +122,7 @@ export const ReleasePlan = ({ const { refetch: refetchChangeRequests } = usePendingChangeRequests(projectId); - const releasePlanChangeRequestsEnabled = useUiFlag( - 'releasePlanChangeRequests', - ); + const releasePlansEnabled = useUiFlag('releasePlans'); const onAddRemovePlanChangesConfirm = async () => { await addChange(projectId, environment, { @@ -166,10 +164,7 @@ export const ReleasePlan = ({ }; const confirmRemoveReleasePlan = () => { - if ( - releasePlanChangeRequestsEnabled && - isChangeRequestConfigured(environment) - ) { + if (releasePlansEnabled && isChangeRequestConfigured(environment)) { setChangeRequestDialogRemoveOpen(true); } else { setRemoveOpen(true); @@ -204,10 +199,7 @@ export const ReleasePlan = ({ }; const onStartMilestone = async (milestone: IReleasePlanMilestone) => { - if ( - releasePlanChangeRequestsEnabled && - isChangeRequestConfigured(environment) - ) { + if (releasePlansEnabled && isChangeRequestConfigured(environment)) { setMilestoneForChangeRequestDialog(milestone); setChangeRequestDialogStartMilestoneOpen(true); } else { diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index ce6b3be37b..ac8c727705 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -84,7 +84,6 @@ export type UiFlags = { enableLegacyVariants?: boolean; flagCreator?: boolean; releasePlans?: boolean; - releasePlanChangeRequests?: boolean; 'enterprise-payg'?: boolean; productivityReportEmail?: boolean; showUserDeviceCount?: boolean; diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index a5aa7436bc..5379c178cd 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -50,7 +50,6 @@ export type IFlagKey = | 'originMiddlewareRequestLogging' | 'webhookDomainLogging' | 'releasePlans' - | 'releasePlanChangeRequests' | 'productivityReportEmail' | 'productivityReportUnsubscribers' | 'enterprise-payg' @@ -255,10 +254,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_RELEASE_PLANS, false, ), - releasePlanChangeRequests: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_RELEASE_PLAN_CHANGE_REQUESTS, - false, - ), productivityReportEmail: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_PRODUCTIVITY_REPORT_EMAIL, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index 311d0efabc..4736c53204 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -50,7 +50,6 @@ process.nextTick(async () => { originMiddlewareRequestLogging: true, webhookDomainLogging: true, releasePlans: false, - releasePlanChangeRequests: false, showUserDeviceCount: true, flagOverviewRedesign: true, deltaApi: true,