X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/45cfc5acaa27151778f245bce76b027c06698b3d..f80a908d033729d3fb63e2611e3bd11d94fa2a65:/src/models/resource.ts

diff --git a/src/models/resource.ts b/src/models/resource.ts
index 3b30b088..b8156cf2 100644
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -10,42 +10,69 @@ export interface Resource {
     modifiedByUserUuid: string;
     modifiedAt: string;
     href: string;
-    kind: string;
+    kind: ResourceKind;
     etag: string;
 }
 
+export interface TrashableResource extends Resource {
+    trashAt: string;
+    deleteAt: string;
+    isTrashed: boolean;
+}
+
 export enum ResourceKind {
     COLLECTION = "arvados#collection",
+    CONTAINER = "arvados#container",
     CONTAINER_REQUEST = "arvados#containerRequest",
     GROUP = "arvados#group",
+    LOG = "arvados#log",
     PROCESS = "arvados#containerRequest",
     PROJECT = "arvados#group",
-    WORKFLOW = "arvados#workflow",
     USER = "arvados#user",
+    WORKFLOW = "arvados#workflow",
+    NONE = "arvados#none"
 }
 
 export enum ResourceObjectType {
-    USER = 'tpzed',
+    COLLECTION = '4zz18',
+    CONTAINER = 'dz642',
+    CONTAINER_REQUEST = 'xvhdp',
     GROUP = 'j7d0g',
-    COLLECTION = '4zz18'
+    LOG = '57u5n',
+    USER = 'tpzed',
+    WORKFLOW = '7fd4e',
 }
 
+export const RESOURCE_UUID_PATTERN = '.{5}-.{5}-.{15}';
+export const RESOURCE_UUID_REGEX = new RegExp(RESOURCE_UUID_PATTERN);
+
+export const isResourceUuid = (uuid: string) =>
+    RESOURCE_UUID_REGEX.test(uuid);
+
 export const extractUuidObjectType = (uuid: string) => {
-    const match = /(.{5})-(.{5})-(.{15})/.exec(uuid);
+    const match = RESOURCE_UUID_REGEX.exec(uuid);
     return match
-        ? match[2]
+        ? match[0].split('-')[1]
         : undefined;
 };
 
 export const extractUuidKind = (uuid: string = '') => {
     const objectType = extractUuidObjectType(uuid);
-    switch(objectType){
+    switch (objectType) {
         case ResourceObjectType.USER:
             return ResourceKind.USER;
         case ResourceObjectType.GROUP:
             return ResourceKind.GROUP;
         case ResourceObjectType.COLLECTION:
             return ResourceKind.COLLECTION;
+        case ResourceObjectType.CONTAINER_REQUEST:
+            return ResourceKind.CONTAINER_REQUEST;
+        case ResourceObjectType.CONTAINER:
+            return ResourceKind.CONTAINER;
+        case ResourceObjectType.LOG:
+            return ResourceKind.LOG;
+        case ResourceObjectType.WORKFLOW:
+            return ResourceKind.WORKFLOW;
         default:
             return undefined;
     }