mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 07:49:41 +02:00
fix(app): on create don't mention previous values [EE-6837] (#11350)
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
Co-authored-by: testa113 <testa113>
This commit is contained in:
parent
ae4970f0ed
commit
51449490fa
2 changed files with 10 additions and 9 deletions
|
@ -17,6 +17,7 @@ type ValidationData = {
|
|||
maxCpuLimit: number;
|
||||
isEnvironmentAdmin: boolean;
|
||||
nodeLimits: NodesLimits;
|
||||
isEdit: boolean;
|
||||
};
|
||||
|
||||
export function resourceReservationValidation(
|
||||
|
@ -34,10 +35,10 @@ export function resourceReservationValidation(
|
|||
}`,
|
||||
() => !!validationData && validationData.maxMemoryLimit > 0
|
||||
)
|
||||
.max(
|
||||
validationData?.maxMemoryLimit || 0,
|
||||
({ value }) =>
|
||||
`Value must be between 0 and ${validationData?.maxMemoryLimit}MB now - the previous value of ${value} exceeds this.`
|
||||
.max(validationData?.maxMemoryLimit || 0, ({ value }) =>
|
||||
validationData?.isEdit
|
||||
? `Value must be between 0 and ${validationData?.maxMemoryLimit}MB now - the previous value of ${value} exceeds this.`
|
||||
: `Value must be between 0 and ${validationData?.maxMemoryLimit}MB.`
|
||||
)
|
||||
.test(
|
||||
'hasSuitableNode',
|
||||
|
@ -68,10 +69,10 @@ export function resourceReservationValidation(
|
|||
}`,
|
||||
() => !!validationData && validationData.maxCpuLimit > 0
|
||||
)
|
||||
.max(
|
||||
validationData?.maxCpuLimit || 0,
|
||||
({ value }) =>
|
||||
`Value must be between 0 and ${validationData?.maxCpuLimit} now - the previous value of ${value} exceeds this.`
|
||||
.max(validationData?.maxCpuLimit || 0, ({ value }) =>
|
||||
validationData?.isEdit
|
||||
? `Value must be between 0 and ${validationData?.maxCpuLimit} now - the previous value of ${value} exceeds this.`
|
||||
: `Value must be between 0 and ${validationData?.maxCpuLimit}.`
|
||||
)
|
||||
.test(
|
||||
'hasSuitableNode',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue