@nocobase/plugin-multi-app-manager 0.9.4-alpha.1 → 0.10.0-alpha.2

package/lib/client/AppManager.d.ts

@@ -1 +1,2 @@
-export declare const AppManager: () => JSX.Element;
+import React from 'react';
+export declare const AppManager: () => React.JSX.Element;

package/lib/client/Settings.d.ts

@@ -1 +1,2 @@
-export declare const Settings: () => JSX.Element;
+import React from 'react';
+export declare const Settings: () => React.JSX.Element;

package/lib/client/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 export { tableActionColumnSchema } from './settings/schemas/applications';
-declare const _default: (props: any) => JSX.Element;
+declare const _default: (props: any) => React.JSX.Element;
 export default _default;

package/lib/client/index.js

@@ -44,7 +44,6 @@ var _utils = require("./utils");
 var _applications = require("./settings/schemas/applications");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const MultiAppManager = () => {
-  const history = (0, _reactRouterDom().useHistory)();
   const _useRequest = (0, _client().useRequest)({
       resource: 'applications',
       action: 'listPinned'
@@ -56,28 +55,33 @@ const MultiAppManager = () => {
     run = _useRequest.run;
   const _usePluginUtils = (0, _utils.usePluginUtils)(),
     t = _usePluginUtils.t;
-  const menu = _react().default.createElement(_antd().Menu, null, ((data === null || data === void 0 ? void 0 : data.data) || []).map(app => {
+  const items = [...((data === null || data === void 0 ? void 0 : data.data) || []).map(app => {
     var _app$options;
     let link = `/apps/${app.name}/admin/`;
     if (((_app$options = app.options) === null || _app$options === void 0 ? void 0 : _app$options.standaloneDeployment) && app.cname) {
       link = `//${app.cname}`;
     }
-    return _react().default.createElement(_antd().Menu.Item, {
+    return {
       key: app.name,
-      onClick: () => {
-        window.open(link, '_blank');
-      }
-    }, app.displayName || app.name);
-  }), ((data === null || data === void 0 ? void 0 : data.data) || []).length > 0 && _react().default.createElement(_antd().Menu.Divider, null), _react().default.createElement(_antd().Menu.Item, {
-    onClick: () => {
-      history.push('/admin/settings/multi-app-manager/applications');
-    }
-  }, t('Manage applications')));
+      label: _react().default.createElement("a", {
+        href: link,
+        target: "_blank",
+        rel: "noopener noreferrer"
+      }, app.displayName || app.name)
+    };
+  }), {
+    key: '.manager',
+    label: _react().default.createElement(_reactRouterDom().Link, {
+      to: "/admin/settings/multi-app-manager/applications"
+    }, t('Manage applications'))
+  }];
   return _react().default.createElement(_antd().Dropdown, {
-    onVisibleChange: visible => {
+    onOpenChange: visible => {
       run();
     },
-    overlay: menu
+    menu: {
+      items
+    }
   }, _react().default.createElement(_antd().Button, {
     title: 'Apps',
     icon: _react().default.createElement(_client().Icon, {

package/lib/client/locale/zh-CN.d.ts

@@ -6,5 +6,7 @@ declare const _default: {
     'Pin to menu': string;
     'Custom domain': string;
     'Manage applications': string;
+    'Standalone deployment': string;
+    'Auto start': string;
 };
 export default _default;

package/lib/client/locale/zh-CN.js

@@ -11,6 +11,8 @@ var _default = {
   'App ID': '应用标识',
   'Pin to menu': '在菜单上显示',
   'Custom domain': '自定义域名',
-  'Manage applications': '管理应用'
+  'Manage applications': '管理应用',
+  'Standalone deployment': '独立部署',
+  'Auto start': '自动启动'
 };
 exports.default = _default;

package/lib/client/settings/schemas/applications.d.ts

@@ -40,6 +40,11 @@ export declare const tableActionColumnSchema: {
                             'x-decorator': string;
                             'x-content': string;
                         };
+                        'options.autoStart': {
+                            'x-component': string;
+                            'x-decorator': string;
+                            'x-content': string;
+                        };
                         cname: {
                             title: string;
                             'x-component': string;

package/lib/client/settings/schemas/applications.js

@@ -155,7 +155,12 @@ const tableActionColumnSchema = {
             'options.standaloneDeployment': {
               'x-component': 'Checkbox',
               'x-decorator': 'FormItem',
-              'x-content': '{{t("Standalone deployment")}}'
+              'x-content': (0, _utils.i18nText)('Standalone deployment')
+            },
+            'options.autoStart': {
+              'x-component': 'Checkbox',
+              'x-decorator': 'FormItem',
+              'x-content': (0, _utils.i18nText)('Auto start')
             },
             cname: {
               title: (0, _utils.i18nText)('Custom domain'),
@@ -288,7 +293,12 @@ const schema = {
                     'options.standaloneDeployment': {
                       'x-component': 'Checkbox',
                       'x-decorator': 'FormItem',
-                      'x-content': '{{t("Standalone deployment")}}'
+                      'x-content': (0, _utils.i18nText)('Standalone deployment')
+                    },
+                    'options.autoStart': {
+                      'x-component': 'Checkbox',
+                      'x-decorator': 'FormItem',
+                      'x-content': (0, _utils.i18nText)('Auto start')
                     },
                     cname: {
                       title: (0, _utils.i18nText)('Custom domain'),

package/lib/server/server.d.ts

@@ -5,6 +5,7 @@ export declare type AppOptionsFactory = (appName: string, mainApp: Application)
 export declare class PluginMultiAppManager extends Plugin {
     appDbCreator: AppDbCreator;
     appOptionsFactory: AppOptionsFactory;
+    private beforeGetApplicationMutex;
     setAppOptionsFactory(factory: AppOptionsFactory): void;
     setAppDbCreator(appDbCreator: AppDbCreator): void;
     static getDatabaseConfig(app: Application): IDatabaseOptions;

package/lib/server/server.js

@@ -33,6 +33,13 @@ function path() {
   return data;
 }
 var _application = require("./models/application");
+function _asyncMutex() {
+  const data = require("async-mutex");
+  _asyncMutex = function _asyncMutex() {
+    return data;
+  };
+  return data;
+}
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -113,6 +120,7 @@ class PluginMultiAppManager extends _server().Plugin {
     super(...args);
     this.appDbCreator = defaultDbCreator;
     this.appOptionsFactory = defaultAppOptionsFactory;
+    this.beforeGetApplicationMutex = new (_asyncMutex().Mutex)();
   }
   setAppOptionsFactory(factory) {
     this.appOptionsFactory = factory;
@@ -197,36 +205,88 @@ class PluginMultiAppManager extends _server().Plugin {
           name,
           options
         }) {
-          if (appManager.applications.has(name)) {
-            return;
-          }
-          const applicationRecord = yield _this.app.db.getRepository('applications').findOne({
-            filter: {
-              name
+          yield _this.beforeGetApplicationMutex.runExclusive( /*#__PURE__*/_asyncToGenerator(function* () {
+            if (appManager.applications.has(name)) {
+              return;
+            }
+            const applicationRecord = yield _this.app.db.getRepository('applications').findOne({
+              filter: {
+                name
+              }
+            });
+            const instanceOptions = applicationRecord.get('options');
+            // skip standalone deployment application
+            if ((instanceOptions === null || instanceOptions === void 0 ? void 0 : instanceOptions.standaloneDeployment) && appManager.runningMode !== 'single') {
+              return;
+            }
+            if (!applicationRecord) {
+              return;
+            }
+            const subApp = yield applicationRecord.registerToMainApp(_this.app, {
+              appOptionsFactory: _this.appOptionsFactory
+            });
+            // must skip load on upgrade
+            if (!(options === null || options === void 0 ? void 0 : options.upgrading)) {
+              yield subApp.load();
+            }
+          }));
+        });
+        return function (_x6) {
+          return _ref5.apply(this, arguments);
+        };
+      }());
+      _this.app.on('afterStart', /*#__PURE__*/function () {
+        var _ref7 = _asyncToGenerator(function* (app) {
+          const repository = _this.db.getRepository('applications');
+          const appManager = _this.app.appManager;
+          if (appManager.runningMode == 'single') {
+            // If the sub application is running in single mode, register the application automatically
+            try {
+              const subApp = yield repository.findOne({
+                filter: {
+                  name: appManager.singleAppName
+                }
+              });
+              const registeredApp = yield subApp.registerToMainApp(_this.app, {
+                appOptionsFactory: _this.appOptionsFactory
+              });
+              yield registeredApp.load();
+            } catch (err) {
+              console.error('Auto register sub application in single mode failed: ', appManager.singleAppName, err);
             }
-          });
-          const instanceOptions = applicationRecord.get('options');
-          // skip standalone deployment application
-          if ((instanceOptions === null || instanceOptions === void 0 ? void 0 : instanceOptions.standaloneDeployment) && appManager.runningMode !== 'single') {
-            return;
-          }
-          if (!applicationRecord) {
             return;
           }
-          const subApp = yield applicationRecord.registerToMainApp(_this.app, {
-            appOptionsFactory: _this.appOptionsFactory
-          });
-          // must skip load on upgrade
-          if (!(options === null || options === void 0 ? void 0 : options.upgrading)) {
-            yield subApp.load();
+          try {
+            const subApps = yield repository.find({
+              filter: {
+                'options.autoStart': true
+              }
+            });
+            var _iterator = _createForOfIteratorHelper(subApps),
+              _step;
+            try {
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                const subApp = _step.value;
+                const registeredApp = yield subApp.registerToMainApp(_this.app, {
+                  appOptionsFactory: _this.appOptionsFactory
+                });
+                yield registeredApp.load();
+              }
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
+            }
+          } catch (err) {
+            console.error('Auto register sub applications failed: ', err);
           }
         });
-        return function (_x6) {
-          return _ref5.apply(this, arguments);
+        return function (_x7) {
+          return _ref7.apply(this, arguments);
         };
       }());
       _this.app.on('afterUpgrade', /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator(function* (app, options) {
+        var _ref8 = _asyncToGenerator(function* (app, options) {
           const cliArgs = options === null || options === void 0 ? void 0 : options.cliArgs;
           const repository = _this.db.getRepository('applications');
           const findOptions = {};
@@ -237,11 +297,11 @@ class PluginMultiAppManager extends _server().Plugin {
             };
           }
           const instances = yield repository.find(findOptions);
-          var _iterator = _createForOfIteratorHelper(instances),
-            _step;
+          var _iterator2 = _createForOfIteratorHelper(instances),
+            _step2;
           try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              const instance = _step.value;
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              const instance = _step2.value;
               const instanceOptions = instance.get('options');
               // skip standalone deployment application
               if ((instanceOptions === null || instanceOptions === void 0 ? void 0 : instanceOptions.standaloneDeployment) && appManager.runningMode !== 'single') {
@@ -265,13 +325,13 @@ class PluginMultiAppManager extends _server().Plugin {
               }
             }
           } catch (err) {
-            _iterator.e(err);
+            _iterator2.e(err);
           } finally {
-            _iterator.f();
+            _iterator2.f();
           }
         });
-        return function (_x7, _x8) {
-          return _ref6.apply(this, arguments);
+        return function (_x8, _x9) {
+          return _ref8.apply(this, arguments);
         };
       }());
       _this.app.resourcer.registerActionHandlers({
@@ -284,7 +344,7 @@ class PluginMultiAppManager extends _server().Plugin {
             });
             ctx.body = items;
           });
-          function applicationsListPinned(_x9, _x10) {
+          function applicationsListPinned(_x10, _x11) {
             return _applicationsListPinned.apply(this, arguments);
           }
           return applicationsListPinned;

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@nocobase/plugin-multi-app-manager",
-  "version": "0.9.4-alpha.1",
-  "description": "",
+  "displayName": "multi app manager",
+  "displayName.zh-CN": "多应用管理",
+  "description": "manage app",
+  "description.zh-CN": "管理应用",
+  "version": "0.10.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/server": "0.9.4-alpha.1"
+    "@nocobase/server": "0.10.0-alpha.2",
+    "async-mutex": "^0.3.2"
   },
-  "gitHead": "0b4936be557be918dbdf8196dadcbc7eb395906d"
+  "gitHead": "85028ae1733fcbd46ecd5d291dacbdc175f7f073"
 }