diff --git a/apps/application/views/application_chat.py b/apps/application/views/application_chat.py index c9175bebb..381bde9dd 100644 --- a/apps/application/views/application_chat.py +++ b/apps/application/views/application_chat.py @@ -125,8 +125,8 @@ class OpenView(APIView): responses=None, tags=[_('Application')] # type: ignore ) - @has_permissions(PermissionConstants.APPLICATION_DEBUG.get_workspace_application_permission(), - PermissionConstants.APPLICATION_DEBUG.get_workspace_permission_workspace_manage_role(), + @has_permissions(PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission(), + PermissionConstants.APPLICATION_EDIT.get_workspace_permission_workspace_manage_role(), ViewPermission([RoleConstants.USER.get_workspace_role()], [PermissionConstants.APPLICATION.get_workspace_application_permission()], CompareConstants.AND), diff --git a/apps/application/views/application_chat_record.py b/apps/application/views/application_chat_record.py index 9f7757544..934843866 100644 --- a/apps/application/views/application_chat_record.py +++ b/apps/application/views/application_chat_record.py @@ -93,8 +93,8 @@ class ApplicationChatRecordOperateAPI(APIView): ) @has_permissions(PermissionConstants.APPLICATION_CHAT_LOG_READ.get_workspace_application_permission(), PermissionConstants.APPLICATION_CHAT_LOG_READ.get_workspace_permission_workspace_manage_role(), - PermissionConstants.APPLICATION_DEBUG.get_workspace_application_permission(), - PermissionConstants.APPLICATION_DEBUG.get_workspace_permission_workspace_manage_role(), + PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission(), + PermissionConstants.APPLICATION_EDIT.get_workspace_permission_workspace_manage_role(), ViewPermission([RoleConstants.USER.get_workspace_role()], [PermissionConstants.APPLICATION.get_workspace_application_permission()], CompareConstants.AND), diff --git a/apps/common/constants/permission_constants.py b/apps/common/constants/permission_constants.py index dbd6fe913..ca86d37db 100644 --- a/apps/common/constants/permission_constants.py +++ b/apps/common/constants/permission_constants.py @@ -510,12 +510,6 @@ class PermissionConstants(Enum): parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL], resource_permission_group_list=[ResourcePermissionConst.TOOL_MANGE] ) - - TOOL_DEBUG = Permission( - group=Group.TOOL, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN, RoleConstants.USER], - parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL], - resource_permission_group_list=[ResourcePermissionConst.TOOL_MANGE] - ) TOOL_IMPORT = Permission( group=Group.TOOL, operate=Operate.IMPORT, role_list=[RoleConstants.ADMIN, RoleConstants.USER], parent_group=[WorkspaceGroup.TOOL, UserGroup.TOOL], @@ -804,16 +798,21 @@ class PermissionConstants(Enum): parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_VIEW], ) - APPLICATION_DEBUG = Permission(group=Group.APPLICATION, operate=Operate.DEBUG, - role_list=[RoleConstants.ADMIN, RoleConstants.USER], - parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], - resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE], - ) APPLICATION_CREATE = Permission(group=Group.APPLICATION, operate=Operate.CREATE, role_list=[RoleConstants.ADMIN, RoleConstants.USER], parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE], ) + APPLICATION_EDIT = Permission(group=Group.APPLICATION, operate=Operate.EDIT, + role_list=[RoleConstants.ADMIN, RoleConstants.USER], + parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], + resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE], + ) + APPLICATION_DELETE = Permission(group=Group.APPLICATION, operate=Operate.DELETE, + role_list=[RoleConstants.ADMIN, RoleConstants.USER], + parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], + resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE], + ) APPLICATION_IMPORT = Permission(group=Group.APPLICATION, operate=Operate.IMPORT, role_list=[RoleConstants.ADMIN, RoleConstants.USER], parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], @@ -824,17 +823,6 @@ class PermissionConstants(Enum): resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE], parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], ) - - APPLICATION_DELETE = Permission(group=Group.APPLICATION, operate=Operate.DELETE, - role_list=[RoleConstants.ADMIN, RoleConstants.USER], - parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], - resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE], - ) - APPLICATION_EDIT = Permission(group=Group.APPLICATION, operate=Operate.EDIT, - role_list=[RoleConstants.ADMIN, RoleConstants.USER], - parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], - resource_permission_group_list=[ResourcePermissionConst.APPLICATION_MANGE], - ) APPLICATION_RESOURCE_AUTHORIZATION = Permission(group=Group.APPLICATION, operate=Operate.AUTH, role_list=[RoleConstants.ADMIN, RoleConstants.USER], parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION], @@ -1233,20 +1221,20 @@ class PermissionConstants(Enum): group=Group.SYSTEM_RES_APPLICATION, operate=Operate.READ, role_list=[RoleConstants.ADMIN], parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE" ) - RESOURCE_APPLICATION_DEBUG = Permission( - group=Group.SYSTEM_RES_APPLICATION, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN], - parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE" - ) - RESOURCE_APPLICATION_EXPORT = Permission( - group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN], + RESOURCE_APPLICATION_EDIT = Permission( + group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN], parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE" ) RESOURCE_APPLICATION_DELETE = Permission( group=Group.SYSTEM_RES_APPLICATION, operate=Operate.DELETE, role_list=[RoleConstants.ADMIN], parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE" ) - RESOURCE_APPLICATION_EDIT = Permission( - group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EDIT, role_list=[RoleConstants.ADMIN], + RESOURCE_APPLICATION_DEBUG = Permission( + group=Group.SYSTEM_RES_APPLICATION, operate=Operate.DEBUG, role_list=[RoleConstants.ADMIN], + parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE" + ) + RESOURCE_APPLICATION_EXPORT = Permission( + group=Group.SYSTEM_RES_APPLICATION, operate=Operate.EXPORT, role_list=[RoleConstants.ADMIN], parent_group=[SystemGroup.RESOURCE_APPLICATION], is_ee=settings.edition == "EE" ) RESOURCE_APPLICATION_AUTH = Permission( diff --git a/apps/tools/views/tool.py b/apps/tools/views/tool.py index 645cfacb5..1f397d024 100644 --- a/apps/tools/views/tool.py +++ b/apps/tools/views/tool.py @@ -92,8 +92,8 @@ class ToolView(APIView): tags=[_('Tool')] # type: ignore ) @has_permissions( - PermissionConstants.TOOL_DEBUG.get_workspace_permission(), - PermissionConstants.TOOL_DEBUG.get_workspace_permission_workspace_manage_role(), + PermissionConstants.TOOL_EDIT.get_workspace_permission(), + PermissionConstants.TOOL_EDIT.get_workspace_permission_workspace_manage_role(), RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.USER.get_workspace_role() ) def post(self, request: Request, workspace_id: str): diff --git a/ui/src/permission/application/workspace.ts b/ui/src/permission/application/workspace.ts index 59d913d1a..96b8f174f 100644 --- a/ui/src/permission/application/workspace.ts +++ b/ui/src/permission/application/workspace.ts @@ -38,8 +38,8 @@ const workspace = { [ new ComplexPermission([RoleConst.USER],[PermissionConst.APPLICATION.getApplicationWorkspaceResourcePermission(source_id)],[],'AND'), RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, - PermissionConst.APPLICATION_DEBUG.getWorkspacePermissionWorkspaceManageRole, - PermissionConst.APPLICATION_DEBUG.getApplicationWorkspaceResourcePermission(source_id) + PermissionConst.APPLICATION_EDIT.getWorkspacePermissionWorkspaceManageRole, + PermissionConst.APPLICATION_EDIT.getApplicationWorkspaceResourcePermission(source_id) ], 'OR' ), diff --git a/ui/src/permission/tool/workspace.ts b/ui/src/permission/tool/workspace.ts index 197539802..5d622d73f 100644 --- a/ui/src/permission/tool/workspace.ts +++ b/ui/src/permission/tool/workspace.ts @@ -125,8 +125,8 @@ const workspace = { [ RoleConst.USER.getWorkspaceRole, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, - PermissionConst.TOOL_DEBUG.getWorkspacePermission, - PermissionConst.TOOL_DEBUG.getWorkspacePermissionWorkspaceManageRole + PermissionConst.TOOL_EDIT.getWorkspacePermission, + PermissionConst.TOOL_EDIT.getWorkspacePermissionWorkspaceManageRole ], 'OR' ), diff --git a/ui/src/utils/permission/data.ts b/ui/src/utils/permission/data.ts index 9aac7c422..d5accc044 100644 --- a/ui/src/utils/permission/data.ts +++ b/ui/src/utils/permission/data.ts @@ -133,7 +133,6 @@ const PermissionConst = { APPLICATION_CREATE: new Permission('APPLICATION:READ+CREATE'), APPLICATION_IMPORT: new Permission('APPLICATION:READ+IMPORT'), APPLICATION_SETTING: new Permission('APPLICATION:READ+SETTING'), - APPLICATION_DEBUG: new Permission('APPLICATION:READ+DEBUG'), APPLICATION_TO_CHAT: new Permission('APPLICATION:READ+TO_CHAT'), APPLICATION_OVERVIEW_READ: new Permission('APPLICATION_OVERVIEW:READ'), @@ -207,7 +206,6 @@ const PermissionConst = { TOOL_EDIT: new Permission('TOOL:READ+EDIT'), TOOL_READ: new Permission('TOOL:READ'), TOOL_DELETE: new Permission('TOOL:READ+DELETE'), - TOOL_DEBUG: new Permission('TOOL:READ+DEBUG'), TOOL_IMPORT: new Permission('TOOL:READ+IMPORT'), TOOL_EXPORT: new Permission('TOOL:READ+EXPORT'),