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/components/icon/icon.tsx
index f0f7da1d5f2694876095dee857d9509e080d7f53,a0f58be4e8df41dd0890a639a839f3d7c8d7a2ac..8049686f3d749c56db2bab6a55b99d63c975a65e
--- 1/src/components/icon/icon.tsx
--- 2/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@@ -3,6 -3,7 +3,6 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import * as React from 'react';
 -import AccessTime from '@material-ui/icons/AccessTime';
  import Add from '@material-ui/icons/Add';
  import ArrowBack from '@material-ui/icons/ArrowBack';
  import ArrowDropDown from '@material-ui/icons/ArrowDropDown';
@@@ -49,6 -50,7 +49,7 @@@ import SettingsEthernet from '@material
  import Star from '@material-ui/icons/Star';
  import StarBorder from '@material-ui/icons/StarBorder';
  import Warning from '@material-ui/icons/Warning';
+ import VpnKey from '@material-ui/icons/VpnKey';
  
  export type IconType = React.SFC<{ className?: string, style?: object }>;
  
@@@ -73,6 -75,7 +74,7 @@@ export const HelpIcon: IconType = (prop
  export const HelpOutlineIcon: IconType = (props) => <HelpOutline {...props} />;
  export const ImportContactsIcon: IconType = (props) => <ImportContacts {...props} />;
  export const InputIcon: IconType = (props) => <InsertDriveFile {...props} />;
+ export const KeyIcon: IconType = (props) => <VpnKey {...props} />;
  export const LogIcon: IconType = (props) => <SettingsEthernet {...props} />;
  export const MailIcon: IconType = (props) => <Mail {...props} />;
  export const MoreOptionsIcon: IconType = (props) => <MoreVert {...props} />;
@@@ -87,6 -90,7 +89,6 @@@ export const ProcessIcon: IconType = (p
  export const ProjectIcon: IconType = (props) => <Folder {...props} />;
  export const ProjectsIcon: IconType = (props) => <Inbox {...props} />;
  export const ProvenanceGraphIcon: IconType = (props) => <DeviceHub {...props} />;
 -export const RecentIcon: IconType = (props) => <AccessTime {...props} />;
  export const RemoveIcon: IconType = (props) => <Delete {...props} />;
  export const RemoveFavoriteIcon: IconType = (props) => <Star {...props} />;
  export const RenameIcon: IconType = (props) => <Edit {...props} />;

diff --combined src/models/resource.ts
index d2f524fc51d47a4537fd624fd47c9c9952e50b05,5fa617974b173741e69e3b017c7778223a606cc9..679a800a8b6d9e1ac5690c01b9adda0b414c806b
--- 1/src/models/resource.ts
--- 2/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -29,8 -29,8 +29,9 @@@ export enum ResourceKind 
      PROCESS = "arvados#containerRequest",
      PROJECT = "arvados#group",
      REPOSITORY = "arvados#repository",
+     SSH_KEY = "arvados#authorizedKeys",
      USER = "arvados#user",
 +    VIRTUAL_MACHINE = "arvados#virtualMachine",
      WORKFLOW = "arvados#workflow",
      NONE = "arvados#none"
  }
@@@ -43,7 -43,6 +44,7 @@@ export enum ResourceObjectType 
      LOG = '57u5n',
      REPOSITORY = 's0uqq',
      USER = 'tpzed',
 +    VIRTUAL_MACHINE = '2x53u',
      WORKFLOW = '7fd4e',
  }
  
@@@ -77,8 -76,6 +78,8 @@@ 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;
          default:

diff --combined src/views/workbench/workbench.tsx
index 5ebf10567f1d87b1d0edc52343659f0cf645bedf,84c8e24c99dc0959ce9c34961d83d1e390478315..3914f64632e716bfe0aa4aca8265ae42a6a6bc93
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -48,7 -48,6 +48,7 @@@ import { SshKeyPanel } from '~/views/ss
  import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog';
  import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog';
  import { ProcessInputDialog } from '~/views-components/process-input-dialog/process-input-dialog';
 +import { VirtualMachinePanel } from '~/views/virtual-machine-panel/virtual-machine-panel';
  import { ProjectPropertiesDialog } from '~/views-components/project-properties-dialog/project-properties-dialog';
  import { RepositoriesPanel } from '~/views/repositories-panel/repositories-panel';
  import { RepositoriesSampleGitDialog } from '~/views-components/repositories-sample-git-dialog/repositories-sample-git-dialog';
@@@ -56,6 -55,9 +56,9 @@@ import { RepositoryAttributesDialog } f
  import { CreateRepositoryDialog } from '~/views-components/dialog-forms/create-repository-dialog';
  import { RemoveRepositoryDialog } from '~/views-components/repository-remove-dialog/repository-remove-dialog';
  import { CreateSshKeyDialog } from '~/views-components/dialog-forms/create-ssh-key-dialog';
+ import { PublicKeyDialog } from '~/views-components/ssh-keys-dialog/public-key-dialog';
+ import { RemoveSshKeyDialog } from '~/views-components/ssh-keys-dialog/remove-dialog';
+ import { AttributesSshKeyDialog } from '~/views-components/ssh-keys-dialog/attributes-dialog';
  
  type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
  
@@@ -125,7 -127,6 +128,7 @@@ export const WorkbenchPanel 
                                  <Route path={Routes.RUN_PROCESS} component={RunProcessPanel} />
                                  <Route path={Routes.WORKFLOWS} component={WorkflowPanel} />
                                  <Route path={Routes.SEARCH_RESULTS} component={SearchResultsPanel} />
 +                                <Route path={Routes.VIRTUAL_MACHINES} component={VirtualMachinePanel} />
                                  <Route path={Routes.REPOSITORIES} component={RepositoriesPanel} />
                                  <Route path={Routes.SSH_KEYS} component={SshKeyPanel} />
                              </Switch>
@@@ -137,6 -138,7 +140,7 @@@
                  <DetailsPanel />
              </Grid>
              <AdvancedTabDialog />
+             <AttributesSshKeyDialog />
              <ChangeWorkflowDialog />
              <ContextMenu />
              <CopyCollectionDialog />
@@@ -152,12 -154,14 +156,14 @@@
              <MoveProcessDialog />
              <MoveProjectDialog />
              <MultipleFilesRemoveDialog />
+             <PublicKeyDialog />
              <PartialCopyCollectionDialog />
              <ProcessCommandDialog />
              <ProcessInputDialog />
              <ProjectPropertiesDialog />
              <RemoveProcessDialog />
              <RemoveRepositoryDialog />
+             <RemoveSshKeyDialog />
              <RenameFileDialog />
              <RepositoryAttributesDialog />
              <RepositoriesSampleGitDialog />