@nocobase/plugin-file-manager 0.8.0-alpha.8 → 0.8.1-alpha.3

package/lib/client/FileStorage.js

@@ -5,16 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FileStoragePane = void 0;
 
-function _shared() {
-  const data = require("@formily/shared");
-
-  _shared = function _shared() {
-    return data;
-  };
-
-  return data;
-}
-
 function _client() {
   const data = require("@nocobase/client");
 
@@ -75,13 +65,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-const schema = {
-  type: 'object',
-  properties: {
-    [(0, _shared().uid)()]: _storage.storageSchema
-  }
-};
-
 const FileStoragePane = () => {
   const _useState = (0, _react().useState)(false),
         _useState2 = _slicedToArray(_useState, 2),
@@ -97,7 +80,7 @@ const FileStoragePane = () => {
     components: {
       StorageOptions: _StorageOptions.StorageOptions
     },
-    schema: schema
+    schema: _storage.storageSchema
   }));
 };
 

package/lib/client/StorageOptions.js

@@ -59,7 +59,7 @@ const schema = {
         type: 'string',
         'x-decorator': 'FormItem',
         'x-component': 'Input',
-        default: 'uploads'
+        required: true
       },
       path: {
         title: '{{t("Path")}}',
@@ -195,16 +195,16 @@ const StorageOptions = (0, _react().observer)(props => {
         setSchema = _useState2[1];
 
   (0, _react2().useEffect)(() => {
-    form.clearFormGraph('options.*');
+    // form.clearFormGraph('options.*');
     setSchema(new (_react().Schema)(schema[form.values.type] || {}));
   }, [form.values.type]);
-  return _react2().default.createElement("div", null, _react2().default.createElement(_antd().FormLayout, {
+  return _react2().default.createElement(_antd().FormLayout, {
     layout: 'vertical'
   }, _react2().default.createElement(_react().RecursionField, {
     key: form.values.type || 'local',
     basePath: field.address,
     onlyRenderProperties: true,
     schema: s
-  })));
+  }));
 });
 exports.StorageOptions = StorageOptions;

package/lib/client/schemas/storage.js

