@steedos/standard-object-database 2.7.1-beta.2 → 2.7.1-beta.21

package/main/default/triggers/object_validation_rules.trigger.js

@@ -8,26 +8,25 @@ const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
 const register = require('@steedos/metadata-registrar')
 const auth = require('@steedos/auth');
+const clone = require('clone');
 
 module.exports = {
     beforeFind: async function(){
         delete this.query.fields;
     },
-    beforeAggregate: async function(){
-        delete this.query.fields;
-    },
     afterFind: async function(){
         const { spaceId } = this;
         let dataList = await register.getAllObjectValidationRules();
         if (!_.isEmpty(dataList)) {
+            const cloneValues = clone(this.data.values, false);
             dataList.forEach((doc) => {
                 if (!_.find(this.data.values, (value) => {
                     return value.name === doc.name
                 })) {
-                    this.data.values.push(doc);
+                    cloneValues.push(doc);
                 }
             })
-            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            const records = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
             if (records.length > 0) {
                 this.data.values = records;
             } else {

package/main/default/triggers/objects.trigger.js

@@ -2,7 +2,7 @@ const InternalData = require('@steedos/standard-objects').internalData;
 const _ = require('underscore');
 const objectql = require('@steedos/objectql');
 const objectTree = require('../server/objects.tree.js');
-
+const clone = require('clone');
 const sleep = async (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
 module.exports = {
@@ -18,13 +18,25 @@ module.exports = {
         let userId = this.userId
         let spaceId = this.spaceId;
 
+        let filters = InternalData.parserFilters(this.query.filters);
+
         _.each(this.data.values, (item)=>{
             item.is_customize = true
         })
 
-        this.data.values = this.data.values.concat(await InternalData.getObjects(userId));
+        let cloneValues = clone(this.data.values, false);
+
+        if(filters.is_customize){
+            const dbObjects = await objectql.getObject('objects').directFind({space: spaceId});
+            _.each(dbObjects, (item)=>{
+                item.is_customize = true
+            })
+            cloneValues = cloneValues.concat(dbObjects);
+        }
+
+        cloneValues = cloneValues.concat(await InternalData.getObjects(userId));
 
-        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+        this.data.values = objectql.getSteedosSchema().metadataDriver.find(cloneValues, this.query, spaceId);
 
         _.each(this.data.values, function(value){
             if(value){
@@ -39,6 +51,11 @@ module.exports = {
     afterCount: async function(){
         let userId = this.userId
         let spaceId = this.spaceId;
+        let filters = InternalData.parserFilters(this.query.filters);
+        if(filters.is_customize){
+            const dbObjects = await objectql.getObject('objects').directFind({space: spaceId});
+            return this.data.values = dbObjects.length;
+        }
         this.data.values = this.data.values + objectql.getSteedosSchema().metadataDriver.count(await InternalData.getObjects(userId), this.query, spaceId);
     },
     afterFindOne: async function(){

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-object-database",
-    "version": "2.7.1-beta.2",
+    "version": "2.7.1-beta.21",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,10 +12,14 @@
     "description": "steedos package",
     "dependencies": {
         "@steedos-widgets/amis-lib": "^1.0.22",
-        "@steedos/metadata-core": "2.7.1-beta.2",
-        "@steedos/standard-objects": "2.7.1-beta.2"
+        "@steedos/metadata-core": "2.7.1-beta.21",
+        "@steedos/service-object-mixin": "2.7.1-beta.21",
+        "@steedos/standard-objects": "2.7.1-beta.21",
+        "amis-formula": "~6.3.0",
+        "clone": "^2.1.2",
+        "moleculer-bullmq": "3.0.0"
     },
     "repository": {},
     "license": "MIT",
-    "gitHead": "1d02bc68fd5dcb00731fffa27684f187c7448b57"
+    "gitHead": "ff50ac64e344991378c0d3148410a3c8290918f8"
 }

package/package.service.js

@@ -166,8 +166,9 @@ module.exports = {
 				const dbRecord = await object.directFind({filters: ['_id','=',id]});
 				if(dbRecord.length === 0){
 					// const newId = await object._makeNewID();
-					const objectConfig = await object.toConfig();
-					let field_groups = objectConfig.field_groups || null;
+					const curentObject = await this.getObject(name);
+					const curentObjectConfig = await curentObject.toConfig();
+					let field_groups = curentObjectConfig.field_groups || null;
 					
 					const now = new Date();
 					await object.directInsert(Object.assign({}, data, {