diff --git a/packages/app/src/components/workspace-setting/workspace-setting.tsx b/packages/app/src/components/workspace-setting/workspace-setting.tsx index 7d7855aac..a905134f7 100644 --- a/packages/app/src/components/workspace-setting/workspace-setting.tsx +++ b/packages/app/src/components/workspace-setting/workspace-setting.tsx @@ -46,6 +46,7 @@ import { GeneralPage } from './general'; import { getActiveWorkspace, getUserInfo, + Login, setWorkspacePublish, User, Workspace, @@ -179,119 +180,151 @@ const MembersPage = ({ workspace }: { workspace: Workspace }) => { // }, [workspace.id]); useEffect(() => { - const user = getUserInfo(); - user && setUserInfo(user); + setUser(); // refreshMembers(); }, []); + const setUser = () => { + const user = getUserInfo(); + user && setUserInfo(user); + }; + return (
- - - Users({members.length}) - - Access level - - - {members.length === 0 && ( - - )} - {members.length ? ( - members.map(member => { - return ( - - - {member.user.type === 'Registered' ? ( - - ) : ( - - - - )} + {userInfo ? ( + <> + + + Users({members.length}) + + Access level + + + {members.length === 0 && ( + + )} + {members.length ? ( + members.map(member => { + return ( + + + {member.user.type === 'Registered' ? ( + + ) : ( + + + + )} - - {member.user.type === 'Registered' ? ( - {member.user.name} - ) : ( - <> - )} - {member.user.email} - - - - {member.accepted - ? member.type !== 99 - ? 'Member' - : 'Workspace Owner' - : 'Pending'} - - - - { - // confirm({ - // title: 'Delete Member?', - // content: `will delete member`, - // confirmText: 'Delete', - // confirmType: 'danger', - // }).then(confirm => { - getDataCenter() - .then(dc => - dc.apis.removeMember({ - permissionId: member.id, - }) - ) - .then(() => { - // console.log('data: ', data); - toast('Moved to Trash'); - // refreshMembers(); - }); - // }); - }} - icon={} - > - Delete - - - } - placement="bottom-end" - disablePortal={true} - > - - - - - - - ); - }) - ) : ( - <> - )} - - - - { - setIsInviteModalShow(false); - }} - onInviteSuccess={() => { - // refreshMembers(); - }} - workspaceId={workspace.id} - open={isInviteModalShow} - > - + + {member.user.type === 'Registered' ? ( + + {member.user.name} + + ) : ( + <> + )} + + {member.user.email} + + + + + {member.accepted + ? member.type !== 99 + ? 'Member' + : 'Workspace Owner' + : 'Pending'} + + + + { + // confirm({ + // title: 'Delete Member?', + // content: `will delete member`, + // confirmText: 'Delete', + // confirmType: 'danger', + // }).then(confirm => { + getDataCenter() + .then(dc => + dc.apis.removeMember({ + permissionId: member.id, + }) + ) + .then(() => { + // console.log('data: ', data); + toast('Moved to Trash'); + // refreshMembers(); + }); + // }); + }} + icon={} + > + Delete + + + } + placement="bottom-end" + disablePortal={true} + > + + + + + + + ); + }) + ) : ( + <> + )} + + + + { + setIsInviteModalShow(false); + }} + onInviteSuccess={() => { + // refreshMembers(); + }} + workspaceId={workspace.id} + open={isInviteModalShow} + > + + + ) : ( + <> +
+ Collaborating with other members requires AFFiNE Cloud service. +
+
+ +
+ + )}
); };