From 0110efc3404c5a53976bb4f07efe6be3bff3a909 Mon Sep 17 00:00:00 2001 From: DarkSky Date: Tue, 3 Jan 2023 13:32:03 +0800 Subject: [PATCH] fix: types of data center call --- .../src/components/invite-members/index.tsx | 27 ++++++---- .../login-modal/LoginOptionButton.tsx | 2 +- .../general/delete/delete.tsx | 5 +- .../workspace-setting/general/general.tsx | 10 ++-- .../workspace-setting/general/leave/leave.tsx | 5 +- .../workspace-setting/workspace-setting.tsx | 53 ++++++++++--------- .../SelectorPopperContent.tsx | 5 +- .../workspace-create/workspace-create.tsx | 11 ++-- .../app/src/hooks/use-ensure-workspace.ts | 1 - .../app/src/pages/invite/[invite_code].tsx | 9 +++- .../providers/app-state-provider/context.ts | 10 ++-- .../app-state-provider/dynamic-blocksuite.tsx | 24 ++++----- .../providers/app-state-provider/provider.tsx | 5 +- packages/data-center/package.json | 6 +-- packages/data-center/src/apis/index.ts | 4 ++ packages/data-center/src/apis/token.ts | 2 +- packages/data-center/src/index.ts | 3 ++ pnpm-lock.yaml | 49 ++--------------- 18 files changed, 111 insertions(+), 120 deletions(-) diff --git a/packages/app/src/components/invite-members/index.tsx b/packages/app/src/components/invite-members/index.tsx index d4c9af03f..f06674cb6 100644 --- a/packages/app/src/components/invite-members/index.tsx +++ b/packages/app/src/components/invite-members/index.tsx @@ -4,7 +4,7 @@ import { Modal, ModalWrapper, ModalCloseButton } from '@/ui/modal'; import { Button } from '@/ui/button'; import Input from '@/ui/input'; import { useState } from 'react'; -import { inviteMember, getUserByEmail } from '@affine/datacenter'; +import { getDataCenter } from '@affine/datacenter'; import { Avatar } from '@mui/material'; interface LoginModalProps { open: boolean; @@ -60,15 +60,19 @@ export const InviteMembers = ({ setShowTip(false); debounce( () => { - getUserByEmail({ - email: value, - workspace_id: workspaceId, - }).then(data => { - if (data?.name) { - setUserData(data); - setShowTip(false); - } - }); + getDataCenter() + .then(dc => + dc.apis.getUserByEmail({ + email: value, + workspace_id: workspaceId, + }) + ) + .then(data => { + if (data?.name) { + setUserData(data); + setShowTip(false); + } + }); }, 300, true @@ -130,7 +134,8 @@ export const InviteMembers = ({ shape="circle" type="primary" onClick={() => { - inviteMember({ id: workspaceId, email: email }) + getDataCenter() + .then(dc => dc.apis.inviteMember({ id: workspaceId, email })) .then(() => { onClose(); onInviteSuccess && onInviteSuccess(); diff --git a/packages/app/src/components/login-modal/LoginOptionButton.tsx b/packages/app/src/components/login-modal/LoginOptionButton.tsx index ce0b4db26..e04d8fecc 100644 --- a/packages/app/src/components/login-modal/LoginOptionButton.tsx +++ b/packages/app/src/components/login-modal/LoginOptionButton.tsx @@ -10,7 +10,7 @@ export const GoogleLoginButton = () => { { getDataCenter() - .then(dc => dc.apis.signInWithGoogle()) + .then(dc => dc.apis.signInWithGoogle?.()) .then(() => { triggerLoginModal(); }) 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 596435014..7fd14ef81 100644 --- a/packages/app/src/components/workspace-setting/general/delete/delete.tsx +++ b/packages/app/src/components/workspace-setting/general/delete/delete.tsx @@ -11,7 +11,7 @@ import { import { useState } from 'react'; import { ModalCloseButton } from '@/ui/modal'; import { Button } from '@/ui/button'; -import { deleteWorkspace } from '@affine/datacenter'; +import { getDataCenter } from '@affine/datacenter'; import { useRouter } from 'next/router'; import { useAppState } from '@/providers/app-state-provider'; @@ -39,7 +39,8 @@ export const WorkspaceDelete = ({ }; const handleDelete = async () => { - await deleteWorkspace({ id: workspaceId }); + const dc = await getDataCenter(); + await dc.apis.deleteWorkspace({ id: workspaceId }); router.push(`/workspace/${nextWorkSpaceId}`); refreshWorkspacesMeta(); onClose(); diff --git a/packages/app/src/components/workspace-setting/general/general.tsx b/packages/app/src/components/workspace-setting/general/general.tsx index acff4876f..cef2daccb 100644 --- a/packages/app/src/components/workspace-setting/general/general.tsx +++ b/packages/app/src/components/workspace-setting/general/general.tsx @@ -9,7 +9,7 @@ import { StyledSettingH2 } from '../style'; import { useState } from 'react'; import { Button } from '@/ui/button'; import Input from '@/ui/input'; -import { uploadBlob, Workspace, WorkspaceType } from '@affine/datacenter'; +import { getDataCenter, Workspace, WorkspaceType } from '@affine/datacenter'; import { useAppState } from '@/providers/app-state-provider'; import { WorkspaceDetails } from '@/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent'; import { WorkspaceDelete } from './delete'; @@ -74,9 +74,11 @@ export const GeneralPage = ({ const fileChange = async (file: File) => { setUploading(true); const blob = new Blob([file], { type: file.type }); - const blobId = await uploadBlob({ blob }).finally(() => { - setUploading(false); - }); + const blobId = await getDataCenter() + .then(dc => dc.apis.uploadBlob({ blob })) + .finally(() => { + setUploading(false); + }); if (blobId) { currentWorkspace?.meta.setAvatar(blobId); workspaces[workspace.id]?.meta.setAvatar(blobId); 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 4caef41fb..3c2cf8ce2 100644 --- a/packages/app/src/components/workspace-setting/general/leave/leave.tsx +++ b/packages/app/src/components/workspace-setting/general/leave/leave.tsx @@ -7,7 +7,7 @@ import { } from './style'; import { ModalCloseButton } from '@/ui/modal'; import { Button } from '@/ui/button'; -import { leaveWorkspace } from '@affine/datacenter'; +import { getDataCenter } from '@affine/datacenter'; import { useRouter } from 'next/router'; import { useAppState } from '@/providers/app-state-provider'; @@ -28,7 +28,8 @@ export const WorkspaceLeave = ({ const router = useRouter(); const { refreshWorkspacesMeta } = useAppState(); const handleLeave = async () => { - await leaveWorkspace({ id: workspaceId }); + const dc = await getDataCenter(); + await dc.apis.leaveWorkspace({ id: workspaceId }); 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 4f3ea36ba..c1b07e244 100644 --- a/packages/app/src/components/workspace-setting/workspace-setting.tsx +++ b/packages/app/src/components/workspace-setting/workspace-setting.tsx @@ -36,13 +36,7 @@ import { useCallback, useEffect, useState } from 'react'; import { Button, IconButton } from '@/ui/button'; import Input from '@/ui/input'; import { InviteMembers } from '../invite-members/index'; -import { - getWorkspaceMembers, - Workspace, - Member, - removeMember, - updateWorkspace, -} from '@affine/datacenter'; +import { Workspace, Member, getDataCenter } from '@affine/datacenter'; import { Avatar } from '@mui/material'; import { Menu, MenuItem } from '@/ui/menu'; import { toast } from '@/ui/toast'; @@ -169,9 +163,12 @@ const MembersPage = ({ workspace }: { workspace: Workspace }) => { const [isInviteModalShow, setIsInviteModalShow] = useState(false); const [members, setMembers] = useState([]); const refreshMembers = useCallback(() => { - getWorkspaceMembers({ - id: workspace.id, - }) + getDataCenter() + .then(dc => + dc.apis.getWorkspaceMembers({ + id: workspace.id, + }) + ) .then(data => { setMembers(data); }) @@ -236,13 +233,17 @@ const MembersPage = ({ workspace }: { workspace: Workspace }) => { // confirmText: 'Delete', // confirmType: 'danger', // }).then(confirm => { - removeMember({ - permissionId: member.id, - }).then(() => { - // console.log('data: ', data); - toast('Moved to Trash'); - refreshMembers(); - }); + getDataCenter() + .then(dc => + dc.apis.removeMember({ + permissionId: member.id, + }) + ) + .then(() => { + // console.log('data: ', data); + toast('Moved to Trash'); + refreshMembers(); + }); // }); }} icon={} @@ -297,13 +298,17 @@ const PublishPage = ({ workspace }: { workspace: Workspace }) => { workspace.public ); const togglePublic = (flag: boolean) => { - updateWorkspace({ - id: workspace.id, - public: flag, - }).then(data => { - setPublicStatus(data?.public); - toast('Updated Public Status Success'); - }); + getDataCenter() + .then(dc => + dc.apis.updateWorkspace({ + id: workspace.id, + public: flag, + }) + ) + .then(data => { + setPublicStatus(data?.public); + toast('Updated Public Status Success'); + }); }; const copyUrl = () => { navigator.clipboard.writeText(shareUrl); diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx index 1748e3e5b..8e101307b 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx @@ -12,7 +12,7 @@ import { } from './WorkspaceItem'; import { WorkspaceSetting } from '@/components/workspace-setting'; import { useCallback, useEffect, useState } from 'react'; -import { getWorkspaceDetail, WorkspaceType } from '@affine/datacenter'; +import { getDataCenter, WorkspaceType } from '@affine/datacenter'; import { useModal } from '@/providers/global-modal-provider'; export type WorkspaceDetails = Record< @@ -54,7 +54,8 @@ export const SelectorPopperContent = ({ if (type === WorkspaceType.Private) { return { id, member_count: 1, owner: user }; } else { - const data = await getWorkspaceDetail({ id }); + const dc = await getDataCenter(); + const data = await dc.apis.getWorkspaceDetail({ id }); return { id, ...data } || { id, member_count: 0, owner: user }; } } diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx index a5a254527..b07fdeeca 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx @@ -1,4 +1,4 @@ -import { createWorkspace, uploadBlob } from '@affine/datacenter'; +import { getDataCenter } from '@affine/datacenter'; import Modal from '@/ui/modal'; import Input from '@/ui/input'; import { @@ -52,7 +52,9 @@ export const WorkspaceCreate = ({ open, onClose }: WorkspaceCreateProps) => { ctx.fillText(workspaceName[0], 50, 50); canvas.toBlob(blob => { if (blob) { - const blobId = uploadBlob({ blob }); + const blobId = getDataCenter().then(dc => + dc.apis.uploadBlob({ blob }) + ); resolve(blobId); } else { reject(); @@ -69,7 +71,10 @@ export const WorkspaceCreate = ({ open, onClose }: WorkspaceCreateProps) => { setCreating(false); }); if (blobId) { - createWorkspace({ name: workspaceName, avatar: blobId }) + getDataCenter() + .then(dc => + dc.apis.createWorkspace({ name: workspaceName, avatar: blobId }) + ) .then(async data => { await refreshWorkspacesMeta(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment diff --git a/packages/app/src/hooks/use-ensure-workspace.ts b/packages/app/src/hooks/use-ensure-workspace.ts index 0fc076f1d..a340b78a4 100644 --- a/packages/app/src/hooks/use-ensure-workspace.ts +++ b/packages/app/src/hooks/use-ensure-workspace.ts @@ -26,7 +26,6 @@ export const useEnsureWorkspace = () => { meta => meta.id.toString() === router.query.workspaceId ) === -1 ) { - debugger; router.push('/404'); return; } diff --git a/packages/app/src/pages/invite/[invite_code].tsx b/packages/app/src/pages/invite/[invite_code].tsx index 69ada5c7e..c6ef0b6b4 100644 --- a/packages/app/src/pages/invite/[invite_code].tsx +++ b/packages/app/src/pages/invite/[invite_code].tsx @@ -1,7 +1,7 @@ import { styled } from '@/styles'; import { Empty } from '@/ui/empty'; import { Avatar } from '@mui/material'; -import { acceptInviting } from '@affine/datacenter'; +import { getDataCenter } from '@affine/datacenter'; import { useRouter } from 'next/router'; import { useEffect, useState } from 'react'; @@ -24,7 +24,12 @@ export default function DevPage() { // eslint-disable-next-line @typescript-eslint/no-explicit-any const [inviteData, setInviteData] = useState(null); useEffect(() => { - acceptInviting({ invitingCode: router.query.invite_code as string }) + getDataCenter() + .then(dc => + dc.apis.acceptInviting({ + invitingCode: router.query.invite_code as string, + }) + ) .then(data => { setSuccessInvited(true); setInviteData(data); diff --git a/packages/app/src/providers/app-state-provider/context.ts b/packages/app/src/providers/app-state-provider/context.ts index aea841d20..ee6b41d05 100644 --- a/packages/app/src/providers/app-state-provider/context.ts +++ b/packages/app/src/providers/app-state-provider/context.ts @@ -1,18 +1,18 @@ import { createContext, MutableRefObject, useContext } from 'react'; -import type { Workspace } from '@affine/datacenter'; +import type { AccessTokenMessage, Workspace } from '@affine/datacenter'; import type { Page as StorePage, Workspace as StoreWorkspace, } from '@blocksuite/store'; import type { EditorContainer } from '@blocksuite/editor'; export type LoadWorkspaceHandler = ( - workspaceId: string - // user?: AccessTokenMessage | null + workspaceId: string, + user?: AccessTokenMessage | null ) => Promise | null; export type CreateEditorHandler = (page: StorePage) => EditorContainer | null; export interface AppStateValue { - // user: AccessTokenMessage | null; + user: AccessTokenMessage | null; workspacesMeta: Workspace[]; currentWorkspaceId: string; @@ -38,7 +38,7 @@ export interface AppStateContext extends AppStateValue { } export const AppState = createContext({ - // user: null, + user: null, workspacesMeta: [], currentWorkspaceId: '', diff --git a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx index a70070845..1aa29b44e 100644 --- a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx +++ b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx @@ -15,19 +15,17 @@ const DynamicBlocksuite = ({ setCreateEditorHandler, }: Props) => { useEffect(() => { - const openWorkspace: LoadWorkspaceHandler = (workspaceId: string, user) => - // eslint-disable-next-line no-async-promise-executor - new Promise(async resolve => { - if (workspaceId) { - const workspace = await getDataCenter().then(dc => - dc.getWorkspace(workspaceId, 'affine') - ); - - resolve(workspace); - } else { - resolve(null); - } - }); + const openWorkspace: LoadWorkspaceHandler = async ( + workspaceId: string, + user + ) => { + if (workspaceId) { + const dc = await getDataCenter(); + return dc.getWorkspace(workspaceId, { providerId: 'affine' }); + } else { + return null; + } + }; setLoadWorkspaceHandler(openWorkspace); }, [setLoadWorkspaceHandler]); diff --git a/packages/app/src/providers/app-state-provider/provider.tsx b/packages/app/src/providers/app-state-provider/provider.tsx index 0bdc81f77..daa60ff85 100644 --- a/packages/app/src/providers/app-state-provider/provider.tsx +++ b/packages/app/src/providers/app-state-provider/provider.tsx @@ -1,7 +1,7 @@ import { useMemo, useState, useEffect, useCallback, useRef } from 'react'; import type { ReactNode } from 'react'; import dynamic from 'next/dynamic'; -import { getWorkspaces } from '@affine/datacenter'; +import { getDataCenter } from '@affine/datacenter'; import { AppState, AppStateContext } from './context'; import type { AppStateValue, @@ -16,7 +16,8 @@ const DynamicBlocksuite = dynamic(() => import('./dynamic-blocksuite'), { export const AppStateProvider = ({ children }: { children?: ReactNode }) => { const refreshWorkspacesMeta = async () => { - const workspacesMeta = await getWorkspaces().catch(() => { + const dc = await getDataCenter(); + const workspacesMeta = await dc.apis.getWorkspaces().catch(() => { return []; }); setState(state => ({ ...state, workspacesMeta })); diff --git a/packages/data-center/package.json b/packages/data-center/package.json index 6f54011ca..5d0ebc843 100644 --- a/packages/data-center/package.json +++ b/packages/data-center/package.json @@ -26,8 +26,8 @@ "typescript": "^4.8.4" }, "dependencies": { - "@blocksuite/blocks": "0.3.0-20221228162706-9576a3a", - "@blocksuite/store": "0.3.0-20221228162706-9576a3a", + "@blocksuite/blocks": "^0.3.1", + "@blocksuite/store": "^0.3.1", "debug": "^4.3.4", "encoding": "^0.1.13", "firebase": "^9.15.0", @@ -36,7 +36,7 @@ "ky-universal": "^0.11.0", "lib0": "^0.2.58", "swr": "^2.0.0", - "yjs": "^13.5.43", + "yjs": "^13.5.44", "y-protocols": "^1.0.5" } } diff --git a/packages/data-center/src/apis/index.ts b/packages/data-center/src/apis/index.ts index caf98f035..1e249355d 100644 --- a/packages/data-center/src/apis/index.ts +++ b/packages/data-center/src/apis/index.ts @@ -15,3 +15,7 @@ export const getApis = (): Apis => { const [signInWithGoogle, onAuthStateChanged] = getAuthorizer(); return { ...user, ...workspace, signInWithGoogle, onAuthStateChanged }; }; + +export type { AccessTokenMessage } from './token'; +export type { Member, Workspace } from './workspace'; +export { WorkspaceType } from './workspace'; diff --git a/packages/data-center/src/apis/token.ts b/packages/data-center/src/apis/token.ts index 33633cde7..b0acf68ee 100644 --- a/packages/data-center/src/apis/token.ts +++ b/packages/data-center/src/apis/token.ts @@ -5,7 +5,7 @@ import type { User } from 'firebase/auth'; import { getLogger } from '../index.js'; import { bareClient } from './request.js'; -interface AccessTokenMessage { +export interface AccessTokenMessage { create_at: number; exp: number; email: string; diff --git a/packages/data-center/src/index.ts b/packages/data-center/src/index.ts index b14a9f50a..4679eb666 100644 --- a/packages/data-center/src/index.ts +++ b/packages/data-center/src/index.ts @@ -20,3 +20,6 @@ export function getLogger(namespace: string) { logger.log = console.log.bind(console); return logger; } + +export type { AccessTokenMessage, Member, Workspace } from './apis'; +export { WorkspaceType } from './apis'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e14d93088..0a5e883aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -131,8 +131,8 @@ importers: packages/data-center: specifiers: - '@blocksuite/blocks': 0.3.0-20221228162706-9576a3a - '@blocksuite/store': 0.3.0-20221228162706-9576a3a + '@blocksuite/blocks': ^0.3.1 + '@blocksuite/store': ^0.3.1 '@playwright/test': ^1.29.1 '@types/debug': ^4.1.7 debug: ^4.3.4 @@ -146,10 +146,10 @@ importers: swr: ^2.0.0 typescript: ^4.8.4 y-protocols: ^1.0.5 - yjs: ^13.5.43 + yjs: ^13.5.44 dependencies: - '@blocksuite/blocks': 0.3.0-20221228162706-9576a3a_yjs@13.5.44 - '@blocksuite/store': 0.3.0-20221228162706-9576a3a_yjs@13.5.44 + '@blocksuite/blocks': 0.3.1_yjs@13.5.44 + '@blocksuite/store': 0.3.1_yjs@13.5.44 debug: 4.3.4 encoding: 0.1.13 firebase: 9.15.0_encoding@0.1.13 @@ -1496,24 +1496,6 @@ packages: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true - /@blocksuite/blocks/0.3.0-20221228162706-9576a3a_yjs@13.5.44: - resolution: {integrity: sha512-gBwqynM0WQuUbsJbazBKIe+jkyoXYZPalYQlz0f1TT51kXmvyhQ1TlvsnZx94aW1JwT2st3z65Q197MmfZ8jSw==} - dependencies: - '@blocksuite/store': 0.3.0-20221228162706-9576a3a_yjs@13.5.44 - '@tldraw/intersect': 1.8.0 - highlight.js: 11.7.0 - hotkeys-js: 3.10.1 - lit: 2.5.0 - perfect-freehand: 1.2.0 - quill: 1.3.7 - quill-cursors: 4.0.0 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - - yjs - dev: false - /@blocksuite/blocks/0.3.1_yjs@13.5.44: resolution: {integrity: sha512-b0dGz2MG4yIgngJPRumaMY58wAsd2FEVSZl3tpCXlagK9I0HD165Bq70PxcaRHVjBSV1Gf29ZVHUF6BVTYogPw==} dependencies: @@ -1558,27 +1540,6 @@ packages: react: 18.2.0 dev: false - /@blocksuite/store/0.3.0-20221228162706-9576a3a_yjs@13.5.44: - resolution: {integrity: sha512-uMbLD+zfhHasDwCmE1ZTtFtK9GNwN37Iaugbj/rtdwhQbdE6qfKHidSY0UzwKtNrQaUdAmp2IpnBpQ0vgk0ArQ==} - peerDependencies: - yjs: ^13 - dependencies: - '@types/flexsearch': 0.7.3 - '@types/quill': 1.3.10 - buffer: 6.0.3 - flexsearch: 0.7.21 - idb-keyval: 6.2.0 - ky: 0.33.1 - lib0: 0.2.58 - y-protocols: 1.0.5 - y-webrtc: 10.2.3 - yjs: 13.5.44 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: false - /@blocksuite/store/0.3.1_yjs@13.5.44: resolution: {integrity: sha512-kynVTDfNCSChz2JI2rtGHxRIV2YrLzvAgVajcbfDVCuXKG0siBoEjLasG1a0kvevbvW/FabrNAj+xaIplklioA==} peerDependencies: