From 314a08b4e69fc4e25a19b03b374839e11618772b Mon Sep 17 00:00:00 2001
From: Christopher Kolstad <chriswk@getunleash.ai>
Date: Mon, 23 Oct 2023 14:32:15 +0200
Subject: [PATCH] feat: Make multiple roles per group/user GA by removing the
 flag (#5109)

To prepare for 5.6 GA,
I've done a find through both Frontend and Backend here to remove the
usages of the flag. Seems like the flag was only in use in the frontend.
@nunogois can you confirm?
---
 .../ProjectAccessAssign.tsx                   | 27 ++++---------------
 .../__snapshots__/create-config.test.ts.snap  |  2 --
 src/lib/types/experimental.ts                 |  5 ----
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx b/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx
index 02ed00a5de90..d1c3eeb0c41c 100644
--- a/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx
+++ b/frontend/src/component/project/ProjectAccess/ProjectAccessAssign/ProjectAccessAssign.tsx
@@ -441,28 +441,11 @@ export const ProjectAccessAssign = ({
                             Select the role to assign for this project
                         </StyledInputDescription>
                         <StyledAutocompleteWrapper>
-                            <ConditionallyRender
-                                condition={Boolean(
-                                    uiConfig.flags.multipleRoles,
-                                )}
-                                show={() => (
-                                    <MultipleRoleSelect
-                                        data-testid={PA_ROLE_ID}
-                                        roles={roles}
-                                        value={selectedRoles}
-                                        setValue={setRoles}
-                                    />
-                                )}
-                                elseShow={() => (
-                                    <RoleSelect
-                                        data-testid={PA_ROLE_ID}
-                                        roles={roles}
-                                        value={selectedRoles[0]}
-                                        setValue={(role) =>
-                                            setRoles(role ? [role] : [])
-                                        }
-                                    />
-                                )}
+                            <MultipleRoleSelect
+                                data-testid={PA_ROLE_ID}
+                                roles={roles}
+                                value={selectedRoles}
+                                setValue={setRoles}
                             />
                         </StyledAutocompleteWrapper>
                     </div>
diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index 487a3d6ec173..180600cfed74 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -106,7 +106,6 @@ exports[`should create default config 1`] = `
         },
       },
       "migrationLock": true,
-      "multipleRoles": false,
       "personalAccessTokensKillSwitch": false,
       "playgroundImprovements": false,
       "privateProjects": false,
@@ -151,7 +150,6 @@ exports[`should create default config 1`] = `
         },
       },
       "migrationLock": true,
-      "multipleRoles": false,
       "personalAccessTokensKillSwitch": false,
       "playgroundImprovements": false,
       "privateProjects": false,
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index 5cd800932fb0..41da53b74714 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -23,7 +23,6 @@ export type IFlagKey =
     | 'filterInvalidClientMetrics'
     | 'lastSeenByEnvironment'
     | 'customRootRolesKillSwitch'
-    | 'multipleRoles'
     | 'featureNamingPattern'
     | 'doraMetrics'
     | 'variantTypeNumber'
@@ -117,10 +116,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_CUSTOM_ROOT_ROLES_KILL_SWITCH,
         false,
     ),
-    multipleRoles: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_MULTIPLE_ROLES,
-        false,
-    ),
     featureNamingPattern: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_FEATURE_NAMING_PATTERN,
         false,