@seafile/sdoc-editor 0.1.146-beta → 0.1.146-beta-4

package/dist/basic-sdk/editor/index.js

@@ -101,8 +101,8 @@ var Editor = forwardRef(function (_ref, ref) {
         }));
       },
       // send message
-      publishDocument: function publishDocument(originFileURL) {
-        editor.publishDocument(originFileURL);
+      publishDocument: function publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc) {
+        editor.publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc);
       },
       mergeDocument: function mergeDocument(value, originFileVersion) {
         editor.mergeDocument(value, originFileVersion);

package/dist/basic-sdk/socket/socket-client.js

@@ -123,27 +123,22 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
     var socketManager = SocketManager.getInstance();
     socketManager.receiveRebaseContent(document, originFileVersion);
   };
-  this.sendRebaseDocument = function (document, originFileVersion, callback) {
-    debug('=========== send operations ==========');
-    debug('%O', document);
-    debug('======================================');
-    _this.socket.emit('rebase-document', _this.getParams({
-      document: document,
-      originFileVersion: originFileVersion
-    }), function (result) {
-      callback && callback(result);
-    });
-  };
-  this.sendPublishDocument = function (originFileURL, callback) {
+  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
     _this.socket.emit('publish-document', _this.getParams({
-      originFileURL: originFileURL
+      origin_doc_uuid: originDocUuid,
+      origin_doc_name: originDocName,
+      update_origin_doc: isNeedUpdateOriginDoc
     }), function (result) {
       callback && callback(result);
     });
   };
-  this.receivePublishDocument = function (originFileURL) {
+  this.receivePublishDocument = function () {
     var socketManager = SocketManager.getInstance();
-    socketManager.receivePublishDocument(originFileURL);
+    socketManager.receivePublishDocument();
+  };
+  this.receivePublishDocumentError = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receivePublishDocumentError();
   };
   this.sendMergeDocument = function (document, originFileVersion, callback) {
     _this.socket.emit('merge-document', _this.getParams({
@@ -157,6 +152,14 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
     var socketManager = SocketManager.getInstance();
     socketManager.receiveMergeDocument(document, originFileVersion);
   };
+  this.receiveMergeDocumentError = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receiveMergeDocumentError();
+  };
+  this.receiveUpdateDocumentFromHardDisk = function (document) {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receiveUpdateDocumentFromHardDisk(document);
+  };
   this.config = config;
   this.isReconnect = false;
   this.socket = io(config.sdocServer, {
@@ -173,7 +176,10 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.socket.on('update-document', this.onReceiveRemoteOperations);
   this.socket.on('rebase-document', this.receiveRebaseDocument);
   this.socket.on('merge-document', this.receiveMergeDocument);
+  this.socket.on('merge-document-error', this.receiveMergeDocumentError);
   this.socket.on('publish-document', this.receivePublishDocument);
+  this.socket.on('publish-document-error', this.receivePublishDocumentError);
+  this.socket.on('update-document-from-hard-disk', this.receiveUpdateDocumentFromHardDisk);
   this.socket.on('update-cursor', this.receiveCursorLocation);
   this.socket.io.on('reconnect', this.onReconnect);
   this.socket.io.on('reconnect_attempt', this.onReconnectAttempt);

package/dist/basic-sdk/socket/socket-manager.js

@@ -27,17 +27,14 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
     var version = _this.document.version;
     return version;
   };
-  this.sendRebaseContent = function (document, originFileVersion) {
-    _this.socketClient.sendRebaseDocument(document, originFileVersion, function (result) {
-      var serverVersion = result.version;
-      _this.document['version'] = serverVersion;
-    });
+  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc) {
+    _this.socketClient.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc);
   };
-  this.sendPublishDocument = function (originFileURL) {
-    _this.socketClient.sendPublishDocument(originFileURL);
+  this.receivePublishDocument = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT);
   };
-  this.receivePublishContent = function (originFileURL) {
-    _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT, originFileURL);
+  this.receivePublishDocumentError = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR);
   };
   this.sendMergeDocument = function (document, originFileVersion) {
     _this.socketClient.sendMergeDocument(document, originFileVersion, function (result) {
@@ -49,6 +46,13 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
     _this.document = document;
     _this.eventBus.dispatch(EXTERNAL_EVENT.MERGE_DOCUMENT, document, originFileVersion);
   };
+  this.receiveMergeDocumentError = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.MERGE_DOCUMENT_ERROR);
+  };
+  this.receiveUpdateDocumentFromHardDisk = function (document) {
+    _this.document = document;
+    _this.eventBus.dispatch(EXTERNAL_EVENT.UPDATE_DOCUMENT_FROM_HARD_DISK, document);
+  };
   this.onReceiveLocalOperations = function (operations) {
     _this.pendingOperationList.push(operations);
     if (_this.pendingOperationList.length > 5) {

package/dist/basic-sdk/socket/with-socket-io.js

@@ -54,10 +54,10 @@ var withSocketIO = function withSocketIO(editor, options) {
     var socketManager = SocketManager.getInstance(newEditor, document, config);
     socketManager.sendRebaseContent(document, originFileVersion);
   };
-  newEditor.publishDocument = function (originFileURL) {
+  newEditor.publishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc) {
     var config = options.config;
     var socketManager = SocketManager.getInstance(newEditor, document, config);
-    socketManager.sendPublishDocument(document, originFileURL);
+    socketManager.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc);
   };
   newEditor.mergeDocument = function (document, originFileVersion) {
     var config = options.config;

package/dist/components/tip-dialog/tip-content.js

@@ -32,7 +32,7 @@ var TipContent = function TipContent(_ref) {
       var siteRoot = context.getSetting('siteRoot');
       var originFilePath = context.getSetting('originFilePath');
       var originFileURL = "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(originFilePath);
-      window.href = originFileURL;
+      window.location.href = originFileURL;
     }
   }, [time]);
   var _useTranslation = useTranslation(),

