Skip to content

Commit 5bfc592

Browse files
authored
Merge pull request #650 from actiontech/ui/rule-list
Ui/rule-list
2 parents cc0ca93 + 9e6bfe6 commit 5bfc592

File tree

24 files changed

+111
-21
lines changed

24 files changed

+111
-21
lines changed

packages/shared/lib/testUtil/common.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ export const ignoreConsoleErrors = (
33
params: Array<UtilsConsoleErrorStringsEnum>
44
) => {
55
const originalError = console.error;
6+
const paramsWithGlobalRules = [
7+
...params,
8+
'Warning: findDOMNode is deprecated and will be removed in the next major release. Instead, add a ref directly to the element you want to reference. Learn more about using refs safely here: https://reactjs.org/link/strict-mode-find-nod'
9+
];
610

711
beforeAll(() => {
812
console.error = (...arg) => {
913
if (
1014
typeof arg[0] === 'string' &&
11-
params.some((v) => arg[0].includes(v))
15+
paramsWithGlobalRules.some((v) => arg[0].includes(v))
1216
) {
1317
return;
1418
}

packages/sqle/src/page/Rule/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ const Rule = () => {
134134
>
135135
<RuleList
136136
enableCheckDetail
137-
pageHeaderHeight={visible ? 170 : 0}
137+
pageHeaderHeight={visible ? 60 : 0}
138138
rules={templateRulesWithStatus}
139139
/>
140140
</EmptyBox>

packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/Table/__tests__/AuditResultDrawer.test.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { fireEvent, act, cleanup, screen } from '@testing-library/react';
44
import { AuditResultDrawerProps } from '../index.type';
55
import { superRender } from '../../../../../../testUtils/customRender';
66
import { mockUseCurrentUser } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentUser';
7+
import {
8+
ignoreConsoleErrors,
9+
UtilsConsoleErrorStringsEnum
10+
} from '@actiontech/shared/lib/testUtil/common';
711

812
describe('sqle/ExecWorkflow/Common/AuditResultList/AuditResultDrawer', () => {
913
const onCloseFn = jest.fn();
@@ -25,6 +29,7 @@ describe('sqle/ExecWorkflow/Common/AuditResultList/AuditResultDrawer', () => {
2529
/>
2630
);
2731
};
32+
ignoreConsoleErrors([UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER]);
2833

2934
beforeEach(() => {
3035
mockUseCurrentUser();

packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/Table/__tests__/index.test.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ describe('sqle/ExecWorkflow/Common/AuditResultList/List', () => {
4848
return superRender(<AuditResultTable {...params} />);
4949
};
5050

51-
ignoreConsoleErrors([UtilsConsoleErrorStringsEnum.INVALID_CUSTOM_ATTRIBUTE]);
51+
ignoreConsoleErrors([
52+
UtilsConsoleErrorStringsEnum.INVALID_CUSTOM_ATTRIBUTE,
53+
UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER
54+
]);
5255

5356
beforeEach(() => {
5457
mockUseCurrentUser();

packages/sqle/src/page/SqlExecWorkflow/Common/SqlStatementFormController/SqlStatementFormItem/__tests__/index.test.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ import SqlStatementFormItem from '..';
66
import { superRender } from '../../../../../../testUtils/customRender';
77
import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
88
import { SQL_EDITOR_PLACEHOLDER_VALUE } from '@actiontech/shared/lib/data/common';
9+
import {
10+
ignoreConsoleErrors,
11+
UtilsConsoleErrorStringsEnum
12+
} from '@actiontech/shared/lib/testUtil/common';
913

1014
describe('test SqlStatementFormItem', () => {
15+
ignoreConsoleErrors([UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER]);
16+
1117
beforeEach(() => {
1218
mockUseCurrentProject();
1319
});

packages/sqle/src/page/SqlExecWorkflow/Common/SqlStatementFormController/__tests__/index.test.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import { superRender } from '../../../../../testUtils/customRender';
44
import { fireEvent, renderHook, screen } from '@testing-library/react';
55
import { SqlStatementFormControllerProps } from '../index.type';
66
import { mockUseCurrentProject } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentProject';
7+
import {
8+
ignoreConsoleErrors,
9+
UtilsConsoleErrorStringsEnum
10+
} from '@actiontech/shared/lib/testUtil/common';
711

812
describe('test SqlStatementFormController', () => {
913
const onChange = jest.fn();
@@ -27,6 +31,7 @@ describe('test SqlStatementFormController', () => {
2731
</Form>
2832
);
2933
};
34+
ignoreConsoleErrors([UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER]);
3035

3136
beforeEach(() => {
3237
mockUseCurrentProject();

packages/sqle/src/page/SqlExecWorkflow/Create/__tests__/index.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ describe('sqle/SqlExecWorkflow/Create', () => {
6262

6363
ignoreConsoleErrors([
6464
UtilsConsoleErrorStringsEnum.UNIQUE_KEY_REQUIRED,
65-
UtilsConsoleErrorStringsEnum.INVALID_CSS_VALUE
65+
UtilsConsoleErrorStringsEnum.INVALID_CSS_VALUE,
66+
UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER
6667
]);
6768

6869
beforeEach(() => {

packages/sqle/src/page/SqlExecWorkflow/Create/components/FormStep/SqlAuditInfoForm/SqlAuditInfoFormItem/__tests__/index.test.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import { act, renderHook } from '@testing-library/react';
99
import { mockUseCurrentProject } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentProject';
1010
import { mockUseDbServiceDriver } from '@actiontech/shared/lib/testUtil/mockHook/mockUseDbServiceDriver';
1111
import { useSelector } from 'react-redux';
12+
import {
13+
ignoreConsoleErrors,
14+
UtilsConsoleErrorStringsEnum
15+
} from '@actiontech/shared/lib/testUtil/common';
1216

1317
jest.mock('react-redux', () => ({
1418
...jest.requireActual('react-redux'),
@@ -29,6 +33,8 @@ describe('test sqle/SqlAuditInfoForm', () => {
2933
);
3034
};
3135

36+
ignoreConsoleErrors([UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER]);
37+
3238
beforeEach(() => {
3339
jest.useFakeTimers();
3440
execWorkflow.mockAllApi();

packages/sqle/src/page/SqlExecWorkflow/Detail/__tests__/index.test.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ import { getBySelector } from '@actiontech/shared/lib/testUtil/customQuery';
2727
import execWorkflow from '../../../../testUtils/mockApi/execWorkflow';
2828
import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
2929
import instance from '../../../../testUtils/mockApi/instance';
30+
import {
31+
ignoreConsoleErrors,
32+
UtilsConsoleErrorStringsEnum
33+
} from '@actiontech/shared/lib/testUtil/common';
3034

3135
jest.mock('react-router-dom', () => {
3236
return {
@@ -53,6 +57,8 @@ describe('sqle/ExecWorkflow/Detail', () => {
5357
let terminateMultipleTaskByWorkflowSpy: jest.SpyInstance;
5458
const useParamsMock: jest.Mock = useParams as jest.Mock;
5559

60+
ignoreConsoleErrors([UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER]);
61+
5662
beforeEach(() => {
5763
jest.useFakeTimers();
5864
mockUseCurrentUser();

packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/TaskResultList/Common/SqlStatementResultTable/__tests__/index.test.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ import { superRender } from '../../../../../../../../../testUtils/customRender';
88
import rule_template from '../../../../../../../../../testUtils/mockApi/rule_template';
99
import { mockUseCurrentUser } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentUser';
1010
import { cleanup } from '@testing-library/react';
11+
import {
12+
ignoreConsoleErrors,
13+
UtilsConsoleErrorStringsEnum
14+
} from '@actiontech/shared/lib/testUtil/common';
1115

1216
describe('test TaskResultList/SQLStatementResultTable', () => {
17+
ignoreConsoleErrors([UtilsConsoleErrorStringsEnum.UNKNOWN_EVENT_HANDLER]);
18+
1319
beforeEach(() => {
1420
mockUseCurrentUser();
1521
});

0 commit comments

Comments
 (0)