@seafile/sdoc-editor 0.2.23 → 0.2.24-beta1

package/dist/basic-sdk/constants/index.js

@@ -6,7 +6,8 @@ export var INTERNAL_EVENT = {
   INSERT_ELEMENT: 'insert_element',
   OUTLINE_STATE_CHANGED: 'outline_state_changed',
   RELOAD_IMAGE: 'reload_image',
-  ARTICLE_CLICK: 'hidden_comment'
+  ARTICLE_CLICK: 'hidden_comment',
+  UPDATE_TAG_VIEW: 'update_tag_view'
 };
 export var PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]
 

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

@@ -7,12 +7,16 @@ import { EXTERNAL_EVENT } from '../../constants';
 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;
   var onInternalLinkClick = useCallback(function () {
     var eventBus = EventBus.getInstance();
     eventBus.dispatch(EXTERNAL_EVENT.INTERNAL_LINK_CLICK);
@@ -37,7 +41,7 @@ var DocInfo = function DocInfo(_ref) {
     className: "internal-link sdocfont sdoc-link",
     title: t('Internal_link'),
     onClick: onInternalLinkClick
-  })), /*#__PURE__*/React.createElement(TipMessage, {
+  })), /*#__PURE__*/React.createElement(FileTagQuickView, null), /*#__PURE__*/React.createElement(TipMessage, {
     isEditMode: isEditMode
   }));
   if (!isSdocRevision) {
@@ -50,7 +54,6 @@ var DocInfo = function DocInfo(_ref) {
   var revisionCreatedAt = context.getSetting('revisionCreatedAt');
   var oldDocName = context.getSetting('originFilename');
   var revisionId = context.getSetting('revisionId');
-  var isPublished = context.getSetting('isPublished');
   return /*#__PURE__*/React.createElement("div", {
     className: "sdoc-revision-info doc-info"
   }, /*#__PURE__*/React.createElement("div", {
@@ -67,8 +70,8 @@ var DocInfo = function DocInfo(_ref) {
   }, oldDocName), /*#__PURE__*/React.createElement("div", {
     className: "sdoc-revision-order"
   }, t('Revision') + ' ' + revisionId), isPublished && /*#__PURE__*/React.createElement("div", {
-    className: "sdoc-revision-order"
-  }, t('Published')), /*#__PURE__*/React.createElement(TipMessage, {
+    className: "sdoc-revision-published-tip"
+  }, t('Published')), !isPublished && /*#__PURE__*/React.createElement(TipMessage, {
     isEditMode: isEditMode
   })), /*#__PURE__*/React.createElement("div", {
     className: "doc-state"

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

@@ -11,6 +11,6 @@ export default function CommentsOperation() {
     className: "op-item",
     onClick: onCommentsToggle
   }, /*#__PURE__*/React.createElement("i", {
-    className: "sdocfont sdoc-comments mr-1"
+    className: "sdocfont sdoc-comments"
   }));
 }

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

@@ -10,13 +10,16 @@ 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,
     changes = _ref.changes,
     handleViewChangesToggle = _ref.handleViewChangesToggle,
+    handleRevisionMerged = _ref.handleRevisionMerged,
     handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
-  var isPublished = context.getSetting('isPublished');
+  var _useConfig = useConfig(),
+    isPublished = _useConfig.isPublished;
   if (isMobile) {
     return /*#__PURE__*/React.createElement("div", {
       className: "doc-ops"
@@ -28,6 +31,7 @@ var DocOperations = function DocOperations(_ref) {
     isShowChanges: isShowChanges,
     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,7 @@ 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 { useConfig, useDocument } from '../../../hooks';
 import toaster from '../../toast';
 import TipDialog from '../../tip-dialog';
 import { useTranslation } from 'react-i18next';
@@ -17,16 +17,16 @@ var RevisionOperations = function RevisionOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
     handleViewChangesToggle = _ref.handleViewChangesToggle,
+    handleRevisionMerged = _ref.handleRevisionMerged,
     handleRevisionPublished = _ref.handleRevisionPublished;
   var isSdocRevision = context.getSetting('isSdocRevision');
-  var isPublished = context.getSetting('isPublished');
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useState = useState(false),
     _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,16 +34,19 @@ var RevisionOperations = function RevisionOperations(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     mergeValue = _useState6[0],
     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);
     setShowTip(true);
   }, [isShowTip]);
   var hasPublishRevision = useCallback(function () {
-    if (isShowTip) return;
-    setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
-    setShowTip(true);
-  }, [isShowTip]);
+    handleRevisionPublished();
+    toaster.success(t('Revision published'));
+  }, [handleRevisionPublished, t]);
   var onDocumentRemoved = useCallback(function () {
     if (isShowTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REMOVED);
@@ -73,8 +76,6 @@ var RevisionOperations = function RevisionOperations(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var _useDocument = useDocument(),
-    loadDocument = _useDocument.loadDocument;
 
   // solve show change view in revision editor
   var onViewChangesToggle = useCallback(function (isShowChanges) {
@@ -122,7 +123,8 @@ var RevisionOperations = function RevisionOperations(_ref) {
       if (canMerge && isNeedReplaceMaster) {
         setTipType(TIP_TYPE.PUBLISHING);
         context.publishRevision().then(function (res) {
-          setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
+          setShowTip(false);
+          setTipType('');
         }).catch(function (error) {
           toaster.danger(t('Error'));
         });
@@ -176,7 +178,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/components/doc-operations/revision-operations/revisions/revisions-dialog/index.js

@@ -92,7 +92,8 @@ var RevisionsDialog = function RevisionsDialog(_ref) {
   var openRevision = useCallback(function (event, revisionId) {
     eventStopPropagation(event);
     if (event.target.className.includes('sdoc-revision-operation-toggle')) return;
-    window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(revisionId, "/");
+    var url = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(revisionId, "/");
+    window.open(url, '_blank');
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -251,7 +252,7 @@ var RevisionsDialog = function RevisionsDialog(_ref) {
     onClose: closeDeleteTipDialog,
     zIndex: 1071
   }, t(TIP_CONTENT[TIP_TYPE.DELETE_REVISION], {
-    content: "".concat(t('Revision'), " ").concat(operatingRevisionId)
+    content: "".concat(t('revision'), " ").concat(operatingRevisionId)
   })));
 };
 export default RevisionsDialog;

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

@@ -11,7 +11,7 @@ var ViewChanges = function ViewChanges(_ref) {
   var onViewChangesToggle = useCallback(function () {
     propsOnViewChangesToggle(!isShowChanges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isShowChanges]);
+  }, [isShowChanges, propsOnViewChangesToggle]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     id: "sdoc-toggle-revision-changes-container",
     className: "h-100 ml-4 d-flex align-items-center "

package/dist/components/doc-operations/style.css

@@ -39,3 +39,15 @@
   cursor: default;
 }
 
+.doc-info  .sdoc-revision-published-tip {
+  display: inline-block;
+  font-size: 14px;
+  color: #55A900;
+  background: #E6F4D6;
+  padding: 0 8px; 
+  height: 20px;
+  line-height: 20px;
+  border-radius: 3px;
+  margin-left: 0.5rem;
+  cursor: default;
+}

package/dist/components/doc-operations/tag-operation/file-tag-quick-view/index.css

@@ -0,0 +1,14 @@
+.sdoc-file-tag-quick-review-container {
+  display: flex;
+  margin-left: 0.5rem;
+}
+
+.sdoc-file-tag-quick-review-container .sdoc-review-circle {
+  display: inline-block;
+  height: 1rem;
+  width: 1rem;
+  margin-right: -0.5rem;
+  border: 0.125rem solid #fff;
+  border-radius: 50%;
+  cursor: pointer;
+}

package/dist/components/doc-operations/tag-operation/file-tag-quick-view/index.js

@@ -0,0 +1,74 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+import React, { useCallback, useEffect, useState, Fragment } from 'react';
+import context from '../../../../context';
+import Tooltip from '../../../tooltip';
+import { EventBus } from '../../../../basic-sdk';
+import { INTERNAL_EVENT } from '../../../../basic-sdk/constants';
+import './index.css';
+var FileTagQuickView = function FileTagQuickView() {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    fileTagList = _useState2[0],
+    setFileTagList = _useState2[1];
+  useEffect(function () {
+    getTagList();
+    var eventBus = EventBus.getInstance();
+    var unsubscribe = eventBus.subscribe(INTERNAL_EVENT.UPDATE_TAG_VIEW, getTagList);
+    return function () {
+      unsubscribe();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  var getTagList = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _yield$context$getFil, file_tags;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          _context.next = 3;
+          return context.getFileTagList();
+        case 3:
+          _yield$context$getFil = _context.sent;
+          file_tags = _yield$context$getFil.data.file_tags;
+          setFileTagList(file_tags);
+          _context.next = 11;
+          break;
+        case 8:
+          _context.prev = 8;
+          _context.t0 = _context["catch"](0);
+          return _context.abrupt("return", null);
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 8]]);
+  })), []);
+
+  // Render nothing if there is no tag
+  if (fileTagList.length === 0) return null;
+  return /*#__PURE__*/React.createElement("div", {
+    className: "sdoc-file-tag-quick-review-container"
+  }, fileTagList.map(function (tag, index) {
+    var file_tag_id = tag.file_tag_id,
+      tag_color = tag.tag_color,
+      tag_name = tag.tag_name;
+    // Id cannot start with number
+    var tagId = "tag".concat(file_tag_id);
+    var tagZindex = fileTagList.length - index;
+    return /*#__PURE__*/React.createElement(Fragment, {
+      key: tagId
+    }, /*#__PURE__*/React.createElement("span", {
+      id: tagId,
+      style: {
+        backgroundColor: tag_color,
+        zIndex: tagZindex
+      },
+      className: "sdoc-review-circle"
+    }), /*#__PURE__*/React.createElement(Tooltip, {
+      target: tagId
+    }, tag_name));
+  }));
+};
+export default FileTagQuickView;

package/dist/components/doc-operations/tag-operation/tag-popover/index.js

@@ -8,6 +8,8 @@ import context from '../../../../context';
 import { getErrorMsg } from '../../../../utils';
 import toaster from '../../../toast';
 import { generateTagColor, removeForwardSpace } from '../utils';
+import { EventBus } from '../../../../basic-sdk';
+import { INTERNAL_EVENT } from '../../../../basic-sdk/constants';
 import './index.css';
 var TagPopover = function TagPopover() {
   var _useState = useState(''),
@@ -21,6 +23,12 @@ var TagPopover = function TagPopover() {
   var tagListRef = useRef([]);
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+
+  // Update tag view when tag is added or removed
+  var updateTagView = useCallback(function () {
+    var eventBus = EventBus.getInstance();
+    eventBus.dispatch(INTERNAL_EVENT.UPDATE_TAG_VIEW);
+  }, []);
   var isShowCreateTag = useMemo(function () {
     var isInputTag = !!searchContent.length;
     var isMathExistTag = tagList.some(function (item) {
@@ -115,19 +123,20 @@ var TagPopover = function TagPopover() {
         case 8:
           getTagList();
           setSearchContent('');
-          _context3.next = 16;
+          updateTagView();
+          _context3.next = 17;
           break;
-        case 12:
-          _context3.prev = 12;
+        case 13:
+          _context3.prev = 13;
           _context3.t0 = _context3["catch"](0);
           errorMessage = getErrorMsg(_context3.t0);
           toaster.danger(t(errorMessage));
-        case 16:
+        case 17:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 12]]);
-  })), [getTagList, searchContent, t]);
+    }, _callee3, null, [[0, 13]]);
+  })), [getTagList, searchContent, updateTagView, t]);
   var matchTag = useCallback(function (matchText) {
     if (matchText.length) {
       var filterTagList = tagListRef.current.filter(function (_ref4) {
@@ -174,23 +183,24 @@ var TagPopover = function TagPopover() {
             return context.addFileTag(repoTagID);
           case 8:
             getTagList();
-            _context4.next = 15;
+            updateTagView();
+            _context4.next = 16;
             break;
-          case 11:
-            _context4.prev = 11;
+          case 12:
+            _context4.prev = 12;
             _context4.t0 = _context4["catch"](0);
             errorMessage = getErrorMsg(_context4.t0);
             toaster.danger(t(errorMessage));
-          case 15:
+          case 16:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[0, 11]]);
+      }, _callee4, null, [[0, 12]]);
     }));
     return function (_x, _x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [getTagList, t]);
