fix: Removed CR on variants flag (it's GA) (#3738)

This PR removes the usage of crOnVariants flag, but keeps the behaviour, so CR are now enabled on variants. --------- Co-authored-by: Nuno Góis <github@nunogois.com>
Unleash · May 10, 2023 · eaacb97 · eaacb97
1 parent 73c9780
commit eaacb97
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 25 deletions.
diff --git a/...Variants/FeatureEnvironmentVariants/EnvironmentVariantsModal/EnvironmentVariantsModal.tsx b/...Variants/FeatureEnvironmentVariants/EnvironmentVariantsModal/EnvironmentVariantsModal.tsx
@@ -269,9 +269,7 @@ export const EnvironmentVariantsModal = ({
         ? 'Add to existing change request'
         : 'Add change to draft';
 
-    const isChangeRequest =
-        isChangeRequestConfigured(environment?.name || '') &&
-        uiConfig.flags.crOnVariants;
+    const isChangeRequest = isChangeRequestConfigured(environment?.name || '');
 
     const stickiness = useMemo(() => {
         if (!loading) {

diff --git a/...ure/FeatureView/FeatureVariants/FeatureEnvironmentVariants/FeatureEnvironmentVariants.tsx b/...ure/FeatureView/FeatureVariants/FeatureEnvironmentVariants/FeatureEnvironmentVariants.tsx
@@ -69,11 +69,9 @@ export const FeatureEnvironmentVariants = () => {
         () =>
             feature?.environments?.map(environment => ({
                 ...environment,
-                crEnabled:
-                    uiConfig.flags.crOnVariants &&
-                    isChangeRequestConfigured(environment.name),
+                crEnabled: isChangeRequestConfigured(environment.name),
             })) || [],
-        [feature.environments, uiConfig.flags.crOnVariants]
+        [feature.environments]
     );
 
     const createPatch = (

diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
@@ -41,7 +41,6 @@ export interface IFlags {
     messageBanner?: boolean;
     featuresExportImport?: boolean;
     caseInsensitiveInOperators?: boolean;
-    crOnVariants?: boolean;
     proPlanAutoCharge?: boolean;
     notifications?: boolean;
     personalAccessTokensKillSwitch?: boolean;

diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -69,7 +69,6 @@ exports[`should create default config 1`] = `
       "anonymiseEventLog": false,
       "caseInsensitiveInOperators": false,
       "cleanClientApi": false,
-      "crOnVariants": false,
       "demo": false,
       "embedProxy": true,
       "embedProxyFrontend": true,
@@ -92,7 +91,6 @@ exports[`should create default config 1`] = `
       "anonymiseEventLog": false,
       "caseInsensitiveInOperators": false,
       "cleanClientApi": false,
-      "crOnVariants": false,
       "demo": false,
       "embedProxy": true,
       "embedProxyFrontend": true,

diff --git a/src/lib/services/feature-toggle-service.ts b/src/lib/services/feature-toggle-service.ts
@@ -1737,13 +1737,7 @@ class FeatureToggleService {
         user: User,
         oldVariants?: IVariant[],
     ): Promise<IVariant[]> {
-        if (this.flagResolver.isEnabled('crOnVariants')) {
-            await this.stopWhenChangeRequestsEnabled(
-                projectId,
-                environment,
-                user,
-            );
-        }
+        await this.stopWhenChangeRequestsEnabled(projectId, environment, user);
         return this.saveVariantsOnEnv(
             projectId,
             featureName,
@@ -1761,10 +1755,8 @@ class FeatureToggleService {
         newVariants: IVariant[],
         user: User,
     ): Promise<IVariant[]> {
-        if (this.flagResolver.isEnabled('crOnVariants')) {
-            for (const env of environments) {
-                await this.stopWhenChangeRequestsEnabled(projectId, env);
-            }
+        for (const env of environments) {
+            await this.stopWhenChangeRequestsEnabled(projectId, env);
         }
         return this.setVariantsOnEnvs(
             projectId,

diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
@@ -33,10 +33,6 @@ const flags = {
         process.env.UNLEASH_EXPERIMENTAL_CASE_INSENSITIVE_IN_OPERATORS,
         false,
     ),
-    crOnVariants: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_CR_ON_VARIANTS,
-        false,
-    ),
     strictSchemaValidation: parseEnvVarBoolean(
         process.env.UNLEASH_STRICT_SCHEMA_VALIDTION,
         false,