Fixed edit user issues (#1408)

Author: ActiveChooN

web_ui/src/pages/user-management/users/actions/edit-organization-user-dialog.component.tsx

@@ -80,6 +80,7 @@ export const EditOrganizationUserDialog = ({
     const isLastRemainingOrgAdmin = currentOrgRole === USER_ROLE.ORGANIZATION_ADMIN && orgAdmins.length === 1;
 
     const canEditNames = isActiveOrgAdmin || isEditingSelf;
+    const canEditRole = isActiveOrgAdmin && !(isLastRemainingOrgAdmin && isEditingSelf);
 
     const nameChanged = firstName !== user.firstName || lastName !== user.lastName;
     const roleChanged = selectedOrgRole !== currentOrgRole;
@@ -182,7 +183,7 @@ export const EditOrganizationUserDialog = ({
                         roles={[USER_ROLE.ORGANIZATION_ADMIN, USER_ROLE.ORGANIZATION_CONTRIBUTOR]}
                         selectedRole={selectedOrgRole as USER_ROLE}
                         setSelectedRole={setSelectedOrgRole}
-                        isDisabled={isLastRemainingOrgAdmin}
+                        isDisabled={!canEditRole}
                         contextualHelp={
                             <ContextualHelp>
                                 <Heading>What roles can there be in an organization?</Heading>

web_ui/src/pages/user-management/users/actions/edit-organization-user-dialog.test.tsx

@@ -269,4 +269,26 @@ describe('EditOrganizationUserDialog', () => {
 
         expect(screen.getByTestId('roles-add-user')).toBeDisabled();
     });
+
+    it('disables role picker when active user is org contributor', async () => {
+        const contributor = createOrgContributor({
+            id: 'contributor',
+            firstName: 'Dan',
+            lastName: 'Contributor',
+            email: '[email protected]',
+        });
+
+        await render(
+            <EditOrganizationUserDialog
+                organizationId={organizationId}
+                user={contributor}
+                users={[contributor]}
+                activeUser={contributor}
+                isSaasEnvironment={false}
+                closeDialog={jest.fn()}
+            />
+        );
+
+        expect(screen.getByTestId('roles-add-user')).toBeDisabled();
+    });
 });

web_ui/src/pages/user-management/users/workspace-users/actions/workspace-user-actions.component.tsx

@@ -3,7 +3,7 @@
 
 import { Key, useState } from 'react';
 
-import { isOrganizationAdmin, isWorkspaceAdmin, isWorkspaceContributor } from '@geti/core/src/users/user-role-utils';
+import { isOrganizationAdmin, isWorkspaceAdmin } from '@geti/core/src/users/user-role-utils';
 import { User } from '@geti/core/src/users/users.interface';
 import { DialogContainer } from '@geti/ui';
 import { Delete, Edit } from '@geti/ui/icons';
@@ -40,7 +40,6 @@ export const WorkspaceUserActions = ({ activeUser, user, users, workspaceId }: U
 
     const isOwnAccount = user.id === activeUser?.id;
     const isActiveUserOrgAdmin = isOrganizationAdmin(activeUser, organizationId);
-    const isActiveMemberWorkspaceContributor = workspaceId ? isWorkspaceContributor(activeUser, workspaceId) : false;
     const isActiveUserWorkspaceAdmin = workspaceId ? isWorkspaceAdmin(activeUser, workspaceId) : false;
 
     const editAction = {
@@ -55,9 +54,7 @@ export const WorkspaceUserActions = ({ activeUser, user, users, workspaceId }: U
         icon: <Delete />,
     };
 
-    const canContributorEdit = (isOwnAccount && !workspaceId) || (isActiveMemberWorkspaceContributor && isOwnAccount);
-    const canEditUserRole =
-        isActiveUserOrgAdmin || canContributorEdit || activeUser.isAdmin || isActiveUserWorkspaceAdmin;
+    const canEditUserRole = isActiveUserOrgAdmin || activeUser.isAdmin || isActiveUserWorkspaceAdmin;
 
     const workspaceAdmins = workspaceId ? users.filter((u) => isWorkspaceAdmin(u, workspaceId)) : [];
     const isTargetWorkspaceAdmin = workspaceId ? isWorkspaceAdmin(user, workspaceId) : false;

web_ui/src/pages/user-management/users/workspace-users/actions/workspace-user-actions.test.tsx

@@ -110,7 +110,7 @@ describe('WorkspaceUserActions', () => {
             expect(screen.getByText('Edit')).toBeInTheDocument();
         });
 
-        it('Workspace contributor can edit themselves (without role edition)', async () => {
+        it('Workspace contributor cannot edit themselves', async () => {
             mockedUseActiveUser.mockImplementation(() => ({
                 data: mockedContributorUser,
                 isLoading: false,
@@ -124,8 +124,9 @@ describe('WorkspaceUserActions', () => {
                 />
             );
 
-            fireEvent.click(screen.getByRole('button', { name: `${mockedContributorUser.email} action menu` }));
-            expect(screen.getByText('Edit')).toBeInTheDocument();
+            expect(
+                screen.queryByRole('button', { name: `${mockedContributorUser.email} action menu` })
+            ).not.toBeInTheDocument();
         });
 
         it('Check if organization admin cannot delete him/herself', async () => {