Просмотр исходного кода

isYjsDataCorrupted -> isYjsDataBroken

Shun Miyazawa 1 год назад
Родитель
Сommit
ffe8e47be5

+ 1 - 1
apps/app/src/client/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -89,7 +89,7 @@ const PageOperationMenuItems = (props: PageOperationMenuItemsProps): JSX.Element
         const editingMarkdownLength = codeMirrorEditor?.getDoc().length;
         const editingMarkdownLength = codeMirrorEditor?.getDoc().length;
         const res = await syncLatestRevisionBody(pageId, editingMarkdownLength);
         const res = await syncLatestRevisionBody(pageId, editingMarkdownLength);
 
 
-        if (res?.isYjsDataCorrupted) {
+        if (res?.isYjsDataBroken) {
           // TODO: i18n
           // TODO: i18n
           // eslint-disable-next-line no-alert
           // eslint-disable-next-line no-alert
           window.alert('Please reload the page');
           window.alert('Please reload the page');

+ 1 - 1
apps/app/src/client/services/page-operation.ts

@@ -175,7 +175,7 @@ export const unpublish = async(pageId: string): Promise<IPageHasId> => {
   return res.data;
   return res.data;
 };
 };
 
 
-export const syncLatestRevisionBody = async(pageId: string, editingMarkdownLength?: number): Promise<{ isYjsDataCorrupted?: boolean } | void> => {
+export const syncLatestRevisionBody = async(pageId: string, editingMarkdownLength?: number): Promise<{ isYjsDataBroken?: boolean } | void> => {
   const res = await apiv3Put(`/page/${pageId}/sync-latest-revision-body-to-yjs-draft`, { editingMarkdownLength });
   const res = await apiv3Put(`/page/${pageId}/sync-latest-revision-body-to-yjs-draft`, { editingMarkdownLength });
   return res.data;
   return res.data;
 };
 };

+ 3 - 3
apps/app/src/server/service/yjs/yjs.ts

@@ -32,7 +32,7 @@ type RequestWithUser = IncomingMessage & { user: IUserHasId };
 
 
 export interface IYjsService {
 export interface IYjsService {
   getYDocStatus(pageId: string): Promise<YDocStatus>;
   getYDocStatus(pageId: string): Promise<YDocStatus>;
-  syncWithTheLatestRevisionForce(pageId: string, editingMarkdownLength?: number): Promise<{ isYjsDataCorrupted?: boolean } | void>
+  syncWithTheLatestRevisionForce(pageId: string, editingMarkdownLength?: number): Promise<{ isYjsDataBroken?: boolean } | void>
   getCurrentYdoc(pageId: string): Ydoc | undefined;
   getCurrentYdoc(pageId: string): Ydoc | undefined;
 }
 }
 
 
@@ -181,7 +181,7 @@ class YjsService implements IYjsService {
     return YDocStatus.OUTDATED;
     return YDocStatus.OUTDATED;
   }
   }
 
 
-  public async syncWithTheLatestRevisionForce(pageId: string, editingMarkdownLength?: number): Promise<{ isYjsDataCorrupted?: boolean } | void> {
+  public async syncWithTheLatestRevisionForce(pageId: string, editingMarkdownLength?: number): Promise<{ isYjsDataBroken?: boolean } | void> {
     const doc = this.ysocketio.documents.get(pageId);
     const doc = this.ysocketio.documents.get(pageId);
 
 
     if (doc == null) {
     if (doc == null) {
@@ -192,7 +192,7 @@ class YjsService implements IYjsService {
 
 
     if (editingMarkdownLength != null) {
     if (editingMarkdownLength != null) {
       const ytextLength = doc?.getText('codemirror').length;
       const ytextLength = doc?.getText('codemirror').length;
-      return { isYjsDataCorrupted: editingMarkdownLength !== ytextLength };
+      return { isYjsDataBroken: editingMarkdownLength !== ytextLength };
     }
     }
   }
   }