Shun Miyazawa 2 gadi atpakaļ
vecāks
revīzija
826c13cdf1

+ 1 - 1
apps/app/src/client/services/side-effects/page-updated.ts

@@ -38,7 +38,7 @@ export const usePageUpdatedEffect = (): void => {
       const remoteRevisionId = s2cMessagePageUpdated.revisionId;
       const isRevisionOutdated = (currentRevisionId != null || remoteRevisionId != null) && currentRevisionId !== remoteRevisionId;
 
-      // !!CAUTION!! Timing of calling openPageStatusAlert may clash with components/PageEditor.tsx
+      // !!CAUTION!! Timing of calling openPageStatusAlert may clash with client/services/update-page/conflict.tsx
       if (isRevisionOutdated && editorMode === EditorMode.View) {
         openPageStatusAlert({ hideEditorMode: EditorMode.Editor, onRefleshPage: mutateCurrentPage });
       }

+ 7 - 1
apps/app/src/components/PageEditor/PageEditor.tsx

@@ -20,7 +20,13 @@ import { throttle, debounce } from 'throttle-debounce';
 
 import { useShouldExpandContent } from '~/client/services/layout';
 import { useUpdateStateAfterSave } from '~/client/services/page-operation';
-import { updatePage, extractRemoteRevisionDataFromErrorObj, useConflictResolver, useConflictEffect, type ConflictHandler } from '~/client/services/update-page';
+import {
+  updatePage,
+  extractRemoteRevisionDataFromErrorObj,
+  useConflictResolver,
+  useConflictEffect,
+  type ConflictHandler
+} from '~/client/services/update-page';
 import { apiv3Get, apiv3PostForm } from '~/client/util/apiv3-client';
 import { toastError, toastSuccess, toastWarning } from '~/client/util/toastr';
 import {