@steedos/objectql 2.1.56 → 2.1.60

package/lib/types/object.js

@@ -16,6 +16,9 @@ var object_events_1 = require("./object_events");
 var i18n_1 = require("@steedos/i18n");
 var object_layouts_1 = require("./object_layouts");
 var lodash_1 = require("lodash");
+var shareRule_1 = require("./shareRule");
+var restrictionRule_1 = require("./restrictionRule");
+var field_permission_1 = require("./field_permission");
 var clone = require('clone');
 // 主子表有层级限制，超过3层就报错，该函数判断当前对象作为主表对象往下的层级最多不越过3层，
 // 其3层指的是A-B-C-D，它们都有父子关系，A作为最顶层，该对象上不可以再创建主表子表关系字段，但是B、C、D上可以；
@@ -713,77 +716,125 @@ 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, rolesFieldsPermission, field_permissions, spaceId;
             return tslib_1.__generator(this, function (_a) {
-                if (!userSession) {
-                    throw new Error('userSession is required');
-                }
-                roles = userSession.roles;
-                objectRolesPermission = this.getObjectRolesPermission(userSession.spaceId);
-                userObjectPermission = {
-                    allowRead: false,
-                    allowCreate: false,
-                    allowEdit: false,
-                    allowDelete: false,
-                    viewAllRecords: false,
-                    modifyAllRecords: false,
-                    viewCompanyRecords: false,
-                    modifyCompanyRecords: false,
-                    allowReadFiles: null,
-                    viewAllFiles: null,
-                    allowCreateFiles: null,
-                    allowEditFiles: null,
-                    allowDeleteFiles: null,
-                    modifyAllFiles: null,
-                    disabled_list_views: null,
-                    disabled_actions: null,
-                    unreadable_fields: null,
-                    uneditable_fields: null,
-                    unrelated_objects: null
-                };
-                if (_.isEmpty(roles)) {
-                    throw new Error('not find user permission');
-                }
-                roles.forEach(function (role) {
-                    var rolePermission = objectRolesPermission[role];
-                    if (rolePermission) {
-                        _.each(userObjectPermission, function (v, k) {
-                            var _v = rolePermission[k];
-                            if (_.isBoolean(v)) {
-                                if (v === false && _v === true) {
-                                    userObjectPermission[k] = _v;
-                                }
-                            }
-                            else if (['allowReadFiles', 'viewAllFiles', 'allowCreateFiles', 'allowEditFiles', 'allowDeleteFiles', 'modifyAllFiles'].indexOf(k) > -1) {
-                                if (_.isBoolean(_v)) {
-                                    userObjectPermission[k] = _v;
-                                }
+                switch (_a.label) {
+                    case 0:
+                        if (!userSession) {
+                            throw new Error('userSession is required');
+                        }
+                        roles = userSession.roles;
+                        objectRolesPermission = this.getObjectRolesPermission(userSession.spaceId);
+                        userObjectPermission = {
+                            allowRead: false,
+                            allowCreate: false,
+                            allowEdit: false,
+                            allowDelete: false,
+                            viewAllRecords: false,
+                            modifyAllRecords: false,
+                            viewCompanyRecords: false,
+                            modifyCompanyRecords: false,
+                            allowReadFiles: null,
+                            viewAllFiles: null,
+                            allowCreateFiles: null,
+                            allowEditFiles: null,
+                            allowDeleteFiles: null,
+                            modifyAllFiles: null,
+                            disabled_list_views: null,
+                            disabled_actions: null,
+                            unreadable_fields: null,
+                            uneditable_fields: null,
+                            unrelated_objects: null,
+                            field_permissions: null,
+                        };
+                        if (_.isEmpty(roles)) {
+                            throw new Error('not find user permission');
+                        }
+                        return [4 /*yield*/, field_permission_1.FieldPermission.getObjectFieldsPermissionGroupRole(this.name)];
+                    case 1:
+                        rolesFieldsPermission = _a.sent();
+                        roles.forEach(function (role) {
+                            var rolePermission = objectRolesPermission[role];
+                            if (rolePermission) {
+                                var roleFieldsPermission_1 = rolesFieldsPermission[role];
+                                _.each(userObjectPermission, function (v, k) {
+                                    var _v = rolePermission[k];
+                                    if (k === 'field_permissions') {
+                                        _v = roleFieldsPermission_1;
+                                    }
+                                    if (_.isBoolean(v)) {
+                                        if (v === false && _v === true) {
+                                            userObjectPermission[k] = _v;
+                                        }
+                                    }
+                                    else if (['allowReadFiles', 'viewAllFiles', 'allowCreateFiles', 'allowEditFiles', 'allowDeleteFiles', 'modifyAllFiles'].indexOf(k) > -1) {
+                                        if (_.isBoolean(_v)) {
+                                            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 = [];
+                                        }
+                                        if (_.isNull(v)) {
+                                            userObjectPermission[k] = _v;
+                                        }
+                                        else {
+                                            if (k === 'field_permissions') {
+                                                userObjectPermission[k] = _.union(v, _v);
+                                            }
+                                            else {
+                                                userObjectPermission[k] = _.intersection(v, _v);
+                                            }
+                                        }
+                                    }
+                                });
                             }
-                            else if ((_.isArray(v) || _.isNull(v))) {
-                                if (!_.isArray(_v)) {
-                                    _v = [];
-                                }
-                                if (_.isNull(v)) {
-                                    userObjectPermission[k] = _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 {
-                                    userObjectPermission[k] = _.intersection(v, _v);
+                                    field_permissions[field] = {
+                                        field: field,
+                                        read: edit || read,
+                                        edit: edit
+                                    };
                                 }
-                            }
-                        });
-                    }
-                });
-                userObjectPermission.disabled_list_views = userObjectPermission.disabled_list_views || [];
-                userObjectPermission.disabled_actions = userObjectPermission.disabled_actions || [];
-                userObjectPermission.unreadable_fields = userObjectPermission.unreadable_fields || [];
-                userObjectPermission.uneditable_fields = userObjectPermission.uneditable_fields || [];
-                userObjectPermission.unrelated_objects = userObjectPermission.unrelated_objects || [];
-                spaceId = userSession.spaceId;
-                if (util_1.isTemplateSpace(spaceId)) {
-                    return [2 /*return*/, Object.assign({}, userObjectPermission, { allowRead: true, viewAllRecords: true, viewCompanyRecords: true })];
+                            });
+                        }
+                        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 || [];
+                        userObjectPermission.uneditable_fields = userObjectPermission.uneditable_fields || [];
+                        userObjectPermission.unrelated_objects = userObjectPermission.unrelated_objects || [];
+                        spaceId = userSession.spaceId;
+                        if (util_1.isTemplateSpace(spaceId)) {
+                            return [2 /*return*/, Object.assign({}, userObjectPermission, { allowRead: true, viewAllRecords: true, viewCompanyRecords: true })];
+                        }
+                        return [2 /*return*/, userObjectPermission];
                 }
-                Creator.processPermissions(userObjectPermission);
-                return [2 /*return*/, userObjectPermission];
             });
         });
     };
