Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libs/i18n/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,7 @@
"{{ fieldName }} is required": "{{ fieldName }} is required",
"Use lowercase alphanumeric characters, or hyphens (-). Must start and end with an alphanumeric character.": "Use lowercase alphanumeric characters, or hyphens (-). Must start and end with an alphanumeric character.",
"Name must not exceed {{ maxLength }} characters": "Name must not exceed {{ maxLength }} characters",
"Use lowercase alphanumeric characters, hyphens (-), or dots (.). Must start and end with an alphanumeric character.": "Use lowercase alphanumeric characters, hyphens (-), or dots (.). Must start and end with an alphanumeric character.",
"Build name is required": "Build name is required",
"{{ fieldName }} must not exceed {{ maxLength }} characters": "{{ fieldName }} must not exceed {{ maxLength }} characters",
"System image is invalid": "System image is invalid",
Expand Down
32 changes: 20 additions & 12 deletions libs/ui-components/src/components/form/validations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const OCI_IMAGE_FULL_REGEXP = /^(?![./_])[a-zA-Z0-9.\-\/:@_+]*$/;
// Accepts all characters from the above regex, but it rejects leading dot, slash, or underscore
const OCI_IMAGE_ALLOWED_CHARS_REGEXP = /^[a-zA-Z0-9.\-\/:@_+]*$/;
const GENERIC_NAME_REGEXP = /^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/;
const CONFIG_NAME_REGEXP = /^[a-z0-9]([-a-z0-9.]*[a-z0-9])?$/; // same as generic name plus "dots"
const APPLICATION_VAR_NAME_REGEXP = /^[a-zA-Z_]+[a-zA-Z0-9_]*$/;

export const GIT_TARGET_REVISION_REGEX = /^[a-zA-Z0-9]([a-zA-Z0-9.\/_-])*$/;
Expand Down Expand Up @@ -240,13 +241,20 @@ export const validApplicationAndVolumeName = (t: TFunction) =>
}),
);

export const validGenericName = (t: TFunction) =>
genericNameSchema(t).max(
GENERIC_NAME_MAX_LENGTH,
t('Name must not exceed {{ maxLength }} characters', {
maxLength: GENERIC_NAME_MAX_LENGTH,
}),
);
export const validConfigName = (t: TFunction) =>
Yup.string()
.matches(
CONFIG_NAME_REGEXP,
t(
'Use lowercase alphanumeric characters, hyphens (-), or dots (.). Must start and end with an alphanumeric character.',
),
)
.max(
EXTENDED_MAX_LENGTH,
t('Name must not exceed {{ maxLength }} characters', {
maxLength: EXTENDED_MAX_LENGTH,
}),
);

export const getBuildNameValidations = (t: TFunction) => [
{
Expand Down Expand Up @@ -1054,7 +1062,7 @@ export const validConfigTemplatesSchema = (t: TFunction) =>
if (isGitConfigTemplate(value)) {
return Yup.object<GitConfigTemplate>().shape({
type: Yup.string().required(t('Source type is required.')),
name: validGenericName(t).required(t('Name is required.')),
name: validConfigName(t).required(t('Name is required.')),
path: Yup.string().required(t('Path is required.')).matches(absolutePathRegex, t('Path must be absolute.')),
repository: Yup.string().required(t('Repository is required.')),
targetRevision: maxLengthString(t, {
Expand All @@ -1066,7 +1074,7 @@ export const validConfigTemplatesSchema = (t: TFunction) =>
return Yup.object<HttpConfigTemplate>().shape({
type: Yup.string().required(t('Source type is required.')),
repository: Yup.string().required(t('Repository is required.')),
name: validGenericName(t).required(t('Name is required.')),
name: validConfigName(t).required(t('Name is required.')),
filePath: Yup.string()
.required(t('File path is required.'))
.matches(absolutePathRegex, t('Path must be absolute.')),
Expand All @@ -1075,7 +1083,7 @@ export const validConfigTemplatesSchema = (t: TFunction) =>
} else if (isKubeSecretTemplate(value)) {
return Yup.object<KubeSecretTemplate>().shape({
type: Yup.string().required(t('Source type is required.')),
name: validGenericName(t).required(t('Name is required.')),
name: validConfigName(t).required(t('Name is required.')),
secretName: Yup.string().required(t('Secret name is required.')),
secretNs: Yup.string().required(t('Secret namespace is required.')),
mountPath: Yup.string()
Expand All @@ -1085,7 +1093,7 @@ export const validConfigTemplatesSchema = (t: TFunction) =>
} else if (isInlineConfigTemplate(value)) {
return Yup.object<InlineConfigTemplate>().shape({
type: Yup.string().required(t('Source type is required.')),
name: validGenericName(t).required(t('Name is required.')),
name: validConfigName(t).required(t('Name is required.')),
files: Yup.array().of(
Yup.object<InlineConfigTemplate['files'][0]>().shape({
path: Yup.string()
Expand Down Expand Up @@ -1114,7 +1122,7 @@ export const validConfigTemplatesSchema = (t: TFunction) =>
}

return Yup.object<InlineConfigTemplate>().shape({
name: validGenericName(t).required(t('Name is required.')),
name: validConfigName(t).required(t('Name is required.')),
type: Yup.string().required(t('Source type is required.')),
});
}),
Expand Down
Loading