From 4bd0dccc8d649d04e81ad0e9f2b3ee08ef1a53ca Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Mon, 19 Sep 2022 16:35:45 +0200
Subject: [PATCH] refactor(nc-gui): cancel permission check if prematurely
 caught

---
 packages/nc-gui/composables/useUIPermission/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/composables/useUIPermission/index.ts b/packages/nc-gui/composables/useUIPermission/index.ts
index 5f06758941..d29bd19689 100644
--- a/packages/nc-gui/composables/useUIPermission/index.ts
+++ b/packages/nc-gui/composables/useUIPermission/index.ts
@@ -12,11 +12,11 @@ const [setup, use] = useInjectionState(() => {
   const hasPermission = (role: Role | ProjectRole, hasRole: boolean, permission: Permission | string) => {
     const rolePermission = rolePermissions[role]
 
-    return (
-      hasRole &&
-      rolePermission &&
-      ((isString(rolePermission) && rolePermission === '*') || rolePermission[permission as keyof typeof rolePermission])
-    )
+    if (!hasRole || !rolePermission) return false
+
+    if (isString(rolePermission) && rolePermission === '*') return true
+
+    return rolePermission[permission as keyof typeof rolePermission]
   }
 
   const isUIAllowed = (permission: Permission | string, skipPreviewAs = false) => {