github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(kube/config): validate change window start [EE-6830] (#11328)

pull/11351/head
Chaim Lev-Ari 2024-03-10 09:42:29 +02:00 committed by GitHub
parent cc1ce9412a
commit e265b8b67c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/react/kubernetes/cluster/ConfigureView/ConfigureForm/validation.ts
View File

@ -1,5 +1,7 @@
import { object, string, boolean, array, number, SchemaOf } from 'yup'; import { object, string, boolean, array, number, SchemaOf } from 'yup';
import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
import { IngressControllerClassMap } from '../../ingressClass/types'; import { IngressControllerClassMap } from '../../ingressClass/types';
import { ConfigureFormValues } from './types'; import { ConfigureFormValues } from './types';
@ -37,6 +39,20 @@ const storageClassFormValuesSchema = array()
} }
); );
// Define Yup schema for EndpointChangeWindow
const endpointChangeWindowSchema = object().shape({
Enabled: boolean().required(),
StartTime: string().test(
'startTime should not be the same as endTime',
'The chosen time configuration is invalid.',
(value, context) => {
const { EndTime, Enabled } = context.parent;
return !Enabled || value !== EndTime;
}
),
EndTime: string(),
});
// Define Yup schema for IngressControllerClassMap // Define Yup schema for IngressControllerClassMap
const ingressControllerClassMapSchema: SchemaOf<IngressControllerClassMap> = const ingressControllerClassMapSchema: SchemaOf<IngressControllerClassMap> =
object().shape({ object().shape({
@ -58,6 +74,7 @@ export const configureValidationSchema: SchemaOf<ConfigureFormValues> = object({
restrictStandardUserIngressW: boolean().required(), restrictStandardUserIngressW: boolean().required(),
ingressAvailabilityPerNamespace: boolean().required(), ingressAvailabilityPerNamespace: boolean().required(),
allowNoneIngressClass: boolean().required(), allowNoneIngressClass: boolean().required(),
changeWindow: isBE ? endpointChangeWindowSchema.required() : undefined,
storageClasses: storageClassFormValuesSchema.required(), storageClasses: storageClassFormValuesSchema.required(),
ingressClasses: array().of(ingressControllerClassMapSchema).required(), ingressClasses: array().of(ingressControllerClassMapSchema).required(),
}); });