@seafile/sdoc-editor 0.1.162 → 0.1.163

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

@@ -4,6 +4,7 @@ import { withTranslation } from 'react-i18next';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 import context from '../../../../context';
 import toaster from '../../../toast';
+import { REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../../../../constants';
 import './index.css';
 var MoreRevisionOperations = function MoreRevisionOperations(_ref) {
   var t = _ref.t;
@@ -18,7 +19,7 @@ var MoreRevisionOperations = function MoreRevisionOperations(_ref) {
   }, []);
   var startRevise = useCallback(function () {
     context.startRevise().then(function (res) {
-      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(res.data.revision_id, "/");
+      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(res.data.revision_id, "/?").concat(REVISION_FIRST_LOAD_KEY, "=").concat(REVISION_FIRST_LOAD_VALUE);
     }).catch(function (error) {
       toaster.danger(t('Error'));
     });

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

@@ -0,0 +1,4 @@
+.sdoc-tip-dialog .highlight-bg-color {
+  background-color: #FF8000;
+  border-color: #FF8000;
+}

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

@@ -1,10 +1,13 @@
-import React, { useCallback } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useCallback, 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';
-var NOT_CLOSE_DIALOG_TIP_TYPE = [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED];
+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];
 var TipDialog = function TipDialog(_ref) {
   var className = _ref.className,
     tipType = _ref.tipType,
@@ -12,17 +15,24 @@ var TipDialog = function TipDialog(_ref) {
     submit = _ref.submit;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isSubmitting = _useState2[0],
+    setSubmitting = _useState2[1];
   var closeDialog = useCallback(function () {
     if (NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType)) return;
+    if (isSubmitting) return;
     toggle && toggle();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType]);
+  }, [tipType, isSubmitting]);
   var confirmTip = useCallback(function () {
-    submit && submit();
+    submit && submit(function (submitting) {
+      setSubmitting(submitting);
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [tipType]);
   return /*#__PURE__*/React.createElement(Modal, {
     isOpen: true,
     autoFocus: false,
@@ -43,8 +53,13 @@ var TipDialog = function TipDialog(_ref) {
     onClick: closeDialog
   }, t('Cancel')), /*#__PURE__*/React.createElement(Button, {
     color: "primary",
-    className: "highlight-bg-color",
-    onClick: confirmTip
-  }, t('Confirm'))));
+    className: classnames('highlight-bg-color', {
+      'd-flex align-items-center': isSubmitting
+    }),
+    onClick: confirmTip,
+    disabled: isSubmitting
+  }, isSubmitting && /*#__PURE__*/React.createElement("span", {
+    className: "submit-loading-container mr-2"
+  }, /*#__PURE__*/React.createElement(CommonLoading, null)), t('Confirm'))));
 };
 export default TipDialog;

package/dist/constants/index.js

@@ -1,5 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _TIP_TITLE, _TIP_CONTENT;
+export var REVISION_FIRST_LOAD_KEY = 'first-load';
+export var REVISION_FIRST_LOAD_VALUE = '1';
 export var EXTERNAL_EVENT = {
   INTERNAL_LINK_CLICK: 'internal_link_click',
   TOGGLE_STAR: 'toggle_star',
@@ -24,7 +26,9 @@ export var TIP_TYPE = {
   HAS_BEEN_PUBLISHED: 'has_been_published',
   HAS_BEEN_REPLACED: 'has_been_merge',
   HAS_CONFLICT_BEFORE_VIEW_CHANGES: 'has_conflict_before_view_changes',
-  HAS_BEEN_REMOVED: 'has_been_removed'
+  HAS_BEEN_REMOVED: 'has_been_removed',
+  CHECKING: 'checking',
+  PUBLISHING: 'publishing'
 };
-export var TIP_TITLE = (_TIP_TITLE = {}, _defineProperty(_TIP_TITLE, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.MERGE, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REPLACED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REMOVED, 'Tip'), _TIP_TITLE);
-export var TIP_CONTENT = (_TIP_CONTENT = {}, _defineProperty(_TIP_CONTENT, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Rebase_delete_no_change_revision_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.MERGE, 'Merge_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Has_conflict_before_publish_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Has_been_published_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REPLACED, 'Has_been_replaced_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Has_conflict_before_view_changes_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REMOVED, 'Has_been_removed_tip'), _TIP_CONTENT);
+export var TIP_TITLE = (_TIP_TITLE = {}, _defineProperty(_TIP_TITLE, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.MERGE, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REPLACED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REMOVED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.CHECKING, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.PUBLISHING, 'Tip'), _TIP_TITLE);
+export var TIP_CONTENT = (_TIP_CONTENT = {}, _defineProperty(_TIP_CONTENT, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Rebase_delete_no_change_revision_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.MERGE, 'Merge_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Has_conflict_before_publish_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Has_been_published_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REPLACED, 'Has_been_replaced_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Has_conflict_before_view_changes_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REMOVED, 'Has_been_removed_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.CHECKING, 'Checking'), _defineProperty(_TIP_CONTENT, TIP_TYPE.PUBLISHING, 'Publishing'), _TIP_CONTENT);

package/dist/pages/simple-editor.js

@@ -11,7 +11,7 @@ import { generateDefaultDocContent } from '../utils';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
 import TipDialog from '../components/tip-dialog';
-import { EXTERNAL_EVENT, MODE, TIP_TYPE } from '../constants';
+import { EXTERNAL_EVENT, MODE, TIP_TYPE, REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../constants';
 import { getRebase, hasConflict } from '../basic-sdk/utils/rebase';
 import toaster from '../components/toast';
 import { EventBus, SDocEditor } from '../basic-sdk';
@@ -79,6 +79,18 @@ var SimpleEditor = function SimpleEditor(_ref) {
     var originFilename = context.getSetting('originFilename');
     if (isSdocRevision) {
       window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
+
+      // show revision created success info
+      var url = new URL(window.location.href);
+      var searchParams = new URLSearchParams(url.search);
+      if (!searchParams.has(REVISION_FIRST_LOAD_KEY)) return;
+      var firstLoadValue = searchParams.get(REVISION_FIRST_LOAD_KEY);
+      if (firstLoadValue === REVISION_FIRST_LOAD_VALUE) {
+        var revisionId = context.getSetting('revisionId');
+        toaster.success(t('Revision_created', {
+          id: revisionId
+        }));
+      }
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -195,6 +207,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          setTipType(TIP_TYPE.CHECKING);
+          setShowTip(true);
           loadDocument(function (document) {
             var revisionContent = document;
             if (hasConflict(revisionContent.children)) {
@@ -216,6 +230,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
                 isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
                 value = _getRebase.value;
               if (canMerge && isNeedReplaceMaster) {
+                setTipType(TIP_TYPE.PUBLISHING);
                 context.publishRevision().then(function (res) {
                   setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
                   setShowTip(true);
@@ -240,7 +255,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
           });
 
           // eslint-disable-next-line react-hooks/exhaustive-deps
-        case 1:
+        case 3:
         case "end":
           return _context.stop();
       }
@@ -259,18 +274,22 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [tipType]);
-  var tipSubmit = useCallback(function () {
+  var tipSubmit = useCallback(function (callback) {
     if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
+      callback && callback(true);
       context.deleteSdocRevision().then(function (res) {
+        callback && callback(false);
         setShowTip(false);
         var originFileURL = context.getSetting('originFileURL');
         jumpToURL(originFileURL);
       }).catch(function (error) {
+        callback && callback(false);
         toaster.danger(t('Error'));
       });
       return;
     }
     if (tipType === TIP_TYPE.MERGE) {
+      callback && callback(true);
       var _context$getUserInfo = context.getUserInfo(),
         username = _context$getUserInfo.username;
       var doc = {
@@ -281,6 +300,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
         last_modify_user: username
       };
       context.updateSdocRevision(doc).then(function (res) {
+        callback && callback(false);
         var origin_file_version = res.data.origin_file_version;
         context.updateSettings({
           'originFileVersion': origin_file_version
@@ -293,6 +313,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
         editorRef.current.setLoading(false);
         setShowTip(false);
       }).catch(function (error) {
+        callback && callback(false);
         toaster.danger(t('Error'));
       });
       return;

package/package.json

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

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

@@ -375,5 +375,8 @@
   "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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -375,5 +375,8 @@
   "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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -375,5 +375,8 @@
   "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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -375,5 +375,8 @@
   "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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -375,5 +375,8 @@
   "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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -375,5 +375,8 @@
   "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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -365,15 +365,18 @@
   "Subtitle": "Подзаголовок",
   "Link_sdoc": "Ссылка на sdoc",
   "Link_file": "Ссылка на файл",
-  "Keep_my_modification": "Keep my modification",
-  "Keep_other_modification": "Keep other's modification",
-  "Keep_both_modification": "Keep my modification",
-  "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_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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Keep_my_modification": "Сохранить мою модификацию",
+  "Keep_other_modification": "Сохранить чужую модификацию",
+  "Keep_both_modification": "Сохранить мою модификацию",
+  "Tip": "Совет",
+  "Rebase_delete_no_change_revision_tip": "Редакция не внесла никаких изменений по сравнению с исходным документом. Вы хотите удалить эту редакцию?",
+  "Has_been_replaced_tip": "Содержимое документа было заменено. Обновите страницу.",
+  "Has_been_published_tip": "Версия опубликована. Автоматический переход к исходному контенту через {{ time }} секунд.",
+  "Has_conflict_before_publish_tip": "В документе есть конфликты, разрешите их перед публикацией!",
+  "Merge_tip": "В документах есть конфликты. Вы хотите объединить их?",
+  "Has_conflict_before_view_changes_tip": "В документе есть конфликты. Разрешите конфликт перед просмотром изменений!",
+  "Has_been_removed_tip": "Документ удален, посмотрите другие документы.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -375,5 +375,8 @@
   "Has_conflict_before_publish_tip": "文档有冲突，请解决冲突后再发布！",
   "Merge_tip": "文档有冲突，是否合并？",
   "Has_conflict_before_view_changes_tip": "文档有冲突，请解决冲突后再查看更改！",
-  "Has_been_removed_tip": "文档已经被删除，请查看其他文档"
+  "Has_been_removed_tip": "文档已经被删除，请查看其他文档",
+  "Revision_created": "已创建修订稿 {{id}}",
+  "Checking": "检查中...",
+  "Publishing": "发布中..."
 }