X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/78224728bc808a560718e934ef124afa77b81834..56069f1f9fa111b9756e9bfa7a3b0c9dba2e9a7a:/src/models/resource.ts diff --git a/src/models/resource.ts b/src/models/resource.ts index c2c2771bc3..239a67cc12 100644 --- a/src/models/resource.ts +++ b/src/models/resource.ts @@ -2,8 +2,6 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ApiClientAuthorization } from '~/models/api-client-authorization'; - export interface Resource { uuid: string; ownerUuid: string; @@ -59,8 +57,9 @@ export enum ResourceObjectType { NODE = '7ekkf' } -export const RESOURCE_UUID_PATTERN = '.{5}-.{5}-.{15}'; +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); @@ -104,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; } };