disable alert on post

packages/app/src/client/services/EditorContainer.js

@@ -161,7 +161,6 @@ export default class EditorContainer extends Container {
   // See https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onbeforeunload#example
   showUnsavedWarning(e) {
     // Cancel the event
-    console.log('showUnsavedWarning');
     e.preventDefault();
     // display browser default message
     e.returnValue = '';
@@ -169,17 +168,13 @@ export default class EditorContainer extends Container {
   }
 
   disableUnsavedWarning() {
-    console.log('disableUnsavedWarning7');
     window.removeEventListener('beforeunload', this.showUnsavedWarning);
-    console.log('disableUnsavedWarning');
     this.isSetBeforeunloadEventHandler = false;
   }
 
   enableUnsavedWarning() {
-    console.log('enableUnsavedWarninga');
     if (!this.isSetBeforeunloadEventHandler) {
       window.addEventListener('beforeunload', this.showUnsavedWarning);
-      console.log('enableUnsavedWarning');
       this.isSetBeforeunloadEventHandler = true;
     }
   }

packages/app/src/client/services/PageContainer.js

@@ -634,7 +634,6 @@ export default class PageContainer extends Container {
 
       // update remote page data
       const { s2cMessagePageUpdated } = data;
-      console.log('s2cMessagePageUpdated:', s2cMessagePageUpdated);
       if (s2cMessagePageUpdated.pageId === pageContainer.state.pageId) {
         pageContainer.setLatestRemotePageData(s2cMessagePageUpdated);
       }

packages/app/src/components/PageEditor.jsx

@@ -114,7 +114,7 @@ class PageEditor extends React.Component {
     const { pageContainer, editorContainer } = this.props;
 
     if (this.state.markdown !== prevState.markdown) {
-      if (pageContainer.state.markdown !== this.state.markdown && !pageContainer.state.isConflictingOnSave) {
+      if (pageContainer.state.markdown !== this.state.markdown) {
         editorContainer.enableUnsavedWarning();
       }
     }

packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -49,6 +49,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
   const onResolveConflict = async() : Promise<void> => {
     // disable button after clicked
     setIsRevisionSelected(false);
+    editorContainer.disableUnsavedWarning();
     try {
       await pageContainer.resolveConflictAndReload(
         pageContainer.state.pageId,

packages/app/src/components/PageStatusAlert.jsx

@@ -66,7 +66,7 @@ class PageStatusAlert extends React.Component {
           revisionId: pageContainer.state.remoteRevisionId,
           revisionBody: pageContainer.state.remoteRevisionBody,
           createdAt: format(new Date(pageContainer.state.remoteRevisionUpdateAt), 'yyyy/MM/dd HH:mm:ss'),
-          userName: pageContainer.state.lastUpdateUsername.toString(),
+          userName: pageContainer.state.lastUpdateUsername,
           userImgPath: pageContainer.state.lastUpdateUserImagePath,
         },
       },

packages/app/src/server/service/system-events/sync-page-status.ts

@@ -103,6 +103,7 @@ class SyncPageStatusService implements S2sMessageHandlable {
       logger.debug('\'update\' event emitted.');
 
       const s2cMessagePageUpdated = new S2cMessagePageUpdated(page, user);
+
       // emit to the room for each page
       socketIoService.getDefaultSocket()
         .in(getRoomNameWithId(RoomPrefix.PAGE, page._id))