diff --git a/apps/api/src/app/access/access.controller.ts b/apps/api/src/app/access/access.controller.ts index 8ac276fb3..9aca159d8 100644 --- a/apps/api/src/app/access/access.controller.ts +++ b/apps/api/src/app/access/access.controller.ts @@ -42,25 +42,27 @@ export class AccessController { where: { userId: this.request.user.id } }); - return accessesWithGranteeUser.map((access) => { - if (access.GranteeUser) { + return accessesWithGranteeUser.map( + ({ alias, GranteeUser, id, permissions }) => { + if (GranteeUser) { + return { + alias, + id, + permissions, + grantee: GranteeUser?.id, + type: 'PRIVATE' + }; + } + return { - alias: access.alias, - grantee: access.GranteeUser?.id, - id: access.id, - permissions: access.permissions, - type: 'RESTRICTED_VIEW' + alias, + id, + permissions, + grantee: 'Public', + type: 'PUBLIC' }; } - - return { - alias: access.alias, - grantee: 'Public', - id: access.id, - permissions: access.permissions, - type: 'PUBLIC' - }; - }); + ); } @HasPermission(permissions.createAccess) diff --git a/apps/client/src/app/components/access-table/access-table.component.html b/apps/client/src/app/components/access-table/access-table.component.html index 89e69a016..8112ca4ad 100644 --- a/apps/client/src/app/components/access-table/access-table.component.html +++ b/apps/client/src/app/components/access-table/access-table.component.html @@ -22,7 +22,7 @@ View } @else if (element.permissions.includes('READ_RESTRICTED')) { - Restricted View + Restricted view } diff --git a/libs/common/src/lib/interfaces/access.interface.ts b/libs/common/src/lib/interfaces/access.interface.ts index d98a2739a..cfed7bde6 100644 --- a/libs/common/src/lib/interfaces/access.interface.ts +++ b/libs/common/src/lib/interfaces/access.interface.ts @@ -4,6 +4,6 @@ export interface Access { alias?: string; grantee?: string; id: string; - type: 'PRIVATE' | 'PUBLIC' | 'RESTRICTED_VIEW'; permissions: AccessPermission[]; + type: 'PRIVATE' | 'PUBLIC'; }