mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +02:00
fix(input): allow clearing number inputs [EE-6714] (#11186)
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
Some checks are pending
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
ci / build_images (map[arch:arm platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Waiting to run
ci / build_images (map[arch:s390x platform:linux version:]) (push) Waiting to run
ci / build_manifests (push) Blocked by required conditions
/ triage (push) Waiting to run
Lint / Run linters (push) Waiting to run
Test / test-client (push) Waiting to run
Test / test-server (map[arch:amd64 platform:linux]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Waiting to run
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Waiting to run
Test / test-server (map[arch:arm64 platform:linux]) (push) Waiting to run
This commit is contained in:
parent
a2a2c6cf3e
commit
0c05539dee
11 changed files with 60 additions and 29 deletions
|
@ -4,7 +4,6 @@ import { round } from 'lodash';
|
|||
import { FormControl } from '@@/form-components/FormControl';
|
||||
import { Input } from '@@/form-components/Input';
|
||||
import { TextTip } from '@@/Tip/TextTip';
|
||||
import { FormError } from '@@/form-components/FormError';
|
||||
|
||||
import { ReplicaCountFormValues } from './types';
|
||||
|
||||
|
@ -31,16 +30,18 @@ export function ReplicationFormSection({
|
|||
|
||||
return (
|
||||
<>
|
||||
<FormControl label="Instance count" required>
|
||||
<FormControl
|
||||
label="Instance count"
|
||||
required
|
||||
errors={errors?.replicaCount}
|
||||
>
|
||||
<Input
|
||||
type="number"
|
||||
min="0"
|
||||
max="9999"
|
||||
value={values.replicaCount}
|
||||
disabled={!supportScalableReplicaDeployment}
|
||||
onChange={(e) =>
|
||||
onChange({ replicaCount: e.target.valueAsNumber || 0 })
|
||||
}
|
||||
onChange={(e) => onChange({ replicaCount: e.target.valueAsNumber })}
|
||||
className="w-1/4"
|
||||
data-cy="k8sAppCreate-replicaCountInput"
|
||||
/>
|
||||
|
@ -54,7 +55,6 @@ export function ReplicationFormSection({
|
|||
<b>{memoryLimit * values.replicaCount} MB</b> of memory.
|
||||
</TextTip>
|
||||
)}
|
||||
{errors?.replicaCount && <FormError>{errors.replicaCount}</FormError>}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
import { SchemaOf, number, object } from 'yup';
|
||||
import { SchemaOf, object } from 'yup';
|
||||
|
||||
import { nanNumberSchema } from '@/react-tools/yup-schemas';
|
||||
|
||||
import { ReplicaCountFormValues } from './types';
|
||||
|
||||
|
@ -19,7 +21,7 @@ export function replicationValidation(
|
|||
supportScalableReplicaDeployment,
|
||||
} = validationData || {};
|
||||
return object({
|
||||
replicaCount: number()
|
||||
replicaCount: nanNumberSchema('Instance count is required')
|
||||
.min(0, 'Instance count must be greater than or equal to 0.')
|
||||
.test(
|
||||
'overflow',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue