X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/215016dc53873f311b5eb3e7e86f2d967ec447fe..9555a2020771863c2e4f6b8802bd6850efb37713:/src/models/resource.ts diff --git a/src/models/resource.ts b/src/models/resource.ts index 2af51ecb..371278e5 100644 --- a/src/models/resource.ts +++ b/src/models/resource.ts @@ -14,6 +14,10 @@ export interface Resource { etag: string; } +export interface EditableResource extends Resource { + isEditable: boolean; +} + export interface TrashableResource extends Resource { trashAt: string; deleteAt: string; @@ -58,8 +62,9 @@ export enum ResourceObjectType { } 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 PORTABLE_DATA_HASH_PATTERN = '[a-f0-9]{32}\\+\\d+'; +export const RESOURCE_UUID_REGEX = new RegExp("^" + RESOURCE_UUID_PATTERN + "$"); +export const COLLECTION_PDH_REGEX = new RegExp("^" + PORTABLE_DATA_HASH_PATTERN + "$"); export const isResourceUuid = (uuid: string) => RESOURCE_UUID_REGEX.test(uuid); @@ -104,7 +109,6 @@ export const extractUuidKind = (uuid: string = '') => { return ResourceKind.LINK; default: const match = COLLECTION_PDH_REGEX.exec(uuid); - console.log("matching " + match); return match ? ResourceKind.COLLECTION : undefined; } };