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

[test]: fix] Refine data export styles and implement unit tests #329

Merged
merged 3 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 1`] = `
<div>
<div
class=" css-13tocah"
class=" css-sjztq0"
>
<div
class="workflow-base-info-title"
Expand All @@ -22,7 +22,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 1`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 2`] = `
<div>
<div
class="test-cls css-1ntohg1"
class="test-cls css-xak3ai"
>
<div
class="workflow-base-info-title"
Expand All @@ -41,7 +41,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 2`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 3`] = `
<div>
<div
class=" css-10a2scf"
class=" css-118aod"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -136,7 +136,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 3`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 4`] = `
<div>
<div
class=" css-12ynod2"
class=" css-1s7y2us"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -231,7 +231,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 4`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 5`] = `
<div>
<div
class=" css-13tocah"
class=" css-sjztq0"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -326,7 +326,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 5`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 6`] = `
<div>
<div
class=" css-1cq7g9q"
class=" css-753lme"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -421,7 +421,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 6`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 7`] = `
<div>
<div
class=" css-1i5h2yp"
class=" css-67i22y"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -516,7 +516,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 7`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 8`] = `
<div>
<div
class=" css-13bz6lz"
class=" css-izsvc5"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -611,7 +611,7 @@ exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 8`]
exports[`test base/DataExport/Common/BasicInfoWrapper should match snapshot 9`] = `
<div>
<div
class=" css-14e2e5f"
class=" css-1bld33o"
>
<div
class="workflow-base-info-status"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const BasicInfoStyleWrapper = styled('div')<{
justify-content: center;
margin-bottom: 20px;

.icon-order-status-wrapper {
.icon-workflow-status-wrapper {
position: absolute;
z-index: 9;
color: ${({ theme, status }) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ exports[`first should match snapshot when pageState is equal CREATE_TASK 1`] = `
</div>
</div>
<div
class="ant-form-item order-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
class="ant-form-item workflow-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
>
<div
class="ant-row ant-form-item-row css-dev-only-do-not-override-txh9fw"
Expand Down Expand Up @@ -1169,7 +1169,7 @@ exports[`first should match snapshot when pageState is equal SUBMIT_WORKFLOW 1`]
</div>
</div>
<div
class=" css-13tocah"
class=" css-sjztq0"
>
<div
class="workflow-base-info-title"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const BaseInfoFormItem: React.FC<{ slot?: ReactNode }> = ({ slot }) => {
{slot}

<FormItemLabel
className="order-base-info-desc-form-item"
className="workflow-base-info-desc-form-item"
name="desc"
label={t('dmsDataExport.create.form.base.describe')}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ exports[`test base/DataExport/Create/BaseInfoForm/BaseInfoFormItem should match
slot
</span>
<div
class="ant-form-item order-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
class="ant-form-item workflow-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
>
<div
class="ant-row ant-form-item-row css-dev-only-do-not-override-txh9fw"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
</div>
</div>
<div
class="ant-form-item order-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
class="ant-form-item workflow-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
>
<div
class="ant-row ant-form-item-row css-dev-only-do-not-override-txh9fw"
Expand Down Expand Up @@ -861,7 +861,7 @@ exports[`test base/DataExport/Create/CreateExportTask should match snapshot when
</div>
</div>
<div
class="ant-form-item order-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
class="ant-form-item workflow-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw"
>
<div
class="ant-row ant-form-item-row css-dev-only-do-not-override-txh9fw"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot 1`]
</div>
</div>
<div
class="ant-form-item order-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw ant-form-item-has-success"
class="ant-form-item workflow-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw ant-form-item-has-success"
>
<div
class="ant-row ant-form-item-row css-dev-only-do-not-override-txh9fw"
Expand Down Expand Up @@ -1033,7 +1033,7 @@ exports[`test base/DataExport/Create/UpdateInfoDrawer should match snapshot when
</div>
</div>
<div
class="ant-form-item order-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw ant-form-item-has-success"
class="ant-form-item workflow-base-info-desc-form-item css-1jlm9cy css-dev-only-do-not-override-txh9fw ant-form-item-has-success"
>
<div
class="ant-row ant-form-item-row css-dev-only-do-not-override-txh9fw"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ exports[`test base/DataExport/Create/SubmitWorkflow should match snapshot 1`] =
</div>
</div>
<div
class=" css-13tocah"
class=" css-sjztq0"
>
<div
class="workflow-base-info-title"
Expand Down Expand Up @@ -298,7 +298,7 @@ exports[`test base/DataExport/Create/SubmitWorkflow should match snapshot 2`] =
</div>
</div>
<div
class=" css-13tocah"
class=" css-sjztq0"
>
<div
class="workflow-base-info-title"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ exports[`test base/DataExport/Detail should match snapshot 1`] = `
</div>
</div>
<div
class="clearPaddingTop css-ppqheb"
class="clearPaddingTop css-1pvtba3"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -1099,7 +1099,7 @@ exports[`test base/DataExport/Detail should match snapshot 2`] = `
</div>
</div>
<div
class="clearPaddingTop css-ppqheb"
class="clearPaddingTop css-1pvtba3"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -3777,7 +3777,7 @@ exports[`test base/DataExport/Detail should match snapshot 3`] = `
</div>
</div>
<div
class="clearPaddingTop css-ppqheb"
class="clearPaddingTop css-1pvtba3"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -6455,7 +6455,7 @@ exports[`test base/DataExport/Detail should match snapshot 4`] = `
</div>
</div>
<div
class="clearPaddingTop css-ppqheb"
class="clearPaddingTop css-1pvtba3"
>
<div
class="workflow-base-info-status"
Expand Down Expand Up @@ -9133,7 +9133,7 @@ exports[`test base/DataExport/Detail should match snapshot with reject workflow
</div>
</div>
<div
class="clearPaddingTop css-8ztf14"
class="clearPaddingTop css-14ff2p5"
>
<div
class="workflow-base-info-status"
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/lib/components/LazyLoadComponent/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ const LazyLoadComponent: React.FC<LazyLoadComponentProps> = ({
animation={animation}
className={classnames('lazy-load-wrapper', className, {
'lazy-load-wrapper-hidden': status === 'hidden',
'lazy-load-wrapper-show': status === 'show'
'lazy-load-wrapper-show': status === 'show',
'lazy-load-wrapper-animation': animation !== false
})}
>
{children}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ReactNode } from 'react';

export type LazyLoadComponentProps = {
open?: boolean;
animation?: string;
animation?: string | false;

forceRender?: boolean;
destroyOnClose?: boolean;
Expand Down
6 changes: 4 additions & 2 deletions packages/shared/lib/components/LazyLoadComponent/style.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { styled } from '@mui/material';

export const LazyLoadComponentStyleWrapper = styled('div')<{
animation?: string;
animation?: string | false;
}>`
@keyframes slide-right {
from {
Expand All @@ -14,7 +14,9 @@ export const LazyLoadComponentStyleWrapper = styled('div')<{
}
}

animation: ${({ animation }) => animation ?? ' slide-right 300ms'};
&.lazy-load-wrapper-animation {
animation: ${({ animation }) => animation || ' slide-right 300ms'};
}

&.lazy-load-wrapper-hidden {
display: none;
Expand Down
10 changes: 6 additions & 4 deletions packages/shared/lib/utils/FormRule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,20 @@ export const roleNameRuleValidator = (): FormValidatorRule => {
};
};

export const whiteSpaceSql = (): Rule[] => {
export const whiteSpaceSql = (enableRule = true): Rule[] => {
return [
{
validator: whiteSpaceSqlValidator()
validator: whiteSpaceSqlValidator(enableRule)
}
];
};

export const whiteSpaceSqlValidator = (): FormValidatorRule => {
export const whiteSpaceSqlValidator = (
enableRule = true
): FormValidatorRule => {
return (_, values) => {
const placeholder = '/* input your sql */';
if (values === placeholder) {
if (values === placeholder && enableRule) {
return Promise.reject(
i18n.t('common.form.placeholder.input', {
name: i18n.t('common.sqlStatements')
Expand Down
11 changes: 11 additions & 0 deletions packages/shared/lib/utils/__tests__/FormRule.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@ describe('utils/FormRule', () => {
expect(message).toBe('请输入SQL语句');
});

it('should not check white space sql when enableRule is false', async () => {
const check = whiteSpaceSqlValidator(false);
let message = '';
try {
await check?.({} as any, '/* input your sql */', () => {});
} catch (error: any) {
message = error;
}
expect(message).toBe('');
});

it('should check prot is between min and max', async () => {
const cases = [
{
Expand Down