@@ -1284,7 +1335,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:
@@ -1384,6 +1435,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();
@@ -1738,6 +1806,29 @@ var SteedosObjectType = /** @class */ (function (_super) {
             });
         });
     };
+    // private async appendRecordPermission(records, userSession) {
+    //     const _ids = _.pluck(records, '_id');
+    //     const objPm = await this.getUserObjectPermission(userSession);
+    //     const permissionFilters = this.getObjectPermissionFilters(objPm, userSession, true);
+    //     if (_.isEmpty(permissionFilters)) {
+    //         return;
+    //     }
+    //     const filters = formatFiltersToODataQuery(['_id', 'in', _ids])
+    //     const results = await this.directFind({
+    //         fields: ['_id'],
+    //         filters: `(${filters}) and (${permissionFilters.join(' or ')})`
+    //     });
+    //     const allowEditIds = _.pluck(results, '_id');
+    //     _.each(records, (record) => {
+    //         if (_.include(allowEditIds, record._id)) {
+    //             record.record_permissions = {
+    //                 allowRead: true,
+    //                 allowEdit: true,
+    //                 allowDelete: true,
+    //             }
+    //         }
+    //     })
+    // }
     SteedosObjectType.prototype.getTriggerContext = function (when, method, args, recordId) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var userSession, context, _a;
@@ -1901,6 +1992,15 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             if (method === 'count') {
                                 values = returnValue || 0;
                             }
+                            // else{
+                            //     if (userSession) {
+                            //         let _records = returnValue
+                            //         if (method == 'findOne' && returnValue) {
+                            //             _records = [_records]
+                            //         }
+                            //         await this.appendRecordPermission(_records, userSession);
+                            //     }
+                            // }
                             Object.assign(afterTriggerContext, { data: { values: values } });
                         }
                         // console.log("==returnValue==", returnValue);
@@ -2012,6 +2112,28 @@ var SteedosObjectType = /** @class */ (function (_super) {
             });
         });
     };
+    // private getObjectPermissionFilters(objectPermission, userSession, isEdit) {
+    //     const objectPermissionFilters = [];
+    //     let permissionFiltersKey = 'read_filters';
+    //     if (isEdit) {
+    //         permissionFiltersKey = 'edit_filters';
+    //     }
+    //     const globalData = Object.assign({}, userSession, { now: new Date() });
+    //     let permissionFilters = objectPermission[permissionFiltersKey];
+    //     _.each(permissionFilters, (permissionFilter) => {
+    //         if (_.isString(permissionFilter) && isExpression(permissionFilter.trim())) {
+    //             try {
+    //                 const filters = parseSingleExpression(permissionFilter, {}, "#", globalData);
+    //                 if (filters && !_.isString(filters)) {
+    //                     objectPermissionFilters.push(`(${formatFiltersToODataQuery(filters, userSession)})`)
+    //                 }
+    //             } catch (error) {
+    //                 console.error(`getObjectPermissionFilters error`, permissionFilter, error.message);
+    //             }
+    //         }
+    //     })
+    //     return objectPermissionFilters;
+    // }
     /**
      * 把query.filters用formatFiltersToODataQuery转为odata query
      * 主要是为了把userSession中的utcOffset逻辑传入formatFiltersToODataQuery函数处理
@@ -2032,82 +2154,102 @@ 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, shareRuleFilters, restrictionRuleFilters, 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:
                         userSession = args[args.length - 1];
-                        if (!userSession) return [3 /*break*/, 2];
+                        if (!userSession) return [3 /*break*/, 5];
                         spaceId = userSession.spaceId;
                         userId = userSession.userId;
                         return [4 /*yield*/, this.getUserObjectPermission(userSession)];
                     case 1:
                         objPm = _a.sent();
