feat: ui hasPermission

Author: shaohuzhang1

ui/src/directives/hasPermission.ts

@@ -1,6 +1,5 @@
 import type { App } from 'vue'
 import { hasPermission } from '@/utils/permission'
-
 const display = async (el: any, binding: any) => {
   const has = hasPermission(
     binding.value?.permission || binding.value,

ui/src/router/modules/application-detail.ts

@@ -1,3 +1,6 @@
+import { ComplexPermission } from '@/utils/permission/type'
+import { PermissionConst, RoleConst } from '@/utils/permission/data'
+
 const ApplicationDetailRouter = {
   path: '/application/:id/:type',
   name: 'ApplicationDetail',
@@ -15,6 +18,10 @@ const ApplicationDetailRouter = {
         active: 'overview',
         parentPath: '/application/:id/:type',
         parentName: 'ApplicationDetail',
+        permission: [
+          PermissionConst.APPLICATION_OVERVIEW_READ.getWorkspacePermission,
+          RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
+        ],
       },
       component: () => import('@/views/application-overview/index.vue'),
     },
@@ -66,10 +73,10 @@ const ApplicationDetailRouter = {
         title: 'views.chatLog.title',
         active: 'chat-log',
         parentPath: '/application/:id/:type',
-        parentName: 'ApplicationDetail'
+        parentName: 'ApplicationDetail',
       },
-      component: () => import('@/views/chat-log/index.vue')
-    }
+      component: () => import('@/views/chat-log/index.vue'),
+    },
   ],
 }
 

ui/src/stores/modules-shared-system/theme.ts

@@ -73,7 +73,6 @@ const useUserStore = defineStore('user', {
         UserApi.getProfile()
           .then(async (ok) => {
             // this.version = ok.data?.version || '-'
-            console.log(ok)
             this.license_is_valid = ok.data.license_is_valid
             this.edition = ok.data.edition
 
@@ -91,21 +90,23 @@ const useUserStore = defineStore('user', {
           })
       })
     },
-
     getPermissions() {
       if (this.userInfo) {
-        return this.isXPack && this.XPACK_LICENSE_IS_VALID
-          ? [...this.userInfo?.permissions, 'x-pack']
-          : this.userInfo?.permissions
-      } else {
+        if (this.isEE()) {
+          return [...this.userInfo?.permissions, 'x-pack-ee']
+        } else if (this.isPE()) {
+          return [...this.userInfo?.permissions, 'x-pack-pe']
+        }
         return this.userInfo?.permissions
+      } else {
+        return []
       }
     },
     getRole() {
       if (this.userInfo) {
         return this.userInfo?.role
       } else {
-        return ''
+        return []
       }
     },
     async theme(loading?: Ref<boolean>) {

ui/src/stores/modules-shared-system/user.ts

@@ -66,3 +66,7 @@ export const defaultIcon = '/ui/favicon.ico'
 export function isAppIcon(url: string | undefined) {
   return url === defaultIcon ? '' : url
 }
+
+export function isFunction(fn: any) {
+  return typeof fn === 'function'
+}

ui/src/stores/modules/user.ts

@@ -1,7 +1,13 @@
-import { Permission } from '@/utils/permission/type'
+import { Permission, Role } from '@/utils/permission/type'
 const PermissionConst = {
   USER_READ: new Permission('USER:READ'),
   USER_CREATE: new Permission('USER:CREATE'),
   KNOWLEDGE_READ: new Permission('KNOWLEDGE:READ'),
+  APPLICATION_OVERVIEW_READ: new Permission('APPLICATION_OVERVIEW_READ'),
 }
-export default PermissionConst
+const RoleConst = {
+  ADMIN: new Role('ADMIN'),
+  WORKSPACE_MANAGE: new Role('WORKSPACE_MANAGE'),
+  USER: new Role('USER'),
+}
+export { PermissionConst, RoleConst }

ui/src/utils/common.ts

@@ -1,26 +1,33 @@
 import useStore from '@/stores'
 import { Role, Permission, ComplexPermission } from '@/utils/permission/type'
+import { isFunction } from '@/utils/common'
+
+type PF = () => Role | string | Permission | ComplexPermission
 /**
  * 是否包含当前权限
  * @param permission 当前权限
  * @returns  True 包含 false 不包含
  */
-const hasPermissionChild = (permission: Role | string | Permission | ComplexPermission) => {
+const hasPermissionChild = (permission: Role | string | Permission | ComplexPermission | PF) => {
   const { user } = useStore()
   const permissions = user.getPermissions()
-  const role = user.getRole()
+  const role: Array<string> = user.getRole()
   if (!permission) {
     return true
   }
+
+  if (isFunction(permission)) {
+    permission = (permission as PF)()
+  }
   if (permission instanceof Role) {
-    return role === permission.role
+    return role.includes(permission.role)
   }
   if (permission instanceof Permission) {
     return permissions.includes(permission.permission)
   }
   if (permission instanceof ComplexPermission) {
     const permissionOk = permission.permissionList.some((p) => permissions.includes(p))
-    const roleOk = permission.roleList.includes(role)
+    const roleOk = role.some((r) => permission.roleList.includes(r))
     return permission.compare === 'AND' ? permissionOk && roleOk : permissionOk || roleOk
   }
   if (typeof permission === 'string') {
@@ -38,11 +45,12 @@ const hasPermissionChild = (permission: Role | string | Permission | ComplexPerm
  */
 export const hasPermission = (
   permission:
-    | Array<Role | string | Permission | ComplexPermission>
+    | Array<Role | string | Permission | ComplexPermission | PF>
     | Role
     | string
     | Permission
-    | ComplexPermission,
+    | ComplexPermission
+    | PF,
   compare: 'OR' | 'AND',
 ): boolean => {
   if (permission instanceof Array) {