fix: remove organization owner from org (#5907)

graphql-hive · Nov 13, 2024 · 5adfb6c · 5adfb6c
1 parent 4fea8ba
commit 5adfb6c
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 25 deletions.
diff --git a/.changeset/tame-panthers-sleep.md b/.changeset/tame-panthers-sleep.md
@@ -0,0 +1,5 @@
+---
+'hive': patch
+---
+
+Remove option to remove the organization owner from the organization.
diff --git a/packages/services/api/src/modules/organization/module.graphql.ts b/packages/services/api/src/modules/organization/module.graphql.ts
@@ -251,10 +251,6 @@ export default gql`
     """
     viewerCanAssignUserRoles: Boolean!
     """
-    Whether the viewer can remove a member from the organization
-    """
-    viewerCanRemoveMember: Boolean!
-    """
     Whether the viewer can modify roles of members within the organization
     """
     viewerCanManageRoles: Boolean!
@@ -326,6 +322,10 @@ export default gql`
     canLeaveOrganization: Boolean!
     role: MemberRole
     isAdmin: Boolean!
+    """
+    Whether the viewer can remove this member from the organization.
+    """
+    viewerCanRemove: Boolean!
   }
 
   type MemberRole {

diff --git a/packages/services/api/src/modules/organization/resolvers/Member.ts b/packages/services/api/src/modules/organization/resolvers/Member.ts
@@ -3,7 +3,7 @@ import type { MemberResolvers } from './../../../__generated__/types';
 
 export const Member: Pick<
   MemberResolvers,
-  'canLeaveOrganization' | 'isAdmin' | 'role' | '__isTypeOf'
+  'canLeaveOrganization' | 'isAdmin' | 'role' | 'viewerCanRemove' | '__isTypeOf'
 > = {
   canLeaveOrganization: async (member, _, { injector }) => {
     const { result } = await injector.get(OrganizationManager).canLeaveOrganization({
@@ -16,4 +16,17 @@ export const Member: Pick<
   isAdmin: (member, _, { injector }) => {
     return member.isOwner || injector.get(OrganizationManager).isAdminRole(member.role);
   },
+  viewerCanRemove: async (member, _arg, { session }) => {
+    if (member.isOwner) {
+      return false;
+    }
+
+    return await session.canPerformAction({
+      action: 'member:removeMember',
+      organizationId: member.organization,
+      params: {
+        organizationId: member.organization,
+      },
+    });
+  },
 };
diff --git a/packages/services/api/src/modules/organization/resolvers/Organization.ts b/packages/services/api/src/modules/organization/resolvers/Organization.ts
@@ -29,7 +29,6 @@ export const Organization: Pick<
   | 'viewerCanManageRoles'
   | 'viewerCanMigrateLegacyMemberRoles'
   | 'viewerCanModifySlug'
-  | 'viewerCanRemoveMember'
   | 'viewerCanSeeMembers'
   | 'viewerCanTransferOwnership'
   | '__isTypeOf'
@@ -212,15 +211,6 @@ export const Organization: Pick<
       },
     });
   },
-  viewerCanRemoveMember: (organization, _arg, { session }) => {
-    return session.canPerformAction({
-      action: 'member:removeMember',
-      organizationId: organization.id,
-      params: {
-        organizationId: organization.id,
-      },
-    });
-  },
   viewerCanManageRoles: (organization, _arg, { session }) => {
     return session.canPerformAction({
       action: 'member:modifyRole',

diff --git a/packages/web/app/src/components/organization/members/list.tsx b/packages/web/app/src/components/organization/members/list.tsx
@@ -345,7 +345,8 @@ const OrganizationMemberRow_MemberFragment = graphql(`
       id
       name
     }
-
+    isOwner
+    viewerCanRemove
     ...ChangePermissionsModal_MemberFragment
     ...OrganizationMemberRoleSwitcher_MemberFragment
   }
@@ -438,16 +439,30 @@ function OrganizationMemberRow(props: {
           <h4 className="text-xs text-gray-400">{member.user.email}</h4>
         </td>
         <td className="relative py-3 text-center text-sm">
-          <OrganizationMemberRoleSwitcher
-            organization={organization}
-            memberId={member.id}
-            memberName={member.user.displayName}
-            memberRoleId={member.role?.id}
-            member={member}
-          />
+          {member.isOwner ? (
+            <TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger>
+                  <span className="font-bold">Owner</span>
+                </TooltipTrigger>
+                <TooltipContent className="max-w-[200px] text-left">
+                  The organization owner has full access to everything within the organization. The
+                  role of the owner can not be changed.
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+          ) : (
+            <OrganizationMemberRoleSwitcher
+              organization={organization}
+              memberId={member.id}
+              memberName={member.user.displayName}
+              memberRoleId={member.role?.id}
+              member={member}
+            />
+          )}
         </td>
         <td className="py-3 text-right text-sm">
-          {organization.viewerCanRemoveMember && (
+          {member.viewerCanRemove && (
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
                 <Button variant="ghost" className="data-[state=open]:bg-muted flex size-8 p-0">
@@ -491,7 +506,6 @@ const OrganizationMembers_OrganizationFragment = graphql(`
       total
     }
     viewerCanManageInvitations
-    viewerCanRemoveMember
     viewerCanMigrateLegacyMemberRoles
     ...OrganizationMemberRoleSwitcher_OrganizationFragment
     ...MemberInvitationForm_OrganizationFragment