@seafile/sdoc-editor 0.2.24-beta1 → 0.2.24-beta2

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

@@ -8,15 +8,14 @@ import { DateUtils } from '../../utils';
 import DraftDropdown from '../draft-dropdown';
 import RevisionAvatar from '../../assets/images/revision-avatar.png';
 import FileTagQuickView from '../doc-operations/tag-operation/file-tag-quick-view';
-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

@@ -10,16 +10,15 @@ import ShareOperation from './share-operation';
 import TagOperation from './tag-operation';
 import { isMobile } from '../../utils';
 import './style.css';
-import { useConfig } from '../../hooks';
 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"
@@ -29,6 +28,7 @@ var DocOperations = function DocOperations(_ref) {
     className: "doc-ops"
   }, /*#__PURE__*/React.createElement(RevisionOperations, {
     isShowChanges: isShowChanges,
+    isPublished: isPublished,
     changes: changes,
     handleViewChangesToggle: handleViewChangesToggle,
     handleRevisionMerged: handleRevisionMerged,

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

@@ -3,8 +3,8 @@ import React, { useCallback, useEffect, useState } from 'react';
 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 { useConfig, useDocument } from '../../../hooks';
+import { EXTERNAL_EVENT, TIP_CONTENT, TIP_TYPE } from '../../../constants';
+import { useDocument } from '../../../hooks';
 import toaster from '../../toast';
 import TipDialog from '../../tip-dialog';
 import { useTranslation } from 'react-i18next';
@@ -15,6 +15,8 @@ import Revisions from './revisions';
 import ChangesCount from './changes-count';
 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,
@@ -36,8 +38,6 @@ var RevisionOperations = function RevisionOperations(_ref) {
     setMergeValue = _useState6[1];
   var _useDocument = useDocument(),
     loadDocument = _useDocument.loadDocument;
-  var _useConfig = useConfig(),
-    isPublished = _useConfig.isPublished;
   var onDocumentReplaced = useCallback(function () {
     if (isShowTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
@@ -45,7 +45,7 @@ var RevisionOperations = function RevisionOperations(_ref) {
   }, [isShowTip]);
   var hasPublishRevision = useCallback(function () {
     handleRevisionPublished();
-    toaster.success(t('Revision published'));
+    toaster.success(t(TIP_CONTENT[TIP_TYPE.HAS_BEEN_PUBLISHED]));
   }, [handleRevisionPublished, t]);
   var onDocumentRemoved = useCallback(function () {
     if (isShowTip) return;

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

@@ -3,8 +3,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
 import classnames from 'classnames';
-import { TIP_TYPE, TIP_TITLE } from '../../constants';
-import TipContent from './tip-content';
+import { TIP_TYPE, TIP_TITLE, TIP_CONTENT } from '../../constants';
 import CommonLoading from '../common-loading';
 import './index.css';
 var NOT_CLOSE_DIALOG_TIP_TYPE = [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED, TIP_TYPE.CHECKING, TIP_TYPE.PUBLISHING];
@@ -58,9 +57,7 @@ var TipDialog = function TipDialog(_ref) {
     toggle: NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType) ? undefined : closeDialog
   }, t(TIP_TITLE[tipType])), /*#__PURE__*/React.createElement(ModalBody, {
     className: "sdoc-tip-body"
-  }, children ? children : /*#__PURE__*/React.createElement(TipContent, {
-    tipType: tipType
-  })), !NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType) && /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+  }, children ? children : /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType]))), !NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType) && /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
     color: "secondary",
     className: "mr-2",
     onClick: closeDialog

package/dist/hooks/index.js

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

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, useConfig } from '../hooks';
+import { useDocument } from '../hooks';
 import { resetWebTitleAndURL } from '../utils';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
@@ -37,9 +37,11 @@ var SimpleEditor = function SimpleEditor(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     changes = _useState6[0],
     setChanges = _useState6[1];
-  var _useConfig = useConfig(),
-    isPublished = _useConfig.isPublished,
-    handelPublished = _useConfig.handelPublished;
+  var initIsPublished = context.getSetting('isPublished');
+  var _useState7 = useState(initIsPublished),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isPublished = _useState8[0],
+    setPublished = _useState8[1];
 
   // useMount: reset title
   useEffect(function () {
@@ -77,8 +79,12 @@ var SimpleEditor = function SimpleEditor(_ref) {
       var revisionContentString = res.data.content;
       var document = JSON.parse(revisionContentString);
       setRevisionContent(document);
-      handelPublished();
+      setPublished(true);
       context.settings['isPublished'] = true;
+      var oldAssetsUrl = context.getSetting('assetsUrl');
+      var docUuid = context.getSetting('docUuid');
+      var originDocUuid = context.getSetting('originDocUuid');
+      context.settings['assetsUrl'] = oldAssetsUrl.replace(docUuid, originDocUuid);
     }).catch(function (error) {
       // eslint-disable-next-line
       console.log(error);
@@ -91,9 +97,9 @@ var SimpleEditor = function SimpleEditor(_ref) {
         }
       }
       setErrorMessage(errorMessage);
-      handelPublished();
+      setPublished(true);
     });
-  }, [handelPublished, setErrorMessage]);
+  }, [setErrorMessage]);
   if (isFirstLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
@@ -107,9 +113,11 @@ 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,

package/package.json

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

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

@@ -379,7 +379,7 @@
   "Tip": "Tip",
   "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
   "Has_been_replaced_tip": "Document content has been replaced. Please refresh the page.",
-  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
+  "Has_been_published_tip": "Revision published",
   "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
   "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
   "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!",
@@ -406,5 +406,7 @@
   "Search_tags": "Search tags",
   "No_options_available": "Tag not found",
   "Add_option": "Vytvořit nový štítek",
-  "Find_an_option": "Search tags"
+  "Find_an_option": "Search tags",
+  "Copy_link_of_section": "Copy link of section",
+  "revision": "revision"
 }

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

@@ -379,7 +379,7 @@
   "Tip": "Tip",
   "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
   "Has_been_replaced_tip": "Document content has been replaced. Please refresh the page.",
-  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
+  "Has_been_published_tip": "Revision published",
   "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
   "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
   "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!",

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

@@ -379,7 +379,7 @@
   "Tip": "Tip",
   "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
   "Has_been_replaced_tip": "Document content has been replaced. Please refresh the page.",
-  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
+  "Has_been_published_tip": "Revision published",
   "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
   "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
   "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!",

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

@@ -379,7 +379,7 @@
   "Tip": "Tip",
   "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
   "Has_been_replaced_tip": "Document content has been replaced. Please refresh the page.",
-  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
+  "Has_been_published_tip": "Revision published",
   "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
   "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
   "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!",

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

@@ -379,7 +379,7 @@
   "Tip": "Tip",
   "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
   "Has_been_replaced_tip": "Document content has been replaced. Please refresh the page.",
-  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
+  "Has_been_published_tip": "Revision published",
   "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
   "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
   "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!",
@@ -406,5 +406,7 @@
   "Search_tags": "Search tags",
   "No_options_available": "Tag not found",
   "Add_option": "Créer un nouveau Tag",
-  "Find_an_option": "Search tags"
+  "Find_an_option": "Search tags",
+  "Copy_link_of_section": "Copy link of section",
+  "revision": "revision"
 }

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

@@ -379,7 +379,7 @@
   "Tip": "Tip",
   "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
   "Has_been_replaced_tip": "Document content has been replaced. Please refresh the page.",
-  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
+  "Has_been_published_tip": "Revision published",
   "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
   "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
   "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!",

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

@@ -379,7 +379,7 @@
   "Tip": "Совет",
   "Rebase_delete_no_change_revision_tip": "Редакция не внесла никаких изменений по сравнению с исходным документом. Вы хотите удалить эту редакцию?",
   "Has_been_replaced_tip": "Содержимое документа было заменено. Обновите страницу.",
-  "Has_been_published_tip": "Версия опубликована. Автоматический переход к исходному контенту через {{ time }} секунд.",
+  "Has_been_published_tip": "Revision published",
   "Has_conflict_before_publish_tip": "В документе есть конфликты, разрешите их перед публикацией!",
   "Merge_tip": "В документах есть конфликты. Вы хотите объединить их?",
   "Has_conflict_before_view_changes_tip": "В документе есть конфликты. Разрешите конфликт перед просмотром изменений!",

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

@@ -379,7 +379,7 @@
   "Tip": "提示",
   "Rebase_delete_no_change_revision_tip": "修订改没有更改，是否删除修订稿？",
   "Has_been_replaced_tip": "文档内容已经被替换，请刷新页面。",
-  "Has_been_published_tip": "修订稿已经发布了，{{ time }} 秒后自动跳转到源文件。",
+  "Has_been_published_tip": "修订稿已发布",
   "Has_conflict_before_publish_tip": "文档有冲突，请解决冲突后再发布！",
   "Merge_tip": "文档有冲突，是否合并？",
   "Has_conflict_before_view_changes_tip": "文档有冲突，请解决冲突后再查看更改！",

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

@@ -1,47 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useEffect, useState } from 'react';
-import PropTypes from 'prop-types';
-import { useTranslation } from 'react-i18next';
-import { TIP_TYPE, TIP_CONTENT } from '../../constants';
-import context from '../../context';
-var TipContent = function TipContent(_ref) {
-  var tipType = _ref.tipType;
-  var _useState = useState(3),
-    _useState2 = _slicedToArray(_useState, 2),
-    time = _useState2[0],
-    setTime = _useState2[1];
-  useEffect(function () {
-    if (tipType === TIP_TYPE.HAS_BEEN_PUBLISHED) {
-      var _time = 3;
-      var timer = setInterval(function () {
-        _time--;
-        setTime(_time);
-        if (_time === 0) {
-          clearInterval(timer);
-          timer = null;
-        }
-      }, 1000);
-      return function () {
-        timer && clearInterval(timer);
-      };
-    }
-  }, [tipType]);
-  useEffect(function () {
-    if (time === 0) {
-      var originFileURL = context.getSetting('originFileURL');
-      window.location.href = originFileURL;
-    }
-  }, [time]);
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  if (tipType === TIP_TYPE.HAS_BEEN_PUBLISHED) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType], {
-      time: time
-    }));
-  }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, t(TIP_CONTENT[tipType]));
-};
-TipContent.propTypes = {
-  tipType: PropTypes.string
-};
-export default TipContent;

package/dist/hooks/use-config.js

@@ -1,18 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useCallback, useState } from 'react';
-import context from '../context';
-export var useConfig = function useConfig() {
-  var initIsPublished = context.getSetting('isPublished');
-  var _useState = useState(initIsPublished),
-    _useState2 = _slicedToArray(_useState, 2),
-    isPublished = _useState2[0],
-    setIsPublished = _useState2[1];
-  var handelPublished = useCallback(function () {
-    setIsPublished(true);
-    context.settings['isPublished'] = true;
-  }, []);
-  return {
-    isPublished: isPublished,
-    handelPublished: handelPublished
-  };
-};