mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
fix: workspace members reordering (#1978)
This commit is contained in:
parent
1530993b84
commit
0525e7d6b3
@ -69,19 +69,6 @@ const MembersSettings: NextPage = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const members = [
|
const members = [
|
||||||
...(workspaceMembers?.map((item) => ({
|
|
||||||
id: item.id,
|
|
||||||
memberId: item.member?.id,
|
|
||||||
avatar: item.member?.avatar,
|
|
||||||
first_name: item.member?.first_name,
|
|
||||||
last_name: item.member?.last_name,
|
|
||||||
email: item.member?.email,
|
|
||||||
display_name: item.member?.display_name,
|
|
||||||
role: item.role,
|
|
||||||
status: true,
|
|
||||||
member: true,
|
|
||||||
accountCreated: true,
|
|
||||||
})) || []),
|
|
||||||
...(workspaceInvitations?.map((item) => ({
|
...(workspaceInvitations?.map((item) => ({
|
||||||
id: item.id,
|
id: item.id,
|
||||||
memberId: item.id,
|
memberId: item.id,
|
||||||
@ -95,6 +82,19 @@ const MembersSettings: NextPage = () => {
|
|||||||
member: false,
|
member: false,
|
||||||
accountCreated: item?.accepted ? false : true,
|
accountCreated: item?.accepted ? false : true,
|
||||||
})) || []),
|
})) || []),
|
||||||
|
...(workspaceMembers?.map((item) => ({
|
||||||
|
id: item.id,
|
||||||
|
memberId: item.member?.id,
|
||||||
|
avatar: item.member?.avatar,
|
||||||
|
first_name: item.member?.first_name,
|
||||||
|
last_name: item.member?.last_name,
|
||||||
|
email: item.member?.email,
|
||||||
|
display_name: item.member?.display_name,
|
||||||
|
role: item.role,
|
||||||
|
status: true,
|
||||||
|
member: true,
|
||||||
|
accountCreated: true,
|
||||||
|
})) || []),
|
||||||
];
|
];
|
||||||
|
|
||||||
const currentUser = workspaceMembers?.find((item) => item.member?.id === user?.id);
|
const currentUser = workspaceMembers?.find((item) => item.member?.id === user?.id);
|
||||||
|
Loading…
Reference in New Issue
Block a user