From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 27 Nov 2018 09:09:28 +0000 (+0100)
Subject: Merge branch 'master' into 13864-Virtual-machines
X-Git-Tag: 1.3.0~11^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/95b86eb6b3184b787b570a906347ccaac32195c6

Merge branch 'master' into 13864-Virtual-machines

refs #13864

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

95b86eb6b3184b787b570a906347ccaac32195c6
diff --cc src/models/resource.ts
index 679a800a,006d0a23..7e2127b2
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -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;
      }