Skip to content

Commit 5b96c97

Browse files
chore: minor improvements related to members dropdown and project member list (#6340)
1 parent 906d095 commit 5b96c97

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

web/core/components/dropdowns/member/index.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type Props = {
2424
onClose?: () => void;
2525
renderByDefault?: boolean;
2626
optionsClassName?: string;
27+
memberIds?: string[];
2728
} & MemberDropdownProps;
2829

2930
export const MemberDropdown: React.FC<Props> = observer((props) => {
@@ -52,6 +53,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
5253
value,
5354
icon,
5455
renderByDefault = true,
56+
memberIds,
5557
} = props;
5658
// states
5759
const [isOpen, setIsOpen] = useState(false);
@@ -169,6 +171,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
169171
>
170172
{isOpen && (
171173
<MemberOptions
174+
memberIds={memberIds}
172175
optionsClassName={optionsClassName}
173176
isOpen={isOpen}
174177
projectId={projectId}

web/core/components/dropdowns/member/member-options.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { usePlatformOS } from "@/hooks/use-platform-os";
2020
import { EUserPermissions } from "@/plane-web/constants";
2121

2222
interface Props {
23+
memberIds?: string[];
2324
className?: string;
2425
optionsClassName?: string;
2526
projectId?: string;
@@ -29,7 +30,7 @@ interface Props {
2930
}
3031

3132
export const MemberOptions: React.FC<Props> = observer((props: Props) => {
32-
const { projectId, referenceElement, placement, isOpen, optionsClassName = "" } = props;
33+
const { memberIds: propsMemberIds, projectId, referenceElement, placement, isOpen, optionsClassName = "" } = props;
3334
// states
3435
const [query, setQuery] = useState("");
3536
const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
@@ -67,7 +68,7 @@ export const MemberOptions: React.FC<Props> = observer((props: Props) => {
6768
}
6869
}, [isOpen, isMobile]);
6970

70-
const memberIds = projectId ? getProjectMemberIds(projectId) : workspaceMemberIds;
71+
const memberIds = propsMemberIds ? propsMemberIds : projectId ? getProjectMemberIds(projectId) : workspaceMemberIds;
7172
const onOpen = () => {
7273
if (!memberIds && workspaceSlug && projectId) fetchProjectMembers(workspaceSlug.toString(), projectId);
7374
};

web/core/components/project/member-list-item.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ export const ProjectMemberListItem: React.FC<Props> = observer((props) => {
3838
if (!workspaceSlug || !projectId || !memberId) return;
3939

4040
if (memberId === currentUser?.id) {
41-
router.push(`/${workspaceSlug}/projects`);
4241
await leaveProject(workspaceSlug.toString(), projectId.toString())
4342
.then(async () => {
43+
router.push(`/${workspaceSlug}/projects`);
4444
captureEvent(PROJECT_MEMBER_LEAVE, {
4545
state: "SUCCESS",
4646
element: "Project settings members page",
@@ -50,22 +50,21 @@ export const ProjectMemberListItem: React.FC<Props> = observer((props) => {
5050
.catch((err) =>
5151
setToast({
5252
type: TOAST_TYPE.ERROR,
53-
title: "Error!",
53+
title: "You can’t leave this project yet.",
5454
message: err?.error || "Something went wrong. Please try again.",
5555
})
5656
);
5757
} else
5858
await removeMemberFromProject(workspaceSlug.toString(), projectId.toString(), memberId).catch((err) =>
5959
setToast({
6060
type: TOAST_TYPE.ERROR,
61-
title: "Error!",
61+
title: "You can’t remove the member from this project yet.",
6262
message: err?.error || "Something went wrong. Please try again.",
6363
})
6464
);
6565
};
6666

6767
if (!memberDetails) return null;
68-
removeMemberModal && console.log("removeMemberModal", JSON.parse(JSON.stringify(removeMemberModal?.member)));
6968
return (
7069
<>
7170
{removeMemberModal && (

web/core/components/project/settings/member-columns.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ export const AccountTypeColumn: React.FC<AccountTypeProps> = observer((props) =>
154154

155155
setToast({
156156
type: TOAST_TYPE.ERROR,
157-
title: "Error!",
157+
title: "You can’t change this role yet.",
158158
message: errorString ?? "An error occurred while updating member role. Please try again.",
159159
});
160160
});

0 commit comments

Comments
 (0)