Merge pull request #694 from actiontech/fix/issue-2439

LZS911 · web-flow · commit a5c19041af60 · 2025-07-30T10:15:56.000+08:00
[fix](SqlManagement): SQL operations can be performed when the user is assignees
diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap
@@ -12962,7 +12962,7 @@ exports[`page/SqlManagement/SQLEEIndex render table with permissions 2`] = `
                           style="width: 200px;"
                         />
                         <col
-                          style="width: 110px;"
+                          style="width: 246px;"
                         />
                       </colgroup>
                       <tbody
@@ -14098,7 +14098,7 @@ exports[`page/SqlManagement/SQLEEIndex render table with permissions 3`] = `
                           style="width: 200px;"
                         />
                         <col
-                          style="width: 110px;"
+                          style="width: 246px;"
                         />
                       </colgroup>
                       <tbody
diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/actions.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/actions.tsx
@@ -3,12 +3,14 @@ import { ModalName } from '../../../../data/ModalName';
 import { ISqlManage } from '@actiontech/shared/lib/api/sqle/service/common';
 import { SupportLanguage } from '@actiontech/shared/lib/enum';
 import {
-  ActiontechTableActionsWithPermissions,
   PERMISSIONS,
-  PermissionsConstantType,
-  ActiontechTableToolbarActionWithPermissions
+  PermissionsConstantType
 } from '@actiontech/shared/lib/features';
 import { ACTIONTECH_TABLE_ACTION_BUTTON_WIDTH } from '@actiontech/shared/lib/components/ActiontechTable/hooks/useTableAction';
+import {
+  ActiontechTableActionsConfig,
+  ActiontechTableToolbarActionMeta
+} from '@actiontech/shared';
 
 export const SqlManagementRowAction = (
   openModal: (name: ModalName, row?: ISqlManage) => void,
@@ -19,19 +21,13 @@ export const SqlManagementRowAction = (
   checkActionPermission: (
     requiredPermission: PermissionsConstantType
   ) => boolean,
-  onPushToCoding: (batch: boolean, record?: ISqlManage) => void
-): ActiontechTableActionsWithPermissions<ISqlManage> => {
+  onPushToCoding: (batch: boolean, record?: ISqlManage) => void,
+  username: string
+): ActiontechTableActionsConfig<ISqlManage> => {
   const getWidth = () => {
-    if (
-      checkActionPermission(
-        PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.ACTION_LAYOUT
-      )
-    ) {
-      return language === SupportLanguage.enUS
-        ? 350
-        : ACTIONTECH_TABLE_ACTION_BUTTON_WIDTH * 3;
-    }
-    return 110;
+    return language === SupportLanguage.enUS
+      ? 350
+      : ACTIONTECH_TABLE_ACTION_BUTTON_WIDTH * 3;
   };
 
   return {
@@ -47,7 +43,15 @@ export const SqlManagementRowAction = (
             }
           };
         },
-        permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.ASSIGNMENT
+        permissions: (record) => {
+          return (
+            (checkActionPermission(
+              PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.ASSIGNMENT
+            ) ||
+              record?.assignees?.includes(username)) ??
+            false
+          );
+        }
       },
       {
         text: t('sqlManagement.table.action.single.updateStatus.triggerText'),
@@ -59,7 +63,15 @@ export const SqlManagementRowAction = (
             }
           };
         },
-        permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.UPDATE_STATUS
+        permissions: (record) => {
+          return (
+            (checkActionPermission(
+              PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.UPDATE_STATUS
+            ) ||
+              record?.assignees?.includes(username)) ??
+            false
+          );
+        }
       }
     ],
     moreButtons: [
@@ -69,7 +81,15 @@ export const SqlManagementRowAction = (
         onClick: (record) => {
           openModal(ModalName.Change_SQL_Priority, record);
         },
-        permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.UPDATE_PRIORITY
+        permissions: (record) => {
+          return (
+            (checkActionPermission(
+              PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.UPDATE_PRIORITY
+            ) ||
+              record?.assignees?.includes(username)) ??
+            false
+          );
+        }
       },
       {
         text: t('sqlManagement.table.action.analyze'),
@@ -84,22 +104,35 @@ export const SqlManagementRowAction = (
         onClick: (record) => {
           openCreateSqlManagementExceptionModal(record);
         },
-        permissions:
-          PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.CREATE_SQL_EXCEPTION
+        permissions: () =>
+          checkActionPermission(
+            PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.CREATE_SQL_EXCEPTION
+          )
       },
       {
         text: t('sqlManagement.table.action.createWhitelist'),
         key: 'create-whitelist',
         onClick: (record) => {
           onCreateWhitelist(record);
         },
-        permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.CREATE_WHITE_LIST
+        permissions: () =>
+          checkActionPermission(
+            PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.CREATE_WHITE_LIST
+          )
       },
       {
         key: 'push-to-coding',
         text: t('sqlManagement.table.action.batch.pushToCoding'),
         onClick: (record) => onPushToCoding(false, record),
-        permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.PUSH_TO_CODING
+        permissions: (record) => {
+          return (
+            (checkActionPermission(
+              PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.PUSH_TO_CODING
+            ) ||
+              record?.assignees?.includes(username)) ??
+            false
+          );
+        }
       }
     ]
   };
