@seafile/sdoc-editor 0.2.23-beta1 → 0.2.23-beta3

package/dist/components/doc-info/index.js

@@ -7,15 +7,14 @@ import { EXTERNAL_EVENT } from '../../constants';
 import { DateUtils } from '../../utils';
 import DraftDropdown from '../draft-dropdown';
 import RevisionAvatar from '../../assets/images/revision-avatar.png';
-import { useDocument } from '../../hooks';
 import './index.css';
 var DocInfo = function DocInfo(_ref) {
   var t = _ref.t,
     isStarred = _ref.isStarred,
     isDraft = _ref.isDraft,
-    isEditMode = _ref.isEditMode;
-  var _useDocument = useDocument(),
-    isPublished = _useDocument.isPublished;
+    isEditMode = _ref.isEditMode,
+    _ref$isPublished = _ref.isPublished,
+    isPublished = _ref$isPublished === void 0 ? false : _ref$isPublished;
   var onInternalLinkClick = useCallback(function () {
     var eventBus = EventBus.getInstance();
     eventBus.dispatch(EXTERNAL_EVENT.INTERNAL_LINK_CLICK);
@@ -70,7 +69,7 @@ var DocInfo = function DocInfo(_ref) {
     className: "sdoc-revision-order"
   }, t('Revision') + ' ' + revisionId), isPublished && /*#__PURE__*/React.createElement("div", {
     className: "sdoc-revision-order"
-  }, t('Published')), /*#__PURE__*/React.createElement(TipMessage, {
+  }, t('Published')), !isPublished && /*#__PURE__*/React.createElement(TipMessage, {
     isEditMode: isEditMode
   })), /*#__PURE__*/React.createElement("div", {
     className: "doc-state"

package/dist/components/doc-operations/index.js

@@ -9,16 +9,16 @@ import CommentsOperation from './comments-operation';
 import ShareOperation from './share-operation';
 import TagOperation from './tag-operation';
 import { isMobile } from '../../utils';
-import { useDocument } from '../../hooks';
 import './style.css';
 var DocOperations = function DocOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
+    _ref$isPublished = _ref.isPublished,
+    isPublished = _ref$isPublished === void 0 ? false : _ref$isPublished,
     changes = _ref.changes,
     handleViewChangesToggle = _ref.handleViewChangesToggle,
+    handleRevisionMerged = _ref.handleRevisionMerged,
     handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
-  var _useDocument = useDocument(),
-    isPublished = _useDocument.isPublished;
   if (isMobile) {
     return /*#__PURE__*/React.createElement("div", {
       className: "doc-ops"
@@ -28,8 +28,10 @@ var DocOperations = function DocOperations(_ref) {
     className: "doc-ops"
   }, /*#__PURE__*/React.createElement(RevisionOperations, {
     isShowChanges: isShowChanges,
+    isPublished: isPublished,
     changes: changes,
     handleViewChangesToggle: handleViewChangesToggle,
+    handleRevisionMerged: handleRevisionMerged,
     handleRevisionPublished: handleRevisionPublished
   }), !isPublished && /*#__PURE__*/React.createElement(TagOperation, null), !isPublished && /*#__PURE__*/React.createElement(CommentsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(ShareOperation, null), /*#__PURE__*/React.createElement(HistoryOperation, null), !isPublished && /*#__PURE__*/React.createElement(CollaboratorsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(MoreOperations, null));
 };

package/dist/components/doc-operations/revision-operations/index.js

@@ -4,7 +4,6 @@ import { EventBus } from '../../../basic-sdk';
 import { getRebase, hasConflict } from '../../../basic-sdk/utils/rebase';
 import context from '../../../context';
 import { EXTERNAL_EVENT, TIP_TYPE } from '../../../constants';
-import { useDocument } from '../../../hooks/use-document';
 import toaster from '../../toast';
 import TipDialog from '../../tip-dialog';
 import { useTranslation } from 'react-i18next';
@@ -13,10 +12,14 @@ import ViewChanges from './view-changes';
 import MoreRevisionOperations from './more-revision-operations';
 import Revisions from './revisions';
 import ChangesCount from './changes-count';
+import { useDocument } from '../../../hooks';
 var RevisionOperations = function RevisionOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
+    _ref$isPublished = _ref.isPublished,
+    isPublished = _ref$isPublished === void 0 ? false : _ref$isPublished,
     changes = _ref.changes,
     handleViewChangesToggle = _ref.handleViewChangesToggle,
+    handleRevisionMerged = _ref.handleRevisionMerged,
     handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
   var _useTranslation = useTranslation(),
@@ -25,7 +28,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     isShowTip = _useState2[0],
     setShowTip = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     tipType = _useState4[0],
     setTipType = _useState4[1];
@@ -34,9 +37,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
     mergeValue = _useState6[0],
     setMergeValue = _useState6[1];
   var _useDocument = useDocument(),
-    loadDocument = _useDocument.loadDocument,
-    isPublished = _useDocument.isPublished,
-    setPublished = _useDocument.setPublished;
+    loadDocument = _useDocument.loadDocument;
   var onDocumentReplaced = useCallback(function () {
     if (isShowTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
@@ -44,9 +45,9 @@ var RevisionOperations = function RevisionOperations(_ref) {
   }, [isShowTip]);
   var hasPublishRevision = useCallback(function () {
     if (isPublished) return;
-    setPublished(true);
+    handleRevisionPublished(true);
     toaster.success(t('Revision published'));
-  }, [isPublished, setPublished, t]);
+  }, [isPublished, handleRevisionPublished, t]);
   var onDocumentRemoved = useCallback(function () {
     if (isShowTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REMOVED);
@@ -123,7 +124,9 @@ var RevisionOperations = function RevisionOperations(_ref) {
       if (canMerge && isNeedReplaceMaster) {
         setTipType(TIP_TYPE.PUBLISHING);
         context.publishRevision().then(function (res) {
-          setPublished(true);
+          setShowTip(false);
+          setTipType('');
+          handleRevisionPublished(true);
           toaster.success(t('Revision published'));
         }).catch(function (error) {
           toaster.danger(t('Error'));
@@ -147,7 +150,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
       }
       toaster.danger(t('Error'));
     });
-  }, [loadDocument, t, setPublished]);
+  }, [loadDocument, t, handleRevisionPublished]);
 
   // confirm publish
   var onSubmit = useCallback(function () {
@@ -178,7 +181,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
         context.updateSettings({
           'originFileVersion': origin_file_version
         });
-        handleRevisionPublished && handleRevisionPublished(mergeValue);
+        handleRevisionMerged && handleRevisionMerged(mergeValue);
         setShowTip(false);
       }).catch(function (error) {
         toaster.danger(t('Error'));

package/dist/hooks/use-document.js

@@ -3,6 +3,7 @@ import { useCallback, useEffect, useState } from 'react';
 import context from '../context';
 export var useDocument = function useDocument() {
   var isSdocRevision = context.getSetting('isSdocRevision');
+  var isPublished = context.getSetting('isPublished');
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     isFirstLoading = _useState2[0],
@@ -23,10 +24,6 @@ export var useDocument = function useDocument() {
     _useState8 = _slicedToArray(_useState7, 2),
     errorMessage = _useState8[0],
     setErrorMessage = _useState8[1];
-  var _useState9 = useState(context.getSetting('isPublished')),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isPublished = _useState10[0],
-    setPublished = _useState10[1];
   var loadDocument = useCallback(function () {
     return new Promise(function (resolve, reject) {
       context.getFileContent().then(function (res) {
@@ -86,7 +83,6 @@ export var useDocument = function useDocument() {
     document: document,
     loadDocument: loadDocument,
     reloadDocument: reloadDocument,
-    isPublished: isPublished,
-    setPublished: setPublished
+    setErrorMessage: setErrorMessage
   };
 };

package/dist/pages/published-revision-viewer.js

@@ -78,10 +78,12 @@ var PublishedRevisionViewer = function PublishedRevisionViewer() {
     }, t(errorMessage)));
   }
   return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement(Header, null, /*#__PURE__*/React.createElement(DocInfo, {
-    isEditMode: false
+    isEditMode: false,
+    isPublished: true
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
     changes: changes,
+    isPublished: true,
     handleViewChangesToggle: handleViewChangesToggle
   })), /*#__PURE__*/React.createElement(Content, null, /*#__PURE__*/React.createElement(PublishedRevisionDiffViewer, {
     isShowChanges: isShowChanges,

package/dist/pages/simple-editor.js

@@ -24,7 +24,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     errorMessage = _useDocument.errorMessage,
     document = _useDocument.document,
     reloadDocument = _useDocument.reloadDocument,
-    isPublished = _useDocument.isPublished;
+    setErrorMessage = _useDocument.setErrorMessage;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isShowChanges = _useState2[0],
@@ -37,6 +37,11 @@ var SimpleEditor = function SimpleEditor(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     changes = _useState6[0],
     setChanges = _useState6[1];
+  var initIsPublished = context.getSetting('isPublished');
+  var _useState7 = useState(initIsPublished),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isPublished = _useState8[0],
+    setPublished = _useState8[1];
 
   // useMount: reset title
   useEffect(function () {
@@ -64,11 +69,33 @@ var SimpleEditor = function SimpleEditor(_ref) {
     setShowChanges(isShowChanges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [document, editorRef.current, isPublished]);
-  var handleRevisionPublished = useCallback(function (value) {
+  var handleRevisionMerged = useCallback(function (value) {
     setShowChanges(false);
     editorRef.current.setSlateValue(value);
     editorRef.current.updateDocumentVersion(value);
   }, []);
+  var handleRevisionPublished = useCallback(function () {
+    context.getPublishedRevisionContent().then(function (res) {
+      var revisionContentString = res.data.content;
+      var document = JSON.parse(revisionContentString);
+      setRevisionContent(document);
+      setPublished(true);
+      context.settings['isPublished'] = true;
+    }).catch(function (error) {
+      // eslint-disable-next-line
+      console.log(error);
+      var errorMessage = 'Load_doc_content_error';
+      if (error && error.response) {
+        var _ref2 = error.response.data || {},
+          error_type = _ref2.error_type;
+        if (error_type === 'content_invalid') {
+          errorMessage = 'Sdoc_format_invalid';
+        }
+      }
+      setErrorMessage(errorMessage);
+      setPublished(true);
+    });
+  }, [setErrorMessage]);
   if (isFirstLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
@@ -82,11 +109,14 @@ var SimpleEditor = function SimpleEditor(_ref) {
   return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement(Header, null, /*#__PURE__*/React.createElement(DocInfo, {
     isStarred: isStarred,
     isDraft: isDraft,
+    isPublished: isPublished,
     isEditMode: isPublished ? false : !isShowChanges
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
+    isPublished: isPublished,
     changes: changes,
     handleViewChangesToggle: handleViewChangesToggle,
+    handleRevisionMerged: handleRevisionMerged,
     handleRevisionPublished: handleRevisionPublished
   })), /*#__PURE__*/React.createElement(Content, null, isPublished && /*#__PURE__*/React.createElement(PublishedRevisionDiffViewer, {
     isShowChanges: isShowChanges,

package/package.json

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

package/dist/hooks/use-config.js

@@ -1,2 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import context from '../context';