refs #master Merge branch 'origin/master' into 14280-query-language

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

diff --combined src/models/resource.ts
index 7852a73e1b8bbc4acf4e20537e3cf232b4230ab0,7e2127b2813dad8076881b8fc69a03bb82184633..99e9196fc55105b5325aacf3098d4a13fd523d01
--- 1/src/models/resource.ts
--- 2/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -31,6 -31,7 +31,7 @@@ export enum ResourceKind 
      REPOSITORY = "arvados#repository",
      SSH_KEY = "arvados#authorizedKeys",
      USER = "arvados#user",
+     VIRTUAL_MACHINE = "arvados#virtualMachine",
      WORKFLOW = "arvados#workflow",
      NONE = "arvados#none"
  }
@@@ -43,7 -44,9 +44,9 @@@ export enum ResourceObjectType 
      LOG = '57u5n',
      REPOSITORY = 's0uqq',
      USER = 'tpzed',
+     VIRTUAL_MACHINE = '2x53u',
      WORKFLOW = '7fd4e',
+     SSH_KEY = 'fngyi'
  }
  
  export const RESOURCE_UUID_PATTERN = '.{5}-.{5}-.{15}';
@@@ -76,28 -79,13 +79,32 @@@ export const extractUuidKind = (uuid: s
              return ResourceKind.LOG;
          case ResourceObjectType.WORKFLOW:
              return ResourceKind.WORKFLOW;
+         case ResourceObjectType.VIRTUAL_MACHINE:
+             return ResourceKind.VIRTUAL_MACHINE;
          case ResourceObjectType.REPOSITORY:
              return ResourceKind.REPOSITORY;
+         case ResourceObjectType.SSH_KEY:
+             return ResourceKind.SSH_KEY;
          default:
              return undefined;
      }
  };
 +
 +export const getResourceKind = (kind?: string) => {
 +    switch (kind) {
 +        case "arvados#collection":
 +            return ResourceKind.COLLECTION;
 +        case "arvados#container":
 +            return ResourceKind.CONTAINER;
 +        case "arvados#containerRequest":
 +            return ResourceKind.CONTAINER_REQUEST;
 +        case "arvados#group":
 +            return ResourceKind.GROUP;
 +        case "arvados#log":
 +            return ResourceKind.LOG;
 +        case "arvados#workflow":
 +            return ResourceKind.WORKFLOW;
 +        default:
 +            return undefined;
 +    }
 +};