fix: System router permission

Author: zhanweizhang7

apps/common/constants/permission_constants.py

@@ -745,12 +745,12 @@ class PermissionConstants(Enum):
                                          parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
                                          resource_permission_group_list=[ResourcePermissionGroup.MANAGE])
 
-    APPLICATION_CHAT_USER_READ = Permission(group=Group.CHAT_USER, operate=Operate.READ,
+    APPLICATION_CHAT_USER_READ = Permission(group=Group.APPLICATION_CHAT_USER, operate=Operate.READ,
                                             role_list=[RoleConstants.ADMIN, RoleConstants.USER],
                                             parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
                                             resource_permission_group_list=[ResourcePermissionGroup.MANAGE],
                                             )
-    APPLICATION_CHAT_USER_EDIT = Permission(group=Group.CHAT_USER, operate=Operate.EDIT,
+    APPLICATION_CHAT_USER_EDIT = Permission(group=Group.APPLICATION_CHAT_USER, operate=Operate.EDIT,
                                             role_list=[RoleConstants.ADMIN, RoleConstants.USER],
                                             parent_group=[WorkspaceGroup.APPLICATION, UserGroup.APPLICATION],
                                             resource_permission_group_list=[ResourcePermissionGroup.MANAGE],
@@ -818,7 +818,6 @@ class PermissionConstants(Enum):
     CHAT_USER_READ = Permission(group=Group.CHAT_USER, operate=Operate.READ,
                                 role_list=[RoleConstants.ADMIN],
                                 parent_group=[SystemGroup.CHAT_USER],
-                                label=_('Sync users')
                                 )
     CHAT_USER_CREATE = Permission(group=Group.CHAT_USER, operate=Operate.CREATE,
                                   role_list=[RoleConstants.ADMIN],

ui/src/router/modules/application.ts

@@ -1,4 +1,4 @@
-import { PermissionConst, EditionConst, RoleConst } from '@/utils/permission/data'
+import { PermissionConst, RoleConst } from '@/utils/permission/data'
 const applicationRouter = {
   path: '/application',
   name: 'application',

ui/src/router/modules/system.ts

@@ -18,6 +18,7 @@ const systemRouter = {
         activeMenu: '/system',
         parentPath: '/system',
         parentName: 'system',
+        sameRoute:  'user',
         permission: [RoleConst.ADMIN, PermissionConst.USER_READ],
       },
       component: () => import('@/views/system/user-manage/index.vue'),
@@ -32,6 +33,7 @@ const systemRouter = {
         activeMenu: '/system',
         parentPath: '/system',
         parentName: 'system',
+        sameRoute:  'role',
         permission: [
           new ComplexPermission(
             [RoleConst.ADMIN, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole],
@@ -53,6 +55,7 @@ const systemRouter = {
         activeMenu: '/system',
         parentPath: '/system',
         parentName: 'system',
+        sameRoute:  'workspace',
         permission: [
           new ComplexPermission(
             [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN],
@@ -113,6 +116,7 @@ const systemRouter = {
         activeMenu: '/system',
         parentPath: '/system',
         parentName: 'system',
+        sameRoute:  'authorization',
       },
       component: () => import('@/views/system/resource-authorization/index.vue'),
     },
@@ -198,10 +202,11 @@ const systemRouter = {
         activeMenu: '/system',
         parentPath: '/system',
         parentName: 'system',
+        sameRoute:  'chat',
         permission: [
           new ComplexPermission(
-            [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN],
-            [PermissionConst.WORKSPACE_USER_GROUP_READ],
+            [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN],
+            [PermissionConst.WORKSPACE_CHAT_USER_READ, PermissionConst.CHAT_USER_READ],
             [EditionConst.IS_EE, EditionConst.IS_PE],
             'OR',
           ),
@@ -218,8 +223,8 @@ const systemRouter = {
             parentName: 'system',
             permission: [
               new ComplexPermission(
-                [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN],
-                [PermissionConst.WORKSPACE_CHAT_USER_READ],
+                [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN],
+                [PermissionConst.CHAT_USER_READ, PermissionConst.WORKSPACE_CHAT_USER_READ],
                 [EditionConst.IS_EE, EditionConst.IS_PE],
                 'OR',
               ),
@@ -237,8 +242,8 @@ const systemRouter = {
             parentName: 'system',
             permission: [
               new ComplexPermission(
-                [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN],
-                [PermissionConst.WORKSPACE_USER_GROUP_READ],
+                [RoleConst.WORKSPACE_MANAGE, RoleConst.ADMIN],
+                [PermissionConst.WORKSPACE_USER_GROUP_READ, PermissionConst.USER_GROUP_READ],
                 [EditionConst.IS_EE, EditionConst.IS_PE],
                 'OR',
               ),
@@ -256,7 +261,7 @@ const systemRouter = {
             parentName: 'system',
             permission: [
               new ComplexPermission(
-                [RoleConst.WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.ADMIN],
+                [RoleConst.ADMIN],
                 [PermissionConst.CHAT_USER_AUTH_READ],
                 [EditionConst.IS_EE, EditionConst.IS_PE],
                 'OR',
@@ -277,6 +282,7 @@ const systemRouter = {
         activeMenu: '/system',
         parentPath: '/system',
         parentName: 'system',
+        sameRoute:  'setting',
       },
       children: [
         {
@@ -326,6 +332,7 @@ const systemRouter = {
         activeMenu: '/system',
         parentPath: '/system',
         parentName: 'system',
+        sameRoute:  'operate',
         permission: [EditionConst.IS_PE, EditionConst.IS_EE],
       },
       component: () => import('@/views/system/operate-log/index.vue'),