Merge branch '194130-unable-to-create-feature-flags-with-userids' into 'master'

Resolve "Unable to create feature flags with userIds"

Closes #194130

See merge request gitlab-org/gitlab!22528

ee/app/assets/javascripts/feature_flags/store/modules/helpers.js

@@ -59,18 +59,18 @@ export const mapToScopesViewModel = scopesFromRails =>
  */
 export const mapFromScopesViewModel = params => {
   const scopes = (params.scopes || []).map(s => {
-    const percentParameters = {};
+    const parameters = {};
     if (s.rolloutStrategy === ROLLOUT_STRATEGY_PERCENT_ROLLOUT) {
-      percentParameters.groupId = PERCENT_ROLLOUT_GROUP_ID;
-      percentParameters.percentage = s.rolloutPercentage;
+      parameters.groupId = PERCENT_ROLLOUT_GROUP_ID;
+      parameters.percentage = s.rolloutPercentage;
+    } else if (s.rolloutStrategy === ROLLOUT_STRATEGY_USER_ID) {
+      parameters.userIds = (s.rolloutUserIds || '').replace(/, /g, ',');
     }
 
     const userIdParameters = {};
 
-    if (s.shouldIncludeUserIds || s.rolloutStrategy === ROLLOUT_STRATEGY_USER_ID) {
+    if (s.shouldIncludeUserIds && s.rolloutStrategy !== ROLLOUT_STRATEGY_USER_ID) {
       userIdParameters.userIds = (s.rolloutUserIds || '').replace(/, /g, ',');
-    } else if (Array.isArray(s.rolloutUserIds) && s.rolloutUserIds.length > 0) {
-      userIdParameters.userIds = s.rolloutUserIds.join(',');
     }
 
     // Strip out any internal IDs
@@ -79,7 +79,7 @@ export const mapFromScopesViewModel = params => {
     const strategies = [
       {
         name: s.rolloutStrategy,
-        parameters: percentParameters,
+        parameters,
       },
     ];
 

ee/changelogs/unreleased/194130-unable-to-create-feature-flags-with-userids.yml

+---
+title: Ensure When userWithId Is Picked User IDs are Sent
+merge_request: 22528
+author:
+type: fixed

ee/spec/frontend/feature_flags/store/helpers_spec.js

@@ -161,9 +161,10 @@ describe('feature flags helpers spec', () => {
             canUpdate: true,
             protected: true,
             shouldBeDestroyed: true,
+            shouldIncludeUserIds: true,
             rolloutStrategy: ROLLOUT_STRATEGY_PERCENT_ROLLOUT,
             rolloutPercentage: '48',
-            rolloutUserIds: ['123', '234'],
+            rolloutUserIds: '123, 234',
           },
         ],
       };