X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/282b04b762cf6366209074333bfd623e3cba58c5..3d93769b1906fd43bade1c053429541877a75cc9:/src/models/resource.ts diff --git a/src/models/resource.ts b/src/models/resource.ts index eddcd5a0..4708a9da 100644 --- a/src/models/resource.ts +++ b/src/models/resource.ts @@ -26,6 +26,7 @@ export enum ResourceKind { CONTAINER = "arvados#container", CONTAINER_REQUEST = "arvados#containerRequest", GROUP = "arvados#group", + LINK = "arvados#link", LOG = "arvados#log", NODE = "arvados#node", PROCESS = "arvados#containerRequest", @@ -45,6 +46,7 @@ export enum ResourceObjectType { CONTAINER = 'dz642', CONTAINER_REQUEST = 'xvhdp', GROUP = 'j7d0g', + LINK = 'o0j2j', LOG = '57u5n', REPOSITORY = 's0uqq', USER = 'tpzed', @@ -55,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); @@ -97,7 +100,10 @@ export const extractUuidKind = (uuid: string = '') => { return ResourceKind.NODE; case ResourceObjectType.API_CLIENT_AUTHORIZATION: return ResourceKind.API_CLIENT_AUTHORIZATION; + case ResourceObjectType.LINK: + return ResourceKind.LINK; default: - return undefined; + const match = COLLECTION_PDH_REGEX.exec(uuid); + return match ? ResourceKind.COLLECTION : undefined; } };