@steedos/service-ui 2.3.2-beta.2 → 2.3.2-beta.3

package/main/default/routes/apps.router.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const express = require("express");
 const core_1 = require("@steedos/core");
 const objectql_1 = require("@steedos/objectql");
-const router = express.Router();
+const SteedosRouter = require('@steedos/router');
+const router = SteedosRouter.staticRouter();
 router.get('/service/api/apps/menus', core_1.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;

package/main/default/routes/bootstrap.router.js

@@ -9,8 +9,8 @@ require("@steedos/license");
 const Fiber = require('fibers');
 const clone = require("clone");
 const _ = require('underscore');
-var express = require('express');
-const bootStrapExpress = express.Router();
+const SteedosRouter = require('@steedos/router');
+const router = SteedosRouter.staticRouter();
 function getUserProfileObjectsLayout(userId, spaceId, objectName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let spaceUser;
@@ -136,25 +136,34 @@ function getSpaceBootStrap(req, res) {
                 let urlParams = req.params;
                 const { userId, language: lng } = userSession;
                 let spaceId = req.headers['x-space-id'] || urlParams.spaceId;
-                let space = yield (0, objectql_1.getObject)("spaces").findOne(spaceId, { fields: ['name'] });
+                let [space, object_listviews, apps, assigned_apps, spaceProcessDefinition, dbListViews, layouts, objectsFieldsPermissionGroupRole, allRelationsInfo, _dbApps, _dbDashboards, assigned_menus, allImportTemplates] = yield Promise.all([
+                    (0, objectql_1.getObject)("spaces").findOne(spaceId, { fields: ['name'] }),
+                    getUserObjectsListViews(userId, spaceId),
+                    (0, objectql_1.getAppConfigs)(spaceId),
+                    (0, objectql_1.getAssignedApps)(userSession),
+                    (0, objectql_1.getObject)("process_definition").find({ filters: [['space', '=', spaceId], ['active', '=', true]] }),
+                    (0, objectql_1.getObject)("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] }),
+                    (0, objectql_1.getObjectLayouts)(userSession.profile, spaceId),
+                    objectql_1.FieldPermission.getObjectsFieldsPermissionGroupRole(),
+                    (0, objectql_1.getAllRelationsInfo)(),
+                    (0, objectql_1.getObject)("apps").directFind({ filters: [['space', '=', spaceId], ['is_creator', '=', true]] }),
+                    (0, objectql_1.getObject)("dashboard").directFind({ filters: [['space', '=', spaceId]] }),
+                    (0, objectql_1.getAssignedMenus)(userSession),
+                    (0, objectql_1.getSteedosSchema)().broker.call(`~packages-@steedos/data-import.getAllImportTemplates`, {}, { meta: { user: userSession } })
+                ]);
                 let result = Creator.getAllPermissions(spaceId, userId);
                 steedosI18n.translationObjects(lng, result.objects);
                 result.user = userSession;
                 result.space = space;
                 result.dashboards = clone(Creator.Dashboards);
                 result.object_workflows = Meteor.call('object_workflows.get', spaceId, userId);
-                result.object_listviews = yield getUserObjectsListViews(userId, spaceId);
-                result.apps = yield (0, objectql_1.getAppConfigs)(spaceId);
-                result.assigned_apps = yield (0, objectql_1.getAssignedApps)(userSession);
+                result.object_listviews = object_listviews;
+                result.apps = apps;
+                result.assigned_apps = assigned_apps;
                 let datasources = Creator.steedosSchema.getDataSources();
-                const spaceProcessDefinition = yield (0, objectql_1.getObject)("process_definition").find({ filters: [['space', '=', spaceId], ['active', '=', true]] });
                 const spaceObjectsProcessDefinition = _.groupBy(spaceProcessDefinition, 'object_name');
-                const dbListViews = yield (0, objectql_1.getObject)("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] });
                 const dbObjectsListViews = _.groupBy(dbListViews, 'object_name');
-                const layouts = yield (0, objectql_1.getObjectLayouts)(userSession.profile, spaceId);
                 const objectsLayouts = _.groupBy(layouts, 'object_name');
-                const objectsFieldsPermissionGroupRole = yield objectql_1.FieldPermission.getObjectsFieldsPermissionGroupRole();
-                const allRelationsInfo = yield (0, objectql_1.getAllRelationsInfo)();
                 for (const datasourceName in datasources) {
                     let datasource = datasources[datasourceName];
                     const datasourceObjects = yield datasource.getObjects();
@@ -199,7 +208,6 @@ function getSpaceBootStrap(req, res) {
                         }
                     }
                 }
-                var _dbApps = yield (0, objectql_1.getObject)("apps").directFind({ filters: [['space', '=', spaceId], ['is_creator', '=', true]] });
                 let dbApps = {};
                 _.each(_dbApps, function (dbApp) {
                     if (dbApp.visible) {
@@ -207,7 +215,6 @@ function getSpaceBootStrap(req, res) {
                     }
                 });
                 result.apps = _.extend(result.apps || {}, dbApps);
-                var _dbDashboards = yield (0, objectql_1.getObject)("dashboard").directFind({ filters: [['space', '=', spaceId]] });
                 let dbDashboards = {};
                 _.each(_dbDashboards, function (dashboard) {
                     dbDashboards[dashboard._id] = dashboard;
@@ -231,7 +238,6 @@ function getSpaceBootStrap(req, res) {
                 });
                 steedosI18n.translationApps(lng, _Apps);
                 result.apps = _Apps;
-                let assigned_menus = yield (0, objectql_1.getAssignedMenus)(userSession);
                 steedosI18n.translationMenus(lng, assigned_menus);
                 result.assigned_menus = assigned_menus;
                 let _Dashboards = {};
@@ -249,7 +255,6 @@ function getSpaceBootStrap(req, res) {
                         result.objects[item.object_name].enable_process = true;
                     }
                 });
-                const allImportTemplates = yield (0, objectql_1.getSteedosSchema)().broker.call(`~packages-@steedos/data-import.getAllImportTemplates`, {}, { meta: { user: userSession } });
                 for (const key in result.objects) {
                     if (Object.prototype.hasOwnProperty.call(result.objects, key)) {
                         const objectConfig = result.objects[key];
@@ -413,6 +418,6 @@ function getSpaceObjectBootStrap(req, res) {
     });
 }
 exports.getSpaceObjectBootStrap = getSpaceObjectBootStrap;
-bootStrapExpress.use('/api/bootstrap/:spaceId/:objectNames', core_1.requireAuthentication, getSpaceObjectBootStrap);
-bootStrapExpress.use('/api/bootstrap/:spaceId/', core_1.requireAuthentication, getSpaceBootStrap);
-exports.default = bootStrapExpress;
+router.use('/api/bootstrap/:spaceId/:objectNames', core_1.requireAuthentication, getSpaceObjectBootStrap);
+router.use('/api/bootstrap/:spaceId/', core_1.requireAuthentication, getSpaceBootStrap);
+exports.default = router;

package/main/default/routes/objects.router.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const objectql_1 = require("@steedos/objectql");
-const express = require("express");
-const router = express.Router();
+const SteedosRouter = require('@steedos/router');
+const router = SteedosRouter.staticRouter();
 const core = require('@steedos/core');
 const callObjectServiceAction = function (actionName, userSession, data) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -57,10 +57,14 @@ router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthenticatio
         const userSession = req.user;
         try {
             const { objectServiceName } = req.params;
-            const result = yield callObjectServiceAction(`${objectServiceName}.getRecordView`, userSession);
-            result.hasImportTemplates = yield callObjectServiceAction(`~packages-@steedos/data-import.hasImportTemplates`, userSession, {
-                objectName: result.name
-            });
+            const objectName = objectServiceName.substring(1);
+            const [result, hasImportTemplates] = yield Promise.all([
+                callObjectServiceAction(`${objectServiceName}.getRecordView`, userSession),
+                callObjectServiceAction(`~packages-@steedos/data-import.hasImportTemplates`, userSession, {
+                    objectName: objectName
+                })
+            ]);
+            result.hasImportTemplates = hasImportTemplates;
             res.status(200).send(result);
         }
         catch (error) {

package/main/default/routes/objects.router.todo.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const express = require("express");
-const router = express.Router();
+const router =require('@steedos/router').staticRouter()
 const core = require('@steedos/core');
 router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthentication, function (req, res) {
     return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-ui",
-    "version": "2.3.2-beta.2",
+    "version": "2.3.2-beta.3",
     "main": "package.service.js",
     "keywords": [
         "steedos"
@@ -11,9 +11,9 @@
     "description": "steedos package",
     "repository": {},
     "dependencies": {
-        "@steedos/core": "2.3.2-beta.2",
-        "@steedos/i18n": "2.3.2-beta.2",
-        "@steedos/objectql": "2.3.2-beta.2",
+        "@steedos/core": "2.3.2-beta.3",
+        "@steedos/i18n": "2.3.2-beta.3",
+        "@steedos/objectql": "2.3.2-beta.3",
         "express": "4.18.1"
     },
     "license": "MIT",
@@ -21,5 +21,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "2e469778c682ec784fbfb93f5e83d2f5f9671ea5"
+    "gitHead": "1f337e8da176f1c75a8596b29ec7889eca996dc1"
 }

package/src/routes/apps.router.ts

@@ -2,14 +2,13 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-08 23:28:39
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-06-09 10:21:45
+ * @LastEditTime: 2022-11-15 18:11:07
  * @Description: 
  */
-import * as express from 'express';
 import { requireAuthentication } from '@steedos/core';
 import { getSteedosSchema } from '@steedos/objectql';
-
-const router = express.Router();
+const SteedosRouter = require('@steedos/router');
+const router = SteedosRouter.staticRouter();
 
 router.get('/service/api/apps/menus', requireAuthentication, async function (req: any, res: any) {
     const userSession = req.user;

package/src/routes/bootstrap.router.ts

@@ -7,8 +7,8 @@ const Fiber = require('fibers')
 const clone = require("clone");
 const _ = require('underscore');
 
-var express = require('express');
-const bootStrapExpress = express.Router();
+const SteedosRouter = require('@steedos/router');
+const router = SteedosRouter.staticRouter();
 
 async function getUserProfileObjectsLayout(userId, spaceId, objectName?) {
     let spaceUser;
@@ -154,7 +154,23 @@ export async function getSpaceBootStrap(req, res) {
         const { userId, language: lng} = userSession;
 
         let spaceId = req.headers['x-space-id'] || urlParams.spaceId
-        let space = await getObject("spaces").findOne(spaceId, { fields: ['name'] })
+
+        let [ space , object_listviews, apps, assigned_apps, spaceProcessDefinition, dbListViews, layouts, objectsFieldsPermissionGroupRole, allRelationsInfo, _dbApps, _dbDashboards, assigned_menus, allImportTemplates] = await Promise.all([
+            getObject("spaces").findOne(spaceId, { fields: ['name'] }),
+            getUserObjectsListViews(userId, spaceId),
+            getAppConfigs(spaceId),
+            getAssignedApps(userSession),
+            getObject("process_definition").find({ filters: [['space', '=', spaceId], ['active', '=', true]] }),
+            getObject("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] }),
+            getObjectLayouts(userSession.profile, spaceId),
+            FieldPermission.getObjectsFieldsPermissionGroupRole(),
+            getAllRelationsInfo(),
+            getObject("apps").directFind({filters: [['space', '=', spaceId],['is_creator', '=', true]]}),
+            getObject("dashboard").directFind({filters: [['space', '=', spaceId]]}),
+            getAssignedMenus(userSession),
+            getSteedosSchema().broker.call(`~packages-@steedos/data-import.getAllImportTemplates`, {}, { meta: { user: userSession}})
+        ])
+
         //TODO 无需再从getAllPermissions中获取用户的对象权限
         let result = Creator.getAllPermissions(spaceId, userId);
         steedosI18n.translationObjects(lng, result.objects);
@@ -163,11 +179,12 @@ export async function getSpaceBootStrap(req, res) {
         result.space = space
 
         result.dashboards = clone(Creator.Dashboards)
-        result.object_workflows = Meteor.call('object_workflows.get', spaceId, userId)
-        result.object_listviews = await getUserObjectsListViews(userId, spaceId)
+        // TODO 删除此代码, 逻辑重新调整, 提供单独的接口处理此问题: 对象可创建流程的清单接口
+        result.object_workflows = Meteor.call('object_workflows.get', spaceId, userId) 
+        result.object_listviews = object_listviews
         // result.apps = clone(Creator.Apps)
-        result.apps = await getAppConfigs(spaceId);
-        result.assigned_apps = await getAssignedApps(userSession);
+        result.apps = apps
+        result.assigned_apps = assigned_apps;
         let datasources = Creator.steedosSchema.getDataSources();
         // for (const datasourceName in datasources) {
         //     if(datasourceName != 'default'){
@@ -183,17 +200,11 @@ export async function getSpaceBootStrap(req, res) {
         //         }
         //     }
         // }
-        const spaceProcessDefinition = await getObject("process_definition").find({ filters: [['space', '=', spaceId], ['active', '=', true]] })
         const spaceObjectsProcessDefinition = _.groupBy(spaceProcessDefinition, 'object_name');
 
-        const dbListViews = await getObject("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] })
         const dbObjectsListViews = _.groupBy(dbListViews, 'object_name');
 
-        const layouts = await getObjectLayouts(userSession.profile, spaceId)
         const objectsLayouts = _.groupBy(layouts, 'object_name');
-        const objectsFieldsPermissionGroupRole = await FieldPermission.getObjectsFieldsPermissionGroupRole();
-        
-        const allRelationsInfo = await getAllRelationsInfo();
 
         for (const datasourceName in datasources) {
             let datasource = datasources[datasourceName];
@@ -237,7 +248,6 @@ export async function getSpaceBootStrap(req, res) {
             }
         }
         
-        var _dbApps = await getObject("apps").directFind({filters: [['space', '=', spaceId],['is_creator', '=', true]]});
         let dbApps = {};
         _.each(_dbApps, function(dbApp){
             if(dbApp.visible){
@@ -247,7 +257,6 @@ export async function getSpaceBootStrap(req, res) {
 
         result.apps = _.extend( result.apps || {}, dbApps);
 
-        var _dbDashboards = await getObject("dashboard").directFind({filters: [['space', '=', spaceId]]});
         let dbDashboards = {};
         _.each(_dbDashboards, function(dashboard){
             dbDashboards[dashboard._id] = dashboard;
@@ -274,7 +283,6 @@ export async function getSpaceBootStrap(req, res) {
 
         steedosI18n.translationApps(lng, _Apps);
         result.apps = _Apps;
-        let assigned_menus = await getAssignedMenus(userSession);
         steedosI18n.translationMenus(lng, assigned_menus);
         result.assigned_menus = assigned_menus;
         
@@ -296,8 +304,6 @@ export async function getSpaceBootStrap(req, res) {
             }
         })
 
-        const allImportTemplates = await getSteedosSchema().broker.call(`~packages-@steedos/data-import.getAllImportTemplates`, {}, { meta: { user: userSession}})
-
         for (const key in result.objects) {
             if (Object.prototype.hasOwnProperty.call(result.objects, key)) {
                 const objectConfig = result.objects[key];
@@ -469,7 +475,7 @@ export async function getSpaceObjectBootStrap(req, res) {
     }).run();
 }
 
-bootStrapExpress.use('/api/bootstrap/:spaceId/:objectNames', requireAuthentication, getSpaceObjectBootStrap)
-bootStrapExpress.use('/api/bootstrap/:spaceId/', requireAuthentication, getSpaceBootStrap)
+router.use('/api/bootstrap/:spaceId/:objectNames', requireAuthentication, getSpaceObjectBootStrap)
+router.use('/api/bootstrap/:spaceId/', requireAuthentication, getSpaceBootStrap)
 
-exports.default = bootStrapExpress;
+exports.default = router;

package/src/routes/objects.router.ts

@@ -2,12 +2,12 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-09 10:19:47
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-10-29 13:15:06
+ * @LastEditTime: 2022-11-17 15:26:01
  * @Description: 
  */
 import { getSteedosSchema } from "@steedos/objectql";
-const express = require("express");
-const router = express.Router();
+const SteedosRouter = require('@steedos/router');
+const router = SteedosRouter.staticRouter();
 const core = require('@steedos/core');
 
 
@@ -56,10 +56,14 @@ router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthenticatio
     const userSession = req.user;
     try {
         const { objectServiceName } = req.params;
-        const result = await callObjectServiceAction(`${objectServiceName}.getRecordView`, userSession);
-        result.hasImportTemplates = await callObjectServiceAction(`~packages-@steedos/data-import.hasImportTemplates`, userSession, {
-            objectName: result.name
-        })
+        const objectName = objectServiceName.substring(1);
+        const [ result, hasImportTemplates ] = await Promise.all([
+            callObjectServiceAction(`${objectServiceName}.getRecordView`, userSession),
+            callObjectServiceAction(`~packages-@steedos/data-import.hasImportTemplates`, userSession, {
+                objectName: objectName
+            })
+        ])
+        result.hasImportTemplates = hasImportTemplates 
         res.status(200).send(result);
     } catch (error) {
         res.status(500).send(error.message);