Merge pull request #680 from actiontech/fix/optimize-permission

LZS911 · web-flow · commit 01ce6a2bc117 · 2025-07-03T13:11:30.000+08:00
[fix](Member): Add role control to project administrator settings
diff --git a/packages/base/src/page/Member/Drawer/Member/__tests__/AddMember.test.tsx b/packages/base/src/page/Member/Drawer/Member/__tests__/AddMember.test.tsx
@@ -21,6 +21,7 @@ import { dbServices as dbServicesList } from '@actiontech/shared/lib/testUtil/mo
 import { ListMemberRoleWithOpRangeOpRangeTypeEnum } from '@actiontech/shared/lib/api/base/service/common.enum';
 import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
 import { memberProjectPermissions } from '@actiontech/shared/lib/testUtil/mockApi/base/member/data';
+import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -45,6 +46,14 @@ describe('base/Member/Drawer/AddMember', () => {
     );
     mockUseDbServiceDriver();
     mockUseCurrentProject();
+    mockUsePermission(
+      {
+        checkActionPermission: jest.fn().mockReturnValue(true)
+      },
+      {
+        useSpyOnMockHooks: true
+      }
+    );
     jest.useFakeTimers();
     addMemberSpy = member.addMember();
     listUsersSpy = userCenter.getUserList();
diff --git a/packages/base/src/page/Member/Drawer/Member/__tests__/UpdateMember.test.tsx b/packages/base/src/page/Member/Drawer/Member/__tests__/UpdateMember.test.tsx
@@ -20,6 +20,7 @@ import { selectOptionByIndex } from '@actiontech/shared/lib/testUtil/customQuery
 import { ListMemberRoleWithOpRangeOpRangeTypeEnum } from '@actiontech/shared/lib/api/base/service/common.enum';
 import { dbServices as dbServicesList } from '@actiontech/shared/lib/testUtil/mockApi/base/dbServices/data';
 import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
+import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -47,6 +48,14 @@ describe('base/Member/Drawer/UpdateMember', () => {
     );
     mockUseDbServiceDriver();
     mockUseCurrentProject();
+    mockUsePermission(
+      {
+        checkActionPermission: jest.fn().mockReturnValue(true)
+      },
+      {
+        useSpyOnMockHooks: true
+      }
+    );
     jest.useFakeTimers();
     updateMemberSpy = member.updateMember();
     listUsersSpy = userCenter.getUserList();
diff --git a/packages/base/src/page/Member/Drawer/Member/__tests__/__snapshots__/MemberForm.test.tsx.snap b/packages/base/src/page/Member/Drawer/Member/__tests__/__snapshots__/MemberForm.test.tsx.snap
@@ -165,7 +165,8 @@ exports[`base/Member/Drawer/MemberForm should match snapshot when isUpdate is fa
               >
                 <button
                   aria-checked="false"
-                  class="ant-switch basic-switch-wrapper css-g6dhbn"
+                  class="ant-switch basic-switch-wrapper css-g6dhbn ant-switch-disabled"
+                  disabled=""
                   id="isProjectAdmin"
                   role="switch"
                   type="button"
@@ -445,7 +446,8 @@ exports[`base/Member/Drawer/MemberForm should match snapshot when isUpdate is tr
               >
                 <button
                   aria-checked="false"
-                  class="ant-switch basic-switch-wrapper css-g6dhbn"
+                  class="ant-switch basic-switch-wrapper css-g6dhbn ant-switch-disabled"
+                  disabled=""
                   id="isProjectAdmin"
                   role="switch"
                   type="button"
diff --git a/packages/base/src/page/Member/Drawer/MemberGroup/__tests__/AddMemberGroup.test.tsx b/packages/base/src/page/Member/Drawer/MemberGroup/__tests__/AddMemberGroup.test.tsx
@@ -21,6 +21,7 @@ import { dbServices as dbServicesList } from '@actiontech/shared/lib/testUtil/mo
 import { ListMemberRoleWithOpRangeOpRangeTypeEnum } from '@actiontech/shared/lib/api/base/service/common.enum';
 import { memberProjectPermissions } from '@actiontech/shared/lib/testUtil/mockApi/base/member/data';
 import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
+import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -44,6 +45,14 @@ describe('base/Member/Drawer/AddMemberGroup', () => {
     );
     mockUseDbServiceDriver();
     mockUseCurrentProject();
+    mockUsePermission(
+      {
+        checkActionPermission: jest.fn().mockReturnValue(true)
+      },
+      {
+        useSpyOnMockHooks: true
+      }
+    );
     jest.useFakeTimers();
     addMemberGroupSpy = member.addMemberGroup();
     listUsersSpy = userCenter.getUserList();
diff --git a/packages/base/src/page/Member/Drawer/MemberGroup/__tests__/UpdateMemberGroup.test.tsx b/packages/base/src/page/Member/Drawer/MemberGroup/__tests__/UpdateMemberGroup.test.tsx
@@ -17,6 +17,7 @@ import {
   memberProjectPermissions
 } from '@actiontech/shared/lib/testUtil/mockApi/base/member/data';
 import { createSpySuccessResponse } from '@actiontech/shared/lib/testUtil/mockApi';
+import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -43,6 +44,14 @@ describe('base/Member/Drawer/UpdateMemberGroup', () => {
     );
     mockUseDbServiceDriver();
     mockUseCurrentProject();
+    mockUsePermission(
+      {
+        checkActionPermission: jest.fn().mockReturnValue(true)
+      },
+      {
+        useSpyOnMockHooks: true
+      }
+    );
     jest.useFakeTimers();
     updateMemberGroup = member.updateMemberGroup();
     listUsersSpy = userCenter.getUserList();
diff --git a/packages/base/src/page/Member/Drawer/MemberGroup/__tests__/__snapshots__/MemberGroupForm.test.tsx.snap b/packages/base/src/page/Member/Drawer/MemberGroup/__tests__/__snapshots__/MemberGroupForm.test.tsx.snap
@@ -188,7 +188,8 @@ exports[`base/Member/Drawer/MemberGroupForm should match snapshot when isUpdate
               >
                 <button
                   aria-checked="false"
-                  class="ant-switch basic-switch-wrapper css-g6dhbn"
+                  class="ant-switch basic-switch-wrapper css-g6dhbn ant-switch-disabled"
+                  disabled=""
                   id="isProjectAdmin"
                   role="switch"
                   type="button"
@@ -491,7 +492,8 @@ exports[`base/Member/Drawer/MemberGroupForm should match snapshot when isUpdate
               >
                 <button
                   aria-checked="false"
-                  class="ant-switch basic-switch-wrapper css-g6dhbn"
+                  class="ant-switch basic-switch-wrapper css-g6dhbn ant-switch-disabled"
+                  disabled=""
                   id="isProjectAdmin"
                   role="switch"
                   type="button"
diff --git a/packages/base/src/page/Member/components/PermissionFields.tsx b/packages/base/src/page/Member/components/PermissionFields.tsx
@@ -23,6 +23,7 @@ import {
 import { PlusCircleFilled, MinusCircleFilled } from '@actiontech/icons';
 import { ListOpPermissionsFilterByTargetEnum } from '@actiontech/shared/lib/api/base/service/OpPermission/index.enum';
 import useOpPermission from '../../../hooks/useOpPermission';
+import { usePermission, PERMISSIONS } from '@actiontech/shared/lib/features';
 
 type PermissionFieldsProps = {
   projectID: string;
@@ -33,6 +34,8 @@ const PermissionFields: React.FC<PermissionFieldsProps> = ({ projectID }) => {
 
   const isProjectAdmin = Form.useWatch('isProjectAdmin');
 
+  const { checkActionPermission } = usePermission();
+
   const {
     loading: getRoleListLoading,
     updateRoleList,
@@ -68,7 +71,13 @@ const PermissionFields: React.FC<PermissionFieldsProps> = ({ projectID }) => {
         valuePropName="checked"
         initialValue={false}
       >
-        <BasicSwitch />
+        <BasicSwitch
+          disabled={
+            !checkActionPermission(
+              PERMISSIONS.ACTIONS.BASE.MEMBER.SWITCH_PROJECT_MANAGER
+            )
+          }
+        />
       </Form.Item>
       <EmptyBox if={isProjectAdmin}>
         <Alert
diff --git a/packages/base/src/page/Member/components/__tests__/PermissionFields.test.tsx b/packages/base/src/page/Member/components/__tests__/PermissionFields.test.tsx
@@ -6,18 +6,29 @@ import dbServices from '@actiontech/shared/lib/testUtil/mockApi/base/dbServices'
 import PermissionFields from '../PermissionFields';
 import { mockProjectInfo } from '@actiontech/shared/lib/testUtil/mockHook/data';
 import { Form } from 'antd';
+import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
 
 describe('base/Member/components/PermissionFields', () => {
   let litDBServices: jest.SpyInstance;
   let listRoleSpy: jest.SpyInstance;
   let opPermissionListSpy: jest.SpyInstance;
+  const checkActionPermissionSpy = jest.fn();
 
   beforeEach(() => {
     mockUseDbServiceDriver();
     jest.useFakeTimers();
     litDBServices = dbServices.ListDBServicesTips();
     listRoleSpy = userCenter.getRoleList();
     opPermissionListSpy = userCenter.getOpPermissionsList();
+    mockUsePermission(
+      {
+        checkActionPermission: checkActionPermissionSpy
+      },
+      {
+        useSpyOnMockHooks: true
+      }
+    );
+    checkActionPermissionSpy.mockReturnValue(true);
   });
 
   afterEach(() => {
@@ -57,4 +68,18 @@ describe('base/Member/components/PermissionFields', () => {
       screen.getByText('项目管理员默认拥有项目下所有管理权限')
     ).toBeInTheDocument();
   });
+
+  it('should disable project admin switch when checkActionPermission return false', async () => {
+    checkActionPermissionSpy.mockReturnValue(false);
+
+    const { container } = superRender(
+      <Form>
+        <PermissionFields projectID={mockProjectInfo.projectID} />
+      </Form>
+    );
+    await act(async () => jest.advanceTimersByTime(3000));
+
+    const switchElement = container.querySelector('.ant-switch');
+    expect(switchElement).toHaveClass('ant-switch-disabled');
+  });
 });
diff --git a/packages/shared/lib/features/usePermission/__tests__/__snapshots__/index.test.ts.snap b/packages/shared/lib/features/usePermission/__tests__/__snapshots__/index.test.ts.snap
@@ -51,6 +51,7 @@ exports[`usePermission should match snapshot 1`] = `
         "EDIT_MEMBER": "action:edit_member",
         "EDIT_MEMBER_GROUP": "action:edit_member_group",
         "MANAGE_MEMBER_GROUP": "action:manage_member_group",
+        "SWITCH_PROJECT_MANAGER": "action:switch_project_manager",
       },
       "NAV": {
         "EDIT_SYSTEM_NOTICE": "action: edit_system_notice",
@@ -1480,6 +1481,15 @@ exports[`usePermission should match snapshot 2`] = `
     ],
     "type": "action",
   },
+  "action:switch_project_manager": {
+    "id": "action:switch_project_manager",
+    "projectManager": true,
+    "role": [
+      "admin",
+      "systemAdministrator",
+    ],
+    "type": "action",
+  },
   "action:sync_task": {
     "id": "action:sync_task",
     "role": [
diff --git a/packages/shared/lib/features/usePermission/permissionManifest.ts b/packages/shared/lib/features/usePermission/permissionManifest.ts
@@ -596,6 +596,12 @@ export const PERMISSION_MANIFEST: Record<
     projectArchived: false,
     projectPermission: OpPermissionItemOpPermissionTypeEnum.manage_member
   },
+  [PERMISSIONS.ACTIONS.BASE.MEMBER.SWITCH_PROJECT_MANAGER]: {
+    id: PERMISSIONS.ACTIONS.BASE.MEMBER.SWITCH_PROJECT_MANAGER,
+    type: 'action',
+    role: [SystemRole.admin, SystemRole.systemAdministrator],
+    projectManager: true
+  },
 
   // 数据导出
   [PERMISSIONS.ACTIONS.BASE.DATA_EXPORT.BATCH_CLOSE]: {
diff --git a/packages/shared/lib/features/usePermission/permissions.ts b/packages/shared/lib/features/usePermission/permissions.ts
@@ -106,7 +106,8 @@ export const PERMISSIONS = {
         MANAGE_MEMBER_GROUP: 'action:manage_member_group',
         ADD_MEMBER_GROUP: 'action:add_member_group',
         EDIT_MEMBER_GROUP: 'action:edit_member_group',
-        DELETE_MEMBER_GROUP: 'action:delete_member_group'
+        DELETE_MEMBER_GROUP: 'action:delete_member_group',
+        SWITCH_PROJECT_MANAGER: 'action:switch_project_manager'
       },
       DATA_EXPORT: {
         BATCH_CLOSE: 'action:data_export_batch_close',
