fix: regression on the database and bookmark block (#2737)

(cherry picked from commit bf6af934f6)

apps/web/src/adapters/local/index.tsx

@@ -19,7 +19,6 @@ import { createIndexedDBBackgroundProvider } from '@affine/workspace/providers';
 import { createEmptyBlockSuiteWorkspace } from '@affine/workspace/utils';
 import { nanoid } from '@blocksuite/store';
 
-import { setEditorFlags } from '../../utils/editor-flag';
 import {
   BlockSuitePageList,
   PageDetailEditor,
@@ -44,7 +43,6 @@ export const LocalAdapter: WorkspaceAdapter<WorkspaceFlavour.LOCAL> = {
       const page = blockSuiteWorkspace.createPage({
         id: DEFAULT_HELLO_WORLD_PAGE_ID,
       });
-      setEditorFlags(blockSuiteWorkspace);
       if (config.enablePreloading) {
         initPageWithPreloading(page).catch(err => {
           logger.error('init page with preloading failed', err);

apps/web/src/layouts/workspace-layout.tsx

@@ -64,7 +64,6 @@ import {
 } from '../providers/modal-provider';
 import { pathGenerator, publicPathGenerator } from '../shared';
 import { toast } from '../utils';
-import { setEditorFlags } from '../utils/editor-flag';
 
 const QuickSearchModal = lazy(() =>
   import('../components/pure/quick-search-modal').then(module => ({
@@ -311,7 +310,6 @@ export const WorkspaceLayoutInner: FC<PropsWithChildren> = ({ children }) => {
       id: pageId,
     });
     assertEquals(page.id, pageId);
-    setEditorFlags(currentWorkspace.blockSuiteWorkspace);
     if (config.enablePreloading) {
       initPageWithPreloading(page).catch(error => {
         console.error('import error:', error);

apps/web/src/utils/editor-flag.ts

@@ -1,12 +0,0 @@
-import { type BlockSuiteFeatureFlags, config } from '@affine/env';
-
-import type { BlockSuiteWorkspace } from '../shared';
-
-export function setEditorFlags(blockSuiteWorkspace: BlockSuiteWorkspace) {
-  Object.entries(config.editorFlags).forEach(([key, value]) => {
-    blockSuiteWorkspace.awarenessStore.setFlag(
-      key as keyof BlockSuiteFeatureFlags,
-      value
-    );
-  });
-}

packages/workspace/src/utils.ts

@@ -1,3 +1,5 @@
+import type { BlockSuiteFeatureFlags } from '@affine/env';
+import { config } from '@affine/env';
 import { WorkspaceFlavour } from '@affine/env/workspace';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Generator, StoreOptions } from '@blocksuite/store';
@@ -14,6 +16,15 @@ export function cleanupWorkspace(flavour: WorkspaceFlavour) {
   );
 }
 
+function setEditorFlags(workspace: Workspace) {
+  Object.entries(config.editorFlags).forEach(([key, value]) => {
+    workspace.awarenessStore.setFlag(
+      key as keyof BlockSuiteFeatureFlags,
+      value
+    );
+  });
+}
+
 const hashMap = new Map<string, Workspace>();
 
 /**
@@ -86,6 +97,7 @@ export function createEmptyBlockSuiteWorkspace(
   })
     .register(AffineSchemas)
     .register(__unstableSchemas);
+  setEditorFlags(workspace);
   hashMap.set(cacheKey, workspace);
   return workspace;
 }