@steedos/objectql 2.1.53 → 2.1.57

package/lib/types/object.js

@@ -356,7 +356,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     };
     SteedosObjectType.prototype.runTriggerActions = function (when, context) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var triggers, triggers_1, triggers_1_1, trigger, params, error_1, e_2_1;
+            var triggers, triggers_1, triggers_1_1, trigger, params, e_2_1;
             var e_2, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -368,39 +368,40 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         }
                         _b.label = 2;
                     case 2:
-                        _b.trys.push([2, 9, 10, 11]);
+                        _b.trys.push([2, 7, 8, 9]);
                         triggers_1 = tslib_1.__values(triggers), triggers_1_1 = triggers_1.next();
                         _b.label = 3;
                     case 3:
-                        if (!!triggers_1_1.done) return [3 /*break*/, 8];
+                        if (!!triggers_1_1.done) return [3 /*break*/, 6];
                         trigger = triggers_1_1.value;
                         params = util_1.generateActionParams(when, context);
-                        _b.label = 4;
+                        return [4 /*yield*/, this._schema.metadataBroker.call(trigger.service.name + "." + trigger.metadata.action, params).catch(function (error) {
+                                //如果action trigger 下线，则只打印error
+                                if (error && _.isObject(error) && error.type === 'SERVICE_NOT_AVAILABLE') {
+                                    console.error("runTriggerActions error", error);
+                                }
+                                else {
+                                    throw error;
+                                }
+                            })];
                     case 4:
-                        _b.trys.push([4, 6, , 7]);
-                        return [4 /*yield*/, this._schema.metadataBroker.call(trigger.service.name + "." + trigger.metadata.action, params)];
-                    case 5:
                         _b.sent();
-                        return [3 /*break*/, 7];
-                    case 6:
-                        error_1 = _b.sent();
-                        console.error(error_1);
-                        return [3 /*break*/, 7];
-                    case 7:
+                        _b.label = 5;
+                    case 5:
                         triggers_1_1 = triggers_1.next();
                         return [3 /*break*/, 3];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
                         e_2_1 = _b.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 11];
-                    case 10:
+                        return [3 /*break*/, 9];
+                    case 8:
                         try {
                             if (triggers_1_1 && !triggers_1_1.done && (_a = triggers_1.return)) _a.call(triggers_1);
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });
@@ -555,7 +556,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     SteedosObjectType.prototype.refreshIndexes = function () {
         var e_3, _a, e_4, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var adapter, collection, indexesInfo, dropIndexNames, key, field, info, indexesInfo_1, indexesInfo_1_1, indexInfo, key, error_2, e_3_1, error_3, dropIndexNames_1, dropIndexNames_1_1, indexName, error_4, e_4_1, error_5;
+            var adapter, collection, indexesInfo, dropIndexNames, key, field, info, indexesInfo_1, indexesInfo_1_1, indexInfo, key, error_1, e_3_1, error_2, dropIndexNames_1, dropIndexNames_1_1, indexName, error_3, e_4_1, error_4;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -600,8 +601,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         _c.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        error_2 = _c.sent();
-                        console.error(error_2);
+                        error_1 = _c.sent();
+                        console.error(error_1);
                         return [3 /*break*/, 9];
                     case 9: return [3 /*break*/, 4];
                     case 10: return [3 /*break*/, 17];
@@ -623,8 +624,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 16: return [7 /*endfinally*/];
                     case 17: return [3 /*break*/, 19];
                     case 18:
-                        error_3 = _c.sent();
-                        console.error(error_3);
+                        error_2 = _c.sent();
+                        console.error(error_2);
                         return [3 /*break*/, 19];
                     case 19:
                         if (!(dropIndexNames && dropIndexNames.length > 0)) return [3 /*break*/, 37];
@@ -648,7 +649,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         _c.sent();
                         return [3 /*break*/, 27];
                     case 26:
-                        error_4 = _c.sent();
+                        error_3 = _c.sent();
                         return [3 /*break*/, 27];
                     case 27: return [3 /*break*/, 22];
                     case 28: return [3 /*break*/, 35];
@@ -670,8 +671,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     case 34: return [7 /*endfinally*/];
                     case 35: return [3 /*break*/, 37];
                     case 36:
-                        error_5 = _c.sent();
-                        console.error(error_5);
+                        error_4 = _c.sent();
+                        console.error(error_4);
                         return [3 /*break*/, 37];
                     case 37: return [2 /*return*/];
                 }
@@ -712,7 +713,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     };
     SteedosObjectType.prototype.getUserObjectPermission = function (userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var roles, objectRolesPermission, userObjectPermission, spaceId;
+            var roles, objectRolesPermission, userObjectPermission, field_permissions, spaceId;
             return tslib_1.__generator(this, function (_a) {
                 if (!userSession) {
                     throw new Error('userSession is required');
@@ -738,7 +739,10 @@ var SteedosObjectType = /** @class */ (function (_super) {
                     disabled_actions: null,
                     unreadable_fields: null,
                     uneditable_fields: null,
-                    unrelated_objects: null
+                    unrelated_objects: null,
+                    field_permissions: null,
+                    read_filters: [],
+                    edit_filters: []
                 };
                 if (_.isEmpty(roles)) {
                     throw new Error('not find user permission');
@@ -758,6 +762,16 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                     userObjectPermission[k] = _v;
                                 }
                             }
+                            else if (['read_filters', 'edit_filters'].indexOf(k) > -1) {
+                                if ('edit_filters' === k) {
+                                    if (!_.isEmpty(_v)) {
+                                        userObjectPermission['read_filters'].push(_v);
+                                    }
+                                }
+                                if (!_.isEmpty(_v)) {
+                                    userObjectPermission[k].push(_v);
+                                }
+                            }
                             else if ((_.isArray(v) || _.isNull(v))) {
                                 if (!_.isArray(_v)) {
                                     _v = [];
@@ -766,12 +780,40 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                     userObjectPermission[k] = _v;
                                 }
                                 else {
-                                    userObjectPermission[k] = _.intersection(v, _v);
+                                    if (k === 'field_permissions') {
+                                        userObjectPermission[k] = _.union(v, _v);
+                                    }
+                                    else {
+                                        userObjectPermission[k] = _.intersection(v, _v);
+                                    }
                                 }
                             }
                         });
                     }
                 });
+                field_permissions = {};
+                if (userObjectPermission.field_permissions) {
+                    _.each(userObjectPermission.field_permissions, function (field_permission) {
+                        var field = field_permission.field, read = field_permission.read, edit = field_permission.edit;
+                        if (field_permissions[field]) {
+                            field_permissions[field].edit = field_permissions[field].edit || edit;
+                            if (field_permissions[field].edit) {
+                                field_permissions[field].read = true;
+                            }
+                            else {
+                                field_permissions[field].read = field_permissions[field].read || read;
+                            }
+                        }
+                        else {
+                            field_permissions[field] = {
+                                field: field,
+                                read: edit || read,
+                                edit: edit
+                            };
+                        }
+                    });
+                }
+                userObjectPermission.field_permissions = field_permissions;
                 userObjectPermission.disabled_list_views = userObjectPermission.disabled_list_views || [];
                 userObjectPermission.disabled_actions = userObjectPermission.disabled_actions || [];
                 userObjectPermission.unreadable_fields = userObjectPermission.unreadable_fields || [];
@@ -781,7 +823,6 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 if (util_1.isTemplateSpace(spaceId)) {
                     return [2 /*return*/, Object.assign({}, userObjectPermission, { allowRead: true, viewAllRecords: true, viewCompanyRecords: true })];
                 }
-                Creator.processPermissions(userObjectPermission);
                 return [2 /*return*/, userObjectPermission];
             });
         });
@@ -1283,7 +1324,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     };
     SteedosObjectType.prototype.getRecordView = function (userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var lng, objectMetadataConfig, objectConfig, _a, _b, _c, _d, layouts, layout, _fields_1, sort_no_1, layoutFieldKeys, objectFieldKeys, difference, layoutButtonsName_1, spaceProcessDefinition, dbListViews;
+            var lng, objectMetadataConfig, objectConfig, _a, _b, _c, _d, layouts, layout, _fields_1, sort_no_1, layoutFieldKeys, objectFieldKeys, difference, layoutButtonsName_1, userObjectFields, spaceProcessDefinition, dbListViews;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -1383,6 +1424,23 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 }
                             });
                         }
+                        userObjectFields = objectConfig.fields;
+                        _.each(objectConfig.permissions.field_permissions, function (field_permission, field) {
+                            var read = field_permission.read, edit = field_permission.edit;
+                            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];
+                            }
+                        });
+                        objectConfig.fields = userObjectFields;
                         return [4 /*yield*/, getObject("process_definition").directFind({ filters: [['space', '=', userSession.spaceId], ['object_name', '=', this.name], ['active', '=', true]] })];
                     case 7:
                         spaceProcessDefinition = _e.sent();
@@ -1551,7 +1609,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     };
     SteedosObjectType.prototype.createDefaulRecordView = function (userSession) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var name, label, profiles, defaultRecordView, error_6;
+            var name, label, profiles, defaultRecordView, error_5;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1567,8 +1625,8 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         return [4 /*yield*/, getObject('object_layouts').insert(Object.assign({}, defaultRecordView, { name: name, label: label, profiles: profiles }), userSession)];
                     case 3: return [2 /*return*/, _a.sent()];
                     case 4:
-                        error_6 = _a.sent();
-                        return [2 /*return*/, { error: error_6.message }];
+                        error_5 = _a.sent();
+                        return [2 /*return*/, { error: error_5.message }];
                     case 5: return [2 /*return*/];
                 }
             });
@@ -1737,6 +1795,42 @@ var SteedosObjectType = /** @class */ (function (_super) {
             });
         });
     };
+    SteedosObjectType.prototype.appendRecordPermission = function (records, userSession) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _ids, objPm, permissionFilters, filters, results, allowEditIds;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _ids = _.pluck(records, '_id');
+                        return [4 /*yield*/, this.getUserObjectPermission(userSession)];
+                    case 1:
+                        objPm = _a.sent();
+                        permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
+                        if (_.isEmpty(permissionFilters)) {
+                            return [2 /*return*/];
+                        }
+                        filters = filters_1.formatFiltersToODataQuery(['_id', 'in', _ids]);
+                        return [4 /*yield*/, this.directFind({
+                                fields: ['_id'],
+                                filters: "(" + filters + ") and (" + permissionFilters.join(' or ') + ")"
+                            })];
+                    case 2:
+                        results = _a.sent();
+                        allowEditIds = _.pluck(results, '_id');
+                        _.each(records, function (record) {
+                            if (_.include(allowEditIds, record._id)) {
+                                record.record_permissions = {
+                                    allowRead: true,
+                                    allowEdit: true,
+                                    allowDelete: true,
+                                };
+                            }
+                        });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     SteedosObjectType.prototype.getTriggerContext = function (when, method, args, recordId) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var userSession, context, _a;
@@ -1744,7 +1838,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         userSession = args[args.length - 1];
-                        context = { userId: userSession ? userSession.userId : undefined, spaceId: userSession ? userSession.spaceId : undefined };
+                        context = { objectName: this.name, userId: userSession ? userSession.userId : undefined, spaceId: userSession ? userSession.spaceId : undefined };
                         if (method === 'find' || method === 'findOne' || method === 'count') {
                             context.query = args[args.length - 2];
                         }
@@ -1826,7 +1920,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
             args[_i - 1] = arguments[_i];
         }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var adapterMethod, allow, objectName, recordId, doc, paramRecordId, returnValue, userSession, beforeTriggerContext, afterTriggerContext, previousDoc, values;
+            var adapterMethod, allow, objectName, recordId, doc, paramRecordId, returnValue, userSession, beforeTriggerContext, afterTriggerContext, previousDoc, values, _records;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1869,7 +1963,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         return [4 /*yield*/, adapterMethod.apply(this._datasource, args)];
                     case 4:
                         returnValue = _a.sent();
-                        return [3 /*break*/, 21];
+                        return [3 /*break*/, 25];
                     case 5:
                         userSession = args[args.length - 1];
                         return [4 /*yield*/, this.getTriggerContext('before', method, args)];
@@ -1895,31 +1989,43 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         return [4 /*yield*/, adapterMethod.apply(this._datasource, args)];
                     case 10:
                         returnValue = _a.sent();
