Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/fix task result error #316

Merged
merged 39 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4746b09
[chore]:(SqlOptimization) Add icon with tooltip to title
LZS911 May 20, 2024
0a3eac5
Merge pull request #313 from actiontech/chore/sql-optimzation
anny1021 May 20, 2024
e11ad77
[refactor]: (SqlExecWorkflow)Adjust locale and theme. Verify unit tests
LZS911 May 21, 2024
c2578e6
[chore]: fix ci error
LZS911 May 21, 2024
e11a14b
[fix]: add locale
LZS911 May 21, 2024
07fd474
Merge branch 'main' of github.com:actiontech/dms-ui into chore/refact…
LZS911 May 21, 2024
e2d2da7
[test]: fix test error
LZS911 May 21, 2024
c0eec7c
[test]: update snapshot
LZS911 May 21, 2024
54f5a3a
[test]: update snapshot
LZS911 May 21, 2024
8175647
[fix]:(SqlExecWorkflow) Rename components and fix styling and filteri…
LZS911 May 21, 2024
14fd19a
[chore]: (SqlExecWorkflow) fix ci error and rename component
LZS911 May 21, 2024
9891846
[chore]: Remove duplicate uppercase named folders
LZS911 May 21, 2024
809f789
[refactor]: (SqlExecWorkflow)Adjust locale and theme. Verify unit tests
LZS911 May 21, 2024
b3eb730
[chore]: fix ci error
LZS911 May 21, 2024
4af7208
[fix]: add locale
LZS911 May 21, 2024
c1ea4b7
[chore]:(SqlOptimization) Add icon with tooltip to title
LZS911 May 20, 2024
51ade1f
[test]: fix test error
LZS911 May 21, 2024
b4900ed
[test]: update snapshot
LZS911 May 21, 2024
32d2e8c
[test]: update snapshot
LZS911 May 21, 2024
03a813c
Merge branch 'chore/refactor-workflow-icon-local-theme' of github.com…
LZS911 May 23, 2024
89d8dd4
Create 工单重构记录.md
LZS911 May 21, 2024
c144709
[refactor]: (SqlExecWorkflow)Adjust locale and theme. Verify unit tests
LZS911 May 21, 2024
fe4e375
[chore]: fix ci error
LZS911 May 21, 2024
9069615
[fix]: add locale
LZS911 May 21, 2024
58f5465
[chore]:(SqlOptimization) Add icon with tooltip to title
LZS911 May 20, 2024
183f4c5
[test]: update snapshot
LZS911 May 23, 2024
8c95dbe
Merge branch 'chore/refactor-workflow-icon-local-theme' of github.com…
LZS911 May 23, 2024
5a2f217
[fix]:(SqlExecWorkflow) Rename components and fix styling and filteri…
LZS911 May 21, 2024
fae2cdc
[chore]: (SqlExecWorkflow) fix ci error and rename component
LZS911 May 21, 2024
147b428
[chore]: Remove duplicate uppercase named folders
LZS911 May 21, 2024
d345650
Merge branch 'refactor/fix-task-result-error' of github.com:actiontec…
LZS911 May 23, 2024
6076d53
[fix]:(SqlExecWorkflow) Rename components and fix styling and filteri…
LZS911 May 21, 2024
64190f4
[chore]: (SqlExecWorkflow) fix ci error and rename component
LZS911 May 21, 2024
81b29fb
[chore]: Remove duplicate uppercase named folders
LZS911 May 21, 2024
364d3a6
Merge branch 'refactor/fix-task-result-error' of github.com:actiontec…
LZS911 May 23, 2024
4a8b71f
[fix]:(SqlExecWorkflow) Rename components and fix styling and filteri…
LZS911 May 21, 2024
90361f3
[chore]: (SqlExecWorkflow) fix ci error and rename component
LZS911 May 21, 2024
971c8f8
[chore]: Remove duplicate uppercase named folders
LZS911 May 21, 2024
bf60f89
Merge branch 'refactor/fix-task-result-error' of github.com:actiontec…
LZS911 May 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,71 @@ exports[`test base/hooks/useThemeStyleData should match snapshot 3`] = `
},
},
},
"execWorkflow": {
"common": {
"auditResultFilter": {
"auditResultInfo": {
"itemBgColor": "#fcfbf9",
"schemaValueColor": "#7d8ca8",
"textColor": "#8a8f99",
},
"bgColor": "#fcfbf9",
"borderColor": "#f2f1f0",
"options": {
"activeBgColor": "#f0f7ff",
"bgColor": "#f7f6f4",
"numActiveColor": "#4583ff",
"numColor": "#575c66",
"textActiveColor": "#4583ff",
"textColor": "#8a8f99",
},
},
"basicInfo": {
"bgColor": "#fcfbf9",
"borderColor": "#f2f1f0",
"descColor": "#8a8f99",
"titleColor": "#292C33",
},
},
"create": {
"auditResult": {
"auditResultDrawer": {
"numberColor": "#4583ff",
},
"download": {
"bgColor": "#fcfbf9",
"borderColor": "#E8E7E6",
"boxShadow": "0px 3px 12px 0px rgba(51, 44, 31, 0.1)",
"itemColor": "#292C33",
"itemHoverColor": "#f7f6f4",
"itemIconColor": "#8a8f99",
},
"toggleButton": {
"activeBgColor": "#f0f7ff",
"activeColor": "#4583ff",
"bgColor": "#f7f6f4",
"borderColor": "#f2f1f0",
"color": "#575c66",
},
},
"editForm": {
"projectFlagIconColor": "#ebad1c",
"titleColor": "#8a8f99",
},
"form": {
"baseInfoTitleIconColor": "#c3c6cd",
},
},
"list": {
"desc": {
"copyIconColor": "#4583ff",
"hoverCopyIconBackgroundColor": "#E8F3FF",
},
},
"steps": {
"boxShadow": "0px 1px 4px 0px rgba(51, 44, 31, 0.12)",
},
},
"order": {
"common": {
"auditResultFilter": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,48 @@ exports[`base/router-sqle-ce render sqle project detail router render sqle proje
</body>
`;

exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render route workflow render route create 1`] = `
<body>
<div>
<div
data-test-parent-id="sqlExecWorkflow"
>
<div>
createSqlExecWorkflow
</div>
</div>
</div>
</body>
`;

exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render route workflow render route detail 1`] = `
<body>
<div>
<div
data-test-parent-id="sqlExecWorkflow"
>
<div>
workflowDetail
</div>
</div>
</div>
</body>
`;

exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render route workflow render route list 1`] = `
<body>
<div>
<div
data-test-parent-id="sqlExecWorkflow"
>
<div>
sqlExecWorkflowList
</div>
</div>
</div>
</body>
`;

exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render whitelist 1`] = `
<body>
<div>
Expand Down Expand Up @@ -636,6 +678,45 @@ exports[`base/router-sqle-ce render sqle route data snap 1`] = `
"key": "projectOverview",
"path": ":projectID/overview",
},
{
"children": [
{
"element": <div>
sqlExecWorkflowList
</div>,
"key": "sqlExecWorkflowList",
"path": "",
},
{
"element": <div>
createSqlExecWorkflow
</div>,
"key": "createSqlExecWorkflow",
"path": "create",
},
{
"element": <div>
orderAnalyze
</div>,
"key": "orderAnalyze",
"path": ":taskId/:sqlNum/analyze",
},
{
"element": <div>
workflowDetail
</div>,
"key": "workflowDetail",
"path": ":workflowId",
},
],
"element": <div
data-test-parent-id="sqlExecWorkflow"
>
<Outlet />
</div>,
"key": "sqlExecWorkflow",
"path": ":projectID/exec-workflow",
},
{
"children": [
{
Expand Down
102 changes: 102 additions & 0 deletions packages/base/src/router/test/__snapshots__/router.sqle.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,62 @@ exports[`base/router-sqle-ee render sqle project detail router render sqle proje
</body>
`;

exports[`base/router-sqle-ee render sqle project detail router render sqle project detail router when version is ce render route workflow render SQLFileStatementOverview 1`] = `
<body>
<div>
<div
data-test-parent-id="sqlExecWorkflow"
>
<div>
WorkflowSQLFileStatementOverview
</div>
</div>
</div>
</body>
`;

exports[`base/router-sqle-ee render sqle project detail router render sqle project detail router when version is ce render route workflow render route list 1`] = `
<body>
<div>
<div
data-test-parent-id="sqlExecWorkflow"
>
<div>
sqlExecWorkflowList
</div>
</div>
</div>
</body>
`;

exports[`base/router-sqle-ee render sqle project detail router render sqle project detail router when version is ce render route workflow render route orderCreate 1`] = `
<body>
<div>
<div
data-test-parent-id="sqlExecWorkflow"
>
<div>
createSqlExecWorkflow
</div>
</div>
</div>
</body>
`;

exports[`base/router-sqle-ee render sqle project detail router render sqle project detail router when version is ce render route workflow render route orderDetail 1`] = `
<body>
<div>
<div
data-test-parent-id="sqlExecWorkflow"
>
<div>
workflowDetail
</div>
</div>
</div>
</body>
`;

exports[`base/router-sqle-ee render sqle project detail router render sqle project detail router when version is ce render whitelist 1`] = `
<body>
<div>
Expand Down Expand Up @@ -811,6 +867,52 @@ exports[`base/router-sqle-ee render sqle route data snap 1`] = `
"key": "projectOverview",
"path": ":projectID/overview",
},
{
"children": [
{
"element": <div>
sqlExecWorkflowList
</div>,
"key": "sqlExecWorkflowList",
"path": "",
},
{
"element": <div>
createSqlExecWorkflow
</div>,
"key": "createSqlExecWorkflow",
"path": "create",
},
{
"element": <div>
orderAnalyze
</div>,
"key": "orderAnalyze",
"path": ":taskId/:sqlNum/analyze",
},
{
"element": <div>
workflowDetail
</div>,
"key": "workflowDetail",
"path": ":workflowId",
},
{
"element": <div>
WorkflowSQLFileStatementOverview
</div>,
"key": "WorkflowSQLFileStatementOverview",
"path": ":taskId/files/:fileId/sqls",
},
],
"element": <div
data-test-parent-id="sqlExecWorkflow"
>
<Outlet />
</div>,
"key": "sqlExecWorkflow",
"path": ":projectID/exec-workflow",
},
{
"children": [
{
Expand Down
32 changes: 32 additions & 0 deletions packages/base/src/router/test/router.ce.sqle.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,38 @@ describe('base/router-sqle-ce', () => {
});
});

describe('render route workflow', () => {
it('render route list', async () => {
const { baseElement } = customRender([
`/sqle/project/${projectID}/exec-workflow`
]);

await act(async () => jest.advanceTimersByTime(300));
expect(baseElement).toMatchSnapshot();
expect(screen.getByText('sqlExecWorkflowList')).toBeInTheDocument();
});

it('render route create', async () => {
const { baseElement } = customRender([
`/sqle/project/${projectID}/exec-workflow/create`
]);

await act(async () => jest.advanceTimersByTime(0));
expect(baseElement).toMatchSnapshot();
expect(screen.getByText('createSqlExecWorkflow')).toBeInTheDocument();
});

it('render route detail', async () => {
const { baseElement } = customRender([
`/sqle/project/${projectID}/exec-workflow/workflowId`
]);

await act(async () => jest.advanceTimersByTime(0));
expect(baseElement).toMatchSnapshot();
expect(screen.getByText('workflowDetail')).toBeInTheDocument();
});
});

describe('render route sqlAudit', () => {
it('render route sqlAuditList', async () => {
const { baseElement } = customRender([
Expand Down
44 changes: 44 additions & 0 deletions packages/base/src/router/test/router.sqle.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,50 @@ describe('base/router-sqle-ee', () => {
});
});

describe('render route workflow', () => {
it('render route list', async () => {
const { baseElement } = customRender([
`/sqle/project/${projectID}/exec-workflow`
]);

await act(async () => jest.advanceTimersByTime(300));
expect(baseElement).toMatchSnapshot();
expect(screen.getByText('sqlExecWorkflowList')).toBeInTheDocument();
});

it('render route orderCreate', async () => {
const { baseElement } = customRender([
`/sqle/project/${projectID}/exec-workflow/create`
]);

await act(async () => jest.advanceTimersByTime(0));
expect(baseElement).toMatchSnapshot();
expect(screen.getByText('createSqlExecWorkflow')).toBeInTheDocument();
});

it('render route orderDetail', async () => {
const { baseElement } = customRender([
`/sqle/project/${projectID}/exec-workflow/workflowId`
]);

await act(async () => jest.advanceTimersByTime(0));
expect(baseElement).toMatchSnapshot();
expect(screen.getByText('workflowDetail')).toBeInTheDocument();
});

it('render SQLFileStatementOverview', async () => {
const { baseElement } = customRender([
`/sqle/project/${projectID}/exec-workflow/123/files/434/sqls`
]);

await act(async () => jest.advanceTimersByTime(300));
expect(baseElement).toMatchSnapshot();
expect(
screen.getByText('WorkflowSQLFileStatementOverview')
).toBeInTheDocument();
});
});

describe('render route sqlAudit', () => {
it('render route sqlAuditList', async () => {
const { baseElement } = customRender([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const CustomSegmentedFilter = <V extends string | number | undefined = string>(
}

if (withAll === true) {
// Segmented 组件会将 value 设置为 each 组件时的 key,当 value 为 undefined 时 key 设置失败。
return [
{ label: t('common.all'), value: undefined as V },
...transformOptions
Expand Down Expand Up @@ -109,7 +110,6 @@ const CustomSegmentedFilter = <V extends string | number | undefined = string>(
</div>
);
}

return (
<BasicSegmented
className={mergeClassNames}
Expand Down
Loading
Loading