update config

frontend/config/webpack.config.prod.js

@@ -58,12 +58,11 @@ module.exports = {
   devtool: shouldUseSourceMap ? 'source-map' : false,
   // In production, we only want to load the polyfills and the app code.
   entry: {
-    main: [require.resolve('./polyfills'), paths.appIndexJs],
+    markdownEditor: [require.resolve('./polyfills'), paths.appIndexJs],
     wiki: [require.resolve('./polyfills'), paths.appSrc + "/wiki.js"],
     repoview: [require.resolve('./polyfills'), paths.appSrc + "/repo-wiki-mode.js"],
-    dashboard: [require.resolve('./polyfills'), paths.appSrc + "/dashboard.js"],
     fileHistory: [require.resolve('./polyfills'), paths.appSrc + "/file-history.js"],
-    drafts: [require.resolve('./polyfills'), paths.appSrc + "/drafts.js"],
+    app: [require.resolve('./polyfills'), paths.appSrc + "/app.js"],
   },
 
   output: {

frontend/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@seafile/seafile-editor": {
-      "version": "0.1.20",
-      "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.1.20.tgz",
-      "integrity": "sha512-/OAEg4cb28PYHE8sVj1Ee7oUZfvQwutSCY86G0xmzC3737SWkEGlbaJ2HaQmW5un7QjlqlEBS6gAJByaOTFydg==",
+      "version": "0.1.25",
+      "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.1.25.tgz",
+      "integrity": "sha512-Q2UybgjGkRL/a9yim5bFS7xHjTqKtyw/cBwDWWbI7V4TqVSA7EleBh0x5AZwPcvo3jUFpCr76BpgFI3OgHIn/g==",
       "requires": {
         "@seafile/slate-react": "0.1.2",
         "autoprefixer": "7.1.6",
@@ -16,7 +16,6 @@
         "codemirror": "5.40.0",
         "crypto-js": "3.1.9-1",
         "css-loader": "0.28.7",
-        "dayjs": "1.6.2",
         "deep-equal": "1.0.1",
         "deepmerge": "2.1.0",
         "detect-indent": "4.0.0",
@@ -36,6 +35,7 @@
         "is-url": "1.2.4",
         "lodash": "4.17.5",
         "mdast-util-definitions": "1.2.2",
+        "moment": "2.22.2",
         "object-assign": "4.1.1",
         "postcss-flexbugs-fixes": "3.2.0",
         "postcss-loader": "2.0.8",
@@ -56,7 +56,7 @@
         "remark-parse": "5.0.0",
         "remark-rehype": "3.0.0",
         "remark-slug": "5.0.0",
-        "seafile-js": "0.2.15",
+        "seafile-js": "0.2.18",
         "seafile-ui": "0.1.10",
         "slate": "0.40.2",
         "slate-hotkeys": "0.2.3",
@@ -86,6 +86,15 @@
             "react-popper": "0.8.3",
             "react-transition-group": "2.4.0"
           }
+        },
+        "seafile-js": {
+          "version": "0.2.18",
+          "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.18.tgz",
+          "integrity": "sha512-aQQS22vHE4Q1B4+UJisk/R+zTfPwWAFw4Wzkb2tqGPAHC8a6S6F0tRkUx3s4Q6oLbhkgUhd2k67n62qhJN7uYg==",
+          "requires": {
+            "axios": "0.18.0",
+            "form-data": "2.3.2"
+          }
         }
       }
     },
@@ -10338,9 +10347,9 @@
       }
     },
     "seafile-js": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.15.tgz",
-      "integrity": "sha512-eVRCpjjCi6p0lXM7w2AMUAdmkvOAAx29iiKxzrYQ2QicZIZ2V6zxxN3CODAFHU3Z+rAItJbsZV6kqmAWd+Hq8A==",
+      "version": "0.2.18",
+      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.18.tgz",
+      "integrity": "sha512-aQQS22vHE4Q1B4+UJisk/R+zTfPwWAFw4Wzkb2tqGPAHC8a6S6F0tRkUx3s4Q6oLbhkgUhd2k67n62qhJN7uYg==",
       "requires": {
         "axios": "0.18.0",
         "form-data": "2.3.2"

frontend/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@reach/router": "^1.2.0",
-    "@seafile/seafile-editor": "^0.1.24",
+    "@seafile/seafile-editor": "^0.1.25",
     "autoprefixer": "7.1.6",
     "chalk": "1.1.3",
     "css-loader": "0.28.7",

frontend/src/markdown-editor.js

@@ -154,7 +154,21 @@ class EditorUtilities {
   }
 
   getDraftKey() {
-      return (this.repoID + this.filePath);
+      return (repoID + filePath);
+    }
+
+  getFileContent(url) {
+    return seafileAPI.getFileContent(url);
+  }
+
+  listFileHistoryRecords(page, perPage) {
+    return (
+      seafileAPI.listFileHistoryRecords(repoID, filePath, page, perPage)
+    )
+  }
+
+  getFileHistoryVersion(commitID) {
+    return seafileAPI.getFileRevision(repoID, commitID, filePath);
   }
 }
 
@@ -227,6 +241,7 @@ class MarkdownEditor extends React.Component {
           editorUtilities={editorUtilities}
           userInfo={this.state.collabServer ? userInfo : null}
           collabServer={this.state.collabServer}
+					showFileHistory={true}
           mode={mode}
         />
       );