From b6542b02453a80f5a2bcb1ba6ec6eef5c91888b8 Mon Sep 17 00:00:00 2001 From: DiamondThree Date: Thu, 5 Jan 2023 19:21:35 +0800 Subject: [PATCH] feat: member init --- .../general/delete/delete.tsx | 2 - .../workspace-setting/general/general.tsx | 37 ++------------- .../workspace-setting/general/leave/leave.tsx | 4 +- .../workspace-setting/workspace-setting.tsx | 46 +++++++++++-------- .../WorkspaceSelector/WorkspaceSelector.tsx | 1 - 5 files changed, 32 insertions(+), 58 deletions(-) diff --git a/packages/app/src/components/workspace-setting/general/delete/delete.tsx b/packages/app/src/components/workspace-setting/general/delete/delete.tsx index 0f972443d7..f5b9e1e86c 100644 --- a/packages/app/src/components/workspace-setting/general/delete/delete.tsx +++ b/packages/app/src/components/workspace-setting/general/delete/delete.tsx @@ -21,7 +21,6 @@ interface WorkspaceDeleteProps { onClose: () => void; workspaceName: string; workspaceId: string; - nextWorkSpaceId: string; } export const WorkspaceDelete = ({ @@ -29,7 +28,6 @@ export const WorkspaceDelete = ({ onClose, workspaceId, workspaceName, - nextWorkSpaceId, }: WorkspaceDeleteProps) => { const [deleteStr, setDeleteStr] = useState(''); const router = useRouter(); diff --git a/packages/app/src/components/workspace-setting/general/general.tsx b/packages/app/src/components/workspace-setting/general/general.tsx index e36bd7db52..9142b3854f 100644 --- a/packages/app/src/components/workspace-setting/general/general.tsx +++ b/packages/app/src/components/workspace-setting/general/general.tsx @@ -12,7 +12,6 @@ import Input from '@/ui/input'; import { getDataCenter } from '@affine/datacenter'; import { useAppState } from '@/providers/app-state-provider'; import { WorkspaceDelete } from './delete'; -import { Workspace as StoreWorkspace } from '@blocksuite/store'; import { debounce } from '@/utils'; import { WorkspaceLeave } from './leave'; import { Upload } from '@/components/file-upload'; @@ -23,18 +22,8 @@ import { Workspace, } from '@/hooks/mock-data/mock'; -export const GeneralPage = ({ - workspace, -}: { - workspace: Workspace; - workspaces: Record; -}) => { - const { - currentWorkspace, - workspacesMeta, - workspaces, - refreshWorkspacesMeta, - } = useAppState(); +export const GeneralPage = ({ workspace }: { workspace: Workspace }) => { + const { currentWorkspace, refreshWorkspacesMeta } = useAppState(); useEffect(() => { setWorkspaceName(workspace.name); const user = getUserInfo(); @@ -53,13 +42,6 @@ export const GeneralPage = ({ const handleChangeWorkSpaceName = (newName: string) => { setWorkspaceName(newName); }; - const currentWorkspaceIndex = workspacesMeta.findIndex( - meta => meta.id === workspace.id - ); - const nextWorkSpaceId = - currentWorkspaceIndex === workspacesMeta.length - 1 - ? workspacesMeta[currentWorkspaceIndex - 1]?.id - : workspacesMeta[currentWorkspaceIndex + 1]?.id; const handleClickDelete = () => { setShowDelete(true); }; @@ -87,7 +69,7 @@ export const GeneralPage = ({ }); if (blobId) { currentWorkspace?.meta.setAvatar(blobId); - workspaces[workspace.id]?.meta.setAvatar(blobId); + // workspaces[workspace.id]?.meta.setAvatar(blobId); setUploading(false); debouncedRefreshWorkspacesMeta(); } @@ -97,15 +79,8 @@ export const GeneralPage = ({
Workspace Avatar - - {workspaces[workspace.id]?.meta.name[0]} + + AFFiNE ) : ( @@ -182,7 +156,6 @@ export const GeneralPage = ({ onClose={handleCloseLeave} workspaceName={workspaceName} workspaceId={workspace.id} - nextWorkSpaceId={nextWorkSpaceId} /> )} diff --git a/packages/app/src/components/workspace-setting/general/leave/leave.tsx b/packages/app/src/components/workspace-setting/general/leave/leave.tsx index 3c2cf8ce22..79cadd6edb 100644 --- a/packages/app/src/components/workspace-setting/general/leave/leave.tsx +++ b/packages/app/src/components/workspace-setting/general/leave/leave.tsx @@ -16,13 +16,11 @@ interface WorkspaceDeleteProps { onClose: () => void; workspaceName: string; workspaceId: string; - nextWorkSpaceId: string; } export const WorkspaceLeave = ({ open, onClose, - nextWorkSpaceId, workspaceId, }: WorkspaceDeleteProps) => { const router = useRouter(); @@ -30,7 +28,7 @@ export const WorkspaceLeave = ({ const handleLeave = async () => { const dc = await getDataCenter(); await dc.apis.leaveWorkspace({ id: workspaceId }); - router.push(`/workspace/${nextWorkSpaceId}`); + // router.push(`/workspace/${nextWorkSpaceId}`); refreshWorkspacesMeta(); onClose(); }; diff --git a/packages/app/src/components/workspace-setting/workspace-setting.tsx b/packages/app/src/components/workspace-setting/workspace-setting.tsx index 66850cabc7..7d7855aaca 100644 --- a/packages/app/src/components/workspace-setting/workspace-setting.tsx +++ b/packages/app/src/components/workspace-setting/workspace-setting.tsx @@ -45,7 +45,9 @@ import { useAppState } from '@/providers/app-state-provider'; import { GeneralPage } from './general'; import { getActiveWorkspace, + getUserInfo, setWorkspacePublish, + User, Workspace, } from '@/hooks/mock-data/mock'; @@ -109,7 +111,7 @@ export const WorkspaceSetting = ({ isShow, onClose, }: WorkspaceSettingProps) => { - const { workspaces } = useAppState(); + // const { workspaces } = useAppState(); const [activeTab, setActiveTab] = useState(ActiveTab.general); const handleTabChange = (tab: ActiveTab) => { setActiveTab(tab); @@ -143,7 +145,7 @@ export const WorkspaceSetting = ({ ) : null} {activeTab === ActiveTab.general && ( - + )} {activeTab === ActiveTab.members && workspace && ( @@ -160,23 +162,27 @@ export const WorkspaceSetting = ({ const MembersPage = ({ workspace }: { workspace: Workspace }) => { const [isInviteModalShow, setIsInviteModalShow] = useState(false); const [members, setMembers] = useState([]); - const refreshMembers = useCallback(() => { - getDataCenter() - .then(dc => - dc.apis.getWorkspaceMembers({ - id: workspace.id, - }) - ) - .then(data => { - setMembers(data); - }) - .catch(err => { - console.log(err); - }); - }, [workspace.id]); + const [userInfo, setUserInfo] = useState(); + // const refreshMembers = useCallback(() => { + // getDataCenter() + // .then(dc => + // dc.apis.getWorkspaceMembers({ + // id: workspace.id, + // }) + // ) + // .then(data => { + // setMembers(data); + // }) + // .catch(err => { + // console.log(err); + // }); + // }, [workspace.id]); + useEffect(() => { - refreshMembers(); - }, [refreshMembers]); + const user = getUserInfo(); + user && setUserInfo(user); + // refreshMembers(); + }, []); return (
@@ -240,7 +246,7 @@ const MembersPage = ({ workspace }: { workspace: Workspace }) => { .then(() => { // console.log('data: ', data); toast('Moved to Trash'); - refreshMembers(); + // refreshMembers(); }); // }); }} @@ -280,7 +286,7 @@ const MembersPage = ({ workspace }: { workspace: Workspace }) => { setIsInviteModalShow(false); }} onInviteSuccess={() => { - refreshMembers(); + // refreshMembers(); }} workspaceId={workspace.id} open={isInviteModalShow} diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx index 669b927a9e..5ccc9a446b 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx @@ -16,7 +16,6 @@ export const WorkspaceSelector = () => { setWorkspaceListShow(true); } }); - const setWorkspace = () => { const workspace = getActiveWorkspace(); setWorkSpace(workspace);