-                        if (method === 'find' || method === 'count' || method === 'findOne' || method === 'aggregate' || method === 'aggregatePrefixalPipeline') {
-                            query = args[args.length - 2];
-                            if (method === 'aggregate' || method === 'aggregatePrefixalPipeline') {
-                                query = args[args.length - 3];
-                            }
-                            if (query.filters && !_.isString(query.filters)) {
-                                query.filters = filters_1.formatFiltersToODataQuery(query.filters);
-                            }
-                            if (this.table_name == 'cfs.files.filerecord' || this.table_name == 'cfs.instances.filerecord') {
-                                return [2 /*return*/];
-                            }
-                            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 = [];
-                            if (spaceId) {
-                                spaceFilter = "(space eq '" + spaceId + "')";
-                            }
-                            if (spaceId && !objPm.viewAllRecords && objPm.viewCompanyRecords) { // 公司级
-                                if (_.isEmpty(userSession.companies)) {
-                                    console.log('objPm', objPm);
-                                    throw new Error("user not belong any company!");
-                                }
-                                companyFilter = _.map(userSession.companies, function (comp) {
-                                    return "(company_id eq '" + comp._id + "') or (company_ids eq '" + comp._id + "')";
-                                });
-                            }
-                            if (!objPm.viewAllRecords && !objPm.viewCompanyRecords && objPm.allowRead) { // owner
-                                ownerFilter = "(owner eq '" + userId + "')";
-                            }
-                            if (!objPm.viewAllRecords) {
-                                sharesFilter = util_1.getUserObjectSharesFilters(this.name, userSession);
-                            }
-                            if (!_.isEmpty(companyFilter)) {
-                                permissionFilters.push("(" + companyFilter.join(' or ') + ")");
-                            }
-                            if (ownerFilter) {
-                                permissionFilters.push(ownerFilter);
-                            }
-                            if (!_.isEmpty(sharesFilter)) {
-                                permissionFilters.push("(" + sharesFilter.join(' or ') + ")");
-                            }
-                            if (clientFilter) {
-                                userFilters.push(clientFilter);
-                            }
-                            if (spaceFilter) {
-                                userFilters.push(spaceFilter);
-                            }
-                            if (!userSession.is_space_admin && !_.isEmpty(permissionFilters)) {
-                                filters = permissionFilters.join(' or ');
-                            }
-                            if (!_.isEmpty(userFilters)) {
-                                filters = filters ? "(" + filters + ") and (" + userFilters.join(' and ') + ")" : userFilters.join(' and ');
+                        if (!(method === 'find' || method === 'count' || method === 'findOne' || method === 'aggregate' || method === 'aggregatePrefixalPipeline')) return [3 /*break*/, 4];
+                        query = args[args.length - 2];
+                        if (method === 'aggregate' || method === 'aggregatePrefixalPipeline') {
+                            query = args[args.length - 3];
+                        }
+                        if (query.filters && !_.isString(query.filters)) {
+                            query.filters = filters_1.formatFiltersToODataQuery(query.filters);
+                        }
+                        if (this.table_name == 'cfs.files.filerecord' || this.table_name == 'cfs.instances.filerecord') {
+                            return [2 /*return*/];
+                        }
+                        if (util_1.isCloudAdminSpace(spaceId)) {
+                            return [2 /*return*/];
+                        }
+                        spaceFilter = void 0, companyFilter = void 0, ownerFilter = void 0, sharesFilter = void 0, shareRuleFilters = void 0, restrictionRuleFilters = void 0, clientFilter = query.filters, filters = void 0, permissionFilters = [], userFilters = [];
+                        if (spaceId) {
+                            spaceFilter = "(space eq '" + spaceId + "')";
+                        }
+                        if (spaceId && !objPm.viewAllRecords && objPm.viewCompanyRecords) { // 公司级
+                            if (_.isEmpty(userSession.companies)) {
+                                console.log('objPm', objPm);
+                                throw new Error("user not belong any company!");
                             }
-                            query.filters = filters;
+                            companyFilter = _.map(userSession.companies, function (comp) {
+                                return "(company_id eq '" + comp._id + "') or (company_ids eq '" + comp._id + "')";
+                            });
+                        }
+                        if (!objPm.viewAllRecords && !objPm.viewCompanyRecords && objPm.allowRead) { // owner
+                            ownerFilter = "(owner eq '" + userId + "')";
+                        }
+                        return [4 /*yield*/, shareRule_1.ShareRules.getUserObjectFilters(this.name, userSession)];
+                    case 2:
+                        shareRuleFilters = _a.sent();
+                        if (!_.isEmpty(shareRuleFilters)) {
+                            permissionFilters.push("(" + shareRuleFilters.join(' or ') + ")");
+                        }
+                        return [4 /*yield*/, restrictionRule_1.RestrictionRule.getUserObjectFilters(this.name, userSession)];
+                    case 3:
+                        restrictionRuleFilters = _a.sent();
+                        if (!_.isEmpty(restrictionRuleFilters)) {
+                            userFilters.push("(" + restrictionRuleFilters.join(' or ') + ")");
+                        }
+                        // 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(' and ') + ")");
+                        }
+                        if (ownerFilter) {
+                            permissionFilters.push(ownerFilter);
+                        }
+                        if (!_.isEmpty(sharesFilter)) {
+                            permissionFilters.push("(" + sharesFilter.join(' or ') + ")");
+                        }
+                        if (clientFilter) {
+                            userFilters.push(clientFilter);
                         }
-                        else if (method === 'insert') {
+                        if (spaceFilter) {
+                            userFilters.push(spaceFilter);
+                        }
+                        if (!userSession.is_space_admin && !_.isEmpty(permissionFilters)) {
+                            filters = permissionFilters.join(' or ');
+                        }
+                        if (!_.isEmpty(userFilters)) {
+                            filters = filters ? "(" + filters + ") and (" + userFilters.join(' and ') + ")" : userFilters.join(' and ');
+                        }
+                        query.filters = filters;
+                        return [3 /*break*/, 5];
+                    case 4:
+                        if (method === 'insert') {
                             if (!objPm.allowCreate) {
                                 throw new Error("no " + method + " permission!");
                             }
                         }
                         else if (method === 'update' || method === 'updateOne') {
-                            if (!objPm.allowEdit) {
+                            permissionFilters = null;
+                            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) {
@@ -2115,25 +2257,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 + "')" : "(owner eq '" + userId + "')";
+                                    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 (" + objectPermissionEditFilters + ")" : "(" + objectPermissionEditFilters + ")";
                                 }
                             }
                             args[args.length - 3] = id;
@@ -2157,25 +2310,41 @@ var SteedosObjectType = /** @class */ (function (_super) {
                             }
                         }
                         else if (method === 'delete') {
-                            if (!objPm.allowDelete) {
+                            permissionFilters = null;
+                            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;
                         }
-                        _a.label = 2;
-                    case 2: return [2 /*return*/];
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });