@seafile/sdoc-editor 0.1.141 → 0.1.142-beta

package/dist/context.js

@@ -89,6 +89,11 @@ var Context = /*#__PURE__*/function () {
     value: function saveContent(content) {
       return this.sdocServerApi.saveDocContent(content);
     }
+  }, {
+    key: "saveDocContentByRebase",
+    value: function saveDocContentByRebase(content) {
+      return this.sdocServerApi.saveDocContentByRebase(content);
+    }
   }, {
     key: "getCollaborators",
     value: function getCollaborators() {
@@ -156,14 +161,15 @@ var Context = /*#__PURE__*/function () {
   }, {
     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);
+      return this.api.sdocPublishRevision(docUuid, replace);
     }
   }, {
-    key: "getSeadocRevisionDownloadLinks",
-    value: function getSeadocRevisionDownloadLinks() {
+    key: "getSeadocOriginFileDownloadLink",
+    value: function getSeadocOriginFileDownloadLink() {
       var docUuid = this.getSetting('docUuid');
-      return this.api.getSeadocRevisionDownloadLinks(docUuid);
+      return this.api.getSeadocOriginFileDownloadLink(docUuid);
     }
   }, {
     key: "getSdocRevisionsCount",
@@ -177,6 +183,26 @@ 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: "rebaseSdocRevision",
+    value: function rebaseSdocRevision() {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.rebaseSdocRevision(docUuid);
+    }
+  }, {
+    key: "getFileHistoryVersion",
+    value: function getFileHistoryVersion(fileVersion, filePath) {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.getFileHistoryVersion(docUuid, fileVersion, filePath);
+    }
+
+    // local files
   }, {
     key: "getSdocLocalFiles",
     value: function getSdocLocalFiles(p) {

package/dist/pages/simple-editor.js

@@ -1,9 +1,6 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { withTranslation } from 'react-i18next';
-import deepCopy from 'deep-copy';
-import { SDocEditor, DiffViewer } from '../basic-sdk';
 import Loading from '../components/loading';
 import DocInfo from '../components/doc-info';
 import DocOperations from '../components/doc-operations';
@@ -11,6 +8,11 @@ import Layout, { Header, Content } from '../layout';
 import { generateDefaultDocContent } from '../utils';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
+import TipDialog from '../components/tip-dialog';
+import { EXTERNAL_EVENT, MODE } from '../constants';
+import { getRebase } from '../basic-sdk/utils/rebase';
+import toaster from '../components/toast';
+import { EventBus, SDocEditor } from '../basic-sdk';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
   var isStarred = _ref.isStarred,
@@ -19,39 +21,74 @@ var SimpleEditor = function SimpleEditor(_ref) {
   var editorRef = useRef(null);
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
-    isFirstLoad = _useState2[0],
-    setFirstLoad = _useState2[1];
-  var _useState3 = useState(true),
+    isLoadingSdoc = _useState2[0],
+    setLoadingSdoc = _useState2[1];
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
-    isLoadingSdoc = _useState4[0],
-    setLoadingSdoc = _useState4[1];
-  var _useState5 = useState(''),
+    errorMessage = _useState4[0],
+    setErrorMessage = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    errorMessage = _useState6[0],
-    setErrorMessage = _useState6[1];
-  var _useState7 = useState(false),
+    isShowChanges = _useState6[0],
+    setShowChanges = _useState6[1];
+  var _useState7 = useState(null),
     _useState8 = _slicedToArray(_useState7, 2),
-    isShowChanges = _useState8[0],
-    setShowChanges = _useState8[1];
-  var _useState9 = useState(null),
+    document = _useState8[0],
+    setDocument = _useState8[1];
+  var _useState9 = useState(MODE.EDITOR),
     _useState10 = _slicedToArray(_useState9, 2),
-    document = _useState10[0],
-    setDocument = _useState10[1];
-  var _useState11 = useState(null),
+    mode = _useState10[0],
+    setMode = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    currentContent = _useState12[0],
-    setCurrentContent = _useState12[1];
-  var _useState13 = useState(null),
+    changes = _useState12[0],
+    setChanges = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    lastContent = _useState14[0],
-    setLastContent = _useState14[1];
+    showTip = _useState14[0],
+    setShowTip = _useState14[1];
   useEffect(function () {
     context.initApi();
-    initDocumentData(true);
+    initDocumentData();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var initDocumentData = useCallback(function (isFirstLoad) {
+  var rebaseDocument = useCallback(function (document) {
+    toaster.warning(t('Document_has_rebased'));
+    editorRef.current.setLoading(true);
+    setShowChanges(false);
+    setMode(MODE.EDITOR);
+    editorRef.current.setEditorMode(MODE.EDITOR);
+
+    // 
+    console.log('document: ', document);
+    setDocument(document);
+    editorRef.current.setSlateValue(document);
+    editorRef.current.setLoading(false);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editorRef]);
+  useEffect(function () {
+    var eventBus = EventBus.getInstance();
+    var rebaseDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.REBASE_DOCUMENT, rebaseDocument);
+    return function () {
+      rebaseDocumentSubscribe();
+    };
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  // useMount: reset title
+  useEffect(function () {
+    var isSdocRevision = context.getSetting('isSdocRevision');
+    var originFilename = context.getSetting('originFilename');
+    if (isSdocRevision) {
+      window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var initDocumentData = useCallback(function () {
     setShowChanges(false);
     setLoadingSdoc(true);
     context.getFileContent().then(function (res) {
@@ -65,7 +102,6 @@ var SimpleEditor = function SimpleEditor(_ref) {
       }
       setDocument(result);
       setLoadingSdoc(false);
-      isFirstLoad && setFirstLoad(false);
     }).catch(function (error) {
       // eslint-disable-next-line
       console.log(error);
@@ -83,54 +119,172 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var initChangesData = useCallback(function () {
-    setShowChanges(true);
-    setLoadingSdoc(true);
-    context.getSeadocRevisionDownloadLinks().then(function (res) {
+  var setFileContent = useCallback(function () {
+    context.getFileContent().then(function (res) {
+      var result = res.data || generateDefaultDocContent();
+      if (result && !result.children) {
+        result = {
+          version: 0,
+          children: result.content,
+          cursors: result.cursors || {}
+        };
+      }
+      setDocument(result);
+      editorRef.current.setSlateValue(result);
+      editorRef.current.setLoading(false);
+    }).catch(function (error) {
+      // eslint-disable-next-line
+      console.log(error);
+      setErrorMessage('Load_doc_content_error');
+      editorRef.current.setLoading(false);
+    });
+
+    // eslint-disable-next-line no-trailing-spaces
+  }, []);
+  var setDiffContent = useCallback(function () {
+    context.getSeadocOriginFileDownloadLink().then(function (res) {
       var originFileDownloadLink = res.data.origin_file_download_link;
       return fetch(originFileDownloadLink);
     }).then(function (res) {
       return res.json();
     }).then(function (originContent) {
-      setLastContent(originContent);
-      setErrorMessage(null);
-      setLoadingSdoc(false);
+      editorRef.current.setDiffContent(originContent);
+      editorRef.current.setLoading(false);
     }).catch(function (error) {
-      setErrorMessage('Load_doc_content_error');
-      setLoadingSdoc(false);
+      console.log('error');
     });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document]);
+  }, []);
   var toggleViewChanges = useCallback(function (isShowChanges) {
-    if (isShowChanges) {
-      var newestValue = editorRef.current.getValue();
-      setCurrentContent(deepCopy(_objectSpread(_objectSpread({}, document), {}, {
-        children: newestValue
-      })));
+    var needFetchNewContent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    editorRef.current.setLoading(true);
+    setShowChanges(isShowChanges);
+    var mode = isShowChanges ? MODE.DIFF_VIEWER : MODE.EDITOR;
+    setMode(mode);
+    editorRef.current.setEditorMode(mode);
+    if (!isShowChanges) {
+      setFileContent();
+      return;
     }
-    if (isShowChanges) {
-      initChangesData();
+    if (!needFetchNewContent) {
+      setDiffContent();
       return;
     }
-    setChanges([]);
-    initDocumentData(false);
+    context.getFileContent().then(function (res) {
+      var result = res.data || generateDefaultDocContent();
+      if (result && !result.children) {
+        result = {
+          version: 0,
+          children: result.content,
+          cursors: result.cursors || {}
+        };
+      }
+      setDocument(result);
+      editorRef.current.setSlateValue(result);
+    }).then(function () {
+      setDiffContent();
+    }).catch(function (error) {
+      // eslint-disable-next-line
+      console.log(error);
+      setErrorMessage('Load_doc_content_error');
+      editorRef.current.setLoading(false);
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [document]);
-  var _useState15 = useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    changes = _useState16[0],
-    setChanges = _useState16[1];
+  var publishRevision = useCallback(function () {
+    var repoID = context.getSetting('repoID');
+    var siteRoot = context.getSetting('siteRoot');
+    var originFileVersion = context.getSetting('originFileVersion');
+    var originFilePath = context.getSetting('originFilePath');
+    var revisionCurrentContent;
+    var revisionMasterContent;
+    var masterContent;
+    context.getFileHistoryVersion(originFileVersion, originFilePath).then(function (res) {
+      var fileHistoryRevisionContent = res.data.content; // commit content
+      revisionMasterContent = JSON.parse(fileHistoryRevisionContent);
+      return context.getSeadocOriginFileDownloadLink();
+    }).then(function (res) {
+      var originFileDownloadLink = res.data.origin_file_download_link;
+      return fetch(originFileDownloadLink);
+    }).then(function (res) {
+      return res.json();
+    }).then(function (content) {
+      masterContent = content;
+      return context.getFileContent();
+    }).then(function (res) {
+      var result = res.data || generateDefaultDocContent();
+      if (result && !result.children) {
+        result = {
+          version: 0,
+          children: result.content,
+          cursors: result.cursors || {}
+        };
+      }
+      revisionCurrentContent = result;
+      var _getRebase = getRebase(masterContent, revisionMasterContent, revisionCurrentContent),
+        canMerge = _getRebase.canMerge,
+        isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
+        value = _getRebase.value;
+      if (canMerge && isNeedReplaceMaster) {
+        context.publishSdocRevision().then(function (res) {
+          var origin_file_path = res.data.origin_file_path;
+          window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file/").concat(origin_file_path);
+        }).catch(function (error) {
+          toaster.danger(t('Error'));
+        });
+        return;
+      }
+      if (canMerge && !isNeedReplaceMaster) {
+        setShowTip(true);
+        return;
+      }
+      toaster.warning(t('Need_rebase'));
+      editorRef.current.setLoading(true);
+      editorRef.current.setSlateValue(value);
+      setMode(MODE.REBASE);
+      editorRef.current.setEditorMode(MODE.REBASE);
+      editorRef.current.setLoading(false);
+    }).catch(function (error) {
+      toaster.danger(t('Error'));
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [document, isShowChanges, mode]);
+  var abortRebase = useCallback(function () {
+    toggleViewChanges(isShowChanges, true);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isShowChanges, document]);
   var setDiffChanges = useCallback(function (diff) {
     setChanges(diff.changes);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges]);
-  if (isFirstLoad && !errorMessage) {
+  var closeTipDialog = useCallback(function () {
+    setShowTip(false);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var deleteRevision = useCallback(function () {
+    context.deleteRevision().then(function (res) {
+      if (res.data.success) {
+        var repoID = context.getSetting('repoID');
+        var siteRoot = context.getSetting('siteRoot');
+        var originFilePath = context.getSetting('originFilePath');
+        window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file/").concat(originFilePath);
+        setShowTip(false);
+      }
+    }).catch(function (error) {
+      toaster.danger(t('Error'));
+      setShowTip(false);
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  if (isLoadingSdoc) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
-  if (isFirstLoad && errorMessage) {
+  if (errorMessage) {
     return /*#__PURE__*/React.createElement("div", {
       className: "error-page"
     }, /*#__PURE__*/React.createElement("div", {
@@ -143,25 +297,21 @@ var SimpleEditor = function SimpleEditor(_ref) {
     isEditMode: !isShowChanges
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
+    mode: mode,
     changes: changes,
-    toggleViewChanges: toggleViewChanges
-  })), /*#__PURE__*/React.createElement(Content, null, isLoadingSdoc && /*#__PURE__*/React.createElement("div", {
-    className: "w-100 h-100 d-flex align-items-center justify-content-center"
-  }, /*#__PURE__*/React.createElement(Loading, null)), !isLoadingSdoc && errorMessage && /*#__PURE__*/React.createElement("div", {
-    className: "error-page"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "error-tip"
-  }, t(errorMessage))), !isLoadingSdoc && !errorMessage && /*#__PURE__*/React.createElement(React.Fragment, null, isShowChanges ? /*#__PURE__*/React.createElement(DiffViewer, {
-    showToolbar: true,
-    showOutline: true,
-    currentContent: currentContent,
-    lastContent: lastContent,
-    didMountCallback: setDiffChanges
-  }) : /*#__PURE__*/React.createElement(SDocEditor, {
-    config: context.getEditorConfig(),
-    document: document,
+    toggleViewChanges: toggleViewChanges,
+    publishRevision: publishRevision,
+    abortRebase: abortRebase
+  })), /*#__PURE__*/React.createElement(Content, null, /*#__PURE__*/React.createElement(SDocEditor, {
     ref: editorRef,
-    isOpenSocket: context.getSetting('isOpenSocket')
-  })))));
+    document: document,
+    mode: mode,
+    setDiffChanges: setDiffChanges,
+    toggleViewChanges: toggleViewChanges
+  }))), showTip && /*#__PURE__*/React.createElement(TipDialog, {
+    toggle: closeTipDialog,
+    submit: deleteRevision,
+    title: t('Rebase_tip')
+  }, t('Rebase_delete_no_change_revision_tip')));
 };
 export default withTranslation('sdoc-editor')(SimpleEditor);

package/package.json

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

package/public/locales/en/sdoc-editor.json

@@ -362,5 +362,11 @@
   "No_changes": "No changes",
   "Title": "Title",
   "Subtitle": "Subtitle",
-  "Link_sdoc": "Link sdoc"
+  "Link_sdoc": "Link sdoc",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "Need_rebase": "Need rebase",
+  "Abort": "Abort",
+  "Rebase_delete_no_change_revision_tip": "No changes have been made in the revision, should the revision be deleted directly ?"
 }

package/public/locales/zh_CN/sdoc-editor.json

@@ -362,5 +362,11 @@
   "No_changes": "没有变化",
   "Title": "标题",
   "Subtitle": "副标题",
-  "Link_sdoc": "链接 sdoc"
+  "Link_sdoc": "链接 sdoc",
+  "Keep_my_modification": "保留我的更改",
+  "Keep_other_modification": "保留其他的更改",
+  "Keep_both_modification": "保留两个更改",
+  "Need_rebase": "需要变基",
+  "Abort": "中止",
+  "Rebase_delete_no_change_revision_tip": "No changes have been made in the revision, should the revision be deleted directly ?"
 }

package/dist/basic-sdk/editor.js

@@ -1,105 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useEffect, useMemo, useState, forwardRef, useImperativeHandle } from 'react';
-import { Editor } from '@seafile/slate';
-import { useTranslation } from 'react-i18next';
-import { createDefaultEditor } from './extension';
-import { focusEditor } from './extension/core';
-import { withSocketIO } from './socket';
-import withNodeId from './node-id';
-import { PAGE_EDIT_AREA_WIDTH } from './constants';
-import context from '../context';
-import { EditorContainer, EditorContent } from './layout';
-import SlateEditor from './slate-editor';
-import InsertElementDialog from './extension/commons/insert-element-dialog';
-var SDocEditor = forwardRef(function (_ref, ref) {
-  var document = _ref.document,
-    config = _ref.config;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-
-  // init editor
-  var editor = useMemo(function () {
-    var defaultEditor = createDefaultEditor();
-    var newEditor = withNodeId(withSocketIO(defaultEditor, {
-      document: document,
-      config: config
-    }));
-    var cursors = document.cursors;
-    newEditor.cursors = cursors || {};
-    newEditor.width = PAGE_EDIT_AREA_WIDTH; // default width
-    newEditor.readonly = false;
-    return newEditor;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var _useState = useState(document.children),
-    _useState2 = _slicedToArray(_useState, 2),
-    slateValue = _useState2[0],
-    setSlateValue = _useState2[1];
-
-  // The parent component can call the method of this component through ref
-  useImperativeHandle(ref, function () {
-    return {
-      // get latest value
-      getValue: function getValue() {
-        return slateValue;
-      }
-    };
-  }, [slateValue]);
-
-  // useMount: init socket connection
-  useEffect(function () {
-    editor.openConnection();
-    return function () {
-      editor.closeConnection();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  // useMount: focus editor
-  useEffect(function () {
-    var timer = setTimeout(function () {
-      var _editor$children = _slicedToArray(editor.children, 1),
-        firstNode = _editor$children[0];
-      if (firstNode) {
-        var _firstNode$children = _slicedToArray(firstNode.children, 1),
-          firstNodeFirstChild = _firstNode$children[0];
-        if (firstNodeFirstChild) {
-          var endOfFirstNode = Editor.end(editor, [0, 0]);
-          var range = {
-            anchor: endOfFirstNode,
-            focus: endOfFirstNode
-          };
-          focusEditor(editor, range);
-        }
-      }
-    }, 300);
-    return function () {
-      clearTimeout(timer);
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  // useMount: reset title
-  useEffect(function () {
-    var isSdocRevision = context.getSetting('isSdocRevision');
-    var originFilename = context.getSetting('originFilename');
-    if (isSdocRevision) {
-      window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditorContainer, {
-    editor: editor
-  }, /*#__PURE__*/React.createElement(EditorContent, {
-    docValue: slateValue,
-    showOutline: true
-  }, /*#__PURE__*/React.createElement(SlateEditor, {
-    editor: editor,
-    slateValue: slateValue,
-    setSlateValue: setSlateValue
-  }))), /*#__PURE__*/React.createElement(InsertElementDialog, {
-    editor: editor
-  }));
-});
-export default SDocEditor;