-                        if (method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline') {
-                            values = returnValue || {};
-                            if (method === 'count') {
-                                values = returnValue || 0;
-                            }
-                            Object.assign(afterTriggerContext, { data: { values: values } });
+                        if (!(method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline')) return [3 /*break*/, 14];
+                        values = returnValue || {};
+                        if (!(method === 'count')) return [3 /*break*/, 11];
+                        values = returnValue || 0;
+                        return [3 /*break*/, 13];
+                    case 11:
+                        if (!userSession) return [3 /*break*/, 13];
+                        _records = returnValue;
+                        if (method == 'findOne' && returnValue) {
+                            _records = [_records];
                         }
+                        return [4 /*yield*/, this.appendRecordPermission(_records, userSession)];
+                    case 12:
+                        _a.sent();
+                        _a.label = 13;
+                    case 13:
+                        Object.assign(afterTriggerContext, { data: { values: values } });
+                        _a.label = 14;
+                    case 14:
                         // console.log("==returnValue==", returnValue);
                         if (method == 'insert' && _.has(returnValue, '_id')) {
                             afterTriggerContext.doc = returnValue;
                             afterTriggerContext = Object.assign({}, afterTriggerContext, { id: returnValue._id });
                         }
-                        if (!(method == "update")) return [3 /*break*/, 13];
-                        if (!returnValue) return [3 /*break*/, 12];
+                        if (!(method == "update")) return [3 /*break*/, 17];
+                        if (!returnValue) return [3 /*break*/, 16];
                         afterTriggerContext.doc = returnValue;
                         return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
-                    case 11:
+                    case 15:
                         _a.sent();
-                        _a.label = 12;
-                    case 12: return [3 /*break*/, 15];
-                    case 13: return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
-                    case 14:
+                        _a.label = 16;
+                    case 16: return [3 /*break*/, 19];
+                    case 17: return [4 /*yield*/, this.runAfterTriggers(method, afterTriggerContext)];
+                    case 18:
                         _a.sent();
-                        _a.label = 15;
-                    case 15:
+                        _a.label = 19;
+                    case 19:
                         if (method === 'find' || method == 'findOne' || method == 'count' || method == 'aggregate' || method == 'aggregatePrefixalPipeline') {
                             if (_.isEmpty(afterTriggerContext.data) || (_.isEmpty(afterTriggerContext.data.values) && !_.isNumber(afterTriggerContext.data.values))) {
                                 return [2 /*return*/, returnValue];
@@ -1935,9 +2041,9 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 user_session: userSession,
                                 previous_record: afterTriggerContext.previousDoc
                             }).run()];
-                    case 16:
+                    case 20:
                         _a.sent();
-                        if (!returnValue) return [3 /*break*/, 19];
+                        if (!returnValue) return [3 /*break*/, 23];
                         if (method === "insert") {
                             // 当为insert时，上面代码执行后的doc不带_id，只能从returnValue中取
                             doc = returnValue;
@@ -1945,18 +2051,18 @@ var SteedosObjectType = /** @class */ (function (_super) {
                         }
                         // 一定要先运行公式再运行汇总，以下两个函数顺序不能反
                         return [4 /*yield*/, this.runRecordFormula(method, objectName, recordId, doc, userSession)];
-                    case 17:
+                    case 21:
                         // 一定要先运行公式再运行汇总，以下两个函数顺序不能反
                         _a.sent();
                         return [4 /*yield*/, this.runRecordSummaries(method, objectName, recordId, doc, previousDoc, userSession)];
-                    case 18:
+                    case 22:
                         _a.sent();
-                        _a.label = 19;
-                    case 19: return [4 /*yield*/, object_events_1.brokeEmitEvents(objectName, method, afterTriggerContext)];
-                    case 20:
+                        _a.label = 23;
+                    case 23: return [4 /*yield*/, object_events_1.brokeEmitEvents(objectName, method, afterTriggerContext)];
+                    case 24:
                         _a.sent();
-                        _a.label = 21;
-                    case 21: return [2 /*return*/, returnValue];
+                        _a.label = 25;
+                    case 25: return [2 /*return*/, returnValue];
                 }
             });
         });
@@ -2011,6 +2117,29 @@ var SteedosObjectType = /** @class */ (function (_super) {
             });
         });
     };
