Remove member default role from API key creation (#14932)

Author: abdulrahmancodes

packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersRoleSelector.tsx

@@ -1,7 +1,5 @@
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
 import { Select } from '@/ui/input/components/Select';
-import { useRecoilValue } from 'recoil';
 import { type IconComponent, useIcons } from 'twenty-ui/display';
 
 type SettingsDevelopersRoleSelectorProps = {
@@ -21,21 +19,6 @@ export const SettingsDevelopersRoleSelector = ({
 }: SettingsDevelopersRoleSelectorProps) => {
   const { getIcon } = useIcons();
 
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
-
-  let doesDefaultRoleExistInRoles = false;
-
-  const defaultRole = currentWorkspace?.defaultRole;
-  try {
-    doesDefaultRoleExistInRoles = roles.some(
-      (role) => role.id === defaultRole?.id,
-    );
-  } catch {
-    throw new Error(
-      'Default role does not exist in roles, this should not happen',
-    );
-  }
-
   if (roles.length === 0) {
     return null;
   }
@@ -55,8 +38,7 @@ export const SettingsDevelopersRoleSelector = ({
     }
   }, []);
 
-  const selectValue =
-    value || (doesDefaultRoleExistInRoles ? defaultRole?.id : roles[0].id);
+  const selectValue = value || options[0]?.value;
 
   return (
     <Select

packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx

@@ -1,7 +1,6 @@
 import { addDays } from 'date-fns';
 import { useState } from 'react';
 
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
@@ -12,7 +11,7 @@ import { Select } from '@/ui/input/components/Select';
 import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { useLingui } from '@lingui/react/macro';
-import { useRecoilCallback, useRecoilValue } from 'recoil';
+import { useRecoilCallback } from 'recoil';
 import { Key } from 'ts-key-enum';
 import { SettingsPath } from 'twenty-shared/types';
 import { getSettingsPath, isDefined } from 'twenty-shared/utils';
@@ -29,21 +28,16 @@ export const SettingsDevelopersApiKeysNew = () => {
   const { t } = useLingui();
   const [generateOneApiKeyToken] = useGenerateApiKeyTokenMutation();
   const navigateSettings = useNavigateSettings();
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
   const { data: rolesData, loading: rolesLoading } = useGetRolesQuery({
     onCompleted: (data) => {
       if (isDefined(data?.getRoles)) {
-        const defaultRole = data.getRoles.find(
-          (role) => role.id === currentWorkspace?.defaultRole?.id,
+        const apiKeyAssignableRoles = data.getRoles.filter(
+          (role) => role.canBeAssignedToApiKeys,
         );
-        if (
-          isDefined(defaultRole) &&
-          defaultRole.canBeAssignedToApiKeys &&
-          !formValues.roleId
-        ) {
+        if (!formValues.roleId && apiKeyAssignableRoles.length > 0) {
           setFormValues((prev) => ({
             ...prev,
-            roleId: defaultRole.id,
+            roleId: apiKeyAssignableRoles[0].id,
           }));
         }
       }