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

can retrieve remote revision body

yuto-oweseek 4 лет назад
Родитель
Сommit
4d30cf6b6f

+ 2 - 0
packages/app/src/client/services/PageContainer.js

@@ -87,6 +87,7 @@ export default class PageContainer extends Container {
 
       // latest(on remote) information
       remoteRevisionId: revisionId,
+      remoteRevisionBody: null,
       revisionIdHackmdSynced: mainContent.getAttribute('data-page-revision-id-hackmd-synced') || null,
       lastUpdateUsername: mainContent.getAttribute('data-page-last-update-username') || null,
       deleteUsername: mainContent.getAttribute('data-page-delete-username') || null,
@@ -363,6 +364,7 @@ export default class PageContainer extends Container {
   setLatestRemotePageData(s2cMessagePageUpdated) {
     const newState = {
       remoteRevisionId: s2cMessagePageUpdated.revisionId,
+      remoteRevisionBody: s2cMessagePageUpdated.revisionBody,
       revisionIdHackmdSynced: s2cMessagePageUpdated.revisionIdHackmdSynced,
       lastUpdateUsername: s2cMessagePageUpdated.lastUpdateUsername,
     };

+ 1 - 0
packages/app/src/components/PageStatusAlert.jsx

@@ -109,6 +109,7 @@ class PageStatusAlert extends React.Component {
       revisionId, revisionIdHackmdSynced, remoteRevisionId, hasDraftOnHackmd, isHackmdDraftUpdatingInRealtime, isConflictingOnSave,
     } = this.props.pageContainer.state;
 
+    console.log('pageContainer is', this.props.pageContainer.state);
     const isRevisionOutdated = revisionId !== remoteRevisionId;
     const isHackmdDocumentOutdated = revisionIdHackmdSynced !== remoteRevisionId;
 

+ 1 - 0
packages/app/src/server/models/vo/s2c-message.js

@@ -15,6 +15,7 @@ class S2cMessagePageUpdated {
 
     this.pageId = _id;
     this.revisionId = revision;
+    this.revisionBody = page.revision.body;
     this.revisionIdHackmdSynced = revisionHackmdSynced;
     this.hasDraftOnHackmd = hasDraftOnHackmd;
 

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

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