From 1166d00e6d0a03535850c8d8393abce11a7f05d9 Mon Sep 17 00:00:00 2001
From: David Leek <david@getunleash.io>
Date: Tue, 6 May 2025 08:41:03 +0200
Subject: [PATCH] chore: flag cleanup simplifyDisableFeature (#9892)

---
 .../feature-toggle/feature-toggle-service.ts  | 32 ++++---------------
 src/lib/types/experimental.ts                 |  5 ---
 src/server-dev.ts                             |  1 -
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/lib/features/feature-toggle/feature-toggle-service.ts b/src/lib/features/feature-toggle/feature-toggle-service.ts
index fa078bcb95..d4b669e49c 100644
--- a/src/lib/features/feature-toggle/feature-toggle-service.ts
+++ b/src/lib/features/feature-toggle/feature-toggle-service.ts
@@ -792,35 +792,15 @@ class FeatureToggleService {
         auditUser: IAuditUser,
         user?: IUser,
     ): Promise<void> {
-        if (this.flagResolver.isEnabled('simplifyDisableFeature')) {
-            const strategies =
-                await this.featureStrategiesStore.getStrategiesForFeatureEnv(
-                    projectId,
-                    featureName,
-                    environment,
-                );
-            const hasOnlyDisabledStrategies = strategies.every(
-                (strategy) => strategy.disabled,
+        const strategies =
+            await this.featureStrategiesStore.getStrategiesForFeatureEnv(
+                projectId,
+                featureName,
+                environment,
             );
-            if (hasOnlyDisabledStrategies) {
-                await this.unprotectedUpdateEnabled(
-                    projectId,
-                    featureName,
-                    environment,
-                    false,
-                    auditUser,
-                    user,
-                );
-            }
-            return;
-        }
-        const feature = await this.getFeature({ featureName });
-
-        const env = feature.environments.find((e) => e.name === environment);
-        const hasOnlyDisabledStrategies = env?.strategies.every(
+        const hasOnlyDisabledStrategies = strategies.every(
             (strategy) => strategy.disabled,
         );
-
         if (hasOnlyDisabledStrategies) {
             await this.unprotectedUpdateEnabled(
                 projectId,
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index 890d23fe21..8724c839eb 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -61,7 +61,6 @@ export type IFlagKey =
     | 'consumptionModel'
     | 'teamsIntegrationChangeRequests'
     | 'edgeObservability'
-    | 'simplifyDisableFeature'
     | 'adminNavUI'
     | 'tagTypeColor'
     | 'addEditStrategy'
@@ -295,10 +294,6 @@ const flags: IFlags = {
         process.env.EXPERIMENTAL_EDGE_OBSERVABILITY,
         false,
     ),
-    simplifyDisableFeature: parseEnvVarBoolean(
-        process.env.EXPERIMENTAL_SIMPLIFY_DISABLE_FEATURE,
-        false,
-    ),
     adminNavUI: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_ADMIN_NAV_UI,
         false,
diff --git a/src/server-dev.ts b/src/server-dev.ts
index 69ec039c8d..71b7794d74 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -55,7 +55,6 @@ process.nextTick(async () => {
                         uniqueSdkTracking: true,
                         filterExistingFlagNames: true,
                         teamsIntegrationChangeRequests: true,
-                        simplifyDisableFeature: true,
                         adminNavUI: true,
                         tagTypeColor: true,
                         newStrategyDropdown: true,