luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(infra): workspace migration without blockVersions (#4936)

Browse Source
This commit is contained in:
Joooye_34
2023-11-14 14:38:11 +01:00
committed by LongYinan
parent 9ac8a32e00
commit ea4f5ffc83
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/common/infra/src/blocksuite/index.ts
View File

@@ -598,12 +598,13 @@ export async function forceUpgradePages(
options: Omit<UpgradeOptions, 'createWorkspace'> options: Omit<UpgradeOptions, 'createWorkspace'>
): Promise<boolean> { ): Promise<boolean> {
const rootDoc = await options.getCurrentRootDoc(); const rootDoc = await options.getCurrentRootDoc();
guidCompatibilityFix(rootDoc);
const spaces = rootDoc.getMap('spaces') as YMap<any>; const spaces = rootDoc.getMap('spaces') as YMap<any>;
const meta = rootDoc.getMap('meta') as YMap<unknown>; const meta = rootDoc.getMap('meta') as YMap<unknown>;
const versions = meta.get('blockVersions') as YMap<number>; const versions = meta.get('blockVersions') as YMap<number>;
const schema = options.getSchema(); const schema = options.getSchema();
const oldVersions = versions.toJSON(); const oldVersions = versions?.toJSON() ?? {};
guidCompatibilityFix(rootDoc);
spaces.forEach((space: Doc) => { spaces.forEach((space: Doc) => {
try { try {
schema.upgradePage(0, oldVersions, space); schema.upgradePage(0, oldVersions, space);

10
packages/frontend/workspace/src/atom.ts
View File

@@ -140,12 +140,10 @@ const fetchMetadata: FetchMetadata = async (get, { signal }) => {
performanceJotaiLogger.info('%s adapter', Adapter.flavour); performanceJotaiLogger.info('%s adapter', Adapter.flavour);
const { CRUD, flavour: currentFlavour } = Adapter; const { CRUD, flavour: currentFlavour } = Adapter;
if ( const appAccessFn = Adapter.Events['app:access'];
Adapter.Events['app:access'] && const canAccess = appAccessFn && !(await appAccessFn());
!(await Adapter.Events['app:access']()) performanceJotaiLogger.info('%s app:access', Adapter.flavour);
) { if (canAccess) {
performanceJotaiLogger.info('%s app:access', Adapter.flavour);
// skip the adapter if the user doesn't have access to it // skip the adapter if the user doesn't have access to it
const removed = metadata.filter( const removed = metadata.filter(
meta => meta.flavour === currentFlavour meta => meta.flavour === currentFlavour