From 3a959208a8318b9d84711be03404697984787548 Mon Sep 17 00:00:00 2001 From: Ali <83188384+testA113@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:34:16 +1300 Subject: [PATCH] fix(app): autoscaling min validation [EE-6387] (#10945) --- .../AutoScalingFormSection.tsx | 2 +- .../autoScalingValidation.ts | 37 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/app/react/kubernetes/applications/components/AutoScalingFormSection/AutoScalingFormSection.tsx b/app/react/kubernetes/applications/components/AutoScalingFormSection/AutoScalingFormSection.tsx index e97a8203c..496c4467d 100644 --- a/app/react/kubernetes/applications/components/AutoScalingFormSection/AutoScalingFormSection.tsx +++ b/app/react/kubernetes/applications/components/AutoScalingFormSection/AutoScalingFormSection.tsx @@ -48,7 +48,7 @@ export function AutoScalingFormSection({ diff --git a/app/react/kubernetes/applications/components/AutoScalingFormSection/autoScalingValidation.ts b/app/react/kubernetes/applications/components/AutoScalingFormSection/autoScalingValidation.ts index f92f3f5b5..272c2f588 100644 --- a/app/react/kubernetes/applications/components/AutoScalingFormSection/autoScalingValidation.ts +++ b/app/react/kubernetes/applications/components/AutoScalingFormSection/autoScalingValidation.ts @@ -12,26 +12,25 @@ export function autoScalingValidation( const { autoScalerOverflow } = validationData || {}; return object({ isUsed: boolean().required(), - minReplicas: number() - .min(0, 'Minimum instances must be greater than 0.') - .when('isUsed', (isUsed: boolean) => - isUsed - ? number() - .required('Minimum instances is required.') - .test( - 'maxReplicas', - 'Minimum instances must be less than maximum instances.', - // eslint-disable-next-line func-names - function (this, value?: number): boolean { - if (!value) { - return false; - } - const { maxReplicas } = this.parent as AutoScalingFormValues; - return !maxReplicas || value < maxReplicas; + minReplicas: number().when('isUsed', (isUsed: boolean) => + isUsed + ? number() + .required('Minimum instances is required.') + .min(1, 'Minimum instances must be greater than 0.') + .test( + 'maxReplicas', + 'Minimum instances must be less than maximum instances.', + // eslint-disable-next-line func-names + function (this, value?: number): boolean { + if (!value) { + return true; } - ) - : number() - ), + const { maxReplicas } = this.parent as AutoScalingFormValues; + return !maxReplicas || value < maxReplicas; + } + ) + : number() + ), maxReplicas: number().when('isUsed', (isUsed: boolean) => isUsed ? number()