@steedos/objectql 2.2.40 → 2.2.43

package/src/services/objectService.ts

@@ -2,7 +2,8 @@ import { SteedosObjectType } from '../types/object';
 import { getDataSource, SteedosDatabaseDriverType } from '../types/datasource';
 import { getObjectConfig } from '../types/object_dynamic_load';
 import _ = require('underscore');
-import { generateActionRestProp, generateActionGraphqlProp, generateSettingsGraphql, RELATED_PREFIX, _getRelatedType, correctName, getGraphqlActions, getRelatedResolver, dealWithRelatedFields, getLocalService } from './helpers';
+import { generateActionGraphqlProp, generateSettingsGraphql, RELATED_PREFIX, _getRelatedType, correctName, getGraphqlActions, getRelatedResolver, dealWithRelatedFields, getLocalService } from './helpers';
+// generateActionRestProp, 
 import { getObjectServiceName } from '.';
 import { jsonToObject } from '../util/convert';
 import { extend } from '../util';
@@ -154,14 +155,14 @@ function getObjectServiceMethodsSchema() {
                 return await this.object.getRecordView(userSession, context);
             }
         },
-        createDefaulRecordView: {
+        createDefaultRecordView: {
             async handler(userSession) {
-                return await this.object.createDefaulRecordView(userSession);
+                return await this.object.createDefaultRecordView(userSession);
             }
         },
-        getDefaulRecordView: {
+        getDefaultRecordView: {
             async handler(userSession) {
-                return await this.object.getDefaulRecordView(userSession);
+                return await this.object.getDefaultRecordView(userSession);
             }
         },
         getRelateds: {
@@ -173,6 +174,26 @@ function getObjectServiceMethodsSchema() {
             async handler() {
                 return await this.object.refreshIndexes();
             }
+        },
+        allowRead:{
+            async handler(userSession) {
+                return await this.object.allowRead(userSession);
+            }
+        },
+        allowInsert:{
+            async handler(userSession) {
+                return await this.object.allowInsert(userSession);
+            }
+        },
+        allowUpdate:{
+            async handler(userSession) {
+                return await this.object.allowUpdate(userSession);
+            }
+        },
+        allowDelete:{
+            async handler(userSession) {
+                return await this.object.allowDelete(userSession);
+            }
         }
         // getPageView: {
         //     //TODO
@@ -437,10 +458,6 @@ function getObjectServiceActionsSchema() {
             }
         },
         count: {
-            rest: {
-                method: "GET",
-                path: "/count"
-            },
             params: {
                 fields: { type: 'array', items: "string", optional: true },
                 filters: [{ type: 'array', optional: true }, { type: 'string', optional: true }],
@@ -454,10 +471,6 @@ function getObjectServiceActionsSchema() {
             }
         },
         getField: {
-            rest: {
-                method: "GET",
-                path: "/field"
-            },
             params: {
                 fieldApiName: { type: "string" },
             },
@@ -467,10 +480,10 @@ function getObjectServiceActionsSchema() {
             }
         },
         getFields: {
-            rest: {
-                method: "GET",
-                path: "/fields"
-            },
+            // rest: {
+            //     method: "GET",
+            //     path: "/fields"
+            // },
             async handler(ctx) {
                 return this.getFields()
             }
@@ -486,10 +499,10 @@ function getObjectServiceActionsSchema() {
             }
         },
         getUserObjectPermission: {
-            rest: {
-                method: "GET",
-                path: "/getUserObjectPermission"
-            },
+            // rest: {
+            //     method: "GET",
+            //     path: "/getUserObjectPermission"
+            // },
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 return this.getUserObjectPermission(userSession)
@@ -516,10 +529,10 @@ function getObjectServiceActionsSchema() {
             }
         },
         getRecordPermissionsById: {
-            rest: {
-                method: "GET",
-                path: "/recordPermissions/:recordId"
-            },
+            // rest: {
+            //     method: "GET",
+            //     path: "/recordPermissions/:recordId"
+            // },
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 const { recordId } = ctx.params;
@@ -535,47 +548,47 @@ function getObjectServiceActionsSchema() {
             }
         },
         getRecordView: {
-            rest: {
-                method: "GET",
-                path: "/uiSchema"
-            },
+            // rest: {
+            //     method: "GET",
+            //     path: "/uiSchema"
+            // },
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 const { context } = ctx.params;
                 return await this.getRecordView(userSession, context);
             }
         },
-        createDefaulRecordView: {
-            rest: {
-                method: "POST",
-                path: "/defUiSchema"
-            },
+        createDefaultRecordView: {
+            // rest: {
+            //     method: "POST",
+            //     path: "/defUiSchema"
+            // },
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 if(!userSession.is_space_admin){
                     throw new Error('no permission.')
                 }
-                return await this.createDefaulRecordView(userSession);
+                return await this.createDefaultRecordView(userSession);
             }
         },
-        getDefaulRecordView: {
-            rest: {
-                method: "GET",
-                path: "/uiSchemaTemplate"
-            },
+        getDefaultRecordView: {
+            // rest: {
+            //     method: "GET",
+            //     path: "/uiSchemaTemplate"
+            // },
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 if(!userSession.is_space_admin){
                     throw new Error('no permission.')
                 }
-                return await this.getDefaulRecordView(userSession);
+                return await this.getDefaultRecordView(userSession);
             }
         },
         getRelateds: {
-            rest: {
-                method: "GET",
-                path: "/relateds"
-            },
+            // rest: {
+            //     method: "GET",
+            //     path: "/relateds"
+            // },
             async handler(ctx) {
                 return await this.getRelateds();
             }
@@ -584,6 +597,30 @@ function getObjectServiceActionsSchema() {
             async handler(ctx) {
                 return await this.refreshIndexes();
             }
+        },
+        allowRead: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                return await this.allowRead(userSession);
+            }
+        },
+        allowInsert: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                return await this.allowInsert(userSession);
+            }
+        },
+        allowUpdate: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                return await this.allowUpdate(userSession);
+            }
+        },
+        allowDelete: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                return await this.allowDelete(userSession);
+            }
         }
     };
     _.each(actions, function(action){
@@ -686,14 +723,15 @@ module.exports = {
     merged(schema) {
         let settings = schema.settings;
         let objectConfig = settings.objectConfig;
-        if (objectConfig.enable_api) {
-            _.each(schema.actions, (action, actionName) => {
-                let rest = generateActionRestProp(actionName);
-                if (rest.method) {
-                    action.rest = rest;
-                }
-            })
-        }
+        // 先关闭对象服务action rest api, 否则会导致 action rest api 过多, 请求速度变慢.
+        // if (objectConfig.enable_api) {
+        //     _.each(schema.actions, (action, actionName) => {
+        //         let rest = generateActionRestProp(actionName);
+        //         if (rest.method) {
+        //             action.rest = rest;
+        //         }
+        //     })
+        // }
         if (objectConfig.enable_graphql || true) { // TODO object.yml添加enable_graphql属性
             _.each(schema.actions, (action, actionName) => {
                 let gpObj = generateActionGraphqlProp(actionName, objectConfig);

package/src/services/objectServiceDispatcher.ts

@@ -187,12 +187,12 @@ class ObjectServiceDispatcher {
         return await this.callAction(`getRecordView`, { userSession, context });
     }
 
-    async createDefaulRecordView(userSession){
-        return await this.callAction(`createDefaulRecordView`, {userSession});
+    async createDefaultRecordView(userSession){
+        return await this.callAction(`createDefaultRecordView`, {userSession});
     }
 
-    async getDefaulRecordView(userSession){
-        return await this.callAction(`getDefaulRecordView`, {userSession});
+    async getDefaultRecordView(userSession){
+        return await this.callAction(`getDefaultRecordView`, {userSession});
     }
 
     async getRelateds(){

package/src/types/datasource.ts

@@ -123,11 +123,14 @@ export class SteedosDataSourceType implements Dictionary {
         return this._driver;
     }
 
-    async getObjects() {
+    async getObjects(useCache = true) {
         // if(!this.schema.metadataRegister){
         //     return this._objects
         // }
         // return await this.schema.metadataRegister.getObjectsConfig(this.name);
+        if(useCache === false){
+            await this.flushCacheObjects();
+        }
         return this.getCacheObjects();
     }