refactor: add workspace unit

This commit is contained in:
alt0
2023-01-10 18:37:24 +08:00
parent 5723117cb8
commit e13d27ad9c
16 changed files with 386 additions and 268 deletions
@@ -1,6 +1,11 @@
import { BaseProvider } from '../base.js';
import type { ProviderConstructorParams } from '../base';
import type { User, WorkspaceInfo, WorkspaceMeta } from '../../types';
import type {
ProviderConstructorParams,
CreateWorkspaceInfoParams,
UpdateWorkspaceMetaParams,
WorkspaceMeta0,
} from '../base';
import type { User } from '../../types';
import { Workspace as BlocksuiteWorkspace } from '@blocksuite/store';
import { BlockSchema } from '@blocksuite/blocks/models';
import { applyUpdate } from 'yjs';
@@ -115,12 +120,13 @@ export class AffineProvider extends BaseProvider {
return [];
}
const workspacesList = await this._apis.getWorkspaces();
const workspaces: WorkspaceInfo[] = workspacesList.map(w => {
const workspaces: WorkspaceMeta0[] = workspacesList.map(w => {
return {
...w,
memberCount: 0,
name: '',
provider: 'affine',
syncMode: 'core',
};
});
const workspaceInstances = workspaces.map(({ id }) => {
@@ -268,19 +274,17 @@ export class AffineProvider extends BaseProvider {
}
public override async createWorkspaceInfo(
meta: WorkspaceMeta
): Promise<WorkspaceInfo> {
const { id } = await this._apis.createWorkspace(
meta as Required<WorkspaceMeta>
);
meta: CreateWorkspaceInfoParams
): Promise<WorkspaceMeta0> {
const { id } = await this._apis.createWorkspace(meta);
const workspaceInfo: WorkspaceInfo = {
const workspaceInfo: WorkspaceMeta0 = {
name: meta.name,
id: id,
isPublish: false,
published: false,
avatar: '',
owner: await this.getUserInfo(),
isLocal: true,
syncMode: 'core',
memberCount: 1,
provider: 'affine',
};
@@ -289,7 +293,7 @@ export class AffineProvider extends BaseProvider {
public override async createWorkspace(
blocksuiteWorkspace: BlocksuiteWorkspace,
meta: WorkspaceMeta
meta: WorkspaceMeta0
): Promise<BlocksuiteWorkspace | undefined> {
const workspaceId = blocksuiteWorkspace.room;
assert(workspaceId, 'Blocksuite Workspace without room(workspaceId).');
@@ -298,13 +302,13 @@ export class AffineProvider extends BaseProvider {
this._applyCloudUpdates(blocksuiteWorkspace);
this.linkLocal(blocksuiteWorkspace);
const workspaceInfo: WorkspaceInfo = {
const workspaceInfo: WorkspaceMeta0 = {
name: meta.name,
id: workspaceId,
isPublish: false,
published: false,
avatar: '',
owner: undefined,
isLocal: true,
syncMode: 'core',
memberCount: 1,
provider: 'affine',
};
@@ -79,7 +79,6 @@ export async function getWorkspaceMembers(
export interface CreateWorkspaceParams {
name: string;
avatar: string;
}
export async function createWorkspace(
+17 -10
View File
@@ -1,7 +1,8 @@
import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store';
import { MessageCenter } from '../message';
import { Logger, User, WorkspaceInfo, WorkspaceMeta } from '../types';
import type { WorkspaceMetaCollectionScope } from '../workspace-meta-collection';
import { Logger, User } from '../types';
import type { WorkspaceUnitCollectionScope } from '../workspace-unit-collection';
import type { WorkspaceUnitCtorParams } from '../workspace-unit';
const defaultLogger = () => {
return;
@@ -9,13 +10,19 @@ const defaultLogger = () => {
export interface ProviderConstructorParams {
logger?: Logger;
workspaces: WorkspaceMetaCollectionScope;
workspaces: WorkspaceUnitCollectionScope;
messageCenter: MessageCenter;
}
export type WorkspaceMeta0 = WorkspaceUnitCtorParams;
export type CreateWorkspaceInfoParams = Pick<WorkspaceUnitCtorParams, 'name'>;
export type UpdateWorkspaceMetaParams = Partial<
Pick<WorkspaceUnitCtorParams, 'name' | 'avatar'>
>;
export class BaseProvider {
public readonly id: string = 'base';
protected _workspaces!: WorkspaceMetaCollectionScope;
protected _workspaces!: WorkspaceUnitCollectionScope;
protected _logger!: Logger;
protected _messageCenter!: MessageCenter;
@@ -37,8 +44,8 @@ export class BaseProvider {
}
public async createWorkspaceInfo(
meta: WorkspaceMeta
): Promise<WorkspaceInfo> {
params: CreateWorkspaceInfoParams
): Promise<WorkspaceMeta0> {
throw new Error(`provider: ${this.id} createWorkspaceInfo Not implemented`);
}
@@ -70,7 +77,7 @@ export class BaseProvider {
/**
* load workspaces
**/
public async loadWorkspaces(): Promise<WorkspaceInfo[]> {
public async loadWorkspaces(): Promise<WorkspaceMeta0[]> {
throw new Error(`provider: ${this.id} loadWorkSpace Not implemented`);
}
@@ -157,10 +164,10 @@ export class BaseProvider {
*/
public async updateWorkspaceMeta(
id: string,
meta: Partial<WorkspaceMeta>
params: UpdateWorkspaceMetaParams
): Promise<void> {
id;
meta;
params;
return;
}
@@ -170,7 +177,7 @@ export class BaseProvider {
*/
public async createWorkspace(
blocksuiteWorkspace: BlocksuiteWorkspace,
meta: WorkspaceMeta
meta: WorkspaceMeta0
): Promise<BlocksuiteWorkspace | undefined> {
return blocksuiteWorkspace;
}
@@ -1,13 +1,15 @@
import { test, expect } from '@playwright/test';
import { WorkspaceMetaCollection } from '../../workspace-meta-collection.js';
import { WorkspaceUnitCollection } from '../../workspace-unit-collection.js';
import { LocalProvider } from './local.js';
import { createBlocksuiteWorkspace } from '../../utils/index.js';
import { MessageCenter } from '../../message/index.js';
import 'fake-indexeddb/auto';
test.describe.serial('local provider', () => {
const workspaceMetaCollection = new WorkspaceMetaCollection();
const workspaceMetaCollection = new WorkspaceUnitCollection();
const provider = new LocalProvider({
workspaces: workspaceMetaCollection.createScope(),
messageCenter: new MessageCenter(),
});
const workspaceName = 'workspace-test';
@@ -16,23 +18,20 @@ test.describe.serial('local provider', () => {
test('create workspace', async () => {
const workspaceInfo = await provider.createWorkspaceInfo({
name: workspaceName,
avatar: 'avatar-url-test',
});
workspaceId = workspaceInfo.id;
const blocksuiteWorkspace = createBlocksuiteWorkspace(workspaceId);
await provider.createWorkspace(blocksuiteWorkspace, {
name: workspaceName,
avatar: 'avatar-url-test',
});
await provider.createWorkspace(blocksuiteWorkspace, workspaceInfo);
expect(workspaceMetaCollection.workspaces.length).toEqual(1);
expect(workspaceMetaCollection.workspaces[0].name).toEqual(workspaceName);
});
test('workspace list cache', async () => {
const workspacesMetaCollection1 = new WorkspaceMetaCollection();
const workspacesMetaCollection1 = new WorkspaceUnitCollection();
const provider1 = new LocalProvider({
workspaces: workspacesMetaCollection1.createScope(),
messageCenter: new MessageCenter(),
});
await provider1.loadWorkspaces();
expect(workspacesMetaCollection1.workspaces.length).toEqual(1);
@@ -1,7 +1,11 @@
import { BaseProvider } from '../base.js';
import type { ProviderConstructorParams } from '../base';
import type {
ProviderConstructorParams,
WorkspaceMeta0,
UpdateWorkspaceMetaParams,
CreateWorkspaceInfoParams,
} from '../base';
import { varStorage as storage } from 'lib0/storage';
import { WorkspaceInfo, WorkspaceMeta } from '../../types';
import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store';
import { IndexedDBProvider } from './indexeddb.js';
import assert from 'assert';
@@ -18,7 +22,7 @@ export class LocalProvider extends BaseProvider {
this.loadWorkspaces();
}
private _storeWorkspaces(workspaces: WorkspaceInfo[]) {
private _storeWorkspaces(workspaces: WorkspaceMeta0[]) {
storage.setItem(WORKSPACE_KEY, JSON.stringify(workspaces));
}
@@ -40,12 +44,12 @@ export class LocalProvider extends BaseProvider {
return workspace;
}
override loadWorkspaces(): Promise<WorkspaceInfo[]> {
override loadWorkspaces(): Promise<WorkspaceMeta0[]> {
const workspaceStr = storage.getItem(WORKSPACE_KEY);
let workspaces: WorkspaceInfo[] = [];
let workspaces: WorkspaceMeta0[] = [];
if (workspaceStr) {
try {
workspaces = JSON.parse(workspaceStr) as WorkspaceInfo[];
workspaces = JSON.parse(workspaceStr) as WorkspaceMeta0[];
workspaces.forEach(workspace => {
this._workspaces.add(workspace);
});
@@ -69,22 +73,22 @@ export class LocalProvider extends BaseProvider {
public override async updateWorkspaceMeta(
id: string,
meta: Partial<WorkspaceMeta>
meta: UpdateWorkspaceMetaParams
) {
this._workspaces.update(id, meta);
this._storeWorkspaces(this._workspaces.list());
}
public override async createWorkspaceInfo(
meta: WorkspaceMeta
): Promise<WorkspaceInfo> {
const workspaceInfo: WorkspaceInfo = {
meta: CreateWorkspaceInfoParams
): Promise<WorkspaceMeta0> {
const workspaceInfo: WorkspaceMeta0 = {
name: meta.name,
id: uuidv4(),
isPublish: false,
published: false,
avatar: '',
owner: undefined,
isLocal: true,
syncMode: 'core',
memberCount: 1,
provider: 'local',
};
@@ -93,20 +97,20 @@ export class LocalProvider extends BaseProvider {
public override async createWorkspace(
blocksuiteWorkspace: BlocksuiteWorkspace,
meta: WorkspaceMeta
meta: WorkspaceMeta0
): Promise<BlocksuiteWorkspace | undefined> {
const workspaceId = blocksuiteWorkspace.room;
assert(workspaceId, 'Blocksuite Workspace without room(workspaceId).');
assert(meta.name, 'Workspace name is required');
this._logger('Creating affine workspace');
const workspaceInfo: WorkspaceInfo = {
const workspaceInfo: WorkspaceMeta0 = {
name: meta.name,
id: workspaceId,
isPublish: false,
published: false,
avatar: '',
owner: undefined,
isLocal: true,
syncMode: 'core',
memberCount: 1,
provider: 'local',
};
@@ -5,6 +5,9 @@ import { getDefaultHeadImgBlob } from '../utils/index.js';
export const setDefaultAvatar = async (
blocksuiteWorkspace: BlocksuiteWorkspace
) => {
if (typeof document === 'undefined') {
return;
}
const blob = await getDefaultHeadImgBlob(blocksuiteWorkspace.meta.name);
const blobStorage = await blocksuiteWorkspace.blobs;
assert(blobStorage, 'No blob storage');