@@ -116,8 +149,12 @@ export const SqlManagementTableToolbarActions = (
   isHighPriority: boolean,
   setAssigneeSelf: (value: boolean) => void,
   setIsHighPriority: (value: boolean) => void,
-  onPushToCoding: (batch: boolean, record?: ISqlManage) => void
-): ActiontechTableToolbarActionWithPermissions => {
+  onPushToCoding: (batch: boolean, record?: ISqlManage) => void,
+  isCertainAssignees: boolean,
+  checkActionPermission: (
+    requiredPermission: PermissionsConstantType
+  ) => boolean
+): ActiontechTableToolbarActionMeta[] => {
   return [
     {
       key: 'is-high-priority',
@@ -148,7 +185,10 @@ export const SqlManagementTableToolbarActions = (
           onBatchAssignment();
         }
       },
-      permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.BATCH_ASSIGNMENT
+      permissions:
+        checkActionPermission(
+          PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.BATCH_ASSIGNMENT
+        ) || isCertainAssignees
     },
     {
       key: 'batch-solve',
@@ -163,7 +203,10 @@ export const SqlManagementTableToolbarActions = (
           disabled: batchSolveLoading
         }
       },
-      permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.BATCH_RESOLVE
+      permissions:
+        checkActionPermission(
+          PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.BATCH_RESOLVE
+        ) || isCertainAssignees
     },
     {
       key: 'batch-ignore',
@@ -178,7 +221,10 @@ export const SqlManagementTableToolbarActions = (
           disabled: batchIgnoreLoading
         }
       },
-      permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.BATCH_IGNORE
+      permissions:
+        checkActionPermission(
+          PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.BATCH_IGNORE
+        ) || isCertainAssignees
     },
     {
       key: 'push-to-coding',
@@ -187,7 +233,10 @@ export const SqlManagementTableToolbarActions = (
         disabled,
         onClick: () => onPushToCoding(true)
       },
-      permissions: PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.PUSH_TO_CODING
+      permissions:
+        checkActionPermission(
+          PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.PUSH_TO_CODING
+        ) || isCertainAssignees
     }
   ];
 };
diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.test.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.test.tsx
@@ -840,4 +840,43 @@ describe('page/SqlManagement/SQLEEIndex', () => {
     expect(getBySelector('.ant-alert-warning')).toBeInTheDocument();
     expect(baseElement.querySelector('.ant-alert-warning')).toMatchSnapshot();
   });
+
+  it('render table actions when user not have permission but is assignee', async () => {
+    mockUseCurrentUser({
+      ...mockCurrentUserReturn,
+      userRoles: {
+        ...mockCurrentUserReturn.userRoles,
+        [SystemRole.admin]: false,
+        [SystemRole.systemAdministrator]: false
+      },
+      bindProjects: [
+        {
+          is_manager: false,
+          project_name: mockProjectInfo.projectName,
+          project_id: mockProjectInfo.projectID,
+          archived: false
+        }
+      ]
+    });
+    sqlManage.getSqlManageList().mockImplementation(() =>
+      createSpySuccessResponse({
+        data: [
+          {
+            ...sqlManageListData.data[0],
+            assignees: [mockCurrentUserReturn.username]
+          }
+        ]
+      })
+    );
+    sqleSuperRender(<SQLEEIndex />);
+    await act(async () => jest.advanceTimersByTime(3000));
+    expect(screen.getByText('指派负责人')).toBeInTheDocument();
+    expect(screen.getByText('变更状态')).toBeInTheDocument();
+    expect(screen.getByText('批量指派')).toBeInTheDocument();
+    expect(screen.getByText('批量解决').closest('button')).toBeDisabled();
+    const batchCheckbox = getBySelector('.ant-table-thead .ant-checkbox-input');
+    fireEvent.click(batchCheckbox);
+    await act(async () => jest.advanceTimersByTime(0));
+    expect(screen.getByText('批量解决').closest('button')).not.toBeDisabled();
+  });
 });
diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.tsx
@@ -63,18 +63,15 @@ import dayjs from 'dayjs';
 import AbnormalInstance from './AbnormalInstance';
 import { formatTime } from '@actiontech/shared/lib/utils/Common';
 import { AbnormalInstanceStatusCodeEnum } from './index.data';
+import { PERMISSIONS } from '@actiontech/shared/lib/features/usePermission/permissions';
 
 const SQLEEIndex = () => {
   const { t } = useTranslation();
 
   const extractQueries = useTypedQuery();
 
   const [messageApi, messageContextHolder] = message.useMessage();
-  const {
-    parse2TableActionPermissions,
-    parse2TableToolbarActionPermissions,
-    checkActionPermission
-  } = usePermission();
+  const { checkActionPermission } = usePermission();
   // api
   const { projectID, projectName } = useCurrentProject();
   const { username, userId, language } = useCurrentUser();
@@ -290,26 +287,25 @@ const SQLEEIndex = () => {
   );
 
   const actions = useMemo(() => {
-    return parse2TableActionPermissions(
-      SqlManagementRowAction(
-        openModal,
-        jumpToAnalyze,
-        onCreateSqlManagementException,
-        onCreateWhitelist,
-        language,
-        checkActionPermission,
-        onPushToCoding
-      )
+    return SqlManagementRowAction(
+      openModal,
+      jumpToAnalyze,
+      onCreateSqlManagementException,
+      onCreateWhitelist,
+      language,
+      checkActionPermission,
+      onPushToCoding,
+      username
     );
   }, [
     jumpToAnalyze,
     openModal,
     onCreateSqlManagementException,
     onCreateWhitelist,
     language,
-    parse2TableActionPermissions,
     checkActionPermission,
-    onPushToCoding
+    onPushToCoding,
+    username
   ]);
 
   const updateRemarkProtect = useRef(false);
@@ -440,32 +436,48 @@ const SQLEEIndex = () => {
   }, [selectedRowData, updateModalStatus, setBatchSelectData]);
 
   const getTableToolbarActions = useMemo(() => {
-    return parse2TableToolbarActionPermissions(
-      SqlManagementTableToolbarActions(
-        selectedRowKeys?.length === 0,
-        batchSolveLoading,
-        batchIgnoreLoading,
-        onBatchAssignment,
-        onBatchSolve,
-        onBatchIgnore,
-        isAssigneeSelf,
-        isHighPriority,
-        setAssigneeSelf,
-        setIsHighPriority,
-        onPushToCoding
-      )
+    // 当前用户不是admin 系统管理员 项目管理员 则根据用户是否是sql负责判断是否有操作权限
+    // 因为批量操作的权限一致 所以这里取其中一个判断
+    const hasPermission = checkActionPermission(
+      PERMISSIONS.ACTIONS.SQLE.SQL_MANAGEMENT.BATCH_ASSIGNMENT
+    );
+    const isAssignees = selectedRowData.every((item) =>
+      item?.assignees?.includes(username)
+    );
+    const isDisabled =
+      selectedRowData?.length === 0 || (!hasPermission && !isAssignees);
+    // 用户为某条sql的负责人才会显示批量操作按钮
+    const isCertainAssignees =
+      sqlList?.list?.some((item) => item?.assignees?.includes(username)) ??
+      false;
+    return SqlManagementTableToolbarActions(
+      isDisabled,
+      batchSolveLoading,
+      batchIgnoreLoading,
+      onBatchAssignment,
+      onBatchSolve,
+      onBatchIgnore,
+      isAssigneeSelf,
+      isHighPriority,
+      setAssigneeSelf,
+      setIsHighPriority,
+      onPushToCoding,
+      isCertainAssignees,
+      checkActionPermission
     );
   }, [
     batchIgnoreLoading,
     batchSolveLoading,
-    selectedRowKeys?.length,
+    selectedRowData,
     isAssigneeSelf,
     isHighPriority,
     onBatchAssignment,
     onBatchIgnore,
     onBatchSolve,
     onPushToCoding,
-    parse2TableToolbarActionPermissions
+    username,
+    checkActionPermission,
+    sqlList
   ]);
 
   const loading = useMemo(
