Refactoring

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)

apps/client/src/app/components/access-table/access-table.component.html

@@ -22,7 +22,7 @@
           <ng-container i18n>View</ng-container>
         } @else if (element.permissions.includes('READ_RESTRICTED')) {
           <ion-icon class="mr-1" name="lock-closed-outline" />
-          <ng-container i18n>Restricted View</ng-container>
+          <ng-container i18n>Restricted view</ng-container>
         }
       </div>
     </td>

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';
 }