Merge branch 'master' into 13864-Virtual-machines

refs #13864

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --combined src/models/resource.ts
index 679a800a8b6d9e1ac5690c01b9adda0b414c806b,006d0a2382ac19165718adfec7480e1516451fa1..7e2127b2813dad8076881b8fc69a03bb82184633
--- 1/src/models/resource.ts
--- 2/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -31,7 -31,6 +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"
  }
@@@ -44,8 -43,8 +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}';
@@@ -78,10 -77,10 +79,12 @@@ 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;
      }