Merge pull request #1585 from rszwajko/consolePF4

Migrate to PF4 based react-console

src/components/Toolbar/index.js

@@ -9,10 +9,7 @@ import {
 } from '@patternfly/react-core'
 import { RouterPropTypeShapes } from '_/propTypeShapes'
 import VmActions from '../VmActions'
-import VmConsoleSelector from '../VmConsole/VmConsoleSelector'
-import VmConsoleInstructionsModal from '../VmConsole/VmConsoleInstructionsModal'
 import VmsListToolbar from './VmsListToolbar'
-import { NATIVE_VNC, SPICE } from '_/constants'
 
 const VmDetailToolbar = ({ match, vms }) => {
   if (vms.getIn(['vms', match.params.id])) {
@@ -43,48 +40,10 @@ const VmDetailToolbarConnected = connect(
   })
 )(VmDetailToolbar)
 
-const VmConsoleToolbar = ({ match: { params: { id, consoleType } } = {}, vms }) => {
-  if (!vms.getIn(['vms', id])) {
-    return <Toolbar/>
-  }
-
-  return (
-    <Toolbar className='portaled-toolbars-padding'>
-      <ToolbarContent >
-        <ToolbarGroup variant="button-group">
-          <VmConsoleSelector
-            vmId={id}
-            consoleType={consoleType}
-            isConsolePage
-          />
-          <VmConsoleInstructionsModal
-            disabled={![NATIVE_VNC, SPICE].includes(consoleType)}
-          />
-        </ToolbarGroup>
-        <ToolbarGroup variant="button-group" alignment={{ default: 'alignRight' }}>
-          <div id='vm-console-toolbar-sendkeys' />
-        </ToolbarGroup>
-      </ToolbarContent>
-    </Toolbar>
-  )
-}
-
-VmConsoleToolbar.propTypes = {
-  vms: PropTypes.object.isRequired,
-  match: RouterPropTypeShapes.match.isRequired,
-}
-
-const VmConsoleToolbarConnected = connect(
-  (state) => ({
-    vms: state.vms,
-  })
-)(VmConsoleToolbar)
-
 const SettingsToolbar = () => <div id='settings-toolbar' />
 
 export {
   VmDetailToolbarConnected as VmDetailToolbar,
-  VmConsoleToolbarConnected as VmConsoleToolbar,
   VmsListToolbar,
   SettingsToolbar,
 }