X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f83344568cb070f716527288abe88a4ec5b0c305..35d6c5a870aeff7bb2cbf6ec80d306debad872c1:/src/models/resource.ts

diff --git a/src/models/resource.ts b/src/models/resource.ts
index 4d2d92e015..4708a9dac8 100644
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -21,10 +21,12 @@ export interface TrashableResource extends Resource {
 }
 
 export enum ResourceKind {
+    API_CLIENT_AUTHORIZATION = "arvados#apiClientAuthorization",
     COLLECTION = "arvados#collection",
     CONTAINER = "arvados#container",
     CONTAINER_REQUEST = "arvados#containerRequest",
     GROUP = "arvados#group",
+    LINK = "arvados#link",
     LOG = "arvados#log",
     NODE = "arvados#node",
     PROCESS = "arvados#containerRequest",
@@ -39,10 +41,12 @@ export enum ResourceKind {
 }
 
 export enum ResourceObjectType {
+    API_CLIENT_AUTHORIZATION = 'gj3su',
     COLLECTION = '4zz18',
     CONTAINER = 'dz642',
     CONTAINER_REQUEST = 'xvhdp',
     GROUP = 'j7d0g',
+    LINK = 'o0j2j',
     LOG = '57u5n',
     REPOSITORY = 's0uqq',
     USER = 'tpzed',
@@ -53,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);
@@ -93,7 +98,12 @@ export const extractUuidKind = (uuid: string = '') => {
             return ResourceKind.KEEP_SERVICE;
         case ResourceObjectType.NODE:
             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;
     }
 };