github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Blackbox tests restructuring (#18122)

Browse Source 
Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Co-authored-by: ian <licitdev@gmail.com>
Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com>
This commit is contained in:
Pascal Jufer
2023-04-11 18:28:37 +02:00
committed by GitHub
parent b4e9afcc88
commit 15b91dee34
127 changed files with 324 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/utils/merge-permissions.ts
View File

@@ -16,7 +16,11 @@ export function mergePermissions(strategy: 'and' | 'or', ...permissions: Permiss
return Array.from(mergedPermissions);
}
export function mergePermission(strategy: 'and' | 'or', currentPerm: Permission, newPerm: Permission) {
export function mergePermission(
strategy: 'and' | 'or',
currentPerm: Permission,
newPerm: Permission
): Omit<Permission, 'id' | 'system'> {
const logicalKey = `_${strategy}` as keyof LogicalFilterOR | keyof LogicalFilterAND;
let permissions = currentPerm.permissions;