Skip to content

Fix/issue 1734 #384

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Aug 14, 2024
Merged

Fix/issue 1734 #384

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a33389
[fix]: Text modification and audit modal closing logic
zzyangh Aug 13, 2024
b695776
[fix]: Unified data source link testing information display method
zzyangh Aug 13, 2024
77077b6
[fix]: Modify the order style and SQL audit description
zzyangh Aug 13, 2024
4eee7fe
[test]: Update unit tests
zzyangh Aug 13, 2024
aa51422
[fix]: Replace form description with CustomLabelContent
zzyangh Aug 14, 2024
971c296
[fix]: Modify ReminderInfomation component
zzyangh Aug 14, 2024
3e14bb8
[fix]: Modify state name and add unknown error message
zzyangh Aug 14, 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
2 changes: 1 addition & 1 deletion packages/base/src/locale/en-US/dmsDataExport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default {
baseTitle: '工单基本信息',
sourceTitle: '工单导出对象',
methodTitle: '导出方式',
updateInfoAction: '编辑工单信息',
updateInfoAction: '修改工单',
submitAction: '提交工单',
submitTips: '仅支持对DQL语句创建导出工单'
},
Expand Down
2 changes: 1 addition & 1 deletion packages/base/src/locale/zh-CN/dmsDataExport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default {
baseTitle: '工单基本信息',
sourceTitle: '工单导出对象',
methodTitle: '导出方式',
updateInfoAction: '编辑工单信息',
updateInfoAction: '修改工单',
submitAction: '提交工单',
submitTips: '仅支持对DQL语句创建导出工单'
},
Expand Down
2 changes: 1 addition & 1 deletion ...ges/base/src/page/DataExportManagement/Create/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ exports[`first should match snapshot when pageState is equal SUBMIT_WORKFLOW 1`]
type="button"
>
<span>
编辑工单信息
修改工单
</span>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ...rtManagement/Create/components/SubmitWorkflow/__tests__/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ exports[`test base/DataExport/Create/SubmitWorkflow should match snapshot 1`] =
type="button"
>
<span>
编辑工单信息
修改工单
</span>
</button>
</div>
Expand Down Expand Up @@ -276,7 +276,7 @@ exports[`test base/DataExport/Create/SubmitWorkflow should match snapshot 2`] =
type="button"
>
<span>
编辑工单信息
修改工单
</span>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ...e/src/page/DataExportManagement/Create/components/SubmitWorkflow/__tests__/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe('test base/DataExport/Create/SubmitWorkflow', () => {

it('should execute updateModalStatus when clicked edit button', () => {
superRender(<SubmitExportWorkflow />);
fireEvent.click(screen.getByText('编辑工单信息'));
fireEvent.click(screen.getByText('修改工单'));
expect(mockCreateDataExportRedux.updateModalStatus).toHaveBeenCalledTimes(
1
);
Expand All @@ -62,7 +62,7 @@ describe('test base/DataExport/Create/SubmitWorkflow', () => {
mockUseCreateDataExportReduxManage({ submitLoading: true });
superRender(<SubmitExportWorkflow />);

expect(screen.getByText('编辑工单信息').closest('button')).toBeDisabled();
expect(screen.getByText('修改工单').closest('button')).toBeDisabled();
expect(screen.getByText('提交工单').closest('button')).toBeDisabled();
});

Expand Down
130 changes: 35 additions & 95 deletions packages/base/src/page/DataSource/components/AddDataSource/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,26 +579,14 @@ exports[`page/DataSource/AddDataSource render add database snap 1`] = `
<div
class="ant-form-item-control-input-content"
>
<div
class="ant-space css-dev-only-do-not-override-txh9fw ant-space-horizontal ant-space-align-center"
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<div
class="ant-space-item"
style="margin-right: 8px;"
>
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<span>
测试数据源连通性
</span>
</button>
</div>
<div
class="ant-space-item"
/>
</div>
<span>
测试数据源连通性
</span>
</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -1720,26 +1708,14 @@ exports[`page/DataSource/AddDataSource render isFixedBusiness is true 1`] = `
<div
class="ant-form-item-control-input-content"
>
<div
class="ant-space css-dev-only-do-not-override-txh9fw ant-space-horizontal ant-space-align-center"
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<div
class="ant-space-item"
style="margin-right: 8px;"
>
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<span>
测试数据源连通性
</span>
</button>
</div>
<div
class="ant-space-item"
/>
</div>
<span>
测试数据源连通性
</span>
</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -3126,26 +3102,14 @@ exports[`page/DataSource/AddDataSource render submit when add database api succe
<div
class="ant-form-item-control-input-content"
>
<div
class="ant-space css-dev-only-do-not-override-txh9fw ant-space-horizontal ant-space-align-center"
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<div
class="ant-space-item"
style="margin-right: 8px;"
>
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<span>
测试数据源连通性
</span>
</button>
</div>
<div
class="ant-space-item"
/>
</div>
<span>
测试数据源连通性
</span>
</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -5442,26 +5406,14 @@ exports[`page/DataSource/AddDataSource render submit when add database api succe
<div
class="ant-form-item-control-input-content"
>
<div
class="ant-space css-dev-only-do-not-override-txh9fw ant-space-horizontal ant-space-align-center"
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<div
class="ant-space-item"
style="margin-right: 8px;"
>
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<span>
测试数据源连通性
</span>
</button>
</div>
<div
class="ant-space-item"
/>
</div>
<span>
测试数据源连通性
</span>
</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -6684,26 +6636,14 @@ exports[`page/DataSource/AddDataSource render submit when projectID is undefined
<div
class="ant-form-item-control-input-content"
>
<div
class="ant-space css-dev-only-do-not-override-txh9fw ant-space-horizontal ant-space-align-center"
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<div
class="ant-space-item"
style="margin-right: 8px;"
>
<button
class="ant-btn css-dev-only-do-not-override-674gwq ant-btn-default basic-button-wrapper css-geipcv"
type="button"
>
<span>
测试数据源连通性
</span>
</button>
</div>
<div
class="ant-space-item"
/>
</div>
<span>
测试数据源连通性
</span>
</button>
</div>
</div>
</div>
Expand Down
Loading
Loading