X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/090f4825bdd30925a10c6df1b9493df0c2e8f541..50286028b596616c33e2e6919f91c7292d5a6a72:/src/models/resource.ts diff --git a/src/models/resource.ts b/src/models/resource.ts index 31f3eb88..4708a9da 100644 --- a/src/models/resource.ts +++ b/src/models/resource.ts @@ -57,8 +57,9 @@ export enum ResourceObjectType { NODE = '7ekkf' } -export const RESOURCE_UUID_PATTERN = '.{5}-.{5}-.{15}'; -export const RESOURCE_UUID_REGEX = new RegExp(RESOURCE_UUID_PATTERN); +export const RESOURCE_UUID_PATTERN = '[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}'; +export const RESOURCE_UUID_REGEX = new RegExp("^" + RESOURCE_UUID_PATTERN + "$"); +export const COLLECTION_PDH_REGEX = /^[a-f0-9]{32}\+\d+$/; export const isResourceUuid = (uuid: string) => RESOURCE_UUID_REGEX.test(uuid); @@ -102,6 +103,7 @@ export const extractUuidKind = (uuid: string = '') => { case ResourceObjectType.LINK: return ResourceKind.LINK; default: - return undefined; + const match = COLLECTION_PDH_REGEX.exec(uuid); + return match ? ResourceKind.COLLECTION : undefined; } };