@seafile/sdoc-editor 0.2.23-beta2 → 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 { useConfig } from '../../hooks';
 import './index.css';
 var DocInfo = function DocInfo(_ref) {
   var t = _ref.t,
     isStarred = _ref.isStarred,
     isDraft = _ref.isDraft,
-    isEditMode = _ref.isEditMode;
-  var _useConfig = useConfig(),
-    isPublished = _useConfig.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);

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 { useConfig } 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 _useConfig = useConfig(),
-    isPublished = _useConfig.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

@@ -12,11 +12,14 @@ import ViewChanges from './view-changes';
 import MoreRevisionOperations from './more-revision-operations';
 import Revisions from './revisions';
 import ChangesCount from './changes-count';
-import { useConfig, useDocument } from '../../../hooks';
+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(),
@@ -35,9 +38,6 @@ var RevisionOperations = function RevisionOperations(_ref) {
     setMergeValue = _useState6[1];
   var _useDocument = useDocument(),
     loadDocument = _useDocument.loadDocument;
-  var _useConfig = useConfig(),
-    isPublished = _useConfig.isPublished,
-    setPublished = _useConfig.setPublished;
   var onDocumentReplaced = useCallback(function () {
     if (isShowTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
@@ -45,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);
@@ -126,7 +126,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
         context.publishRevision().then(function (res) {
           setShowTip(false);
           setTipType('');
-          setPublished(true);
+          handleRevisionPublished(true);
           toaster.success(t('Revision published'));
         }).catch(function (error) {
           toaster.danger(t('Error'));
@@ -150,7 +150,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
       }
       toaster.danger(t('Error'));
     });
-  }, [loadDocument, t, setPublished]);
+  }, [loadDocument, t, handleRevisionPublished]);
 
   // confirm publish
   var onSubmit = useCallback(function () {
@@ -181,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/index.js

@@ -1,3 +1,3 @@
-export { CollaboratorsProvider, useCollaborators } from './use-collaborators';
-export { useDocument } from './use-document';
-export { ConfigContext, useConfig } from './use-config';
+import { CollaboratorsProvider, useCollaborators } from './use-collaborators';
+import { useDocument } from './use-document';
+export { CollaboratorsProvider, useCollaborators, useDocument };

package/dist/hooks/use-document.js

@@ -82,6 +82,7 @@ export var useDocument = function useDocument() {
     errorMessage: errorMessage,
     document: document,
     loadDocument: loadDocument,
-    reloadDocument: reloadDocument
+    reloadDocument: reloadDocument,
+    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

@@ -9,7 +9,7 @@ import context from '../context';
 import ErrorBoundary from './error-boundary';
 import { SDocEditor } from '../basic-sdk';
 import { PublishedRevisionDiffViewer, RevisionDiffViewer } from '../basic-sdk/views';
-import { useDocument, ConfigContext } from '../hooks';
+import { useDocument } from '../hooks';
 import { resetWebTitleAndURL } from '../utils';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
@@ -23,7 +23,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
     isReloading = _useDocument.isReloading,
     errorMessage = _useDocument.errorMessage,
     document = _useDocument.document,
-    reloadDocument = _useDocument.reloadDocument;
+    reloadDocument = _useDocument.reloadDocument,
+    setErrorMessage = _useDocument.setErrorMessage;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isShowChanges = _useState2[0],
@@ -68,16 +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);
   }, []);
-
-  // const setPublished = useCallback(() => {
-
-  // }, []);
-
+  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);
   }
@@ -88,21 +106,19 @@ var SimpleEditor = function SimpleEditor(_ref) {
       className: "error-tip"
     }, t(errorMessage)));
   }
-  return /*#__PURE__*/React.createElement(ErrorBoundary, null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement(Header, null, /*#__PURE__*/React.createElement(ConfigContext.Provider, {
-    value: {
-      isPublished: isPublished,
-      setPublished: setPublished
-    }
-  }, /*#__PURE__*/React.createElement(DocInfo, {
+  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, {
+  })), /*#__PURE__*/React.createElement(Content, null, isPublished && /*#__PURE__*/React.createElement(PublishedRevisionDiffViewer, {
     isShowChanges: isShowChanges,
     revisionContent: revisionContent,
     didMountCallback: setDiffChanges

package/package.json

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

package/dist/hooks/use-config.js

@@ -1,26 +0,0 @@
-import React, { useContext } from 'react';
-export var ConfigContext = React.createContext(null);
-
-// export const ConfigProvider = (props) => {
-//   const initIsPublished = context.getSetting('isPublished');
-//   const [isPublished, setPublished] = useState(initIsPublished);
-
-//   return (
-//     <ConfigContext.Provider value={{ isPublished, setPublished }}>
-//       {props.children}
-//     </ConfigContext.Provider>
-//   );
-// };
-
-export var useConfig = function useConfig() {
-  var context = useContext(ConfigContext);
-  if (!context) {
-    throw new Error('\'ConfigContext\' is null');
-  }
-  var isPublished = context.isPublished,
-    setPublished = context.setPublished;
-  return {
-    isPublished: isPublished,
-    setPublished: setPublished
-  };
-};