+  }(), [getTagList, updateTagView, t]);
   return /*#__PURE__*/React.createElement(UncontrolledPopover, {
     target: "tag-operation-icon-container",
     placement: "bottom-end",

package/dist/hooks/index.js

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

package/dist/hooks/use-config.js

@@ -0,0 +1,18 @@
+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
+  };
+};

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/simple-editor.js

@@ -8,8 +8,8 @@ import Layout, { Header, Content } from '../layout';
 import context from '../context';
 import ErrorBoundary from './error-boundary';
 import { SDocEditor } from '../basic-sdk';
-import { RevisionDiffViewer } from '../basic-sdk/views';
-import { useDocument } from '../hooks';
+import { PublishedRevisionDiffViewer, RevisionDiffViewer } from '../basic-sdk/views';
+import { useDocument, useConfig } 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],
@@ -36,6 +37,9 @@ var SimpleEditor = function SimpleEditor(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     changes = _useState6[0],
     setChanges = _useState6[1];
+  var _useConfig = useConfig(),
+    isPublished = _useConfig.isPublished,
+    handelPublished = _useConfig.handelPublished;
 
   // useMount: reset title
   useEffect(function () {
@@ -47,6 +51,10 @@ var SimpleEditor = function SimpleEditor(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges]);
   var handleViewChangesToggle = useCallback(function (isShowChanges) {
+    if (isPublished) {
+      setShowChanges(isShowChanges);
+      return;
+    }
     if (!isShowChanges) {
       setShowChanges(isShowChanges);
       reloadDocument();
@@ -58,12 +66,34 @@ var SimpleEditor = function SimpleEditor(_ref) {
     setRevisionContent(revisionContent);
     setShowChanges(isShowChanges);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document, editorRef.current]);
-  var handleRevisionPublished = useCallback(function (value) {
+  }, [document, editorRef.current, isPublished]);
+  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);
+      handelPublished();
+      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);
+      handelPublished();
+    });
+  }, [handelPublished, setErrorMessage]);
   if (isFirstLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
@@ -77,17 +107,22 @@ 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,
-    isEditMode: !isShowChanges
+    isEditMode: isPublished ? false : !isShowChanges
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
     changes: changes,
     handleViewChangesToggle: handleViewChangesToggle,
+    handleRevisionMerged: handleRevisionMerged,
     handleRevisionPublished: handleRevisionPublished
-  })), /*#__PURE__*/React.createElement(Content, null, !isShowChanges && /*#__PURE__*/React.createElement(SDocEditor, {
+  })), /*#__PURE__*/React.createElement(Content, null, isPublished && /*#__PURE__*/React.createElement(PublishedRevisionDiffViewer, {
+    isShowChanges: isShowChanges,
+    revisionContent: revisionContent,
+    didMountCallback: setDiffChanges
+  }), !isPublished && !isShowChanges && /*#__PURE__*/React.createElement(SDocEditor, {
     ref: editorRef,
     isReloading: isReloading,
     document: document
-  }), isShowChanges && /*#__PURE__*/React.createElement(RevisionDiffViewer, {
+  }), !isPublished && isShowChanges && /*#__PURE__*/React.createElement(RevisionDiffViewer, {
     revisionContent: revisionContent,
     didMountCallback: setDiffChanges
   }))));

