@seafile/sdoc-editor 0.1.29 → 0.1.30

package/dist/api/seafile-api.js

@@ -0,0 +1,31 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import axios from 'axios';
+var SeafileAPI = /*#__PURE__*/function () {
+  function SeafileAPI(server, token) {
+    _classCallCheck(this, SeafileAPI);
+    this.req = axios.create({
+      baseURL: server,
+      headers: {
+        Authorization: 'Token ' + token
+      }
+    });
+  }
+  _createClass(SeafileAPI, [{
+    key: "uploadSdocImage",
+    value: function uploadSdocImage(docUuid, file) {
+      var url = '/api/v2.1/seadoc/upload-image/' + docUuid + '/';
+      var form = new FormData();
+      form.append('file', file);
+      return this.req.post(url, form);
+    }
+  }, {
+    key: "getSdocDownloadImageUrl",
+    value: function getSdocDownloadImageUrl(docUuid, imageName) {
+      var url = '/api/v2.1/seadoc/download-image/' + docUuid + '/' + encodeURIComponent(imageName);
+      return this.req.get(url);
+    }
+  }]);
+  return SeafileAPI;
+}();
+export default SeafileAPI;

package/dist/basic-sdk/extension/plugins/image/menu/index.js

@@ -90,9 +90,7 @@ var ImageMenu = /*#__PURE__*/function (_React$Component) {
       var editor = _this.props.editor;
       var file = event.target.files[0];
       context.uploadLocalImage(file).then(function (fileUrl) {
-        console.log(fileUrl);
         insertImage(editor, fileUrl, _this.selection);
-        console.log(editor.children);
       });
     };
     _this.setInputRef = function (ref) {

package/dist/basic-sdk/extension/plugins/image/render-elem.js

@@ -5,10 +5,12 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import { useSelected } from '@seafile/slate-react';
 import React from 'react';
-import { updateImage } from './helpers';
 import classNames from 'classnames';
 import { withTranslation } from 'react-i18next';
+import urlJoin from 'url-join';
+import { updateImage } from './helpers';
 import ImagePreviewer from './dialogs/image-previewer';
+import context from '../../../../context';
 var Image = /*#__PURE__*/function (_React$Component) {
   _inherits(Image, _React$Component);
   var _super = _createSuper(Image);
@@ -87,6 +89,13 @@ var Image = /*#__PURE__*/function (_React$Component) {
     return _this;
   }
   _createClass(Image, [{
+    key: "getImageURL",
+    value: function getImageURL(url) {
+      var serviceUrl = context.getSetting('serviceUrl');
+      var assetsUrl = context.getSetting('assetsUrl');
+      return urlJoin(serviceUrl, assetsUrl, url);
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
@@ -107,7 +116,7 @@ var Image = /*#__PURE__*/function (_React$Component) {
       }, attributes), /*#__PURE__*/React.createElement("img", {
         className: imageClassName,
         ref: this.setImageRef,
-        src: data.src,
+        src: this.getImageURL(data.src),
         style: imageStyle,
         draggable: false,
         alt: ""

package/dist/context.js

@@ -1,38 +1,20 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import cookie from 'react-cookies';
-import { SeafileAPI } from 'seafile-js';
 import Url from 'url-parse';
 import SDocServerApi from './api/sdoc-server-api';
-import { getDirPath, getImageFileNameWithTimestamp } from './utils';
+import SeafileAPI from './api/seafile-api';
 var Context = /*#__PURE__*/function () {
   function Context() {
     var _this = this;
     _classCallCheck(this, Context);
     this.initSettings = function () {
       _this.settings = window.seafile ? window.seafile : window.seafileConfig;
-      var isOpenSocket = _this.getSetting('isOpenSocket');
-      if (isOpenSocket) {
-        _this.sdocServerApi = new SDocServerApi(_this.settings);
-      }
     };
     this.uploadLocalImage = function (imageFile) {
-      var repoID = _this.getSetting('repoID');
       var docUuid = _this.getSetting('docUuid');
-      var relativePath = "images/sdoc/".concat(docUuid);
-      return _this.api.getFileServerUploadLink(repoID, '/').then(function (res) {
-        var uploadLink = res.data + '?ret-json=1';
-        var name = getImageFileNameWithTimestamp();
-        var newFile = new File([imageFile], name, {
-          type: imageFile.type
-        });
-        var formData = new FormData();
-        formData.append('parent_dir', '/');
-        formData.append('relative_path', relativePath);
-        formData.append('file', newFile);
-        return _this.api.uploadImage(uploadLink, formData);
-      }).then(function (res) {
-        return _this._getImageURL(res.data[0].name);
+      return _this.api.uploadSdocImage(docUuid, imageFile).then(function (res) {
+        var relative_path = res.data.relative_path;
+        return relative_path;
       });
     };
     this.settings = null;
@@ -44,27 +26,10 @@ var Context = /*#__PURE__*/function () {
     key: "initApi",
     value: function initApi() {
       this.initSettings(); // lazy init context class
-      var seafileAPI = new SeafileAPI();
-      if (this.getSetting('isDevelopment')) {
-        var server = this.getSetting('serviceUrl');
-        var username = this.getSetting('username');
-        var password = this.getSetting('password');
-        seafileAPI.init({
-          server: server,
-          username: username,
-          password: password
-        });
-        this.api = seafileAPI;
-        return seafileAPI.login();
-      } else {
-        var siteRoot = this.getSetting('siteRoot');
-        var xcsrfHeaders = cookie.load('dtable_csrftoken');
-        seafileAPI.initForSeahubUsage({
-          siteRoot: siteRoot,
-          xcsrfHeaders: xcsrfHeaders
-        });
-        this.api = seafileAPI;
-      }
+      var server = this.getSetting('serviceUrl');
+      var token = this.getSetting('accessToken');
+      this.api = new SeafileAPI(server, token);
+      this.sdocServerApi = new SDocServerApi(this.settings);
     }
   }, {
     key: "getSettings",
@@ -109,71 +74,13 @@ var Context = /*#__PURE__*/function () {
   }, {
     key: "getFileContent",
     value: function getFileContent() {
-      var isOpenSocket = this.getSetting('isOpenSocket');
-      if (isOpenSocket) {
-        return this.getFileContent1();
-      }
-
-      // visit by shared link
-      var rawPath = this.getSetting('rawPath');
-      if (rawPath) {
-        return this.api.getFileContent(rawPath);
-      }
-      return this.getFileContent2();
+      return this.sdocServerApi.getDocContent();
     }
   }, {
     key: "saveContent",
     value: function saveContent(content) {
-      var isOpenSocket = this.getSetting('isOpenSocket');
-      if (isOpenSocket) {
-        return this.saveContent1(content);
-      }
-      return this.saveContent2(content);
-    }
-  }, {
-    key: "getFileContent1",
-    value: function getFileContent1() {
-      return this.sdocServerApi.getDocContent();
-    }
-  }, {
-    key: "saveContent1",
-    value: function saveContent1(content) {
       return this.sdocServerApi.saveDocContent(content);
     }
-  }, {
-    key: "getFileContent2",
-    value: function getFileContent2() {
-      var _this2 = this;
-      var repoID = this.getSetting('repoID');
-      var docPath = this.getSetting('docPath');
-      return this.api.getFileDownloadLink(repoID, docPath).then(function (res) {
-        var downloadLink = res.data;
-        return _this2.api.getFileContent(downloadLink);
-      });
-    }
-  }, {
-    key: "saveContent2",
-    value: function saveContent2(content) {
-      var _this3 = this;
-      var settings = this.getSettings();
-      var repoID = settings.repoID,
-        docPath = settings.docPath,
-        docName = settings.docName;
-      var dirPath = getDirPath(docPath);
-      return this.api.getUpdateLink(repoID, dirPath).then(function (res) {
-        var uploadLink = res.data;
-        return _this3.api.updateFile(uploadLink, docPath, docName, content);
-      });
-    }
-  }, {
-    key: "_getImageURL",
-    value: function _getImageURL(fileName) {
-      var repoID = this.getSetting('repoID');
-      var serviceUrl = this.getSetting('serviceUrl');
-      var docUuid = this.getSetting('docUuid');
-      var url = serviceUrl + '/lib/' + repoID + '/file/images/sdoc/' + docUuid + '/' + fileName + '?raw=1';
-      return url;
-    }
   }, {
     key: "getCollaborators",
     value: function getCollaborators() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -18,6 +18,7 @@
     "reactstrap": "8.9.0",
     "slugid": "3.2.0",
     "socket.io-client": "4.6.1",
+    "url-join": "5.0.0",
     "url-parse": "1.5.10",
     "uuid": "9.0.0"
   },