fixed conflicts

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

diff --git a/src/models/resource.ts b/src/models/resource.ts
index 520520f76eb1d39c65c04378968b9c4de3093e5e..d2f524fc51d47a4537fd624fd47c9c9952e50b05 100644 (file)
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -30,6 +30,7 @@ export enum ResourceKind {
     PROJECT = "arvados#group",
     REPOSITORY = "arvados#repository",
     USER = "arvados#user",
+    VIRTUAL_MACHINE = "arvados#virtualMachine",
     WORKFLOW = "arvados#workflow",
     NONE = "arvados#none"
 }
@@ -42,6 +43,7 @@ export enum ResourceObjectType {
     LOG = '57u5n',
     REPOSITORY = 's0uqq',
     USER = 'tpzed',
+    VIRTUAL_MACHINE = '2x53u',
     WORKFLOW = '7fd4e',
 }
 
@@ -75,6 +77,8 @@ export const extractUuidKind = (uuid: string = '') => {
             return ResourceKind.LOG;
         case ResourceObjectType.WORKFLOW:
             return ResourceKind.WORKFLOW;
+        case ResourceObjectType.VIRTUAL_MACHINE:
+            return ResourceKind.VIRTUAL_MACHINE;
         case ResourceObjectType.REPOSITORY:
             return ResourceKind.REPOSITORY;
         default: