15781: Uses 'contains' or 'ilike' on prop searches depending on API revision.

[arvados-workbench2.git] / src / models / resource.ts

diff --git a/src/models/resource.ts b/src/models/resource.ts
index 232b21aaebe844a1eba915625b4d3b52d64ba416..4708a9dac8e98a618fbc853e39a2d48c10cb367f 100644 (file)
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -46,6 +46,7 @@ export enum ResourceObjectType {
     CONTAINER = 'dz642',
     CONTAINER_REQUEST = 'xvhdp',
     GROUP = 'j7d0g',
+    LINK = 'o0j2j',
     LOG = '57u5n',
     REPOSITORY = 's0uqq',
     USER = 'tpzed',
@@ -56,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);
@@ -98,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;
     }
 };