package/package.json

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

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

@@ -406,5 +406,7 @@
   "Search_tags": "Search tags",
   "No_options_available": "Tag not found",
   "Add_option": "Neues Tag erstellen",
-  "Find_an_option": "Search tags"
+  "Find_an_option": "Search tags",
+  "Copy_link_of_section": "Copy link of section",
+  "revision": "revision"
 }

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

@@ -407,5 +407,6 @@
   "No_options_available": "Tag not found",
   "Add_option": "Create a new tag",
   "Find_an_option": "Search tags",
-  "Copy_link_of_section": "Copy link of section"
+  "Copy_link_of_section": "Copy link of section",
+  "revision": "revision"
 }

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

@@ -406,5 +406,7 @@
   "Search_tags": "Search tags",
   "No_options_available": "Tag not found",
   "Add_option": "Cear una nueva etiqueta",
-  "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

@@ -406,5 +406,7 @@
   "Search_tags": "Search tags",
   "No_options_available": "Tag not found",
   "Add_option": "Crea un nuovo tag",
-  "Find_an_option": "Search tags"
+  "Find_an_option": "Search tags",
+  "Copy_link_of_section": "Copy link of section",
+  "revision": "revision"
 }

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

@@ -400,11 +400,13 @@
   "Insert_caption": "Вставить подпись",
   "No_collaborators_available": "Нет доступных соавторов",
   "Find_a_collaborator": "Найти соавтора",
-  "Doc_comments": "Document comments",
+  "Doc_comments": "Комментарии к документу",
   "Tag_not_found": "Тег не найден",
   "Create_a_new_tag": "Создать новый тег",
-  "Search_tags": "Search tags",
+  "Search_tags": "Поиск тегов",
   "No_options_available": "Тег не найден",
   "Add_option": "Создать новый тег",
-  "Find_an_option": "Search tags"
+  "Find_an_option": "Поиск тегов",
+  "Copy_link_of_section": "Копировать ссылку на раздел",
+  "revision": "revision"
 }

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

@@ -407,5 +407,6 @@
   "No_options_available": "标签未找到",
   "Add_option": "新建标签",
   "Find_an_option": "查找标签",
-  "Copy_link_of_section": "拷贝章节的链接"
+  "Copy_link_of_section": "拷贝章节的链接",
+  "revision": "修订稿"
 }