diff --git a/packages/app/src/components/create-workspace/index.tsx b/packages/app/src/components/create-workspace/index.tsx
index 3814d2449..26d5d5cef 100644
--- a/packages/app/src/components/create-workspace/index.tsx
+++ b/packages/app/src/components/create-workspace/index.tsx
@@ -2,8 +2,8 @@ import { styled } from '@/styles';
import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal';
import { Button } from '@/ui/button';
import { useState } from 'react';
-import { createWorkspace } from '@/hooks/mock-data/mock';
import Input from '@/ui/input';
+import useTemporaryHelper from '@/hooks/use-temporary-helper';
interface ICloseParams {
workspaceId?: string;
}
@@ -14,9 +14,10 @@ interface ModalProps {
export const CreateWorkspaceModal = ({ open, onClose }: ModalProps) => {
const [workspaceName, setWorkspaceName] = useState('');
+ const { createWorkspace } = useTemporaryHelper();
const handleCreateWorkspace = () => {
- const { workspaceId } = createWorkspace(workspaceName);
- onClose({ workspaceId });
+ const { id } = createWorkspace(workspaceName);
+ onClose({ workspaceId: id });
};
return (
diff --git a/packages/app/src/components/workspace-modal/index.tsx b/packages/app/src/components/workspace-modal/index.tsx
index eb83c1ab0..c33a889a4 100644
--- a/packages/app/src/components/workspace-modal/index.tsx
+++ b/packages/app/src/components/workspace-modal/index.tsx
@@ -1,16 +1,8 @@
import { styled } from '@/styles';
import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal';
import { Button } from '@/ui/button';
-import { useEffect, useState } from 'react';
-import {
- getWorkspaces,
- Workspace,
- setActiveWorkspace,
- Login,
- User,
- SignOut,
- updateWorkspaceMeta,
-} from '@/hooks/mock-data/mock';
+import { useState } from 'react';
+import { SignOut } from '@/hooks/mock-data/mock';
import { CreateWorkspaceModal } from '../create-workspace';
import {
CloudUnsyncedIcon,
@@ -28,19 +20,17 @@ interface LoginModalProps {
}
export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
- const [workspaceList, setWorkspaceList] = useState
([]);
const [createWorkspaceOpen, setCreateWorkspaceOpen] = useState(false);
const { confirm } = useConfirm();
- const { user, login } = useTemporaryHelper();
- useEffect(() => {
- setList();
- }, []);
-
- const setList = () => {
- const data = getWorkspaces();
- setWorkspaceList(data);
- };
+ const {
+ user,
+ login,
+ workspaceMetaList,
+ setActiveWorkspace,
+ updateWorkspaceMeta,
+ } = useTemporaryHelper();
+ console.log('workspaceMetaList: ', workspaceMetaList);
return (
@@ -60,7 +50,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
- {workspaceList.map((item, index) => {
+ {workspaceMetaList.map((item, index) => {
return (
{
@@ -165,7 +155,6 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
open={createWorkspaceOpen}
onClose={({ workspaceId }) => {
setCreateWorkspaceOpen(false);
- setList();
onClose();
confirm({
title: 'Enable AFFiNE Cloud?',
@@ -182,7 +171,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
});
}, 1000);
} else {
- confirm && Login();
+ confirm && login();
}
});
}}
diff --git a/packages/app/src/components/workspace-setting/MembersPage.tsx b/packages/app/src/components/workspace-setting/MembersPage.tsx
index 7695a43b0..b69c89b6f 100644
--- a/packages/app/src/components/workspace-setting/MembersPage.tsx
+++ b/packages/app/src/components/workspace-setting/MembersPage.tsx
@@ -15,24 +15,21 @@ import { MoreVerticalIcon, EmailIcon, TrashIcon } from '@blocksuite/icons';
import { useEffect, useState } from 'react';
import { Button, IconButton } from '@/ui/button';
import { InviteMembers } from '../invite-members/index';
-// import { Member, getDataCenter } from '@affine/datacenter';
-// import { Avatar } from '@mui/material';
import { Menu, MenuItem } from '@/ui/menu';
import { Empty } from '@/ui/empty';
import {
deleteMember,
getMembers,
- getUserInfo,
- Login,
User,
Workspace,
} from '@/hooks/mock-data/mock';
+import useTemporaryHelper from '@/hooks/use-temporary-helper';
// import { useAppState } from '@/providers/app-state-provider';
export const MembersPage = ({ workspace }: { workspace: Workspace }) => {
const [isInviteModalShow, setIsInviteModalShow] = useState(false);
const [members, setMembers] = useState([]);
- const [userInfo, setUserInfo] = useState();
+ const { user, login } = useTemporaryHelper();
// const refreshMembers = useCallback(() => {
// getDataCenter()
// .then(dc =>
@@ -49,15 +46,10 @@ export const MembersPage = ({ workspace }: { workspace: Workspace }) => {
// }, [workspace.id]);
useEffect(() => {
- setUser();
setMembersList();
// refreshMembers();
}, []);
- const setUser = () => {
- const user = getUserInfo();
- user && setUserInfo(user);
- };
const setMembersList = () => {
const members = getMembers(workspace.id);
members && setMembers(members);
@@ -65,7 +57,7 @@ export const MembersPage = ({ workspace }: { workspace: Workspace }) => {
return (
- {userInfo ? (
+ {user ? (
<>
@@ -184,8 +176,7 @@ export const MembersPage = ({ workspace }: { workspace: Workspace }) => {