+    SteedosObjectType.prototype.getObjectPermissionFilters = function (objectPermission, userSession, isEdit) {
+        var objectPermissionFilters = [];
+        var permissionFiltersKey = 'read_filters';
+        if (isEdit) {
+            permissionFiltersKey = 'edit_filters';
+        }
+        var globalData = Object.assign({}, userSession, { now: new Date() });
+        var permissionFilters = objectPermission[permissionFiltersKey];
+        _.each(permissionFilters, function (permissionFilter) {
+            if (_.isString(permissionFilter) && util_1.isExpression(permissionFilter.trim())) {
+                try {
+                    var filters = util_1.parseSingleExpression(permissionFilter, {}, "#", globalData);
+                    if (filters && !_.isString(filters)) {
+                        objectPermissionFilters.push("(" + filters_1.formatFiltersToODataQuery(filters, userSession) + ")");
+                    }
+                }
+                catch (error) {
+                    console.error("getObjectPermissionFilters error", permissionFilter, error.message);
+                }
+            }
+        });
+        return objectPermissionFilters;
+    };
     /**
      * 把query.filters用formatFiltersToODataQuery转为odata query
      * 主要是为了把userSession中的utcOffset逻辑传入formatFiltersToODataQuery函数处理
@@ -2031,7 +2160,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
     };
     SteedosObjectType.prototype.dealWithMethodPermission = function (method, args) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var userSession, spaceId, userId, objPm, query, spaceFilter, companyFilter, ownerFilter, sharesFilter, clientFilter, filters, permissionFilters, userFilters, id, companyFilters, queryFilters, companyFilters, id, companyFilters;
+            var userSession, spaceId, userId, objPm, query, spaceFilter, companyFilter, ownerFilter, sharesFilter, objectPermissionFilters, clientFilter, filters, permissionFilters, userFilters, permissionFilters, objectPermissionEditFilters, id, companyFilters, queryFilters, companyFilters, permissionFilters, objectPermissionEditFilters, id, companyFilters;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2056,7 +2185,7 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             if (util_1.isCloudAdminSpace(spaceId)) {
                                 return [2 /*return*/];
                             }
-                            spaceFilter = void 0, companyFilter = void 0, ownerFilter = void 0, sharesFilter = void 0, clientFilter = query.filters, filters = void 0, permissionFilters = [], userFilters = [];
+                            spaceFilter = void 0, companyFilter = void 0, ownerFilter = void 0, sharesFilter = void 0, objectPermissionFilters = void 0, clientFilter = query.filters, filters = void 0, permissionFilters = [], userFilters = [];
                             if (spaceId) {
                                 spaceFilter = "(space eq '" + spaceId + "')";
                             }
@@ -2072,9 +2201,11 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             if (!objPm.viewAllRecords && !objPm.viewCompanyRecords && objPm.allowRead) { // owner
                                 ownerFilter = "(owner eq '" + userId + "')";
                             }
