mirror of https://github.com/portainer/portainer
fix(app): fix env var state and validation [EE-6232] (#10941)
Co-authored-by: testa113 <testa113>pull/10943/head
parent
067a7d148f
commit
55f66f161e
|
@ -45,15 +45,15 @@ export function EnvironmentVariablesFieldset({
|
|||
export function envVarValidation(): SchemaOf<Values> {
|
||||
return array(
|
||||
object({
|
||||
name: string().required('Name is required'),
|
||||
name: string().required('Environment variable name is required'),
|
||||
value: string().default(''),
|
||||
needsDeletion: boolean().default(false),
|
||||
})
|
||||
).test(
|
||||
'unique',
|
||||
'This environment variable is already defined.',
|
||||
'This environment variable is already defined',
|
||||
buildUniquenessTest(
|
||||
() => 'This environment variable is already defined.',
|
||||
() => 'This environment variable is already defined',
|
||||
'name'
|
||||
)
|
||||
);
|
||||
|
|
|
@ -35,6 +35,7 @@ export function parseArrayOfStrings(array: Array<string> = []): Array<EnvVar> {
|
|||
return {
|
||||
name: parsedKeyValArr[1].trim(),
|
||||
value: parsedKeyValArr[3].trim() || '',
|
||||
needsDeletion: false,
|
||||
};
|
||||
})
|
||||
);
|
||||
|
|
|
@ -7,19 +7,19 @@ export function kubeEnvVarValidationSchema(): SchemaOf<EnvVar[]> {
|
|||
return array(
|
||||
object({
|
||||
name: string()
|
||||
.required('Name is required')
|
||||
.required('Environment variable name is required')
|
||||
.matches(
|
||||
/^[a-zA-Z][a-zA-Z0-9_.-]*$/,
|
||||
`This field must consist of alphabetic characters, digits, '_', '-', or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'.`
|
||||
`This field must consist of alphabetic characters, digits, '_', '-', or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'`
|
||||
),
|
||||
value: string().default(''),
|
||||
needsDeletion: bool().default(false),
|
||||
})
|
||||
).test(
|
||||
'unique',
|
||||
'This environment variable is already defined.',
|
||||
'This environment variable is already defined',
|
||||
buildUniquenessTest(
|
||||
() => 'This environment variable is already defined.',
|
||||
() => 'This environment variable is already defined',
|
||||
'name'
|
||||
)
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue