From 4e36d2285e3e2550a4d19cdd0cea29677e3d8764 Mon Sep 17 00:00:00 2001
From: Tymoteusz Czech <2625371+Tymek@users.noreply.github.com>
Date: Thu, 6 Feb 2025 19:40:10 +0100
Subject: [PATCH] chore: remove sortProjectRoles flag (#9226)

---
 .../RolePermissionCategories/RolePermissionCategories.tsx    | 3 +--
 frontend/src/interfaces/uiConfig.ts                          | 1 -
 src/lib/types/experimental.ts                                | 5 -----
 src/server-dev.ts                                            | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/frontend/src/component/admin/roles/RoleForm/RolePermissionCategories/RolePermissionCategories.tsx b/frontend/src/component/admin/roles/RoleForm/RolePermissionCategories/RolePermissionCategories.tsx
index 3aa6cd7d76..1c34b1bbd7 100644
--- a/frontend/src/component/admin/roles/RoleForm/RolePermissionCategories/RolePermissionCategories.tsx
+++ b/frontend/src/component/admin/roles/RoleForm/RolePermissionCategories/RolePermissionCategories.tsx
@@ -47,7 +47,6 @@ export const RolePermissionCategories = ({
     const granularAdminPermissionsEnabled = useUiFlag(
         'granularAdminPermissions',
     );
-    const sortProjectRoles = useUiFlag('sortProjectRoles');
 
     const isProjectRole = PROJECT_ROLE_TYPES.includes(type);
 
@@ -121,7 +120,7 @@ export const RolePermissionCategories = ({
                             checkedPermissions={checkedPermissions}
                             onCheckAll={() => onCheckAll(permissions)}
                         >
-                            {type === 'project' && sortProjectRoles ? (
+                            {type === 'project' ? (
                                 <RolePermissionProject
                                     permissions={permissions}
                                     checkedPermissions={checkedPermissions}
diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
index 306025aebc..32ae71d2ec 100644
--- a/frontend/src/interfaces/uiConfig.ts
+++ b/frontend/src/interfaces/uiConfig.ts
@@ -91,7 +91,6 @@ export type UiFlags = {
     showUserDeviceCount?: boolean;
     flagOverviewRedesign?: boolean;
     granularAdminPermissions?: boolean;
-    sortProjectRoles?: boolean;
     frontendHeaderRedesign?: boolean;
     dataUsageMultiMonthView?: boolean;
     uiGlobalFontSize?: Variant;
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index 1e49f65f30..67727f239b 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -61,7 +61,6 @@ export type IFlagKey =
     | 'etagVariant'
     | 'deltaApi'
     | 'uniqueSdkTracking'
-    | 'sortProjectRoles'
     | 'frontendHeaderRedesign'
     | 'dataUsageMultiMonthView'
     | 'uiGlobalFontSize';
@@ -293,10 +292,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_UNIQUE_SDK_TRACKING,
         false,
     ),
-    sortProjectRoles: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_SORT_PROJECT_ROLES,
-        false,
-    ),
     frontendHeaderRedesign: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_FRONTEND_HEADER_REDESIGN,
         false,
diff --git a/src/server-dev.ts b/src/server-dev.ts
index f9c178c129..a7c7cb60b5 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -54,7 +54,6 @@ process.nextTick(async () => {
                         showUserDeviceCount: true,
                         flagOverviewRedesign: false,
                         granularAdminPermissions: true,
-                        sortProjectRoles: true,
                         deltaApi: true,
                         uniqueSdkTracking: true,
                         frontendHeaderRedesign: true,