Merge pull request #676 from actiontech/temporary/optmize-permission

Temporary/optmize permission

Author: LZS911

packages/base/src/App.tsx

@@ -124,7 +124,7 @@ function App() {
 
   const { isDriverInfoFetched, updateDriverList } = useDbServiceDriver();
 
-  const { checkPagePermission } = usePermission();
+  const { checkPagePermission, userOperationPermissions } = usePermission();
 
   // #if [ee]
   const { syncWebTitleAndLogo } = useSystemConfig();
@@ -158,11 +158,20 @@ function App() {
       }, verifiedRoutes);
     };
 
-    if (isUserInfoFetched && isFeatureSupportFetched) {
+    if (
+      isUserInfoFetched &&
+      isFeatureSupportFetched &&
+      userOperationPermissions
+    ) {
       return filterRoutesByPermission(AuthRouterConfig);
     }
     return AuthRouterConfig;
-  }, [checkPagePermission, isFeatureSupportFetched, isUserInfoFetched]);
+  }, [
+    checkPagePermission,
+    isFeatureSupportFetched,
+    isUserInfoFetched,
+    userOperationPermissions
+  ]);
 
   const elements = useRoutes(
     token ? (AuthRouterConfigData as RouteObject[]) : unAuthRouterConfig

packages/base/src/components/ProjectTagList/index.tsx

@@ -3,19 +3,24 @@ import { BasicTag } from '@actiontech/shared';
 import { Space } from 'antd';
 import { useMemo, useState } from 'react';
 import { FlagFilled } from '@actiontech/icons';
+import { useCurrentProject } from '@actiontech/shared/lib/features';
 
 export interface ProjectTagListProps {
   projectList?: string[];
   maxDisplayCount?: number;
+  highlightCurrentProject?: boolean;
 }
 
 const ProjectTagList: React.FC<ProjectTagListProps> = ({
   projectList = [],
-  maxDisplayCount = 3
+  maxDisplayCount = 3,
+  highlightCurrentProject
 }) => {
   const { t } = useTranslation();
   const [expanded, setExpanded] = useState(false);
 
+  const { projectName } = useCurrentProject();
+
   const displayProjects = useMemo(() => {
     return expanded ? projectList : projectList.slice(0, maxDisplayCount);
   }, [expanded, projectList, maxDisplayCount]);
@@ -36,7 +41,11 @@ const ProjectTagList: React.FC<ProjectTagListProps> = ({
         <BasicTag
           style={{ height: 28 }}
           size="small"
-          color="gray"
+          color={
+            project === projectName && highlightCurrentProject
+              ? 'orange'
+              : 'gray'
+          }
           key={project}
         >
           <FlagFilled />

packages/base/src/data/ModalName.ts

@@ -2,6 +2,7 @@ export enum ModalName {
   // userCenter manage
   DMS_Add_Role = 'DMS_ADD_ROLE',
   DMS_Update_Role = 'DMS_UPDATE_ROLE',
+  DMS_Clone_Role = 'DMS_CLONE_ROLE',
 
   DMS_Add_User = 'DMS_ADD_USER',
   DMS_Update_User = 'DMS_UPDATE_USER',
@@ -14,6 +15,7 @@ export enum ModalName {
   DMS_Update_Member = 'DMS_UPDATE_MEMBER',
   DMS_Add_Member_Group = 'DMS_Add_Member_Group',
   DMS_Update_Member_Group = 'DMS_Update_Member_Group',
+  DMS_Manage_Member_Group = 'DMS_Manage_Member_Group',
 
   // project manage
   DMS_Add_Project = 'DMS_ADD_PROJECT',

packages/base/src/hooks/useOpPermission/index.tsx

@@ -1,9 +1,12 @@
 import { useCallback, useState, useMemo } from 'react';
 import { useBoolean } from 'ahooks';
 import { ResponseCode } from '@actiontech/shared/lib/enum';
-import { ListOpPermissionsFilterByTargetEnum } from '@actiontech/shared/lib/api/base/service/OpPermission/index.enum';
+import {
+  ListOpPermissionsFilterByTargetEnum,
+  ListOpPermissionsServiceEnum
+} from '@actiontech/shared/lib/api/base/service/OpPermission/index.enum';
 import { IListOpPermission } from '@actiontech/shared/lib/api/base/service/common';
-import OpPermission from '@actiontech/shared/lib/api/base/service/OpPermission';
+import { DmsApi } from '@actiontech/shared/lib/api';
 import { Select, Tooltip } from 'antd';
 
 const useOpPermission = () => {
@@ -17,9 +20,14 @@ const useOpPermission = () => {
       filterBy: ListOpPermissionsFilterByTargetEnum = ListOpPermissionsFilterByTargetEnum.all
     ) => {
       setTrue();
-      OpPermission.ListOpPermissions({
+      let service: ListOpPermissionsServiceEnum | undefined = undefined;
+      // #if [sqle && !dms]
+      service = ListOpPermissionsServiceEnum.sqle;
+      // #endif
+      DmsApi.OpPermissionService.ListOpPermissions({
         page_size: 9999,
-        filter_by_target: filterBy
+        filter_by_target: filterBy,
+        service
       })
         .then((res) => {
           if (res.data.code === ResponseCode.SUCCESS) {

packages/base/src/locale/zh-CN/dmsMember.ts

@@ -7,16 +7,24 @@ export default {
     deleteConfirmTitle: '确定要移除成员:{{name}}?',
     deleteSuccessTips: '移除成员{{name}}成功',
     columns: {
-      opRanges: '当前项目权限',
-      opRangeTips: '格式 角色: [操作范围11,操作范围2 ...]',
+      opRanges: '当前项目操作权限',
+      opRangeTips: '格式：数据源+角色',
       isProjectAdmin: '项目管理员',
+      projectManagePermissions: '当前项目管理权限',
       projects: '所属项目',
       projectsCount: '+{{count}}个项目',
-      platformRoles: '平台角色'
+      platformRoles: '平台角色',
+      sourceFromMemberGroup: '来源于 成员组{{groupName}}',
+      sourceFromDorectPermission: '来源于 直接授权',
+      permissions: '权限',
+      projectAdmin: '项目管理员',
+      partialManagePermissions: '部分管理权限',
+      noManagePermissions: '无管理权限'
     },
     allPermission: 'ALL: 拥有对所有数据源的全部操作权限',
     actions: {
-      removeMember: '移除'
+      removeMember: '移除',
+      manageMemberGroup: '管理成员组'
     }
   },
   addMember: {
@@ -30,13 +38,17 @@ export default {
   memberForm: {
     username: '用户名称',
     usernameTips: '需要先在<0>系统设置-用户中心</0>处新增用户',
-    isProjectAdmin: '项目管理权限'
+    isProjectAdmin: '是否为项目管理员',
+    projectAdminTips: '项目管理员默认拥有项目下所有管理权限',
+    managerSetter: '管理员设置',
+    projectManagementPermission: '项目管理权限',
+    projectOpPermission: '项目操作权限',
+    addProjectOpPermission: '添加项目操作权限'
   },
 
   roleSelector: {
-    role: '平台角色',
-    opRange: '操作范围',
-    addRoleAndOpRange: '添加平台角色与操作范围'
+    role: '项目角色',
+    opRange: '操作范围'
   },
 
   memberGroupList: {
@@ -47,8 +59,8 @@ export default {
     columns: {
       userGroupName: '成员组名',
       users: '用户名',
-      opRanges: '当前项目权限',
-      opRangeTips: '格式 角色: [操作范围11,操作范围2 ...]',
+      opRanges: '当前项目操作权限',
+      opRangeTips: '格式：数据源+角色',
       isProjectAdmin: '项目管理员'
     },
     allPermission: 'ALL: 拥有对所有数据源的全部操作权限'
@@ -64,5 +76,13 @@ export default {
   updateMemberGroup: {
     modalTitle: '更新成员组',
     successTips: '更新成员组{{name}}成功'
+  },
+  manageMemberGroup: {
+    modalTitle: '管理成员组',
+    editPermissions: '编辑权限',
+    exitGroup: '退出组',
+    exitGroupConfirmTitle: '确定要退出成员组"{{groupName}}"吗？',
+    exitGroupSuccess: '已退出成员组: {{name}}',
+    emptyGroup: '暂无成员组'
   }
 };

packages/base/src/locale/zh-CN/dmsUserCenter.ts

@@ -78,9 +78,11 @@ export default {
     },
     roleForm: {
       name: '角色名',
+      nameAlert: '当前基于"{{name}}"角色进行克隆，请修改角色名称',
       desc: '描述',
       opPermissions: '操作权限',
-      isDisabled: '是否禁用'
+      isDisabled: '是否禁用',
+      viewAll: '查看全部'
     },
     createRole: {
       button: '添加角色',
@@ -98,12 +100,18 @@ export default {
       deleting: '正在删除角色 "{{name}}"...',
       deleteSuccessTips: '删除角色 "{{name}}" 成功'
     },
+
+    cloneRole: {
+      modalTitle: '克隆角色',
+      createSuccessTips: '克隆角色 "{{name}}" 成功'
+    },
     opPermissionList: {
       title: '操作权限列表',
       columns: {
-        name: '操作权限名称',
-        range: '操作范围粒度',
-        desc: '描述'
+        name: '权限点',
+        range: '权限作用范围',
+        desc: '描述',
+        module: '功能模块'
       },
       rangeTypeDictionary: {
         global: '全局',

packages/base/src/page/CloudBeaver/List/index.test.tsx

@@ -58,7 +58,7 @@ describe('test base/CloudBeaver/List', () => {
         permission: {
           moduleFeatureSupport: false,
           userOperationPermissions: {
-            is_admin: true,
+            is_admin: false,
             op_permission_list: []
           }
         }

packages/base/src/page/DataSource/components/List/index.test.tsx

@@ -55,7 +55,7 @@ describe('page/DataSource/DataSourceList', () => {
         },
         permission: {
           moduleFeatureSupport: { sqlOptimization: false },
-          userOperationPermissions: { is_admin: true, op_permission_list: [] }
+          userOperationPermissions: { is_admin: false, op_permission_list: [] }
         }
       },
       routerProps: {