@seafile/sdoc-editor 0.1.149-beta2 → 0.1.149-beta3

package/dist/api/seafile-api.js

@@ -46,14 +46,6 @@ var SeafileAPI = /*#__PURE__*/function () {
       var url = '/api/v2.1/seadoc/download-image/' + docUuid + '/' + encodeURIComponent(imageName);
       return this.req.get(url);
     }
-  }, {
-    key: "sdocPublishRevision",
-    value: function sdocPublishRevision(docUuid, replace) {
-      var url = '/api/v2.1/seadoc/publish-revision/' + docUuid + '/';
-      var form = new FormData();
-      form.append('replace', replace);
-      return this._sendPostRequest(url, form);
-    }
   }, {
     key: "startRevise",
     value: function startRevise(repoID, fileUuid, path) {
@@ -83,12 +75,6 @@ var SeafileAPI = /*#__PURE__*/function () {
       var url = 'api/v2.1/seadoc/revisions/' + docUuid + '/?page=' + page + '&per_page=' + perPage;
       return this.req.get(url);
     }
-  }, {
-    key: "deleteSdocRevision",
-    value: function deleteSdocRevision(docUuid) {
-      var url = 'api/v2.1/seadoc/revision/' + docUuid + '/';
-      return this.req.delete(url);
-    }
   }, {
     key: "updateSdocRevision",
     value: function updateSdocRevision(docUuid) {

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

@@ -94,14 +94,11 @@ var Editor = forwardRef(function (_ref, ref) {
         }));
       },
       // send message
-      publishDocument: function publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc) {
-        editor.publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc);
+      publishDocument: function publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
+        editor.publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
       },
       replaceDocument: function replaceDocument(value, originFileVersion) {
         editor.replaceDocument(value, originFileVersion);
-      },
-      saveDocument: function saveDocument(callback) {
-        editor.saveDocument(callback);
       }
 
       // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -124,8 +124,8 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
       origin_doc_uuid: originDocUuid,
       origin_doc_name: originDocName,
       update_origin_doc: isNeedUpdateOriginDoc
-    }), function (result) {
-      callback && callback(result);
+    }), function (success) {
+      callback && callback(success);
     });
   };
   this.receivePublishDocument = function () {

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

@@ -27,8 +27,8 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
     var version = _this.document.version;
     return version;
   };
-  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc) {
-    _this.socketClient.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc);
+  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
+    _this.socketClient.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
   };
   this.receivePublishDocument = function () {
     _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT);

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

@@ -54,21 +54,16 @@ var withSocketIO = function withSocketIO(editor, options) {
     var socketManager = SocketManager.getInstance(newEditor, document, config);
     socketManager.sendRebaseContent(document, originFileVersion);
   };
-  newEditor.publishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc) {
+  newEditor.publishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
     var config = options.config;
     var socketManager = SocketManager.getInstance(newEditor, document, config);
-    socketManager.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc);
+    socketManager.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
   };
   newEditor.replaceDocument = function (document) {
     var config = options.config;
     var socketManager = SocketManager.getInstance(newEditor, document, config);
     socketManager.sendReplaceDocument(document);
   };
-  newEditor.saveDocument = function (callback) {
-    var config = options.config;
-    var socketManager = SocketManager.getInstance(newEditor, document, config);
-    socketManager.sendSaveDocument(callback);
-  };
   return newEditor;
 };
 export default withSocketIO;

package/dist/context.js

@@ -163,13 +163,6 @@ var Context = /*#__PURE__*/function () {
       var fileUuid = this.getSetting('docUuid');
       return this.api.startRevise(repoID, fileUuid, filePath);
     }
-  }, {
-    key: "publishSdocRevision",
-    value: function publishSdocRevision() {
-      var replace = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
-      var docUuid = this.getSetting('docUuid');
-      return this.api.sdocPublishRevision(docUuid, replace);
-    }
   }, {
     key: "getSeadocOriginFileDownloadLink",
     value: function getSeadocOriginFileDownloadLink() {
@@ -188,12 +181,6 @@ var Context = /*#__PURE__*/function () {
       var docUuid = this.getSetting('docUuid');
       return this.api.getSdocRevisions(docUuid, page, perPage);
     }
-  }, {
-    key: "deleteSdocRevision",
-    value: function deleteSdocRevision() {
-      var docUuid = this.getSetting('docUuid');
-      return this.api.deleteSdocRevision(docUuid);
-    }
   }, {
     key: "updateSdocRevision",
     value: function updateSdocRevision() {

package/dist/pages/simple-editor.js

@@ -227,15 +227,10 @@ var SimpleEditor = function SimpleEditor(_ref) {
                 isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
                 value = _getRebase.value;
               if (canMerge && isNeedReplaceMaster) {
-                editorRef.current.saveDocument(function (saveFlag) {
-                  if (saveFlag) {
-                    context.publishSdocRevision().then(function (res) {
-                      editorRef.current.publishDocument(originDocUuid, originDocName, true);
-                      setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
-                      setShowTip(true);
-                    }).catch(function (error) {
-                      toaster.danger(t('Error'));
-                    });
+                editorRef.current.publishDocument(originDocUuid, originDocName, true, function (success) {
+                  if (success) {
+                    setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+                    setShowTip(true);
                   } else {
                     toaster.danger(t('Error'));
                   }
@@ -279,14 +274,13 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }, [tipType]);
   var tipSubmit = useCallback(function () {
     if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
-      context.deleteSdocRevision().then(function (res) {
-        if (res.data.success) {
-          editorRef.current.publishDocument(originDocUuid, originDocName, false);
+      editorRef.current.publishDocument(originDocUuid, originDocName, false, function (success) {
+        if (success) {
           setShowTip(false);
           jumpToURL(originFileURL);
+        } else {
+          toaster.danger(t('Error'));
         }
-      }).catch(function (error) {
-        toaster.danger(t('Error'));
       });
       return;
     }

package/package.json

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