Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions web/core/components/dropdowns/member/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type Props = {
onClose?: () => void;
renderByDefault?: boolean;
optionsClassName?: string;
memberIds?: string[];
} & MemberDropdownProps;

export const MemberDropdown: React.FC<Props> = observer((props) => {
Expand Down Expand Up @@ -52,6 +53,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
value,
icon,
renderByDefault = true,
memberIds,
} = props;
// states
const [isOpen, setIsOpen] = useState(false);
Expand Down Expand Up @@ -169,6 +171,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
>
{isOpen && (
<MemberOptions
memberIds={memberIds}
optionsClassName={optionsClassName}
isOpen={isOpen}
projectId={projectId}
Expand Down
5 changes: 3 additions & 2 deletions web/core/components/dropdowns/member/member-options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
import { EUserPermissions } from "@/plane-web/constants";

interface Props {
memberIds?: string[];
className?: string;
optionsClassName?: string;
projectId?: string;
Expand All @@ -29,7 +30,7 @@ interface Props {
}

export const MemberOptions: React.FC<Props> = observer((props: Props) => {
const { projectId, referenceElement, placement, isOpen, optionsClassName = "" } = props;
const { memberIds: propsMemberIds, projectId, referenceElement, placement, isOpen, optionsClassName = "" } = props;
// states
const [query, setQuery] = useState("");
const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -67,7 +68,7 @@ export const MemberOptions: React.FC<Props> = observer((props: Props) => {
}
}, [isOpen, isMobile]);

const memberIds = projectId ? getProjectMemberIds(projectId) : workspaceMemberIds;
const memberIds = propsMemberIds ? propsMemberIds : projectId ? getProjectMemberIds(projectId) : workspaceMemberIds;
const onOpen = () => {
if (!memberIds && workspaceSlug && projectId) fetchProjectMembers(workspaceSlug.toString(), projectId);
};
Expand Down
7 changes: 3 additions & 4 deletions web/core/components/project/member-list-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ export const ProjectMemberListItem: React.FC<Props> = observer((props) => {
if (!workspaceSlug || !projectId || !memberId) return;

if (memberId === currentUser?.id) {
router.push(`/${workspaceSlug}/projects`);
await leaveProject(workspaceSlug.toString(), projectId.toString())
.then(async () => {
router.push(`/${workspaceSlug}/projects`);
captureEvent(PROJECT_MEMBER_LEAVE, {
state: "SUCCESS",
element: "Project settings members page",
Expand All @@ -50,22 +50,21 @@ export const ProjectMemberListItem: React.FC<Props> = observer((props) => {
.catch((err) =>
setToast({
type: TOAST_TYPE.ERROR,
title: "Error!",
title: "You can’t leave this project yet.",
message: err?.error || "Something went wrong. Please try again.",
})
);
} else
await removeMemberFromProject(workspaceSlug.toString(), projectId.toString(), memberId).catch((err) =>
setToast({
type: TOAST_TYPE.ERROR,
title: "Error!",
title: "You can’t remove the member from this project yet.",
message: err?.error || "Something went wrong. Please try again.",
})
);
};

if (!memberDetails) return null;
removeMemberModal && console.log("removeMemberModal", JSON.parse(JSON.stringify(removeMemberModal?.member)));
return (
<>
{removeMemberModal && (
Expand Down
2 changes: 1 addition & 1 deletion web/core/components/project/settings/member-columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export const AccountTypeColumn: React.FC<AccountTypeProps> = observer((props) =>

setToast({
type: TOAST_TYPE.ERROR,
title: "Error!",
title: "You can’t change this role yet.",
message: errorString ?? "An error occurred while updating member role. Please try again.",
});
});
Expand Down
Loading