Skip to content

Commit 6a01457

Browse files
zhanweizhang7zhanweizhang7
committed
feat: Remove debug permission
1 parent f77ad75 commit 6a01457

File tree

7 files changed

+28
-42
lines changed

7 files changed

+28
-42
lines changed

‎apps/application/views/application_chat.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ class OpenView(APIView):
125125
responses=None,
126126
tags=[_('Application')] # type: ignore
127127
)
128-
@has_permissions(PermissionConstants.APPLICATION_DEBUG.get_workspace_application_permission(),
129-
PermissionConstants.APPLICATION_DEBUG.get_workspace_permission_workspace_manage_role(),
128+
@has_permissions(PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission(),
129+
PermissionConstants.APPLICATION_EDIT.get_workspace_permission_workspace_manage_role(),
130130
ViewPermission([RoleConstants.USER.get_workspace_role()],
131131
[PermissionConstants.APPLICATION.get_workspace_application_permission()],
132132
CompareConstants.AND),

‎apps/application/views/application_chat_record.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ class ApplicationChatRecordOperateAPI(APIView):
9393
)
9494
@has_permissions(PermissionConstants.APPLICATION_CHAT_LOG_READ.get_workspace_application_permission(),
9595
PermissionConstants.APPLICATION_CHAT_LOG_READ.get_workspace_permission_workspace_manage_role(),
96-
PermissionConstants.APPLICATION_DEBUG.get_workspace_application_permission(),
97-
PermissionConstants.APPLICATION_DEBUG.get_workspace_permission_workspace_manage_role(),
96+
PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission(),
97+
PermissionConstants.APPLICATION_EDIT.get_workspace_permission_workspace_manage_role(),
9898
ViewPermission([RoleConstants.USER.get_workspace_role()],
9999
[PermissionConstants.APPLICATION.get_workspace_application_permission()],
100100
CompareConstants.AND),

‎apps/common/constants/permission_constants.py‎

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,6 @@ class PermissionConstants(Enum):
510510
parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL],
511511
resource_permission_group_list=[ResourcePermissionConst.TOOL_MANGE]
512512
)
513-
514-
TOOL_DEBUG = Permission(
515-
group=Group.TOOL, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
516-
parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL],
517-
resource_permission_group_list=[ResourcePermissionConst.TOOL_MANGE]
518-
)
519513
TOOL_IMPORT = Permission(
520514
group=Group.TOOL, operate=Operate.IMPORT, role_list=[RoleConstants.ADMIN, RoleConstants.USER],
521515
parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL],
@@ -804,16 +798,21 @@ class PermissionConstants(Enum):
804798
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
805799
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW],
806800
)
807-
APPLICATION_DEBUG = Permission(group=Group.APPLICATION, operate=Operate.DEBUG,
808-
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
809-
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
810-
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
811-
)
812801
APPLICATION_CREATE = Permission(group=Group.APPLICATION, operate=Operate.CREATE,
813802
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
814803
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
815804
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
816805
)
806+
APPLICATION_EDIT = Permission(group=Group.APPLICATION, operate=Operate.EDIT,
807+
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
808+
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
809+
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
810+
)
811+
APPLICATION_DELETE = Permission(group=Group.APPLICATION, operate=Operate.DELETE,
812+
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
813+
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
814+
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
815+
)
817816
APPLICATION_IMPORT = Permission(group=Group.APPLICATION, operate=Operate.IMPORT,
818817
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
819818
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
@@ -824,17 +823,6 @@ class PermissionConstants(Enum):
824823
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
825824
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
826825
)
827-
828-
APPLICATION_DELETE = Permission(group=Group.APPLICATION, operate=Operate.DELETE,
829-
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
830-
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
831-
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
832-
)
833-
APPLICATION_EDIT = Permission(group=Group.APPLICATION, operate=Operate.EDIT,
834-
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
835-
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
836-
resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE],
837-
)
838826
APPLICATION_RESOURCE_AUTHORIZATION = Permission(group=Group.APPLICATION, operate=Operate.AUTH,
839827
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
840828
parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
@@ -1233,20 +1221,20 @@ class PermissionConstants(Enum):
12331221
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.READ, role_list=[RoleConstants.ADMIN],
12341222
parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE"
12351223
)
1236-
RESOURCE_APPLICATION_DEBUG = Permission(
1237-
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN],
1238-
parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE"
1239-
)
1240-
RESOURCE_APPLICATION_EXPORT = Permission(
1241-
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN],
1224+
RESOURCE_APPLICATION_EDIT = Permission(
1225+
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN],
12421226
parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE"
12431227
)
12441228
RESOURCE_APPLICATION_DELETE = Permission(
12451229
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN],
12461230
parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE"
12471231
)
1248-
RESOURCE_APPLICATION_EDIT = Permission(
1249-
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN],
1232+
RESOURCE_APPLICATION_DEBUG = Permission(
1233+
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN],
1234+
parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE"
1235+
)
1236+
RESOURCE_APPLICATION_EXPORT = Permission(
1237+
group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN],
12501238
parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE"
12511239
)
12521240
RESOURCE_APPLICATION_AUTH = Permission(

‎apps/tools/views/tool.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ class Debug(APIView):
9292
tags=[_('Tool')] # type: ignore
9393
)
9494
@has_permissions(
95-
PermissionConstants.TOOL_DEBUG.get_workspace_permission(),
96-
PermissionConstants.TOOL_DEBUG.get_workspace_permission_workspace_manage_role(),
95+
PermissionConstants.TOOL_EDIT.get_workspace_permission(),
96+
PermissionConstants.TOOL_EDIT.get_workspace_permission_workspace_manage_role(),
9797
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role()
9898
)
9999
def post(self, request: Request, workspace_id: str):

‎ui/src/permission/application/workspace.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ const workspace = {
3838
[
3939
new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'),
4040
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
41-
PermissionConst.APPLICATION_DEBUG.getWorkspacePermissionWorkspaceManageRole,
42-
PermissionConst.APPLICATION_DEBUG.getApplicationWorkspaceResourcePermission(source_id)
41+
PermissionConst.APPLICATION_EDIT.getWorkspacePermissionWorkspaceManageRole,
42+
PermissionConst.APPLICATION_EDIT.getApplicationWorkspaceResourcePermission(source_id)
4343
],
4444
'OR'
4545
),

‎ui/src/permission/tool/workspace.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ const workspace = {
125125
[
126126
RoleConst.USER.getWorkspaceRole,
127127
RoleConst.WORKSPACE_MANAGE.getWorkspaceRole,
128-
PermissionConst.TOOL_DEBUG.getWorkspacePermission,
129-
PermissionConst.TOOL_DEBUG.getWorkspacePermissionWorkspaceManageRole
128+
PermissionConst.TOOL_EDIT.getWorkspacePermission,
129+
PermissionConst.TOOL_EDIT.getWorkspacePermissionWorkspaceManageRole
130130
],
131131
'OR'
132132
),

‎ui/src/utils/permission/data.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ const PermissionConst = {
133133
APPLICATION_CREATE: new Permission('APPLICATION:READ+CREATE'),
134134
APPLICATION_IMPORT: new Permission('APPLICATION:READ+IMPORT'),
135135
APPLICATION_SETTING: new Permission('APPLICATION:READ+SETTING'),
136-
APPLICATION_DEBUG: new Permission('APPLICATION:READ+DEBUG'),
137136
APPLICATION_TO_CHAT: new Permission('APPLICATION:READ+TO_CHAT'),
138137

139138
APPLICATION_OVERVIEW_READ: new Permission('APPLICATION_OVERVIEW:READ'),
@@ -207,7 +206,6 @@ const PermissionConst = {
207206
TOOL_EDIT: new Permission('TOOL:READ+EDIT'),
208207
TOOL_READ: new Permission('TOOL:READ'),
209208
TOOL_DELETE: new Permission('TOOL:READ+DELETE'),
210-
TOOL_DEBUG: new Permission('TOOL:READ+DEBUG'),
211209
TOOL_IMPORT: new Permission('TOOL:READ+IMPORT'),
212210
TOOL_EXPORT: new Permission('TOOL:READ+EXPORT'),
213211

0 commit comments

Comments
 (0)