Merge remote-tracking branch 'origin/feat/cloud-sync-saika' into feat/cloud-sync-saika

This commit is contained in:
alt0
2023-01-10 15:04:15 +08:00
44 changed files with 239 additions and 207 deletions
+4 -4
View File
@@ -191,18 +191,18 @@ export class DataCenter {
* @param {WorkspaceMeta} workspaceMeta workspace meta
* @param {BlocksuiteWorkspace} workspace workspace instance
*/
public async resetWorkspaceMeta(
{ name, avatar }: WorkspaceMeta,
public async updateWorkspaceMeta(
{ name, avatar }: Partial<WorkspaceMeta>,
workspace: BlocksuiteWorkspace
) {
assert(workspace?.room, 'No workspace to set meta');
const update: Partial<WorkspaceMeta> = {};
if (name) {
workspace.doc.meta.setName(name);
workspace.meta.setName(name);
update.name = name;
}
if (avatar) {
workspace.doc.meta.setAvatar(avatar);
workspace.meta.setAvatar(avatar);
update.avatar = avatar;
}
// may run for change workspace meta
+1 -2
View File
@@ -8,8 +8,7 @@ export const setDefaultAvatar = async (
const blob = await getDefaultHeadImgBlob(blocksuiteWorkspace.meta.name);
const blobStorage = await blocksuiteWorkspace.blobs;
assert(blobStorage, 'No blob storage');
const blobId = await blobStorage.set(blob);
const avatar = await blobStorage.get(blobId);
const avatar = await blobStorage.set(blob);
if (avatar) {
blocksuiteWorkspace.meta.setAvatar(avatar);
}