package/dist/constants/index.js

@@ -5,15 +5,16 @@ export var EXTERNAL_EVENT = {
   TOGGLE_STAR: 'toggle_star',
   UNMARK_AS_DRAFT: 'unmark_as_draft',
   SHARE_SDOC: 'share_sdoc',
-  // REBASE_DOCUMENT: 'rebase_document',
   PUBLISH_DOCUMENT: 'publish_document',
-  MERGE_DOCUMENT: 'merge_document'
+  PUBLISH_DOCUMENT_ERROR: 'publish_document_error',
+  MERGE_DOCUMENT: 'merge_document',
+  MERGE_DOCUMENT_ERROR: 'merge_document_error',
+  UPDATE_DOCUMENT_FROM_HARD_DISK: 'update-document-from-hard-disk'
 };
 export var MODE = {
   DIFF_VIEWER: 'diff-viewer',
   VIEWER: 'viewer',
-  EDITOR: 'editor',
-  REBASE: 'rebase'
+  EDITOR: 'editor'
 };
 export var TIP_TYPE = {
   DELETE_NO_CHANGES_REVISION: 'delete_no_changes_revision',

package/dist/pages/simple-editor.js

@@ -24,6 +24,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
   var originFilePath = context.getSetting('originFilePath');
   var isRevision = context.getSetting('isSdocRevision');
   var originFileURL = isRevision ? "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(originFilePath) : '';
+  var originDocName = isRevision ? context.getSetting('originFilename') : '';
+  var originDocUuid = isRevision ? context.getSetting('originDocUuid') : '';
   var editorRef = useRef(null);
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
@@ -66,29 +68,39 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-
-  // 提示刷新界面: 主动刷新
-  var mergeDocument = useCallback(function (document, originFileVersion) {
+  var mergeDocument = useCallback(function () {
     setTipType(TIP_TYPE.HAS_BEEN_MERGE);
     setShowTip(true);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editorRef]);
-
-  // 提示刷新界面: 被动跳转
   var hasPublishRevision = useCallback(function () {
     setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
     setShowTip(true);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editorRef]);
+  var mergeDocumentError = useCallback(function () {}, []);
+  var publishDocumentError = useCallback(function () {}, []);
+  var updateDocumentFromHardDisk = useCallback(function (document) {
+    setDocument(document);
+    editorRef.current.setSlateValue(document);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editorRef.current]);
   useEffect(function () {
     var eventBus = EventBus.getInstance();
     var mergeDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.MERGE_DOCUMENT, mergeDocument);
     var publishDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
+    var mergeDocumentErrorSubscribe = eventBus.subscribe(EXTERNAL_EVENT.MERGE_DOCUMENT_ERROR, mergeDocumentError);
+    var publishDocumentErrorSubscribe = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, publishDocumentError);
+    var updateDocumentFromHardDiskSubscribe = eventBus.subscribe(EXTERNAL_EVENT.UPDATE_DOCUMENT_FROM_HARD_DISK, updateDocumentFromHardDisk);
     return function () {
       mergeDocumentSubscribe();
       publishDocumentSubscribe();
+      mergeDocumentErrorSubscribe();
+      publishDocumentErrorSubscribe();
+      updateDocumentFromHardDiskSubscribe();
     };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -224,8 +236,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
       setShowTip(true);
       return;
     }
-    var originFileVersion = context.getSetting('originFileVersion');
-    var originFilePath = context.getSetting('originFilePath');
+    var originFileVersion = context.getSetting('originFileVersion'); // changing
     var revisionMasterContent;
     var masterContent;
     context.getFileHistoryVersion(originFileVersion, originFilePath).then(function (res) {
@@ -245,7 +256,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
         value = _getRebase.value;
       if (canMerge && isNeedReplaceMaster) {
         context.publishSdocRevision().then(function (res) {
-          editorRef.current.publishDocument(originFileURL);
+          editorRef.current.publishDocument(originDocUuid, originDocName, true);
           setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
           setShowTip(true);
         }).catch(function (error) {
@@ -266,7 +277,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document, isShowChanges, mode]);
+  }, [document, isShowChanges, mode, originDocUuid, originDocName, originFilePath]);
   var abortRebase = useCallback(function () {
     toggleViewChanges(isShowChanges, true);
 
@@ -278,7 +289,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges]);
   var jumpToURL = useCallback(function (url) {
-    window.href = url;
+    window.location.href = url;
   }, []);
   var closeTip = useCallback(function () {
     setShowTip(false);
@@ -289,12 +300,9 @@ var SimpleEditor = function SimpleEditor(_ref) {
     if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
       context.deleteSdocRevision().then(function (res) {
         if (res.data.success) {
-          // 通知其他用户文档已经发布
-          var targetURL = "".concat(siteRoot, "lib/").concat(repoID, "/file/").concat(originFilePath);
-          editorRef.current.publishDocument(targetURL);
+          editorRef.current.publishDocument(originDocUuid, originDocName, false);
           setShowTip(false);
-          // 跳转页面
-          jumpToURL(targetURL);
+          jumpToURL(originFileURL);
         }
       }).catch(function (error) {
         toaster.danger(t('Error'));
@@ -307,11 +315,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
         context.updateSettings({
           'originFileVersion': origin_file_version
         });
-
-        // 通知其他用户合并文档 并更新
         editorRef.current.mergeDocument(mergeValue, origin_file_version);
-
-        // 当前用户更新内容
         editorRef.current.setLoading(true);
         editorRef.current.setSlateValue(mergeValue);
         setMode(MODE.EDITOR);
@@ -326,7 +330,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     setShowTip(false);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType, originFileURL, mergeValue, editorRef.current]);
+  }, [tipType, originFileURL, mergeValue, editorRef.current, originDocUuid, originDocName]);
   if (isLoadingSdoc) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.146beta",
+  "version": "0.1.146beta-4",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",