Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/app/assets/javascripts/feature_flags/utils.js b/app/assets/javascripts/feature_flags/utils.js
index ccb6ac17792..24c570657e6 100644
--- a/app/assets/javascripts/feature_flags/utils.js
+++ b/app/assets/javascripts/feature_flags/utils.js
@@ -2,6 +2,7 @@ import { s__, n__, sprintf } from '~/locale';
 import {
   ALL_ENVIRONMENTS_NAME,
   ROLLOUT_STRATEGY_ALL_USERS,
+  ROLLOUT_STRATEGY_FLEXIBLE_ROLLOUT,
   ROLLOUT_STRATEGY_PERCENT_ROLLOUT,
   ROLLOUT_STRATEGY_USER_ID,
   ROLLOUT_STRATEGY_GITLAB_USER_LIST,
@@ -12,6 +13,23 @@ const badgeTextByType = {
     name: s__('FeatureFlags|All Users'),
     parameters: null,
   },
+  [ROLLOUT_STRATEGY_FLEXIBLE_ROLLOUT]: {
+    name: s__('FeatureFlags|Percent rollout'),
+    parameters: ({ parameters: { rollout, stickiness } }) => {
+      switch (stickiness) {
+        case 'USERID':
+          return sprintf(s__('FeatureFlags|%{percent} by user ID'), { percent: `${rollout}%` });
+        case 'SESSIONID':
+          return sprintf(s__('FeatureFlags|%{percent} by session ID'), { percent: `${rollout}%` });
+        case 'RANDOM':
+          return sprintf(s__('FeatureFlags|%{percent} randomly'), { percent: `${rollout}%` });
+        default:
+          return sprintf(s__('FeatureFlags|%{percent} by available ID'), {
+            percent: `${rollout}%`,
+          });
+      }
+    },
+  },
   [ROLLOUT_STRATEGY_PERCENT_ROLLOUT]: {
     name: s__('FeatureFlags|Percent of users'),
     parameters: ({ parameters: { percentage } }) => `${percentage}%`,