Skip to content

feat: Org Owners/Admins unable to access their own "Edit Member" menu #24407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vibgitcode27 wants to merge 6 commits into
base: main
Choose a base branch
from
+63 −47
Open

feat: Org Owners/Admins unable to access their own "Edit Member" menu #24407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83a2296
feat:allow_privileged_to_open_edit_menu
Vibgitcode27 Oct 10, 2025
aaafedc
route use to /team as he leaves team
Vibgitcode27 Oct 17, 2025
059ae83
Merge upstream/main into feat/org-owner-admin-edit-member-menu
devin-ai-integration[bot] Feb 4, 2026
9be010f
Merge branch 'main' into feat/org-owner-admin-edit-member-menu
sahitya-chandra Feb 19, 2026
b934929
refactor: rename deletedUserEmail to deletedUserId in MemberList and …
sahitya-chandra Feb 19, 2026
ed4f499
refactor: update member list dropdown permissions for editing and rem…
sahitya-chandra Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 62 additions & 45 deletions apps/web/modules/ee/teams/components/MemberList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import classNames from "classnames";
import { useSession } from "next-auth/react";
import { signIn } from "next-auth/react";
import { usePathname } from "next/navigation";
import { usePathname, useRouter } from "next/navigation";
import { useQueryState, parseAsBoolean } from "nuqs";
import posthog from "posthog-js";
import { useMemo, useReducer, useRef, useState } from "react";
Expand Down Expand Up @@ -178,6 +178,7 @@ export default function MemberList(props: Props) {
}

function MemberListContent(props: Props) {
const router = useRouter();
const { facetedTeamValues } = props;
const [dynamicLinkVisible, setDynamicLinkVisible] = useQueryState("dynamicLink", parseAsBoolean);
const { t, i18n } = useLocale();
Expand Down Expand Up @@ -258,23 +259,29 @@ function MemberListContent(props: Props) {
teamId: teamIds[0],
searchTerm,
});

const deletedUserId = state.deleteMember.user?.id;
if (previousValue) {
removeMemberFromCache({
utils,
memberId: state.deleteMember.user?.id as number,
memberId: deletedUserId as number,
teamId: teamIds[0],
searchTerm,
});
}
return { previousValue };
return { previousValue, deletedUserId };
},
async onSuccess() {
async onSuccess(data, variables, context) {
await utils.viewer.teams.get.invalidate();
await utils.viewer.eventTypes.invalidate();
await utils.viewer.organizations.listMembers.invalidate();
await utils.viewer.organizations.getMembers.invalidate();
showToast(t("success"), "success");
const { previousValue: _previousValue, deletedUserId } = context;
const currentUserId = session?.user.id;
const isSelf = deletedUserId === currentUserId;
if (isSelf) {
router.push("/teams");
}
},
async onError(err) {
showToast(err.message, "error");
Expand Down Expand Up @@ -436,11 +443,11 @@ function MemberListContent(props: Props) {
const canRemove = props.permissions?.canRemove ?? false;
const canImpersonate = props.permissions?.canImpersonate ?? false;
const canResendInvitation = props.permissions?.canInvite ?? false;
const editMode =
[canChangeRole, canRemove, canImpersonate, canResendInvitation].some(Boolean) && !isSelf;
const editMode = [canChangeRole, canRemove, canImpersonate, canResendInvitation].some(Boolean);

const impersonationMode =
canImpersonate &&
!isSelf &&
!user.disableImpersonation &&
user.accepted &&
process.env.NEXT_PUBLIC_TEAM_IMPERSONATION === "true";
Expand Down Expand Up @@ -538,7 +545,7 @@ function MemberListContent(props: Props) {
<DropdownMenuSeparator />
</>
)}
{canResendInvitation && (
{canResendInvitation && !isSelf && (
<DropdownMenuItem>
<DropdownItem
type="button"
Expand Down Expand Up @@ -569,7 +576,7 @@ function MemberListContent(props: Props) {
}
color="destructive"
StartIcon="user-x">
{t("remove")}
{isSelf ? t("leave") : t("remove")}
</DropdownItem>
</DropdownMenuItem>
) : null}
Expand Down Expand Up @@ -597,39 +604,43 @@ function MemberListContent(props: Props) {
</DropdownMenuItem>
{editMode && (
<>
<DropdownMenuItem>
<DropdownItem
type="button"
onClick={() =>
dispatch({
type: "EDIT_USER_SHEET",
payload: {
user,
showModal: true,
},
})
}
StartIcon="pencil">
{t("edit")}
</DropdownItem>
</DropdownMenuItem>
<DropdownMenuItem>
<DropdownItem
type="button"
color="destructive"
onClick={() =>
dispatch({
type: "SET_DELETE_ID",
payload: {
user,
showModal: true,
},
})
}
StartIcon="user-x">
{t("remove")}
</DropdownItem>
</DropdownMenuItem>
{canChangeRole ? (
<DropdownMenuItem>
<DropdownItem
type="button"
onClick={() =>
dispatch({
type: "EDIT_USER_SHEET",
payload: {
user,
showModal: true,
},
})
}
StartIcon="pencil">
{t("edit")}
</DropdownItem>
</DropdownMenuItem>
) : null}
{canRemove ? (
<DropdownMenuItem>
<DropdownItem
type="button"
color="destructive"
onClick={() =>
dispatch({
type: "SET_DELETE_ID",
payload: {
user,
showModal: true,
},
})
}
StartIcon="user-x">
{isSelf ? t("leave") : t("remove")}
</DropdownItem>
</DropdownMenuItem>
) : null}
</>
)}
</DropdownMenuContent>
Expand Down Expand Up @@ -776,10 +787,16 @@ function MemberListContent(props: Props) {
}>
<ConfirmationDialogContent
variety="danger"
title={t("remove_member")}
confirmBtnText={t("confirm_remove_member")}
title={state.deleteMember.user?.id === session?.user.id ? t("leave_team") : t("remove_member")}
confirmBtnText={
state.deleteMember.user?.id === session?.user.id
? t("confirm_leave_team")
: t("confirm_remove_member")
}
onConfirm={removeMember}>
{t("remove_member_confirmation_message")}
{state.deleteMember.user?.id === session?.user.id
? t("leave_team_confirmation_message")
: t("remove_member_confirmation_message")}
</ConfirmationDialogContent>
</Dialog>
)}
Expand Down
3 changes: 1 addition & 2 deletions apps/web/modules/users/components/UserTable/UserListTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,7 @@ function UserListTableContent({
const permissionsForUser = {
canEdit:
((permissionsRaw.canEdit ?? false) || (permissions?.canEditAttributesForUser ?? false)) &&
user.accepted &&
!isSelf,
user.accepted,
canRemove: (permissionsRaw.canRemove ?? false) && !isSelf,
canImpersonate:
user.accepted &&
Expand Down
Loading