-                            if (!objPm.viewAllRecords) {
-                                sharesFilter = util_1.getUserObjectSharesFilters(this.name, userSession);
+                            objectPermissionFilters = this.getObjectPermissionFilters(objPm, userSession, false);
+                            if (!_.isEmpty(objectPermissionFilters)) {
+                                permissionFilters.push("(" + objectPermissionFilters.join(' or ') + ")");
                             }
+                            sharesFilter = util_1.getUserObjectSharesFilters(this.name, userSession);
                             if (!_.isEmpty(companyFilter)) {
                                 permissionFilters.push("(" + companyFilter.join(' or ') + ")");
                             }
@@ -2104,9 +2235,14 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             }
                         }
                         else if (method === 'update' || method === 'updateOne') {
-                            if (!objPm.allowEdit) {
+                            permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
+                            if (!objPm.allowEdit && _.isEmpty(permissionFilters)) {
                                 throw new Error("no " + method + " permission!");
                             }
+                            objectPermissionEditFilters = '';
+                            if (!_.isEmpty(permissionFilters)) {
+                                objectPermissionEditFilters = " or (" + permissionFilters.join(' or ') + ")";
+                            }
                             id = args[args.length - 3];
                             if (!objPm.modifyAllRecords && objPm.modifyCompanyRecords) {
                                 companyFilters = _.map(userSession.companies, function (comp) {
@@ -2114,25 +2250,36 @@ var SteedosObjectType = /** @class */ (function (_super) {
                                 }).join(' or ');
                                 if (companyFilters) {
                                     if (_.isString(id)) {
-                                        id = { filters: "(_id eq '" + id + "') and (" + companyFilters + ")" };
+                                        id = { filters: "(_id eq '" + id + "') and (" + companyFilters + objectPermissionEditFilters + ")" };
                                     }
                                     else if (_.isObject(id)) {
                                         if (id.filters && !_.isString(id.filters)) {
                                             id.filters = filters_1.formatFiltersToODataQuery(id.filters);
                                         }
-                                        id.filters = id.filters ? "(" + id.filters + ") and (" + companyFilters + ")" : "(" + companyFilters + ")";
+                                        id.filters = id.filters ? "(" + id.filters + ") and (" + companyFilters + objectPermissionEditFilters + ")" : "(" + companyFilters + objectPermissionEditFilters + ")";
                                     }
                                 }
                             }
                             else if (!objPm.modifyAllRecords && !objPm.modifyCompanyRecords && objPm.allowEdit) {
                                 if (_.isString(id)) {
-                                    id = { filters: "(_id eq '" + id + "') and (owner eq '" + userId + "')" };
+                                    id = { filters: "(_id eq '" + id + "') and (owner eq '" + userId + "' " + objectPermissionEditFilters + ")" };
+                                }
+                                else if (_.isObject(id)) {
+                                    if (id.filters && !_.isString(id.filters)) {
+                                        id.filters = filters_1.formatFiltersToODataQuery(id.filters);
+                                    }
+                                    id.filters = id.filters ? "(" + id.filters + ") and (owner eq '" + userId + "' " + objectPermissionEditFilters + ")" : "(owner eq '" + userId + "' " + objectPermissionEditFilters + ")";
+                                }
+                            }
+                            else if (objectPermissionEditFilters) {
+                                if (_.isString(id)) {
+                                    id = { filters: "(_id eq '" + id + "') and (" + objectPermissionEditFilters + ")" };
                                 }
                                 else if (_.isObject(id)) {
                                     if (id.filters && !_.isString(id.filters)) {
                                         id.filters = filters_1.formatFiltersToODataQuery(id.filters);
                                     }
-                                    id.filters = id.filters ? "(" + id.filters + ") and (owner eq '" + userId + "')" : "(owner eq '" + userId + "')";
+                                    id.filters = id.filters ? "(" + id.filters + ") and (" + objectPermissionEditFilters + ")" : "(" + objectPermissionEditFilters + ")";
                                 }
                             }
                             args[args.length - 3] = id;
@@ -2156,20 +2303,36 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             }
                         }
                         else if (method === 'delete') {
-                            if (!objPm.allowDelete) {
+                            permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
+                            if (!objPm.allowDelete && _.isEmpty(permissionFilters)) {
                                 throw new Error("no " + method + " permission!");
                             }
+                            objectPermissionEditFilters = '';
+                            if (!_.isEmpty(permissionFilters)) {
+                                objectPermissionEditFilters = " or (" + permissionFilters.join(' or ') + ")";
+                            }
                             id = args[args.length - 2];
                             if (!objPm.modifyAllRecords && objPm.modifyCompanyRecords) {
                                 companyFilters = _.map(userSession.companies, function (comp) {
                                     return "(company_id eq '" + comp._id + "') or (company_ids eq '" + comp._id + "')";
                                 }).join(' or ');
                                 if (companyFilters) {
-                                    id = { filters: "(_id eq '" + id + "') and (" + companyFilters + ")" };
+                                    id = { filters: "(_id eq '" + id + "') and (" + companyFilters + objectPermissionEditFilters + ")" };
                                 }
                             }
                             else if (!objPm.modifyAllRecords && !objPm.modifyCompanyRecords) {
-                                id = { filters: "(_id eq '" + id + "') and (owner eq '" + userId + "')" };
+                                id = { filters: "(_id eq '" + id + "') and (owner eq '" + userId + "'" + objectPermissionEditFilters + ")" };
+                            }
+                            else if (objectPermissionEditFilters) {
+                                if (_.isString(id)) {
+                                    id = { filters: "(_id eq '" + id + "') and (" + objectPermissionEditFilters + ")" };
+                                }
+                                else if (_.isObject(id)) {
+                                    if (id.filters && !_.isString(id.filters)) {
+                                        id.filters = filters_1.formatFiltersToODataQuery(id.filters);
+                                    }
+                                    id.filters = id.filters ? "(" + id.filters + ") and (" + objectPermissionEditFilters + ")" : "(" + objectPermissionEditFilters + ")";
+                                }
                             }
                             args[args.length - 2] = id;
                         }