@steedos/objectql 2.1.76 → 2.1.84

package/src/types/datasource.ts

@@ -28,8 +28,7 @@ import {
     addAllConfigFiles
 } from '.';
 import { SteedosDriverConfig } from '../driver';
-import { createObjectService } from '../metadata-register/objectServiceManager';
-import { getObjectDispatcher } from '../services/index';
+import { getObjectDispatcher, createObjectService, createDataSourceService } from '../services/index';
 import path = require('path');
 let Fiber = require('fibers');
 declare var Creator: any;
@@ -87,6 +86,21 @@ export class SteedosDataSourceType implements Dictionary {
     private _locale?: string;
     private _schema: SteedosSchema;
     private _objects: Dictionary<SteedosObjectType> = {};
+    private _cacheObjects?: Array<SteedosObjectType> = [];
+    public get cacheObjects(): any {
+        return this._cacheObjects;
+    }
+    public set cacheObjects(value: any) {
+        this._cacheObjects = value;
+    }
+    private _service?: any;
+    public get service(): any {
+        return this._service;
+    }
+    public set service(value: any) {
+        this._service = value;
+    }
+
     private _objectsConfig: Dictionary<SteedosObjectTypeConfig> = {};
     private _objectsRolesPermission: Dictionary<Dictionary<SteedosObjectPermissionType>> = {};
     private _objectsSpaceRolesPermission: Dictionary<Dictionary<Dictionary<SteedosObjectPermissionType>>> = {};
@@ -110,10 +124,19 @@ export class SteedosDataSourceType implements Dictionary {
     }
 
     async getObjects() {
-        if(!this.schema.metadataRegister){
-            return this._objects
-        }
-        return await this.schema.metadataRegister.getObjectsConfig(this.name);
+        // if(!this.schema.metadataRegister){
+        //     return this._objects
+        // }
+        // return await this.schema.metadataRegister.getObjectsConfig(this.name);
+        return this.getCacheObjects();
+    }
+
+    getCacheObjects() {
+        return this.cacheObjects;
+    }
+
+    async flushCacheObjects() {
+        this.cacheObjects = await this.schema.metadataRegister.getObjectsConfig(this.name);
     }
 
     getLocalObjects() {
@@ -147,7 +170,17 @@ export class SteedosDataSourceType implements Dictionary {
     async setObject(objectApiName: string, objectConfig: SteedosObjectTypeConfig) {
         const serviceName = getObjectServiceName(objectApiName)
         let object = new SteedosObjectType(objectApiName, this, objectConfig)
+
         this._objectsConfig[objectApiName] = objectConfig;
+
+        const findIndex = _.findIndex(this.cacheObjects, (item: any) => { return item?.metadata?.name === objectApiName });
+
+        if (findIndex != -1) {
+            this.cacheObjects[findIndex] = Object.assign({ service: { name: serviceName } }, { metadata: objectConfig });
+        } else {
+            this.cacheObjects.push(Object.assign({ service: { name: serviceName } }, { metadata: objectConfig }));
+        }
+
         this._objects[objectApiName] = object;
         await createObjectService(this._schema.metadataBroker, serviceName, objectConfig)
         return object;
@@ -206,71 +239,32 @@ export class SteedosDataSourceType implements Dictionary {
         }
     }
 
-    async initObjects(){
+    async initObject(objectConfig) {
+        //从本地对象配置中读取触发器配置
+        const localObjectConfig = getObjectConfig(objectConfig.name);
+        if (localObjectConfig) {
+            objectConfig.listeners = localObjectConfig.listeners;
+            objectConfig.methods = localObjectConfig.methods;
+        }
+        if (this.name === "meteor") {
+            try {
+                const _db = Creator.createCollection(objectConfig)
+                Creator.Collections[_db._name] = _db
+            } catch (error) {
+                // console.log(`error`, error) //此处无需打印日志，@steedos/core 在init Creator 时，会兼容此部分的异常逻辑。
+            }
+        }
+        await this.setObject(objectConfig.name, objectConfig);
+    }
+
+    async initObjects() {
         // 从缓存中加载所有本数据源对象到datasource中
-        let objects: Array<any> = await this.getObjects();
+        let objects: Array<any> = this.cacheObjects;
         let self = this;
         for await (const object of _.values(objects)) {
             const objectConfig = object.metadata;
-            //从本地对象配置中读取触发器配置
-            const localObjectConfig = getObjectConfig(objectConfig.name);
-            if(localObjectConfig){
-                objectConfig.listeners = localObjectConfig.listeners; 
-                objectConfig.methods = localObjectConfig.methods; 
-            }
-            // if(self._schema.metadataBroker){
-            //     const res = await self._schema.metadataRegister.object(object)
-            //     if(res){
-            //         self.setObject(object.name, object);
-            //     }
-            // }else{
-            //     self.setObject(object.name, object);
-            // }
-            await self.setObject(objectConfig.name, objectConfig);
-
-            if(this.name === "default"){
-                try {
-                    const _db = Creator.createCollection(objectConfig)
-	                Creator.Collections[_db._name] = _db
-                } catch (error) {
-                    // console.log(`error`, error) //此处无需打印日志，@steedos/core 在init Creator 时，会兼容此部分的异常逻辑。
-                }
-            }
+            await self.initObject(objectConfig)
         }
-
-        // _.each(objects, (object) => {
-        //     const obj = this.getObject(object.name);
-        //     if(obj){
-        //         // 加try catch是因为有错误时不应该影响下一个对象加载
-        //         try{
-        //             obj.initMasterDetails();
-        //         }
-        //         catch(ex){
-        //             console.error(ex);
-        //         }
-        //     }
-        // });
-
-        // _.each(objects, (object) => {
-        //     const obj = this.getObject(object.name);
-        //     if(obj){
-        //         // 加try catch是因为有错误时不应该影响下一个对象加载
-        //         try{
-        //             obj.checkMasterDetails();
-        //         }
-        //         catch(ex){
-        //             console.error(ex);
-        //         }
-        //     }
-        // });
-
-        _.each(this.config.objectsRolesPermission, (objectRolesPermission, object_name) => {
-            _.each(objectRolesPermission, (objectRolePermission, role_name) => {
-                objectRolePermission.name = role_name
-                this.setObjectPermission(object_name, objectRolePermission)
-            })
-        })
-
         return true;
     }
 
@@ -436,14 +430,6 @@ export class SteedosDataSourceType implements Dictionary {
         return this._schema;
     }
 
-    buildGraphQLSchema() {
-        return this._schema.buildGraphQLSchema();
-    }
-
-    getGraphQLSchema() {
-        return this._schema.getGraphQLSchema();
-    }
-
     async dropEntities() {
         if (this._adapter.dropEntities) {
             return await this._adapter.dropEntities();
@@ -469,15 +455,30 @@ export class SteedosDataSourceType implements Dictionary {
     }
 
     async init() {
-        await this.initObjects();
-        await this.initTypeORM();
-        // initObjectFieldsSummarys(this.name);
-        // this.schema.transformReferenceOfObject(this);
+        // await this.flushCacheObjects();
+        // await this.initObjects();
+        this.initObjectPermissions();
+        if (!this.service) {
+            const broker = this._schema.metadataBroker
+            this.service = await createDataSourceService(broker, this)
+        }
+    }
+
+    /**
+     * 初始化数据源上配置的对象权限。
+     */
+    initObjectPermissions() {
+        _.each(this.config.objectsRolesPermission, (objectRolesPermission, object_name) => {
+            _.each(objectRolesPermission, (objectRolePermission, role_name) => {
+                objectRolePermission.name = role_name
+                this.setObjectPermission(object_name, objectRolePermission)
+            })
+        })
     }
 
-    async initTypeORM() {
+    initTypeORM() {
         const _objects = {};
-        _.map(await this.getObjects(), (item)=>{
+        _.map(this.cacheObjects, (item) => {
             if(item && item.metadata){
                 _objects[item.metadata.name] = item.metadata
             }

package/src/types/field.ts

@@ -52,7 +52,7 @@ abstract class SteedosFieldProperties{
     object_name?: string
     name?: string
     column_name?: string
-    type?: string
+    abstract type?: string
     primary?: boolean
     generated?: true
     label?: string
@@ -88,7 +88,7 @@ abstract class SteedosFieldProperties{
     reference_limit?: number
     is_company_limited?: boolean
     system?: string;
-    fieldDBType?: SteedosFieldDBType | string
+    abstract fieldDBType: SteedosFieldDBType | string
     formula?: string
     data_type?: string
     formula_blank_value?: string

package/src/types/field_permission.ts

@@ -23,4 +23,20 @@ export class FieldPermission {
         })
         return result;
     }
+
+    static async getObjectsFieldsPermissionGroupRole() {
+        const permissions = await this.getObjectFieldsPermission('*', '*');
+        const result = {};
+        _.each(permissions, (permission) => {
+            if (!result[permission.object_name]) {
+                result[permission.object_name] = {};
+            }
+            const { permission_set_id, field, editable, readable } = permission.metadata;
+            if (!result[permission.object_name][permission_set_id]) {
+                result[permission.object_name][permission_set_id] = [];
+            }
+            result[permission.object_name][permission_set_id].push({ field: field, read: readable, edit: editable })
+        })
+        return result;
+    }
 }

package/src/types/index.ts

@@ -7,6 +7,7 @@ export * from "./dashboard";
 export * from "./object";
 export * from "./connection";
 export * from "./object_layouts";
+export * from "./field_permission";
 export { SteedosFieldType, SteedosFieldTypeConfig } from "./field";
 export { SteedosListenerConfig } from './listeners'
 export { SteedosTriggerType } from './trigger'

package/src/types/list_view.ts

@@ -2,7 +2,7 @@ import { SteedosObjectType } from ".";
 import _ = require('underscore')
 
 abstract class SteedosObjectListViewTypeProperties{
-    name?: string
+    abstract name?: string
     label?: string
     type?: string
     filter_scope?: string

package/src/types/object.ts

@@ -58,9 +58,9 @@ export const getRepeatObjectNameFromPaths = (paths: string[]) => {
 
 abstract class SteedosObjectProperties {
     _id?: string
-    name?: string
+    abstract name?: string
     extend?: string
-    table_name?: string
+    abstract table_name?: string
     label?: string
     icon?: string
     enable_search?: boolean
@@ -70,11 +70,11 @@ abstract class SteedosObjectProperties {
     enable_notes?: boolean
     enable_events?: boolean
     enable_api?: boolean  //TODO 未开放功能
-    enable_share?: boolean
-    enable_instances?: boolean
+    abstract enable_share?: boolean
+    abstract enable_instances?: boolean
     enable_chatter?: boolean
-    enable_audit?: boolean
-    enable_trash?: boolean
+    abstract enable_audit?: boolean
+    abstract enable_trash?: boolean
     enable_space_global?: boolean
     enable_tree?: boolean
     parent_field?: string
@@ -91,10 +91,10 @@ abstract class SteedosObjectProperties {
     // triggers?: object
     sidebar?: object //TODO
     calendar?: object //TODO
-    actions?: Dictionary<SteedosActionTypeConfig>
-    fields?: Dictionary<SteedosFieldTypeConfig>
-    listeners?: Dictionary<SteedosListenerConfig>
-    list_views?: Dictionary<SteedosObjectListViewTypeConfig>
+    abstract actions?: Dictionary<SteedosActionTypeConfig>
+    abstract fields?: Dictionary<SteedosFieldTypeConfig>
+    abstract listeners?: Dictionary<SteedosListenerConfig>
+    abstract list_views?: Dictionary<SteedosObjectListViewTypeConfig>
     permissions?: Dictionary<SteedosObjectPermissionTypeConfig>
     methods?: Dictionary<Function>
     fields_serial_number?: number
@@ -107,7 +107,7 @@ export interface SteedosObjectTypeConfig extends SteedosObjectProperties {
     name?: string
     isMain?: boolean
     datasource?: string
-    fields: Dictionary<SteedosFieldTypeConfig>
+    fields?: Dictionary<SteedosFieldTypeConfig>
     actions?: Dictionary<SteedosActionTypeConfig>
     listeners?: Dictionary<SteedosListenerConfig>
     permission_set?: Dictionary<SteedosObjectPermissionTypeConfig> //TODO remove ; 目前为了兼容现有object的定义保留
@@ -609,7 +609,7 @@ export class SteedosObjectType extends SteedosObjectProperties {
         return globalPermission
     }
 
-    async getUserObjectPermission(userSession: SteedosUserSession) {
+    async getUserObjectPermission(userSession: SteedosUserSession, rolesFieldsPermission?: any) {
 
         if (!userSession) {
             throw new Error('userSession is required')
@@ -649,7 +649,9 @@ export class SteedosObjectType extends SteedosObjectProperties {
             throw new Error('not find user permission');
         }
 
-        const rolesFieldsPermission = await FieldPermission.getObjectFieldsPermissionGroupRole(this.name);
+        if (!rolesFieldsPermission) {
+            rolesFieldsPermission = await FieldPermission.getObjectFieldsPermissionGroupRole(this.name);
+        }
 
         roles.forEach((role) => {
             let rolePermission = objectRolesPermission[role];
@@ -926,6 +928,13 @@ export class SteedosObjectType extends SteedosObjectProperties {
         return await this.callMetadataObjectServiceAction(`getLookupDetailsInfo`, {objectApiName: this.name});
     }
 
+    /**
+     * 此函数返回getDetailsInfo、getMastersInfo、getLookupDetailsInfo 3个请求的结果，用于优化访问速度
+     */
+    async getRelationsInfo() {
+        return await this.callMetadataObjectServiceAction(`getRelationsInfo`, { objectApiName: this.name });
+    }
+
     async getRecordPermissions(record, userSession){
         const permissions = await this.getUserObjectPermission(userSession);
         const { userId, company_ids: user_company_ids } = userSession;
@@ -985,22 +994,39 @@ export class SteedosObjectType extends SteedosObjectProperties {
         return permissions
     }
 
-    async getRecordView(userSession){
+    async getRecordView(userSession, context?: any) {
+        let objectConfig;
+        let layouts;
+        let spaceProcessDefinition;
+        let dbListViews;
+        let rolesFieldsPermission;
+
+        if (context) {
+            objectConfig = context.objectConfig;
+            layouts = context.layouts;
+            spaceProcessDefinition = context.spaceProcessDefinition;
+            dbListViews = context.dbListViews;
+            rolesFieldsPermission = context.rolesFieldsPermission;
+        }
+
         const lng = userSession.language;
-        const objectMetadataConfig: any = await this.callMetadataObjectServiceAction('get', {objectApiName: this.name});
-        let objectConfig = objectMetadataConfig.metadata;
+        if (!objectConfig) {
+            const objectMetadataConfig: any = await this.callMetadataObjectServiceAction('get', { objectApiName: this.name });
+            objectConfig = objectMetadataConfig.metadata;
+        }
         objectConfig.name = this.name
         objectConfig.datasource = this.datasource.name;
-        objectConfig.permissions = await this.getUserObjectPermission(userSession);
-        objectConfig.details = await this.getDetailsInfo();
-        objectConfig.masters = await this.getMastersInfo();
-        objectConfig.lookup_details = await this.getLookupDetailsInfo();
-
+        objectConfig.permissions = await this.getUserObjectPermission(userSession, rolesFieldsPermission);
+        const relationsInfo = await this.getRelationsInfo();
+        objectConfig.details = relationsInfo.details;
+        objectConfig.masters = relationsInfo.masters;
+        objectConfig.lookup_details = relationsInfo.lookup_details;
         delete objectConfig.db
 
         translationObject(lng, objectConfig.name, objectConfig, true);
-
-        const layouts = await getObjectLayouts(userSession.profile, userSession.spaceId, this.name);
+        if (!layouts) {
+            layouts = await getObjectLayouts(userSession.profile, userSession.spaceId, this.name);
+        }
         if(layouts && layouts.length > 0){
             const layout = layouts[0];
             let _fields = {};
@@ -1084,24 +1110,31 @@ export class SteedosObjectType extends SteedosObjectProperties {
         const userObjectFields = objectConfig.fields;
         _.each(objectConfig.permissions.field_permissions, (field_permission, field) => {
             const { read, edit } = field_permission;
-            if (read) {
-                userObjectFields[field].omit = true;
-            }
-            if (edit) {
-                userObjectFields[field].omit = false;
-                userObjectFields[field].hidden = false;
-                userObjectFields[field].readonly = false;
-                userObjectFields[field].disabled = false;
-            }
-            if (!read && !edit) {
-                delete userObjectFields[field]
+            if (userObjectFields[field]) {
+                if (read) {
+                    userObjectFields[field].hidden = false;
+                    userObjectFields[field].omit = true;
+                    userObjectFields[field].readonly = true;
+                    userObjectFields[field].disabled = true;
+                }
+                if (edit) {
+                    userObjectFields[field].omit = false;
+                    userObjectFields[field].hidden = false;
+                    userObjectFields[field].readonly = false;
+                    userObjectFields[field].disabled = false;
+                }
+                if (!read && !edit) {
+                    delete userObjectFields[field]
+                }
             }
         })
 
         objectConfig.fields = userObjectFields
 
         // TODO object layout 是否需要控制审批记录显示？
-        let spaceProcessDefinition = await getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })
+        if (!spaceProcessDefinition) {
+            spaceProcessDefinition = await getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })
+        }
         if (spaceProcessDefinition.length > 0) {
             objectConfig.enable_process = true
         }
@@ -1113,8 +1146,9 @@ export class SteedosObjectType extends SteedosObjectProperties {
                 delete objectConfig.triggers[key];
             }
         })
-
-        const dbListViews = await getObject("object_listviews").find({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] })
+        if (!dbListViews) {
+            dbListViews = await getObject("object_listviews").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], [['owner', '=', userSession.userId], 'or', ['shared', '=', true]]] })
+        }
         objectConfig.list_views = Object.assign({}, objectConfig.list_views)
         _.each(dbListViews, function(dbListView){
             delete dbListView.created;

package/src/types/object_dynamic_load.ts

@@ -3,7 +3,7 @@ import path = require('path')
 import { SteedosObjectTypeConfig, SteedosObjectPermissionTypeConfig, SteedosActionTypeConfig, getDataSource } from '.'
 // import { isMeteor } from '../util'
 import { Dictionary } from '@salesforce/ts-types';
-import { loadObjectFields, loadObjectListViews, loadObjectButtons, loadObjectMethods, loadObjectActions, loadObjectTriggers, addObjectListenerConfig, loadObjectLayouts, getLazyLoadFields, getLazyLoadButtons, loadObjectPermissions, loadSourceProfiles, loadSourcePermissionset, loadObjectValidationRules, loadSourceRoles, loadSourceFlowRoles, loadSourceApprovalProcesses, loadSourceWorkflows, loadStandardProfiles, loadStandardPermissionsets, preloadDBObjectFields, preloadDBObjectButtons, preloadDBApps, preloadDBObjectLayouts, preloadDBTabs, preloadDBShareRules, preloadDBRestrictionRules, preloadDBPermissionFields } from '../dynamic-load'
+import { addObjectListenerConfig, loadObjectLayouts, loadSourceProfiles, loadSourcePermissionset, loadObjectValidationRules, loadSourceRoles, loadSourceFlowRoles, loadSourceApprovalProcesses, loadSourceWorkflows, loadStandardProfiles, loadStandardPermissionsets, preloadDBObjectFields, preloadDBObjectButtons, preloadDBApps, preloadDBObjectLayouts, preloadDBTabs, preloadDBShareRules, preloadDBRestrictionRules, preloadDBPermissionFields, loadPackageMetadatas } from '../dynamic-load'
 import { transformListenersToTriggers } from '..';
 import { getSteedosSchema } from './schema';
 
@@ -24,6 +24,7 @@ const _routers: Array<any> = [];
 const _objectsData: Dictionary<any> = {};
 const delayLoadExtendObjectConfigQueue: Dictionary<any> = {};
 let standardObjectsLoaded: boolean = false;
+let dbMetadataLoaing: boolean = false;
 
 const addDelayLoadExtendObjectConfig = function (extend: string, config: SteedosObjectTypeConfig){
     if(!delayLoadExtendObjectConfigQueue[extend]){
@@ -93,54 +94,12 @@ export const addObjectConfigFiles = async (filePath: string, datasource: string,
     if (!datasource)
       datasource = 'meteor'
 
-    let objectJsons = util.loadObjects(filePath);
-    for await (const element of objectJsons) {
-        let startNo = 10;
-        _.each(element.fields, function(field){
-            if(!_.has(field, 'sort_no')){
-                field.sort_no = startNo;
-                startNo = startNo + 10;
-            }
-        })
-        if(!element.fields){
-            element.fields = {}
-        }
-        _.each(getLazyLoadFields(element.name), function(field){
-            util.extend(element.fields, {[field.name]: field})
-        })
-        if(!element.actions){
-            element.actions = {}
-        }
-        _.each(getLazyLoadButtons(element.name), function(action){
-            util.extend(element.actions, {[action.name]: action})
-        })
-        let _mf =  _.maxBy(_.values(element.fields), function (field) { return field.sort_no; });
-        if(_mf && element.name){
-            element.fields_serial_number = _mf.sort_no + 10;
-        }
-        await addObjectConfig(element, datasource, serviceName);
-    }
-
-    await loadObjectFields(filePath, serviceName);
-
-    await loadObjectListViews(filePath, serviceName);
-
-    await loadObjectButtons(filePath, serviceName);
-
-    loadObjectTriggers(filePath);
-
-    await loadObjectActions(filePath, serviceName);
-
-    loadObjectMethods(filePath);  //此功能不支持微服务模式
+    await loadPackageMetadatas(filePath, datasource, serviceName)
 
     await loadObjectLayouts(filePath, serviceName);
-
-    await loadObjectPermissions(filePath, serviceName);
-
+    // await loadObjectPermissions(filePath, serviceName);
     await loadSourceProfiles(filePath, serviceName);
-
     await loadSourcePermissionset(filePath, serviceName);
-
     loadObjectValidationRules(filePath);
 
     loadSourceRoles(filePath);
@@ -323,10 +282,17 @@ export const removeObjectListenerConfig = (_id, listenTo, when)=>{
     }
 }
 
-export const loadStandardMetadata = async (serviceName: string, datasourceApiName: string) =>{
-    await loadStandardProfiles(serviceName);
-    await loadStandardPermissionsets(serviceName);
+export const loadStandardMetadata = async (serviceName: string, datasourceApiName: string) => {
     await loadStandardBaseObjects(serviceName);
+    if (dbMetadataLoaing != true) {
+        dbMetadataLoaing = true;
+        await loadStandardProfiles(serviceName);
+        await loadStandardPermissionsets(serviceName);
+        await loadDbMetadatas(datasourceApiName);
+    }
+}
+
+export const loadDbMetadatas = async (datasourceApiName: string) => {
     if(datasourceApiName === 'default' || datasourceApiName === 'meteor'){
         const datasource = getDataSource(datasourceApiName)
         if(datasource && datasourceApiName === 'default'){

package/src/types/object_permission.ts

@@ -1,7 +1,7 @@
 import _ = require('underscore')
 
 abstract class SteedosObjectPermissionTypeProperties {
-    name?: string
+    abstract name?: string
     object_name?: string
     allowRead?: boolean
     allowCreate?: boolean

package/src/types/schema.ts

@@ -7,7 +7,6 @@ import { getFromContainer } from 'typeorm';
 // import { loadCoreValidators } from '../validators';
 // import { loadStandardBaseObjects } from './object_dynamic_load';
 // import { preloadDBObjectFields, preloadDBObjectButtons } from '../dynamic-load';
-import { buildGraphQLSchema } from '../graphql';
 import { MetadataRegister } from '../metadata-register';
 import { MetadataDriver } from '../driver/metadata';
 
@@ -22,7 +21,6 @@ export type SteedosSchemaConfig = {
 export class SteedosSchema {
     private _datasources: Dictionary<SteedosDataSourceType> = {};
     private _objectsMap: Dictionary<{ datasourceName: string, filePath?: string }> = {};
-    private graphQLSchema: any = null;
     private _broker: any = null;
     private _metadataBroker: any = null;
     metadataRegister: MetadataRegister = null;
@@ -230,19 +228,18 @@ export class SteedosSchema {
         return this._datasources
     }
 
-    buildGraphQLSchema() {
-        this.graphQLSchema = buildGraphQLSchema(this);
-    }
-
-    getGraphQLSchema() {
-        if (!this.graphQLSchema) {
-            this.buildGraphQLSchema();
-        }
-        return this.graphQLSchema;
-    }
-
     async getAllObject() {
-        return await this.metadataBroker.call("objects.getAll");
+        let schemaObjects = [];
+        const datasources = this.getDataSources();
+        for (const name in datasources) {
+            const datasource = datasources[name]
+            const datasourceObjects = await datasource.getObjects();
+            if (datasourceObjects && datasourceObjects.length > 0) {
+                schemaObjects = schemaObjects.concat(datasourceObjects);
+            }
+        }
+        return schemaObjects;
+        // return await this.metadataBroker.call("objects.getAll");
     }
 }