X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/ac0824da1999359c43df8ef0eba924494a666fe7..939693eea743bcb4fc74ae6de5d5d796f125ec17:/src/validators/validators.tsx diff --git a/src/validators/validators.tsx b/src/validators/validators.tsx index acef9744..81fed2cc 100644 --- a/src/validators/validators.tsx +++ b/src/validators/validators.tsx @@ -6,18 +6,22 @@ import { require } from './require'; import { maxLength } from './max-length'; import { isRsaKey } from './is-rsa-key'; import { isRemoteHost } from "./is-remote-host"; +import { validFilePath, validName, validNameAllowSlash } from "./valid-name"; export const TAG_KEY_VALIDATION = [require, maxLength(255)]; export const TAG_VALUE_VALIDATION = [require, maxLength(255)]; -export const PROJECT_NAME_VALIDATION = [require, maxLength(255)]; +export const PROJECT_NAME_VALIDATION = [require, validName, maxLength(255)]; +export const PROJECT_NAME_VALIDATION_ALLOW_SLASH = [require, validNameAllowSlash, maxLength(255)]; -export const COLLECTION_NAME_VALIDATION = [require, maxLength(255)]; +export const COLLECTION_NAME_VALIDATION = [require, validName, maxLength(255)]; +export const COLLECTION_NAME_VALIDATION_ALLOW_SLASH = [require, validNameAllowSlash, maxLength(255)]; export const COLLECTION_DESCRIPTION_VALIDATION = [maxLength(255)]; export const COLLECTION_PROJECT_VALIDATION = [require]; export const COPY_NAME_VALIDATION = [require, maxLength(255)]; export const COPY_FILE_VALIDATION = [require]; +export const RENAME_FILE_VALIDATION = [require, validFilePath]; export const MOVE_TO_VALIDATION = [require]; @@ -35,3 +39,5 @@ export const SSH_KEY_NAME_VALIDATION = [require, maxLength(255)]; export const SITE_MANAGER_REMOTE_HOST_VALIDATION = [require, isRemoteHost, maxLength(255)]; export const MY_ACCOUNT_VALIDATION = [require]; + +export const CHOOSE_VM_VALIDATION = [require];