From 3b6789deb1ebcc81ff9521a50efae221ccfd616b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20G=C3=B3is?= Date: Fri, 29 Nov 2024 10:35:38 +0000 Subject: [PATCH] chore: use simpler approach by dropping existing enabled override in response --- .../feature-toggle/feature-toggle-strategies-store.ts | 11 +++-------- ...4-features-view-filter-out-milestone-strategies.js | 7 +++++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/lib/features/feature-toggle/feature-toggle-strategies-store.ts b/src/lib/features/feature-toggle/feature-toggle-strategies-store.ts index 58d5ec283648..05ed24720f10 100644 --- a/src/lib/features/feature-toggle/feature-toggle-strategies-store.ts +++ b/src/lib/features/feature-toggle/feature-toggle-strategies-store.ts @@ -535,13 +535,9 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore { return a.sortOrder - b.sortOrder; }); featureToggle.environments = featureToggle.environments.map((e) => { - if (e.strategies && e.strategies.length === 0) { - e.enabled = false; - } - e.strategies = e.strategies - .filter(({ milestoneId }) => !milestoneId) - .map(({ milestoneId, ...strategy }) => strategy) - .sort((a, b) => a.sortOrder - b.sortOrder); + e.strategies = e.strategies.sort( + (a, b) => a.sortOrder - b.sortOrder, + ); return e; }); @@ -861,7 +857,6 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore { id: r.strategy_id, title: r.strategy_title, disabled: r.strategy_disabled || false, - milestoneId: r.strategy_milestone_id, }; if (!includeId) { delete strategy.id; diff --git a/src/migrations/20241128152334-features-view-filter-out-milestone-strategies.js b/src/migrations/20241128152334-features-view-filter-out-milestone-strategies.js index a05d93a5571e..f1f3a1b3c9e1 100644 --- a/src/migrations/20241128152334-features-view-filter-out-milestone-strategies.js +++ b/src/migrations/20241128152334-features-view-filter-out-milestone-strategies.js @@ -32,7 +32,6 @@ exports.up = function (db, callback) { feature_strategies.title as strategy_title, feature_strategies.disabled as strategy_disabled, feature_strategies.variants as strategy_variants, - feature_strategies.milestone_id as strategy_milestone_id, users.id as user_id, users.name as user_name, users.username as user_username, @@ -40,7 +39,11 @@ exports.up = function (db, callback) { FROM features LEFT JOIN feature_environments ON feature_environments.feature_name = features.name - LEFT JOIN feature_strategies ON feature_strategies.feature_name = feature_environments.feature_name + LEFT JOIN ( + SELECT * + FROM feature_strategies + WHERE milestone_id IS NULL + ) AS feature_strategies ON feature_strategies.feature_name = feature_environments.feature_name and feature_strategies.environment = feature_environments.environment LEFT JOIN environments ON feature_environments.environment = environments.name LEFT JOIN feature_strategy_segment as fss ON fss.feature_strategy_id = feature_strategies.id