Skip to content

UIOR-1530 Update validate props for payment terms #1877

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
usavkov-epam merged 2 commits into from
Jul 23, 2026
Merged

UIOR-1530 Update validate props for payment terms #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
421c028
UIOR-1530 Update validate props for payment terms
usavkov-epam Jul 23, 2026
811846c
update tests
usavkov-epam Jul 23, 2026
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
1 change: 0 additions & 1 deletion src/components/POLine/OngoingOrder/OngoingOrderForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ const OngoingOrderForm = ({
name={POL_FORM_FIELDS.multiYearPayment}
onChange={onMultiYearPaymentChange}
type="checkbox"
validateFields={[]}
vertical
/>
</VisibilityControl>
Expand Down
7 changes: 3 additions & 4 deletions src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { noop } from 'lodash';
import PropTypes from 'prop-types';
import {
useCallback,
Expand Down Expand Up @@ -164,7 +163,7 @@ export const PaymentTermsForm = ({

try {
const error = await composeValidatorsAsync(
isRequired ? validateFundDistributionRequired : noop,
validateFundDistributionRequired,
validateFundDistributionUniqueFunds,
fundDistributionTotalValidator,
)(value);
Expand All @@ -175,7 +174,7 @@ export const PaymentTermsForm = ({
} finally {
setIsFundDistributionValidating(false);
}
}, [fundDistributionTotalValidator, isRequired]);
}, [fundDistributionTotalValidator]);

return (
<>
Expand Down Expand Up @@ -242,7 +241,7 @@ export const PaymentTermsForm = ({
onRemoveFiscalYear={onRemoveFiscalYearDistribution}
onRemoveFundDistribution={onRemoveFundDistribution}
totalAmount={totalPrice}
validate={validateFiscalYearsDistributions}
validate={isRequired ? validateFiscalYearsDistributions : undefined}
/>
</Col>
</Row>
Expand Down
8 changes: 4 additions & 4 deletions src/components/POLine/PaymentTerms/PaymentTermsForm/PaymentTermsForm.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,16 @@ describe('PaymentTermsForm', () => {
expect(getDistributionProps().isAddFYButtonDisabled).toBe(true);
});

it('should still pass a validate function to FiscalYearsDistribution when isTemplate is true', () => {
it('should not pass a validate function to FiscalYearsDistribution when isTemplate is true', () => {
renderComponent({ isTemplate: true });

expect(getDistributionProps().validate).toEqual(expect.any(Function));
expect(getDistributionProps().validate).toBeUndefined();
});

it('should still pass a validate function to FiscalYearsDistribution when multiYearPayment is false', () => {
it('should not pass a validate function to FiscalYearsDistribution when multiYearPayment is false', () => {
renderComponent({}, { multiYearPayment: false });

expect(getDistributionProps().validate).toEqual(expect.any(Function));
expect(getDistributionProps().validate).toBeUndefined();
});

it('should pass isLoading=true to FiscalYearsDistribution', () => {
Expand Down
Loading