Skip to content

Commit 23b835f

Browse files
committed
fix: Application community permission
1 parent c2256a5 commit 23b835f

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { SourceTypeEnum } from '@/enums/common'
22
import { get_next_route } from '@/utils/permission'
33

4-
import { PermissionConst, RoleConst } from '@/utils/permission/data'
4+
import { EditionConst, PermissionConst, RoleConst } from '@/utils/permission/data'
55
import { ComplexPermission } from '@/utils/permission/type'
66

77
const ApplicationDetailRouter = {
@@ -77,15 +77,13 @@ const ApplicationDetailRouter = {
7777
permission: [
7878
() => {
7979
const to: any = get_next_route()
80-
return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[],'AND')},
81-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
82-
PermissionConst.APPLICATION_ACCESS_READ.getWorkspacePermissionWorkspaceManageRole,
83-
() => {
80+
return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[EditionConst.IS_EE, EditionConst.IS_PE],'AND')},
81+
new ComplexPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,],[PermissionConst.APPLICATION_ACCESS_READ.getWorkspacePermissionWorkspaceManageRole],[EditionConst.IS_EE, EditionConst.IS_PE],'OR'),
82+
new ComplexPermission([],[() => {
8483
const to: any = get_next_route()
8584
return PermissionConst.APPLICATION_ACCESS_READ.getApplicationWorkspaceResourcePermission(
86-
to ? to.params.id : '',
87-
)
88-
}
85+
to ? to.params.id : '',)
86+
}],[EditionConst.IS_EE, EditionConst.IS_PE],'OR'),
8987
]
9088
},
9189
component: () => import('@/views/application/ApplicationAccess.vue'),
@@ -104,14 +102,13 @@ const ApplicationDetailRouter = {
104102
permission: [
105103
() => {
106104
const to: any = get_next_route()
107-
return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[],'AND')},
108-
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
109-
PermissionConst.APPLICATION_CHAT_USER_READ.getWorkspacePermissionWorkspaceManageRole,
105+
return new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission( to ? to.params.id : '',)],[EditionConst.IS_EE, EditionConst.IS_PE],'AND')},
106+
new ComplexPermission([RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],[PermissionConst.APPLICATION_CHAT_USER_READ.getWorkspacePermissionWorkspaceManageRole],[EditionConst.IS_EE, EditionConst.IS_PE],'OR')
107+
,
110108
() => {
111109
const to: any = get_next_route()
112-
return PermissionConst.APPLICATION_CHAT_USER_READ.getApplicationWorkspaceResourcePermission(
113-
to ? to.params.id : '',
114-
)
110+
return new ComplexPermission([],[PermissionConst.APPLICATION_CHAT_USER_READ.getApplicationWorkspaceResourcePermission(
111+
to ? to.params.id : '',)],[EditionConst.IS_EE, EditionConst.IS_PE],'OR')
115112
}
116113
]
117114
},

ui/src/router/modules/knowledge.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const ModelRouter = {
66
title: 'views.knowledge.title',
77
menu: true,
88
permission: [
9-
RoleConst.ADMIN,
109
RoleConst.USER.getWorkspaceRole,
1110
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
1211
PermissionConst.KNOWLEDGE_READ.getWorkspacePermission,

ui/src/router/modules/model.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const ModelRouter = {
66
title: 'views.model.title',
77
menu: true,
88
permission: [
9-
RoleConst.ADMIN,
109
RoleConst.USER.getWorkspaceRole,
1110
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
1211
PermissionConst.MODEL_READ.getWorkspacePermission,

ui/src/router/modules/tool.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ const ModelRouter = {
66
title: 'views.tool.title',
77
menu: true,
88
permission: [
9-
RoleConst.ADMIN,
109
RoleConst.USER.getWorkspaceRole,
1110
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
1211
PermissionConst.TOOL_READ.getWorkspacePermission,

0 commit comments

Comments
 (0)