Merge pull request #8958 from weseek/fix/149828-error-when-trying-to-sync-latest-revision-to-corrupt-yjs-data

fix: Error when trying to sync latest revision to corrupt yjs data

apps/app/src/client/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -7,8 +7,6 @@ import type {
   IPageToRenameWithMeta, IPageWithMeta, IPageInfoForEntity,
 } from '@growi/core';
 import { pagePathUtils } from '@growi/core/dist/utils';
-import { GlobalCodeMirrorEditorKey } from '@growi/editor';
-import { useCodeMirrorEditorIsolated } from '@growi/editor/dist/client/stores/codemirror-editor';
 import { useTranslation } from 'next-i18next';
 import dynamic from 'next/dynamic';
 import Link from 'next/link';

apps/app/src/server/routes/apiv3/page/sync-latest-revision-body-to-yjs-draft.ts

@@ -7,6 +7,7 @@ import mongoose from 'mongoose';
 
 import type Crowi from '~/server/crowi';
 import type { PageModel } from '~/server/models/page';
+import { getYjsService } from '~/server/service/yjs';
 import loggerFactory from '~/utils/logger';
 
 import { apiV3FormValidator } from '../../../middlewares/apiv3-form-validator';
@@ -45,7 +46,8 @@ export const syncLatestRevisionBodyToYjsDraftHandlerFactory: SyncLatestRevisionB
       }
 
       try {
-        await crowi.pageService.syncLatestRevisionBodyToYjsDraft(pageId);
+        const yjsService = getYjsService();
+        await yjsService.syncWithTheLatestRevisionForce(pageId);
         return res.apiv3({ });
       }
       catch (err) {