@@ -82,7 +82,8 @@ const collection = {
     uiSchema: {
       title: '{{t("Storage base URL")}}',
       type: 'string',
-      'x-component': 'Input'
+      'x-component': 'Input',
+      required: true
     }
   }, {
     type: 'boolean',

package/lib/server/storages/local.d.ts

@@ -1,6 +1,6 @@
 import Application from '@nocobase/server';
 import multer from 'multer';
-declare function middleware(app: Application, options?: any): Promise<void>;
+declare function middleware(app: Application): Promise<void>;
 declare const _default: {
     middleware: typeof middleware;
     make(storage: any): multer.StorageEngine;

package/lib/server/storages/local.js

@@ -86,17 +86,18 @@ function match(basePath, pathname) {
   return newPath[0] === '/';
 }
 
-function update(_x, _x2) {
-  return _update.apply(this, arguments);
+function refresh(_x, _x2, _x3) {
+  return _refresh.apply(this, arguments);
 }
 
-function _update() {
-  _update = _asyncToGenerator(function* (app, storages) {
+function _refresh() {
+  _refresh = _asyncToGenerator(function* (app, storages, options) {
     const Storage = app.db.getCollection('storages');
     const items = yield Storage.repository.find({
       filter: {
         type: _constants.STORAGE_TYPE_LOCAL
-      }
+      },
+      transaction: options === null || options === void 0 ? void 0 : options.transaction
     });
     const primaryKey = Storage.model.primaryKeyAttribute;
     storages.clear();
@@ -115,18 +116,18 @@ function _update() {
       _iterator.f();
     }
   });
-  return _update.apply(this, arguments);
+  return _refresh.apply(this, arguments);
 }
 
 function createLocalServerUpdateHook(app, storages) {
   return /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(function* (row) {
+    var _ref = _asyncToGenerator(function* (row, options) {
       if (row.get('type') === _constants.STORAGE_TYPE_LOCAL) {
-        yield update(app, storages);
+        yield refresh(app, storages, options);
       }
     });
 
-    return function (_x3) {
+    return function (_x4, _x5) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -141,21 +142,19 @@ function getDocumentRoot(storage) {
   return _path().default.resolve(_path().default.isAbsolute(documentRoot) ? documentRoot : _path().default.join(process.cwd(), documentRoot));
 }
 
-function middleware(_x4, _x5) {
+function middleware(_x6) {
   return _middleware.apply(this, arguments);
 }
 
 function _middleware() {
-  _middleware = _asyncToGenerator(function* (app, options) {
-    const LOCALHOST = `http://localhost:${process.env.APP_PORT || '13000'}`;
+  _middleware = _asyncToGenerator(function* (app) {
     const Storage = app.db.getCollection('storages');
     const storages = new Map();
     const localServerUpdateHook = createLocalServerUpdateHook(app, storages);
-    Storage.model.addHook('afterCreate', localServerUpdateHook);
-    Storage.model.addHook('afterUpdate', localServerUpdateHook);
+    Storage.model.addHook('afterSave', localServerUpdateHook);
     Storage.model.addHook('afterDestroy', localServerUpdateHook);
     app.on('beforeStart', /*#__PURE__*/_asyncToGenerator(function* () {
-      yield update(app, storages);
+      yield refresh(app, storages);
     }));
     app.use( /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator(function* (ctx, next) {
@@ -167,7 +166,14 @@ function _middleware() {
             var _storage$options;
 
             const storage = _step2.value;
-            const baseUrl = storage.get('baseUrl');
+            const baseUrl = storage.get('baseUrl').trim();
+
+            if (!baseUrl) {
+              console.error('"baseUrl" is not configured'); // return ctx.throw(500);
+
+              continue;
+            }
+
             let url;
 
             try {
@@ -190,12 +196,11 @@ function _middleware() {
               continue;
             }
 
-            return (0, _koaStatic().default)(getDocumentRoot(storage), {
-              // for handle files after any api handlers
-              defer: true
-            })(ctx, /*#__PURE__*/_asyncToGenerator(function* () {
-              if (ctx.path.startsWith(basePath)) {
-                ctx.path = ctx.path.replace(basePath, '');
+            ctx.path = ctx.path.replace(basePath, '');
+            const documentRoot = getDocumentRoot(storage);
+            return (0, _koaStatic().default)(documentRoot)(ctx, /*#__PURE__*/_asyncToGenerator(function* () {
+              if (ctx.status == 404) {
+                return;
               }
 
               yield next();
@@ -210,7 +215,7 @@ function _middleware() {
         yield next();
       });
 
-      return function (_x6, _x7) {
+      return function (_x7, _x8) {
         return _ref4.apply(this, arguments);
       };
     }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "0.8.0-alpha.8",
+  "version": "0.8.1-alpha.3",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -11,8 +11,8 @@
   ],
   "dependencies": {
     "@koa/multer": "^3.0.0",
-    "@nocobase/client": "0.8.0-alpha.8",
-    "@nocobase/server": "0.8.0-alpha.8",
+    "@nocobase/client": "0.8.1-alpha.3",
+    "@nocobase/server": "0.8.1-alpha.3",
     "aws-sdk": "^2.2.32",
     "cos-nodejs-sdk-v5": "^2.11.14",
     "koa-static": "^5.0.0",
@@ -24,9 +24,9 @@
     "multer-s3": "^2.10.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.8.0-alpha.8",
+    "@nocobase/test": "0.8.1-alpha.3",
     "@types/koa-multer": "^1.0.1",
     "@types/multer": "^1.4.5"
   },
-  "gitHead": "d53b20e08591651692c37b8bfdf1bfe59332bbdb"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }