add message for current operation

CHANGELOG.md

@@ -1,68 +1,5 @@
 # ChangeLog
 
-## **5.12.0** (2017-08-31)
-
-### Enhancements
-
- * PIF selector with physical status [#2326](https://github.com/vatesfr/xo-web/issues/2326)
- * [SortedTable] Range selection [#2323](https://github.com/vatesfr/xo-web/issues/2323)
- * Self service filter for home/VM view [#2303](https://github.com/vatesfr/xo-web/issues/2303)
- * SR/Disks Display total of VDIs to coalesce [#2300](https://github.com/vatesfr/xo-web/issues/2300)
- * Pool filter in the task view [#2293](https://github.com/vatesfr/xo-web/issues/2293)
- * "Loading" while fetching objects [#2285](https://github.com/vatesfr/xo-web/issues/2285)
- * [SortedTable] Add grouped actions feature [#2276](https://github.com/vatesfr/xo-web/issues/2276)
- * Add a filter to the backups' log [#2246](https://github.com/vatesfr/xo-web/issues/2246)
- * It should not be possible to migrate a halted VM. [#2233](https://github.com/vatesfr/xo-web/issues/2233)
- * [Home][Keyboard navigation] Allow selecting the objects [#2214](https://github.com/vatesfr/xo-web/issues/2214)
- * Allow to set pool master [#2213](https://github.com/vatesfr/xo-web/issues/2213)
- * Continuous Replication Retention  [#1692](https://github.com/vatesfr/xo-web/issues/1692)
-
-### Bugs
-
- * Home pagination bug [#2310](https://github.com/vatesfr/xo-web/issues/2310)
- * Fix PoolActionBar to add a new SR [#2307](https://github.com/vatesfr/xo-web/issues/2307)
- * VM snapshots are not correctly deleted [#2304](https://github.com/vatesfr/xo-web/issues/2304)
- * Parallel deletion of VMs fails [#2297](https://github.com/vatesfr/xo-web/issues/2297)
- * Continous replication create multiple zombie disks [#2292](https://github.com/vatesfr/xo-web/issues/2292)
- * Add user to Group issue [#2196](https://github.com/vatesfr/xo-web/issues/2196)
- * [VM migration] Error if default SR not accessible to target host [#2180](https://github.com/vatesfr/xo-web/issues/2180)
-
-## **5.11.0** (2017-07-31)
-
-### Enhancements
-
-- Storage VHD chain health [\#2178](https://github.com/vatesfr/xo-web/issues/2178)
-
-### Bug fixes
-
-- No web VNC console [\#2258](https://github.com/vatesfr/xo-web/issues/2258)
-- Patching issues [\#2254](https://github.com/vatesfr/xo-web/issues/2254)
-- Advanced button in VM creation for self service user [\#2202](https://github.com/vatesfr/xo-web/issues/2202)
-- Hide "new VM" menu entry if not admin or not self service user [\#2191](https://github.com/vatesfr/xo-web/issues/2191)
-
-## **5.10.0** (2017-06-30)
-
-### Enhancements
-
-- Improve backup log display [\#2239](https://github.com/vatesfr/xo-web/issues/2239)
-- Patch SR detection improvement [\#2215](https://github.com/vatesfr/xo-web/issues/2215)
-- Less strict coalesce detection [\#2207](https://github.com/vatesfr/xo-web/issues/2207)
-- IP pool UI improvement [\#2203](https://github.com/vatesfr/xo-web/issues/2203)
-- Ability to clear "Auto power on" flag for DR-ed VM [\#2097](https://github.com/vatesfr/xo-web/issues/2097)
-- [Delta backup restoration] Choose SR for each VDIs [\#2070](https://github.com/vatesfr/xo-web/issues/2070)
-- Ability to forget an host (even if no longer present) [\#1934](https://github.com/vatesfr/xo-web/issues/1934)
-
-### Bug fixes
-
-- Cross pool migrate fail [\#2248](https://github.com/vatesfr/xo-web/issues/2248)
-- ActionButtons with modals stay in pending state forever [\#2222](https://github.com/vatesfr/xo-web/issues/2222)
-- Permission issue for a user on self service VMs [\#2212](https://github.com/vatesfr/xo-web/issues/2212)
-- Self-Service resource loophole [\#2198](https://github.com/vatesfr/xo-web/issues/2198)
-- Backup log no longer shows the name of destination VM [\#2195](https://github.com/vatesfr/xo-web/issues/2195)
-- State not restored when exiting modal dialog [\#2194](https://github.com/vatesfr/xo-web/issues/2194)
-- [Xapi#exportDeltaVm] Cannot read property 'managed' of undefined [\#2189](https://github.com/vatesfr/xo-web/issues/2189)
-- VNC keyboard layout change [\#404](https://github.com/vatesfr/xo-web/issues/404)
-
 ## **5.9.0** (2017-05-31)
 
 ### Enhancements

package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "xo-web",
-  "version": "5.12.0",
+  "version": "5.9.1",
   "license": "AGPL-3.0",
   "description": "Web interface client for Xen-Orchestra",
   "keywords": [
@@ -31,7 +31,6 @@
     "npm": ">=3"
   },
   "devDependencies": {
-    "@nraynaud/novnc": "^0.6.1-1",
     "ansi_up": "^1.3.0",
     "asap": "^2.0.4",
     "babel-eslint": "^7.0.0",
@@ -80,7 +79,6 @@
     "gulp-watch": "^4.3.5",
     "human-format": "^0.8.0",
     "husky": "^0.13.1",
-    "immutable": "^3.8.1",
     "index-modules": "^0.3.0",
     "is-ip": "^1.0.0",
     "jest": "^20.0.4",
@@ -95,6 +93,7 @@
     "moment": "^2.13.0",
     "moment-timezone": "^0.5.4",
     "notifyjs": "^3.0.0",
+    "novnc-node": "^0.5.3",
     "promise-toolbox": "^0.9.4",
     "random-password": "^0.1.2",
     "react": "^15.4.1",

src/common/action-bar.js

@@ -1,50 +1,47 @@
-import ActionButton from 'action-button'
-import propTypes from 'prop-types-decorator'
-import React, { cloneElement } from 'react'
-import { noop } from 'lodash'
+import React from 'react'
+import { map, noop } from 'lodash'
 
+import _ from './intl'
+import ActionButton from './action-button'
 import ButtonGroup from './button-group'
 
-export const Action = ({ display, handler, handlerParam, icon, label, pending, redirectOnSuccess }) =>
-  <ActionButton
-    handler={handler}
-    handlerParam={handlerParam}
-    icon={icon}
-    pending={pending}
-    redirectOnSuccess={redirectOnSuccess}
-    size='large'
-    tooltip={display === 'icon' ? label : undefined}
-  >
-    {display === 'both' && label}
-  </ActionButton>
-
-Action.propTypes = {
-  display: propTypes.oneOf([ 'icon', 'both' ]),
-  handler: propTypes.func.isRequired,
-  icon: propTypes.string.isRequired,
-  label: propTypes.node,
-  pending: propTypes.bool,
-  redirectOnSuccess: propTypes.string
-}
-
-const ActionBar = ({ children, handlerParam = noop, display = 'both' }) =>
+const ActionBar = ({ actions, param }) => (
   <ButtonGroup>
-    {React.Children.map(children, (child, key) => {
-      if (!child) {
+    {map(actions, (button, index) => {
+      if (!button) {
         return
       }
 
-      const { props } = child
-      return cloneElement(child, {
-        display: props.display || display,
-        handlerParam: props.handlerParam || handlerParam,
-        key
-      })
+      const {
+        handler,
+        handlerParam = param,
+        icon,
+        label,
+        pending,
+        redirectOnSuccess
+      } = button
+      return <ActionButton
+        key={index}
+        handler={handler || noop}
+        handlerParam={handlerParam}
+        icon={icon}
+        pending={pending}
+        redirectOnSuccess={redirectOnSuccess}
+        size='large'
+        tooltip={_(label)}
+      />
     })}
   </ButtonGroup>
-
+)
 ActionBar.propTypes = {
-  display: propTypes.oneOf([ 'icon', 'both' ]),
-  handlerParam: propTypes.any
+  actions: React.PropTypes.arrayOf(
+    React.PropTypes.shape({
+      label: React.PropTypes.string.isRequired,
+      icon: React.PropTypes.string.isRequired,
+      handler: React.PropTypes.func,
+      redirectOnSuccess: React.PropTypes.string
+    })
+  ).isRequired,
+  display: React.PropTypes.oneOf(['icon', 'text', 'both'])
 }
 export { ActionBar as default }

src/common/card.js

@@ -17,16 +17,16 @@ const CARD_HEADER_STYLE = {
 }
 
 export const Card = propTypes({
+  disableMaxHeight: propTypes.bool,
   shadow: propTypes.bool
 })(({
-  shadow,
-  ...props
-}) => {
-  props.className = 'card'
-  props.style = shadow ? CARD_STYLE_WITH_SHADOW : CARD_STYLE
-
-  return <div {...props} />
-})
+  children,
+  shadow
+}) => (
+  <div className='card' style={shadow ? CARD_STYLE_WITH_SHADOW : CARD_STYLE}>
+    {children}
+  </div>
+))
 
 export const CardHeader = propTypes({
   className: propTypes.string

src/common/drag-n-drop-order.js

@@ -0,0 +1,128 @@
+import _ from 'intl'
+import ActionButton from 'action-button'
+import Component from 'base-component'
+import HTML5Backend from 'react-dnd-html5-backend'
+import Icon from 'icon'
+import map from 'lodash/map'
+import propTypes from 'prop-types-decorator'
+import React from 'react'
+import { DragDropContext, DragSource, DropTarget } from 'react-dnd'
+import { Toggle } from 'form'
+
+const orderItemSource = {
+  beginDrag: props => ({
+    id: props.id,
+    index: props.index
+  })
+}
+
+const orderItemTarget = {
+  hover: (props, monitor, component) => {
+    const dragIndex = monitor.getItem().index
+    const hoverIndex = props.index
+    if (dragIndex === hoverIndex) {
+      return
+    }
+    props.move(dragIndex, hoverIndex)
+    monitor.getItem().index = hoverIndex
+  }
+}
+
+@DropTarget('orderItem', orderItemTarget, connect => ({
+  connectDropTarget: connect.dropTarget()
+}))
+@DragSource('orderItem', orderItemSource, (connect, monitor) => ({
+  connectDragSource: connect.dragSource(),
+  isDragging: monitor.isDragging()
+}))
+@propTypes({
+  connectDragSource: propTypes.func.isRequired,
+  connectDropTarget: propTypes.func.isRequired,
+  index: propTypes.number.isRequired,
+  isDragging: propTypes.bool.isRequired,
+  id: propTypes.any.isRequired,
+  item: propTypes.object.isRequired,
+  move: propTypes.func.isRequired
+})
+class OrderItem extends Component {
+  _toggle = checked => {
+    const { item } = this.props
+    item.active = checked
+    this.forceUpdate()
+  }
+
+  render () {
+    const { item, connectDragSource, connectDropTarget, toggle } = this.props
+    return connectDragSource(connectDropTarget(
+      <li className='list-group-item'>
+        <Icon icon='grab' />
+        {' '}
+        <Icon icon='grab' />
+        {' '}
+        {item.text}
+        {toggle && <span className='pull-right'>
+          <Toggle value={item.active} onChange={this._toggle} />
+        </span>}
+      </li>
+    ))
+  }
+}
+
+@propTypes({
+  onClose: propTypes.func
+})
+@DragDropContext(HTML5Backend)
+export default class DragNDropOrder extends Component {
+  constructor (props) {
+    super(props)
+    const { parseOrderParam, parseOrder } = props
+    this.state = parseOrder(parseOrderParam)
+  }
+
+  _moveOrderItem = (dragIndex, hoverIndex) => {
+    const order = this.state.order.slice()
+    const dragItem = order.splice(dragIndex, 1)
+    if (dragItem.length) {
+      order.splice(hoverIndex, 0, dragItem.pop())
+      this.setState({order})
+    }
+  }
+
+  _reset = () => {
+    const { parseOrderParam, parseOrder } = this.props
+    this.state = this.setState(parseOrder(parseOrderParam))
+  }
+
+  _save = () => {
+    const { order, toggleActive } = this.state
+    this.props.setOrder(this.props.parseOrderParam, order, toggleActive)
+  }
+
+  _toggleOnChange = event => this.setState({toggleActive: event})
+
+  render () {
+    const { order, toggleActive } = this.state
+    const { toggleItems } = this.props
+    return <form>
+      {!toggleItems && <Toggle value={toggleActive} onChange={this._toggleOnChange} />}
+      <ul>
+        {map(order, (item, index) => <OrderItem
+          toggle={toggleItems}
+          key={index}
+          index={index}
+          id={item.id}
+          // FIXME missing translation
+          item={item}
+          move={this._moveOrderItem}
+        />)}
+      </ul>
+      <fieldset className='form-inline'>
+        <span className='pull-right'>
+          <ActionButton icon='save' btnStyle='primary' handler={this._save}>{_('saveBootOption')}</ActionButton>
+          {' '}
+          <ActionButton icon='reset' handler={this._reset}>{_('resetBootOption')}</ActionButton>
+        </span>
+      </fieldset>
+    </form>
+  }
+}

src/common/editable/index.js

@@ -390,6 +390,7 @@ const MAP_TYPE_SELECT = {
 }
 
 @propTypes({
+  labelProp: propTypes.string.isRequired,
   value: propTypes.oneOfType([
     propTypes.string,
     propTypes.object

src/common/form/select-plain-object.js

@@ -15,7 +15,7 @@ import Select from './select'
   multi: propTypes.bool,
   onChange: propTypes.func,
   options: propTypes.array,
-  placeholder: propTypes.node,
+  placeholder: propTypes.string,
   predicate: propTypes.func,
   required: propTypes.bool,
   value: propTypes.any

src/common/home-filters.js

@@ -31,3 +31,8 @@ export const SR = {
   ...common,
   homeFilterTags: 'tags:'
 }
+
+export const vmGroup = {
+  ...common,
+  homeFilterTags: 'tags:'
+}

src/common/icon.js

@@ -4,19 +4,17 @@ import React from 'react'
 
 import propTypes from './prop-types-decorator'
 
-const Icon = ({ icon, size = 1, color, fixedWidth, ...props }) => {
+const Icon = ({ icon, size = 1, fixedWidth, ...props }) => {
   props.className = classNames(
     props.className,
     icon !== undefined ? `xo-icon-${icon}` : 'fa', // Without icon prop, is a placeholder.
     isInteger(size) ? `fa-${size}x` : `fa-${size}`,
-    color,
     fixedWidth && 'fa-fw'
   )
 
   return <i {...props} />
 }
 propTypes(Icon)({
-  color: propTypes.string,
   fixedWidth: propTypes.bool,
   icon: propTypes.string,
   size: propTypes.oneOfType([

src/common/intl/index.js

@@ -48,10 +48,6 @@ const getMessage = (props, messageId, values, render) => {
     {render}
   </FormattedMessage>
 }
-getMessage.keyValue = (key, value) => getMessage('keyValue', {
-  key: <strong>{key}</strong>,
-  value
-})
 
 export { getMessage as default }
 

src/common/intl/messages.js

@@ -5,8 +5,6 @@ var forEach = require('lodash/forEach')
 var isString = require('lodash/isString')
 
 var messages = {
-  keyValue: '{key}: {value}',
-
   statusConnecting: 'Connecting',
   statusDisconnected: 'Disconnected',
   statusLoading: 'Loading…',
@@ -40,6 +38,7 @@ var messages = {
   // ----- Titles -----
   homePage: 'Home',
   homeVmPage: 'VMs',
+  homeVmGroupPage: 'VM-Groups',
   homeHostPage: 'Hosts',
   homePoolPage: 'Pools',
   homeTemplatePage: 'Templates',
@@ -68,6 +67,7 @@ var messages = {
   taskMenu: 'Tasks',
   taskPage: 'Tasks',
   newVmPage: 'VM',
+  newVmGroupPage: 'VM-Group',
   newSrPage: 'Storage',
   newServerPage: 'Server',
   newImport: 'Import',
@@ -103,7 +103,7 @@ var messages = {
 
   // ----- Home view ------
   homeFetchingData: 'Fetching data…',
-  homeWelcome: 'Welcome to Xen Orchestra!',
+  homeWelcome: 'Welcome on Xen Orchestra!',
   homeWelcomeText: 'Add your XenServer hosts or pools',
   homeConnectServerText: 'Some XenServers have been registered but are not connected',
   homeHelp: 'Want some help?',
@@ -123,13 +123,13 @@ var messages = {
   homeTypePool: 'Pool',
   homeTypeHost: 'Host',
   homeTypeVm: 'VM',
+  homeTypeVmGroup: 'VM group',
   homeTypeSr: 'SR',
   homeTypeVmTemplate: 'Template',
   homeSort: 'Sort',
   homeAllPools: 'Pools',
   homeAllHosts: 'Hosts',
   homeAllTags: 'Tags',
-  homeAllResourceSets: 'Resource sets',
   homeNewVm: 'New VM',
   homeFilterNone: 'None',
   homeFilterRunningHosts: 'Running hosts',
@@ -160,9 +160,6 @@ var messages = {
   srSharedType: 'Shared {type}',
   srNotSharedType: 'Not shared {type}',
 
-  // ----- Common components -----
-  sortedTableSelectedItems: '{selected, number} selected on {total, number}',
-
   // ----- Forms -----
   add: 'Add',
   selectAll: 'Select all',
@@ -224,12 +221,6 @@ var messages = {
   cronPattern: 'Cron Pattern:',
   backupEditNotFoundTitle: 'Cannot edit backup',
   backupEditNotFoundMessage: 'Missing required info for edition',
-  successfulJobCall: 'Successful',
-  failedJobCall: 'Failed',
-  jobCallInProgess: 'In progress',
-  jobTransferredDataSize: 'size:',
-  jobTransferredDataSpeed: 'speed:',
-  allJobCalls: 'All',
   job: 'Job',
   jobModalTitle: 'Job {job}',
   jobId: 'ID',
@@ -262,7 +253,7 @@ var messages = {
   noJobs: 'No jobs found.',
   noSchedules: 'No schedules found',
   jobActionPlaceHolder: 'Select a xo-server API command',
-  jobTimeoutPlaceHolder: 'Timeout (number of seconds after which a VM is considered failed)',
+  jobTimeoutPlaceHolder: ' Timeout (number of seconds after which a VM is considered failed)',
   jobSchedules: 'Schedules',
   jobScheduleNamePlaceHolder: 'Name of your schedule',
   jobScheduleJobPlaceHolder: 'Select a Job',
@@ -455,13 +446,7 @@ var messages = {
   convertVmToTemplateLabel: 'Convert to template',
   vmConsoleLabel: 'Console',
 
-  // ----- SR advanced tab -----
-
-  srUnhealthyVdiNameLabel: 'Name',
-  srUnhealthyVdiSize: 'Size',
-  srUnhealthyVdiDepth: 'Depth',
-  srUnhealthyVdiTitle: 'VDI to coalesce ({total, number})',
-
+  // ----- SR tabs -----
   // ----- SR actions -----
   srRescan: 'Rescan all disks',
   srReconnectAll: 'Connect to all hosts',
@@ -485,7 +470,6 @@ var messages = {
   poolHaStatus: 'High Availability',
   poolHaEnabled: 'Enabled',
   poolHaDisabled: 'Disabled',
-  setpoolMaster: 'Master',
   // ----- Pool host tab -----
   hostNameLabel: 'Name',
   hostDescription: 'Description',
@@ -554,7 +538,7 @@ var messages = {
   hostCpusNumber: 'Core (socket)',
   hostManufacturerinfo: 'Manufacturer info',
   hostBiosinfo: 'BIOS info',
-  licenseHostSettingsLabel: 'License',
+  licenseHostSettingsLabel: 'Licence',
   hostLicenseType: 'Type',
   hostLicenseSocket: 'Socket',
   hostLicenseExpiry: 'Expiry',
@@ -615,7 +599,7 @@ var messages = {
   patchStatus: 'Status',
   patchStatusApplied: 'Applied',
   patchStatusNotApplied: 'Missing patches',
-  patchNothing: 'No patches detected',
+  patchNothing: 'No patch detected',
   patchReleaseDate: 'Release date',
   patchGuidance: 'Guidance',
   patchAction: 'Action',
@@ -643,6 +627,7 @@ var messages = {
   advancedTabName: 'Advanced',
   networkTabName: 'Network',
   disksTabName: 'Disk{disks, plural, one {} other {s}}',
+  managementTabName: 'Management',
 
   powerStateHalted: 'halted',
   powerStateRunning: 'running',
@@ -680,6 +665,7 @@ var messages = {
   copyToClipboardLabel: 'Copy',
   ctrlAltDelButtonLabel: 'Ctrl+Alt+Del',
   tipLabel: 'Tip:',
+  tipConsoleLabel: 'Due to a XenServer issue, non-US keyboard layouts aren\'t well supported. Switch your own layout to US to workaround it.',
   hideHeaderTooltip: 'Hide infos',
   showHeaderTooltip: 'Show infos',
 
@@ -734,8 +720,6 @@ var messages = {
   cdDriveInstallation: 'Stop and start the VM to install the CD drive',
   saveBootOption: 'Save',
   resetBootOption: 'Reset',
-  deleteSelectedVdis: 'Delete selected VDIs',
-  deleteSelectedVdi: 'Delete selected VDI',
 
   // ----- VM network tab -----
   vifCreateDeviceButton: 'New device',
@@ -900,6 +884,7 @@ var messages = {
 
   // ----- New VM -----
   newVmCreateNewVmOn: 'Create a new VM on {select}',
+  newVmCreateNewVmOn2: 'Create a new VM on {select1} or {select2}',
   newVmCreateNewVmNoPermission: 'You have no permission to create a VM',
   newVmInfoPanel: 'Infos',
   newVmNameLabel: 'Name',
@@ -953,6 +938,32 @@ var messages = {
   newVmHideAdvanced: 'Hide advanced settings',
   newVmShare: 'Share this VM',
 
+  // ----- VM-Group-----
+  newVmGroupTitle: 'Create a new Vm-Group on ',
+  newVmGroupNameLabel: 'Label',
+  newVmGroupDescriptionLabel: 'Description',
+  newVmGroupReset: 'Reset',
+  newVmGroupCreate: 'Create',
+  newVmGroupInfoPanel: 'Infos',
+
+  // ----- VM-Group item -----
+  powerStateVmGroupRunning: 'All vms are running',
+  powerStateVmGroupHalted: 'All vms are halted',
+  powerStateVmGroupBusy: 'Contains vms halted and vms running',
+
+  // ----- VM-Group management Tab -----
+  'attachVmButton': 'new VM',
+  'vmsBootOrder': 'Boot order',
+  'vmGroupLabel': 'Label',
+  'vmGroupDescription': 'Description',
+  'vmGroupActions': 'Actions',
+
+  // ----- VM-Group general Tab -----
+  'vmGroupCurrentStatus': 'Current status',
+
+  // ----- VM-Group stats Tab -----
+  'vmGroupAllVm': 'All VMs',
+
   // ----- Self -----
   resourceSets: 'Resource sets',
   noResourceSets: 'No resource sets.',
@@ -1030,10 +1041,6 @@ var messages = {
   availableBackupsColumn: 'Available Backups',
   backupRestoreErrorTitle: 'Missing parameters',
   backupRestoreErrorMessage: 'Choose a SR and a backup',
-  backupRestoreSelectDefaultSr: 'Select default SR…',
-  backupRestoreChooseSrForEachVdis: 'Choose a SR for each VDI',
-  backupRestoreVdiLabel: 'VDI',
-  backupRestoreSrLabel: 'SR',
   displayBackup: 'Display backups',
   importBackupTitle: 'Import VM',
   importBackupMessage: 'Starting your backup import',
@@ -1097,26 +1104,22 @@ var messages = {
   migrateVmModalTitle: 'Migrate VM',
   migrateVmSelectHost: 'Select a destination host:',
   migrateVmSelectMigrationNetwork: 'Select a migration network:',
+  migrateVmSelectSrs: 'For each VDI, select an SR:',
   migrateVmSelectNetworks: 'For each VIF, select a network:',
   migrateVmsSelectSr: 'Select a destination SR:',
   migrateVmsSelectSrIntraPool: 'Select a destination SR for local disks:',
   migrateVmsSelectNetwork: 'Select a network on which to connect each VIF:',
   migrateVmsSmartMapping: 'Smart mapping',
+  migrateVmName: 'Name',
+  migrateVmSr: 'SR',
   migrateVmVif: 'VIF',
   migrateVmNetwork: 'Network',
   migrateVmNoTargetHost: 'No target host',
   migrateVmNoTargetHostMessage: 'A target host is required to migrate a VM',
-  migrateVmNoDefaultSrError: 'No default SR',
-  migrateVmNotConnectedDefaultSrError: 'Default SR not connected to host',
-  chooseSrForEachVdisModalSelectSr: 'For each VDI, select an SR:',
-  chooseSrForEachVdisModalMainSr: 'Select main SR…',
-  chooseSrForEachVdisModalVdiLabel: 'VDI',
-  chooseSrForEachVdisModalSrLabel: 'SR*',
-  chooseSrForEachVdisModalOptionalEntry: '* optional',
+  deleteVmGroupModalTitle: 'Delete VM-Group',
+  deleteVmGroupModalMessage: 'Are you sure you want to delete this VMGroup ?',
   deleteVdiModalTitle: 'Delete VDI',
   deleteVdiModalMessage: 'Are you sure you want to delete this disk? ALL DATA ON THIS DISK WILL BE LOST',
-  deleteVdisModalTitle: 'Delete VDI{nVdis, plural, one {} other {s}}',
-  deleteVdisModalMessage: 'Are you sure you want to delete {nVdis, number} disk{nVdis, plural, one {} other {s}}? ALL DATA ON THESE DISKS WILL BE LOST',
   revertVmModalTitle: 'Revert your VM',
   deleteSnapshotModalTitle: 'Delete snapshot',
   deleteSnapshotModalMessage: 'Are you sure you want to delete this snapshot?',
@@ -1183,16 +1186,6 @@ var messages = {
   detachHostModalMessage: 'Are you sure you want to detach {host} from its pool? THIS WILL REMOVE ALL VMs ON ITS LOCAL STORAGE AND REBOOT THE HOST.',
   detachHost: 'Detach',
 
-  // ----- Forget host -----
-  forgetHostModalTitle: 'Forget host',
-  forgetHostModalMessage: 'Are you sure you want to forget {host} from its pool? Be sure this host can\'t be back online, or use detach instead.',
-  forgetHost: 'Forget',
-
-  // ----- Set pool master -----
-
-  setPoolMasterModalTitle: 'Designate a new master',
-  setPoolMasterModalMessage: 'This operation may take several minutes. Do you want to continue?',
-
   // ----- Network -----
   newNetworkCreate: 'Create network',
   newBondedNetworkCreate: 'Create bonded network',
@@ -1262,7 +1255,7 @@ var messages = {
   refresh: 'Refresh',
   upgrade: 'Upgrade',
   noUpdaterCommunity: 'No updater available for Community Edition',
-  considerSubscribe: 'Please consider subscribing and trying it with all the features for free during 15 days on {link}.',
+  considerSubscribe: 'Please consider subscribe and try it with all features for free during 15 days on {link}.',
   noUpdaterWarning: 'Manual update could break your current installation due to dependencies issues, do it with caution',
   currentVersion: 'Current version:',
   register: 'Register',
@@ -1418,8 +1411,7 @@ var messages = {
   xosanSuggestions: 'Suggestions',
   xosanName: 'Name',
   xosanHost: 'Host',
-  xosanHosts: 'Connected Hosts',
-  xosanPool: 'Pool',
+  xosanHosts: 'Hosts',
   xosanVolumeId: 'Volume ID',
   xosanSize: 'Size',
   xosanUsedSpace: 'Used space',
@@ -1436,15 +1428,8 @@ var messages = {
   xosanAvailableSpace: 'Available space',
   xosanDiskLossLegend: '* Can fail without data loss',
   xosanCreate: 'Create',
-  xosanAdd: 'Add',
   xosanInstalling: 'Installing XOSAN. Please wait...',
   xosanCommunity: 'No XOSAN available for Community Edition',
-  xosanNew: 'New',
-  xosanAdvanced: 'Advanced',
-  xosanRemoveSubvolumes: 'Remove subvolumes',
-  xosanAddSubvolume: 'Add subvolume',
-  xosanWarning: 'This version of XOSAN SR is from the first beta phase. You can keep using it, but to modify it you\'ll have to save your disks and re-create it.',
-  xosanVlan: 'VLAN',
   // Pack download modal
   xosanInstallCloudPlugin: 'Install cloud plugin first',
   xosanLoadCloudPlugin: 'Load cloud plugin first',
@@ -1455,38 +1440,8 @@ var messages = {
   xosanInstallPackOnHosts: 'Install XOSAN pack on these hosts:',
   xosanInstallPack: 'Install {pack} v{version}?',
   xosanNoPackFound: 'No compatible XOSAN pack found for your XenServer versions.',
-  xosanPackRequirements: 'At least one of these version requirements must be satisfied by all the hosts in this pool:',
-  // SR tab XOSAN
-  xosanVmsNotRunning: 'Some XOSAN Virtual Machines are not running',
-  xosanVmsNotFound: 'Some XOSAN Virtual Machines could not be found',
-  xosanFilesNeedHealing: 'Some XOSAN Virtual Machines have files needing healing',
-  xosanVm: 'VM controller',
-  xosanUnderlyingStorage: 'SR',
-  xosanReplace: 'Replace',
-  xosanOnSameVm: 'On same VM',
-  xosanBrickUuid: 'Brick UUID',
-  xosanBrickSize: 'Brick size',
-  xosanMemorySize: 'Memory size',
-  xosanStatus: 'Status',
-  xosanArbiter: 'Arbiter',
-  xosanUsedInodes: 'Used Inodes',
-  xosanBlockSize: 'Block size',
-  xosanDevice: 'Device',
-  xosanFsName: 'FS name',
-  xosanMountOptions: 'Mount options',
-  xosanPath: 'Path',
-  xosanJob: 'Job',
-  xosanPid: 'PID',
-  xosanPort: 'Port',
-  xosanReplaceBrickErrorTitle: 'Missing values',
-  xosanReplaceBrickErrorMessage: 'You need to select a SR and a size',
-  xosanAddSubvolumeErrorTitle: 'Bad values',
-  xosanAddSubvolumeErrorMessage: 'You need to select {nSrs, number} and a size',
-  xosanSelectNSrs: 'Select {nSrs, number} SRs',
-  xosanRun: 'Run',
-  xosanRemove: 'Remove',
-  xosanVolume: 'Volume',
-  xosanVolumeOptions: 'Volume options'
+  xosanPackRequirements: 'At least one of these version requirements must be satisfied by all the hosts in this pool:'
+
 }
 forEach(messages, function (message, id) {
   if (isString(message)) {

src/common/link.js

@@ -44,21 +44,11 @@ export class BlockLink extends Component {
     }
   }
 
-  _addAuxClickListener = ref => {
-    // FIXME: when https://github.com/facebook/react/issues/8529 is fixed,
-    // remove and use onAuxClickCapture.
-    // In Chrome ^55, middle-clicking triggers auxclick event instead of click
-    if (ref !== null) {
-      ref.addEventListener('auxclick', this._onClickCapture)
-    }
-  }
-
   render () {
     const { children, tagName = 'div' } = this.props
     const Component = tagName
     return (
       <Component
-        ref={this._addAuxClickListener}
         style={this._style}
         onClickCapture={this._onClickCapture}
       >

src/common/modal.js

@@ -29,7 +29,7 @@ const modal = (content, onClose) => {
   buttons: propTypes.arrayOf(propTypes.shape({
     btnStyle: propTypes.string,
     icon: propTypes.string,
-    label: propTypes.node.isRequired,
+    label: propTypes.string.isRequired,
     tooltip: propTypes.node,
     value: propTypes.any
   })).isRequired,
@@ -58,6 +58,8 @@ class GenericModal extends Component {
   }
 
   render () {
+    const { Body, Footer, Header, Title } = ReactModal
+
     const {
       buttons,
       icon,
@@ -67,33 +69,34 @@ class GenericModal extends Component {
     const body = _addRef(this.props.children, 'body')
 
     return <div>
-      <ReactModal.Header closeButton>
-        <ReactModal.Title>
+      <Header closeButton>
+        <Title>
           {icon
             ? <span><Icon icon={icon} /> {title}</span>
             : title
           }
-        </ReactModal.Title>
-      </ReactModal.Header>
-      <ReactModal.Body>
+        </Title>
+      </Header>
+      <Body>
         {body}
-      </ReactModal.Body>
-      <ReactModal.Footer>
+      </Body>
+      <Footer>
         {map(buttons, ({
           label,
           tooltip,
           value,
           icon,
           ...props
-        }, key) => {
+        }) => {
           const button = <Button
             onClick={() => this._resolve(value)}
+            key={value}
             {...props}
           >
             {icon !== undefined && <Icon icon={icon} fixedWidth />}
             {label}
           </Button>
-          return <span key={key}>
+          return <span>
             {tooltip !== undefined
               ? <Tooltip content={tooltip}>{button}</Tooltip>
               : button
@@ -106,7 +109,7 @@ class GenericModal extends Component {
             {_('genericCancel')}
           </Button>
         }
-      </ReactModal.Footer>
+      </Footer>
     </div>
   }
 }
@@ -206,8 +209,14 @@ export default class Modal extends Component {
   }
 
   render () {
+    const { showModal } = this.state
+    /* TODO: remove this work-around and use
+     * ReactModal.Body, ReactModal.Header, ...
+     * after this issue has been fixed:
+     * https://phabricator.babeljs.io/T6976
+     */
     return (
-      <ReactModal show={this.state.showModal} onHide={this._onHide}>
+      <ReactModal show={showModal} onHide={this._onHide}>
         {this.state.content}
       </ReactModal>
     )

src/common/no-objects.js

@@ -1,30 +0,0 @@
-import React from 'react'
-import { isEmpty } from 'lodash'
-
-import propTypes from './prop-types-decorator'
-
-// This component returns :
-//  - A loading icon when the objects are not fetched
-//  - A default message if the objects are fetched and the collection is empty
-//  - The children if the objects are fetched and the collection is not empty
-//
-// ```js
-//  <NoObjects collection={collection} emptyMessage={message}>
-//    {children}
-// </NoObjects>
-// ````
-const NoObjects = ({ children, collection, emptyMessage }) => collection == null
-  ? <img src='assets/loading.svg' alt='loading' />
-  : isEmpty(collection)
-    ? <p>{emptyMessage}</p>
-    : <div>{children}</div>
-
-propTypes(NoObjects)({
-  children: propTypes.node.isRequired,
-  collection: propTypes.oneOfType([
-    propTypes.array,
-    propTypes.object
-  ]).isRequired,
-  emptyMessage: propTypes.node.isRequired
-})
-export default NoObjects

src/common/react-novnc.js

@@ -1,7 +1,8 @@
 import React, { Component } from 'react'
-import RFB from '@nraynaud/novnc/lib/rfb'
 import { createBackoff } from 'jsonrpc-websocket-client'
+import { RFB } from 'novnc-node'
 import {
+  format as formatUrl,
   parse as parseUrl,
   resolve as resolveUrl
 } from 'url'
@@ -41,7 +42,7 @@ export default class NoVnc extends Component {
         }
       }
 
-      if (state !== 'disconnected' || this.refs.canvas == null) {
+      if (state !== 'disconnected') {
         return
       }
 
@@ -90,23 +91,14 @@ export default class NoVnc extends Component {
     const rfb = this._rfb = new RFB({
       encrypt: isSecure,
       target: this.refs.canvas,
+      wsProtocols: [ 'chat' ],
       onClipboard: onClipboardChange && ((_, text) => {
         onClipboardChange(text)
       }),
       onUpdateState: this._onUpdateState
     })
 
-    // remove leading slashes from the path
-    //
-    // a leading slassh will be added by noVNC
-    const clippedPath = url.path.replace(/^\/+/, '')
-
-    // a port is required
-    //
-    // if not available from the URL, use the default ones
-    const port = url.port || (isSecure ? 443 : 80)
-
-    rfb.connect(url.hostname, port, null, clippedPath)
+    rfb.connect(formatUrl(url))
     disableShortcuts()
   }
 

src/common/render-xo-item.js

@@ -165,7 +165,7 @@ const xoItemToRender = {
   // PIF.
   PIF: pif => (
     <span>
-      <Icon icon='network' color={pif.carrier ? 'text-success' : 'text-danger'} /> {pif.device} ({pif.deviceName})
+      <Icon icon='network' /> {pif.device} ({pif.deviceName})
     </span>
   ),
 

src/common/sorted-table/index.js

@@ -1,27 +1,18 @@
 import _ from 'intl'
+import ceil from 'lodash/ceil'
 import classNames from 'classnames'
+import debounce from 'lodash/debounce'
+import findIndex from 'lodash/findIndex'
+import isEmpty from 'lodash/isEmpty'
+import isFunction from 'lodash/isFunction'
+import map from 'lodash/map'
+import React from 'react'
+import { Dropdown, MenuItem, Pagination } from 'react-bootstrap-4/lib'
 import DropdownMenu from 'react-bootstrap-4/lib/DropdownMenu' // https://phabricator.babeljs.io/T6662 so Dropdown.Menu won't work like https://react-bootstrap.github.io/components.html#btn-dropdowns-custom
 import DropdownToggle from 'react-bootstrap-4/lib/DropdownToggle' // https://phabricator.babeljs.io/T6662 so Dropdown.Toggle won't work https://react-bootstrap.github.io/components.html#btn-dropdowns-custom
-import React from 'react'
 import { Portal } from 'react-overlays'
-import { Set } from 'immutable'
-import {
-  Dropdown,
-  MenuItem,
-  Pagination
-} from 'react-bootstrap-4/lib'
-import {
-  ceil,
-  debounce,
-  findIndex,
-  isEmpty,
-  isFunction,
-  map
-} from 'lodash'
 
-import ActionRowButton from 'action-row-button'
 import Button from '../button'
-import ButtonGroup from '../button-group'
 import Component from '../base-component'
 import Icon from '../icon'
 import propTypes from '../prop-types-decorator'
@@ -143,41 +134,7 @@ class ColumnHead extends Component {
 
 // ===================================================================
 
-@propTypes({
-  indeterminate: propTypes.bool.isRequired
-})
-class Checkbox extends Component {
-  componentDidUpdate () {
-    const { props: { indeterminate }, ref } = this
-    if (ref !== null) {
-      ref.indeterminate = indeterminate
-    }
-  }
-
-  _ref = ref => {
-    this.ref = ref
-    this.componentDidUpdate()
-  }
-
-  render () {
-    const { indeterminate, ...props } = this.props
-    props.ref = this._ref
-    props.type = 'checkbox'
-    return <input {...props} />
-  }
-}
-
-// ===================================================================
-
 const DEFAULT_ITEMS_PER_PAGE = 10
-const actionsShape = propTypes.arrayOf(propTypes.shape({
-  // groupedActions: the function will be called with an array of the selected items` ids in parameters
-  // individualActions: the function will be called with the related item's id in parameters
-  handler: propTypes.func.isRequired,
-  icon: propTypes.string.isRequired,
-  label: propTypes.node.isRequired,
-  level: propTypes.oneOf([ 'warning', 'danger' ])
-}))
 
 @propTypes({
   defaultColumn: propTypes.number,
@@ -200,8 +157,6 @@ const actionsShape = propTypes.arrayOf(propTypes.shape({
   })).isRequired,
   filterContainer: propTypes.func,
   filters: propTypes.object,
-  groupedActions: actionsShape,
-  individualActions: actionsShape,
   itemsPerPage: propTypes.number,
   paginationContainer: propTypes.func,
   rowAction: propTypes.func,
@@ -265,8 +220,6 @@ export default class SortedTable extends Component {
       () => this.state.activePage,
       this.state.itemsPerPage
     )
-
-    this.state.selectedItemsIds = new Set()
   }
 
   componentWillMount () {
@@ -303,60 +256,10 @@ export default class SortedTable extends Component {
     })
   }
 
-  componentDidUpdate () {
-    const { selectedItemsIds } = this.state
-
-    // Unselect items that are no longer visible
-    if ((this._visibleItemsRecomputations || 0) < (this._visibleItemsRecomputations = this._getVisibleItems.recomputations())) {
-      const newSelectedItems = selectedItemsIds.intersect(map(this._getVisibleItems(), 'id'))
-      if (newSelectedItems.size < selectedItemsIds.size) {
-        this.setState({ selectedItemsIds: newSelectedItems })
-      }
-    }
-  }
-
   _onPageSelection = (_, event) => this.setState({
     activePage: event.eventKey
   })
 
-  _selectAllVisibleItems = event => {
-    this.setState({
-      selectedItemsIds: event.target.checked
-        ? this.state.selectedItemsIds.union(map(this._getVisibleItems(), 'id'))
-        : this.state.selectedItemsIds.clear()
-    })
-  }
-
-  _selectItem = event => {
-    const { selectedItemsIds } = this.state
-    const { target } = event
-    const visibleItems = this._getVisibleItems()
-
-    const current = +target.name
-    let method = target.checked ? 'add' : 'delete'
-
-    let previous
-    this.setState({ selectedItemsIds:
-      (
-        event.nativeEvent.shiftKey &&
-        (previous = this._previous) !== undefined
-      ) ? selectedItemsIds.withMutations(selectedItemsIds => {
-        let i = previous
-        let end = current
-        if (previous > current) {
-          i = current
-          end = previous
-        }
-        for (; i <= end; ++i) {
-          selectedItemsIds[method](visibleItems[i].id)
-        }
-      })
-        : selectedItemsIds[method](visibleItems[current].id)
-    })
-
-    this._previous = current
-  }
-
   _onFilterChange = debounce(filter => {
     this.setState({
       filter,
@@ -364,27 +267,18 @@ export default class SortedTable extends Component {
     })
   }, 500)
 
-  _executeGroupedAction = handler => handler(this.state.selectedItemsIds.toArray())
-
   render () {
     const { props, state } = this
     const {
+      paginationContainer,
       filterContainer,
       filters,
-      groupedActions,
-      individualActions,
-      paginationContainer,
       rowAction,
       rowLink,
       userData
     } = props
 
     const nFilteredItems = this._getAllItems().length
-    const nVisibleItems = this._getVisibleItems().length
-    const nSelectedItems = state.selectedItemsIds.size
-
-    const hasGroupedActions = !isEmpty(groupedActions)
-    const hasIndividualActions = !isEmpty(individualActions)
 
     const paginationInstance = (
       <Pagination
@@ -416,13 +310,6 @@ export default class SortedTable extends Component {
         <table className='table'>
           <thead className='thead-default'>
             <tr>
-              {hasGroupedActions && <th>
-                <Checkbox
-                  onChange={this._selectAllVisibleItems}
-                  checked={nSelectedItems === nVisibleItems}
-                  indeterminate={nSelectedItems !== 0 && nSelectedItems !== nVisibleItems}
-                />
-              </th>}
               {map(props.columns, (column, key) => (
                 <ColumnHead
                   textAlign={column.textAlign}
@@ -434,30 +321,9 @@ export default class SortedTable extends Component {
                   sortIcon={state.selectedColumn === key ? state.sortOrder : 'sort'}
                />
               ))}
-              {hasIndividualActions && <th />}
             </tr>
           </thead>
           <tbody>
-            {nSelectedItems !== 0 && <tr className='bg-faded'>
-              <td colSpan={props.columns.length + (individualActions != null ? 2 : 1)}>
-                {_('sortedTableSelectedItems', {
-                  selected: nSelectedItems,
-                  total: nVisibleItems
-                })}
-                <div className='pull-right'>
-                  <ButtonGroup>
-                    {map(groupedActions, ({ icon, label, level, handler }, key) => <ActionRowButton
-                      btnStyle={level}
-                      handler={this._executeGroupedAction}
-                      handlerParam={handler}
-                      icon={icon}
-                      key={key}
-                      tooltip={label}
-                    />)}
-                  </ButtonGroup>
-                </div>
-              </td>
-            </tr>}
             {map(this._getVisibleItems(), (item, i) => {
               const columns = map(props.columns, ({
                 component: Component,
@@ -477,45 +343,18 @@ export default class SortedTable extends Component {
 
               const { id = i } = item
 
-              const selectionColumn = hasGroupedActions && <td>
-                <input
-                  checked={state.selectedItemsIds.has(id)}
-                  name={i} // position in visible items
-                  onChange={this._selectItem}
-                  type='checkbox'
-                />
-              </td>
-              const actionsColumn = hasIndividualActions && <td><div className='pull-right'>
-                <ButtonGroup>
-                  {map(individualActions, ({ icon, label, level, handler }, key) => <ActionRowButton
-                    btnStyle={level}
-                    handler={handler}
-                    handlerParam={id}
-                    icon={icon}
-                    key={key}
-                    tooltip={label}
-                  />)}
-                </ButtonGroup>
-              </div></td>
-
-              return rowLink != null
+              return rowLink
                 ? <BlockLink
                   key={id}
                   tagName='tr'
                   to={isFunction(rowLink) ? rowLink(item, userData) : rowLink}
-                >
-                  {selectionColumn}
-                  {columns}
-                  {actionsColumn}
-                </BlockLink>
+                >{columns}</BlockLink>
                 : <tr
                   className={rowAction && styles.clickableRow}
                   key={id}
                   onClick={rowAction && (() => rowAction(item, userData))}
                 >
-                  {selectionColumn}
                   {columns}
-                  {actionsColumn}
                 </tr>
             })}
           </tbody>

src/common/state-button.js

@@ -1,14 +1,10 @@
 import React from 'react'
 import styled from 'styled-components'
-import {
-  omit
-} from 'lodash'
 
 import ActionButton from './action-button'
 import propTypes from './prop-types-decorator'
 
-// do not forward `state` to ActionButton
-const Button = styled(p => <ActionButton {...omit(p, 'state')} />)`
+const Button = styled(ActionButton)`
   background-color: ${p => p.theme[`${p.state ? 'enabled' : 'disabled'}StateBg`]};
   border: 2px solid ${p => p.theme[`${p.state ? 'enabled' : 'disabled'}StateColor`]};
   color: ${p => p.theme[`${p.state ? 'enabled' : 'disabled'}StateColor`]};

src/common/tab-button.js

@@ -18,9 +18,7 @@ const TabButton = ({
     {...props}
     size='large'
     style={STYLE}
-  >
-    {labelId !== undefined && <span className='hidden-md-down'>{_(labelId)}</span>}
-  </ActionButton>
+  ><span className='hidden-md-down'>{_(labelId)}</span></ActionButton>
 )
 export { TabButton as default }
 

src/common/utils.js

@@ -15,7 +15,6 @@ import mapValues from 'lodash/mapValues'
 import React from 'react'
 import ReadableStream from 'readable-stream'
 import replace from 'lodash/replace'
-import sample from 'lodash/sample'
 import startsWith from 'lodash/startsWith'
 import { connect } from 'react-redux'
 
@@ -64,12 +63,8 @@ export const addSubscriptions = subscriptions => Component => {
     }
 
     componentWillMount () {
-      this._unsubscribes = map(
-        isFunction(subscriptions)
-          ? subscriptions(this.props)
-          : subscriptions,
-        (subscribe, prop) =>
-          subscribe(value => this._setState({ [prop]: value }))
+      this._unsubscribes = map(isFunction(subscriptions) ? subscriptions() : subscriptions, (subscribe, prop) =>
+        subscribe(value => this._setState({ [prop]: value }))
       )
     }
 
@@ -273,11 +268,6 @@ export const formatSize = bytes => humanFormat(bytes, { scale: 'binary', unit: '
 
 export const formatSizeRaw = bytes => humanFormat.raw(bytes, { scale: 'binary', unit: 'B' })
 
-export const formatSpeed = (bytes, milliseconds) => humanFormat(
-  bytes * 1e3 / milliseconds,
-  { scale: 'binary', unit: 'B/s' }
-)
-
 export const parseSize = size => {
   let bytes = humanFormat.parse.raw(size, { scale: 'binary' })
   if (bytes.unit && bytes.unit !== 'B') {
@@ -551,17 +541,3 @@ export const getCoresPerSocketPossibilities = (maxCoresPerSocket, vCPUs) => {
 
   return options
 }
-
-// Generates a random human-readable string of length `length`
-// Useful to generate random default names intended for the UI user
-export const generateReadableRandomString = (() => {
-  const CONSONANTS = 'bdfgklmnprtvz'.split('')
-  const VOWELS = 'aeiou'.split('')
-  return (length = 8) => {
-    const result = new Array(length)
-    for (let i = 0; i < length; ++i) {
-      result[i] = sample((i & 1) === 0 ? VOWELS : CONSONANTS)
-    }
-    return result.join('')
-  }
-})()

src/common/xo-line-chart/index.js

@@ -8,6 +8,7 @@ import {
   find,
   flatten,
   floor,
+  forEach,
   map,
   max,
   size,
@@ -16,7 +17,7 @@ import {
 } from 'lodash'
 
 import propTypes from '../prop-types-decorator'
-import { computeArraysSum } from '../xo-stats'
+import { computeArraysSum, computeArraysAvg } from '../xo-stats'
 import { formatSize } from '../utils'
 
 import styles from './index.css'
@@ -214,6 +215,54 @@ export const PoolCpuLineChart = injectIntl(propTypes({
   )
 }))
 
+export const VmGroupCpuLineChart = injectIntl(propTypes({
+  addSumSeries: propTypes.bool,
+  data: propTypes.object.isRequired,
+  options: propTypes.object
+})(({ addSumSeries, data, options = {}, intl }) => {
+  const firstVmData = data[0]
+  const length = getStatsLength(firstVmData.stats.cpus)
+
+  if (!length) {
+    return templateError
+  }
+
+  const series = map(data, ({ vm, stats }) => ({
+    name: vm,
+    data: computeArraysSum(stats.cpus)
+  }))
+
+  if (addSumSeries) {
+    series.push({
+      name: intl.formatMessage(messages.vmGroupAllVm),
+      data: computeArraysSum(map(series, 'data')),
+      className: styles.dashedLine
+    })
+  }
+
+  const nbCpusByVm = map(data, ({ stats }) => stats.cpus.length)
+
+  return (
+    <ChartistGraph
+      type='Line'
+      data={{
+        series
+      }}
+      options={{
+        ...makeOptions({
+          intl,
+          nValues: length,
+          endTimestamp: firstVmData.endTimestamp,
+          interval: firstVmData.interval,
+          valueTransform: value => `${floor(value)}%`
+        }),
+        high: 100 * (addSumSeries ? sum(nbCpusByVm) : max(nbCpusByVm)),
+        ...options
+      }}
+    />
+  )
+}))
+
 export const MemoryLineChart = injectIntl(propTypes({
   data: propTypes.object.isRequired,
   options: propTypes.object
@@ -302,6 +351,57 @@ export const PoolMemoryLineChart = injectIntl(propTypes({
   )
 }))
 
+export const VmGroupMemoryLineChart = injectIntl(propTypes({
+  addSumSeries: propTypes.bool,
+  data: propTypes.object.isRequired,
+  options: propTypes.object
+})(({ addSumSeries, data, options = {}, intl }) => {
+  const firstVmData = data[0]
+  const {
+    memory,
+    memoryUsed
+  } = firstVmData.stats
+
+  if (!memory || !memoryUsed) {
+    return templateError
+  }
+
+  const series = map(data, ({ vm, stats }) => ({
+    name: vm,
+    data: stats.memoryUsed
+  }))
+
+  if (addSumSeries) {
+    series.push({
+      name: intl.formatMessage(messages.vmGroupAllVm),
+      data: computeArraysSum(map(data, 'stats.memoryUsed')),
+      className: styles.dashedLine
+    })
+  }
+
+  const currentMemoryByHost = map(data, ({ stats }) => stats.memory[stats.memory.length - 1])
+
+  return (
+    <ChartistGraph
+      type='Line'
+      data={{
+        series
+      }}
+      options={{
+        ...makeOptions({
+          intl,
+          nValues: firstVmData.stats.memoryUsed.length,
+          endTimestamp: firstVmData.endTimestamp,
+          interval: firstVmData.interval,
+          valueTransform: formatSize
+        }),
+        high: addSumSeries ? sum(currentMemoryByHost) : max(currentMemoryByHost),
+        ...options
+      }}
+    />
+  )
+}))
+
 export const XvdLineChart = injectIntl(propTypes({
   addSumSeries: propTypes.bool,
   data: propTypes.object.isRequired,
@@ -334,6 +434,60 @@ export const XvdLineChart = injectIntl(propTypes({
   )
 }))
 
+export const VmGroupXvdLineChart = injectIntl(propTypes({
+  addSumSeries: propTypes.bool,
+  data: propTypes.object.isRequired,
+  options: propTypes.object
+})(({ addSumSeries, data, options = {}, intl }) => {
+  const firstVmData = data[0]
+  const {
+    memory,
+    memoryUsed
+  } = firstVmData.stats
+
+  if (!memory || !memoryUsed) {
+    return templateError
+  }
+
+  const series = flatten(map(data, ({ stats, vm }) =>
+    map(stats.xvds, (xvd, key) => {
+      return {
+        name: `${vm} (${key})`,
+        data: computeArraysAvg(stats.xvds[key])
+      }
+    })
+  ))
+
+  const datas = []
+  forEach(series, ({ data }) => datas.push(data))
+  if (addSumSeries) {
+    series.push({
+      name: intl.formatMessage(messages.vmGroupAllVm),
+      data: computeArraysSum(datas),
+      className: styles.dashedLine
+    })
+  }
+
+  return (
+    <ChartistGraph
+      type='Line'
+      data={{
+        series
+      }}
+      options={{
+        ...makeOptions({
+          intl,
+          nValues: firstVmData.stats.xvds.r.length,
+          endTimestamp: data.endTimestamp,
+          interval: data.interval,
+          valueTransform: formatSize
+        }),
+        ...options
+      }}
+    />
+  )
+}))
+
 export const VifLineChart = injectIntl(propTypes({
   addSumSeries: propTypes.bool,
   data: propTypes.object.isRequired,
@@ -443,6 +597,48 @@ export const PoolPifLineChart = injectIntl(propTypes({
   )
 }))
 
+export const VmGroupVifLineChart = injectIntl(propTypes({
+  addSumSeries: propTypes.bool,
+  data: propTypes.object.isRequired,
+  options: propTypes.object
+})(({ addSumSeries, data, options = {}, intl }) => {
+  const firstVmData = data[0]
+  const length = firstVmData.stats && getStatsLength(firstVmData.stats.vifs.rx)
+
+  if (!length) {
+    return templateError
+  }
+  const series = addSumSeries
+      ? map(ios, io => ({
+        name: `${intl.formatMessage(messages.vmGroupAllVm)} (${io})`,
+        data: computeArraysSum(map(data, ({ stats }) => computeArraysSum(stats.vifs[io])))
+      }))
+      : flatten(map(data, ({ stats, vm }) =>
+        map(ios, io => ({
+          name: `${vm} (${io})`,
+          data: computeArraysSum(stats.vifs[io])
+        }))
+      ))
+  return (
+    <ChartistGraph
+      type='Line'
+      data={{
+        series
+      }}
+      options={{
+        ...makeOptions({
+          intl,
+          nValues: length,
+          endTimestamp: firstVmData.endTimestamp,
+          interval: firstVmData.interval,
+          valueTransform: formatSize
+        }),
+        ...options
+      }}
+    />
+  )
+}))
+
 export const LoadLineChart = injectIntl(propTypes({
   data: propTypes.object.isRequired,
   options: propTypes.object

src/common/xo/choose-sr-for-each-vdis-modal/index.js

@@ -1,139 +0,0 @@
-import Collapse from 'collapse'
-import Component from 'base-component'
-import React from 'react'
-import { every, forEach, map } from 'lodash'
-
-import _ from '../../intl'
-import propTypes from '../../prop-types-decorator'
-import SingleLineRow from '../../single-line-row'
-import { createSelector } from '../../selectors'
-import { SelectSr } from '../../select-objects'
-import { isSrWritable } from 'xo'
-import {
-  Container,
-  Col
-} from 'grid'
-
-// Can 2 SRs on the same pool have 2 VDIs used by the same VM
-const areSrsCompatible = (sr1, sr2) =>
-  sr1.shared || sr2.shared || sr1.$container === sr2.$container
-
-const Collapsible = ({collapsible, children, ...props}) => collapsible
-  ? <Collapse {...props}>{children}</Collapse>
-  : <div>
-    <span>{props.buttonText}</span>
-    <br />
-    {children}
-  </div>
-
-Collapsible.propTypes = {
-  collapsible: propTypes.bool.isRequired,
-  children: propTypes.node.isRequired
-}
-
-@propTypes({
-  vdis: propTypes.array.isRequired,
-  predicate: propTypes.func
-})
-export default class ChooseSrForEachVdisModal extends Component {
-  state = {
-    mapVdisSrs: {}
-  }
-
-  componentWillReceiveProps (newProps) {
-    if (
-      this.props.predicate !== undefined &&
-      newProps.predicate !== this.props.predicate
-    ) {
-      this.state = {
-        mainSr: undefined,
-        mapVdisSrs: {}
-      }
-    }
-  }
-
-  _onChange = props => {
-    this.setState(props)
-    this.props.onChange(props)
-  }
-
-  _onChangeMainSr = newSr => {
-    const oldSr = this.state.mainSr
-
-    if (oldSr == null || newSr == null || oldSr.$pool !== newSr.$pool) {
-      this.setState({
-        mapVdisSrs: {}
-      })
-    } else if (!newSr.shared) {
-      const mapVdisSrs = {...this.state.mapVdisSrs}
-      forEach(mapVdisSrs, (sr, vdi) => {
-        if (sr != null && newSr !== sr && sr.$container !== newSr.$container && !sr.shared) {
-          delete mapVdisSrs[vdi]
-        }
-      })
-      this._onChange({mapVdisSrs})
-    }
-
-    this._onChange({
-      mainSr: newSr
-    })
-  }
-
-  _getSrPredicate = createSelector(
-    () => this.state.mainSr,
-    () => this.state.mapVdisSrs,
-    (mainSr, mapVdisSrs) => sr =>
-      isSrWritable(sr) &&
-      mainSr.$pool === sr.$pool &&
-      areSrsCompatible(mainSr, sr) &&
-      every(mapVdisSrs, selectedSr => selectedSr == null || areSrsCompatible(selectedSr, sr))
-  )
-
-  render () {
-    const { props, state } = this
-    const { vdis } = props
-    const {
-      mainSr,
-      mapVdisSrs
-    } = state
-
-    const srPredicate = props.predicate || this._getSrPredicate()
-
-    return <div>
-      <SelectSr
-        onChange={mainSr => props.predicate !== undefined
-          ? this._onChange({mainSr})
-          : this._onChangeMainSr(mainSr)
-        }
-        predicate={props.predicate || isSrWritable}
-        placeholder={_('chooseSrForEachVdisModalMainSr')}
-        value={mainSr}
-      />
-      <br />
-      {vdis != null && mainSr != null &&
-        <Collapsible collapsible={vdis.length >= 3} buttonText={_('chooseSrForEachVdisModalSelectSr')}>
-          <br />
-          <Container>
-            <SingleLineRow>
-              <Col size={6}><strong>{_('chooseSrForEachVdisModalVdiLabel')}</strong></Col>
-              <Col size={6}><strong>{_('chooseSrForEachVdisModalSrLabel')}</strong></Col>
-            </SingleLineRow>
-            {map(vdis, vdi =>
-              <SingleLineRow key={vdi.uuid}>
-                <Col size={6}>{ vdi.name_label || vdi.name }</Col>
-                <Col size={6}>
-                  <SelectSr
-                    onChange={sr => this._onChange({ mapVdisSrs: { ...mapVdisSrs, [vdi.uuid]: sr } })}
-                    value={mapVdisSrs[vdi.uuid]}
-                    predicate={srPredicate}
-                  />
-                </Col>
-              </SingleLineRow>
-            )}
-            <i>{_('chooseSrForEachVdisModalOptionalEntry')}</i>
-          </Container>
-        </Collapsible>
-      }
-    </div>
-  }
-}

src/common/xo/index.js

@@ -48,7 +48,7 @@ export const XEN_VIDEORAM_VALUES = [1, 2, 4, 8, 16]
 // ===================================================================
 
 export const isSrWritable = sr => sr && sr.content_type !== 'iso' && sr.size > 0
-export const isSrShared = sr => sr && sr.shared
+export const isSrShared = sr => sr && sr.$PBDs.length > 1
 export const isVmRunning = vm => vm && vm.power_state === 'Running'
 
 // ===================================================================
@@ -163,11 +163,6 @@ const createSubscription = cb => {
 
   let running = false
 
-  const uninstall = () => {
-    clearTimeout(timeout)
-    cache = undefined
-  }
-
   const loop = () => {
     if (running) {
       return
@@ -176,11 +171,6 @@ const createSubscription = cb => {
     running = true
     _signIn.then(() => cb()).then(result => {
       running = false
-
-      if (n === 0) {
-        return uninstall()
-      }
-
       timeout = setTimeout(loop, delay)
 
       if (!isEqual(result, cache)) {
@@ -197,11 +187,6 @@ const createSubscription = cb => {
       }
     }, error => {
       running = false
-
-      if (n === 0) {
-        return uninstall()
-      }
-
       console.error(error)
     })
   }
@@ -210,10 +195,8 @@ const createSubscription = cb => {
     const id = nextId++
     subscribers[id] = cb
 
-    if (n++ !== 0) {
-      if (cache !== undefined) {
-        asap(() => cb(cache))
-      }
+    if (n++) {
+      cache !== undefined && asap(() => cb(cache))
     } else {
       loop()
     }
@@ -221,8 +204,9 @@ const createSubscription = cb => {
     return once(() => {
       delete subscribers[id]
 
-      if (--n === 0) {
-        uninstall()
+      if (!--n) {
+        clearTimeout(timeout)
+        cache = undefined
       }
     })
   }
@@ -291,6 +275,8 @@ export const subscribeIpPools = createSubscription(() => _call('ipPool.getAll'))
 
 export const subscribeResourceCatalog = createSubscription(() => _call('cloud.getResourceCatalog'))
 
+export const subscribeVmGroups = createSubscription(() => _call('vmGroup.get'))
+
 const xosanSubscriptions = {}
 export const subscribeIsInstallingXosan = (pool, cb) => {
   const poolId = resolveId(pool)
@@ -324,18 +310,6 @@ subscribeHostMissingPatches.forceRefresh = host => {
   }
 }
 
-const unhealthyVdiChainsLengthSubscriptionsBySr = {}
-export const createSrUnhealthyVdiChainsLengthSubscription = sr => {
-  sr = resolveId(sr)
-  let subscription = unhealthyVdiChainsLengthSubscriptionsBySr[sr]
-  if (subscription === undefined) {
-    subscription = unhealthyVdiChainsLengthSubscriptionsBySr[sr] = createSubscription(
-      () => _call('sr.getUnhealthyVdiChainsLength', { sr })
-    )
-  }
-  return subscription
-}
-
 // System ============================================================
 
 export const apiMethods = _call('system.getMethodsInfo')
@@ -443,30 +417,10 @@ export const detachHost = host => (
   )
 )
 
-export const forgetHost = host => (
-  confirm({
-    icon: 'host-forget',
-    title: _('forgetHostModalTitle'),
-    body: _('forgetHostModalMessage', { host: <strong>{host.name_label}</strong> })
-  }).then(
-    () => _call('host.forget', { host: resolveId(host) })
-  )
-)
-
 export const setDefaultSr = sr => (
   _call('pool.setDefaultSr', { sr: resolveId(sr) })
 )
 
-export const setPoolMaster = host => (
-  confirm({
-    title: _('setPoolMasterModalTitle'),
-    body: _('setPoolMasterModalMessage', { host: <strong>{host.name_label}</strong> })
-  }).then(
-    () => _call('pool.setPoolMaster', { host: resolveId(host) }),
-    noop
-  )
-)
-
 // Host --------------------------------------------------------------
 
 export const editHost = (host, props) => (
@@ -1000,13 +954,8 @@ export const importBackup = ({ remote, file, sr }) => (
   _call('vm.importBackup', resolveIds({ remote, file, sr }))
 )
 
-export const importDeltaBackup = ({ remote, file, sr, mapVdisSrs }) => (
-  _call('vm.importDeltaBackup', resolveIds({
-    remote,
-    filePath: file,
-    sr,
-    mapVdisSrs: resolveIds(mapVdisSrs)
-  }))
+export const importDeltaBackup = ({ remote, file, sr }) => (
+  _call('vm.importDeltaBackup', resolveIds({ remote, filePath: file, sr }))
 )
 
 import RevertSnapshotModalBody from './revert-snapshot-modal' // eslint-disable-line import/first
@@ -1088,6 +1037,10 @@ export const attachDiskToVm = (vdi, vm, { bootable, mode, position }) => (
   })
 )
 
+export const removeAppliance = vm => {
+  _call('vm.removeAppliance', { id: resolveId(vm) })
+}
+
 // DISK ---------------------------------------------------------------
 
 export const createDisk = (name, size, sr) => (
@@ -1114,16 +1067,6 @@ export const deleteVdi = vdi => (
   )
 )
 
-export const deleteVdis = vdis => (
-  confirm({
-    title: _('deleteVdisModalTitle', { nVdis: vdis.length }),
-    body: _('deleteVdisModalMessage', { nVdis: vdis.length })
-  }).then(
-    () => Promise.all(map(vdis, id => _call('vdi.delete', { id }))),
-    noop
-  )
-)
-
 export const deleteOrphanedVdis = vdis => (
   confirm({
     title: _('removeAllOrphanedObject'),
@@ -1990,26 +1933,18 @@ export const setIpPool = (ipPool, { name, addresses, networks }) => (
 
 // XO SAN ----------------------------------------------------------------------
 
-export const getVolumeInfo = (xosanSr, infoType) => _call('xosan.getVolumeInfo', { sr: xosanSr, infoType })
+export const getVolumeInfo = (xosanSr) => _call('xosan.getVolumeInfo', { sr: xosanSr })
 
-export const createXosanSR = ({ template, pif, vlan, srs, glusterType, redundancy, brickSize, memorySize }) => _call('xosan.createSR', {
+export const createXosanSR = ({ template, pif, vlan, srs, glusterType, redundancy }) => _call('xosan.createSR', {
   template,
   pif: pif.id,
   vlan: String(vlan),
   srs: resolveIds(srs),
   glusterType,
-  redundancy: Number.parseInt(redundancy),
-  brickSize,
-  memorySize
+  redundancy: Number.parseInt(redundancy)
 })
 
-export const addXosanBricks = (xosansr, lvmsrs, brickSize) => _call('xosan.addBricks', {xosansr, lvmsrs, brickSize})
-
-export const replaceXosanBrick = (xosansr, previousBrick, newLvmSr, brickSize, onSameVM = false) =>
-  _call('xosan.replaceBrick', {xosansr, previousBrick, newLvmSr, brickSize, onSameVM})
-export const removeXosanBricks = (xosansr, bricks) => _call('xosan.removeBricks', {xosansr, bricks})
-
-export const computeXosanPossibleOptions = (lvmSrs, brickSize) => _call('xosan.computeXosanPossibleOptions', { lvmSrs, brickSize })
+export const computeXosanPossibleOptions = lvmSrs => _call('xosan.computeXosanPossibleOptions', { lvmSrs })
 
 import InstallXosanPackModal from './install-xosan-pack-modal' // eslint-disable-line import/first
 export const downloadAndInstallXosanPack = pool =>
@@ -2022,3 +1957,33 @@ export const downloadAndInstallXosanPack = pool =>
   )
 
 export const registerXosan = namespace => _call('cloud.registerResource', { namespace: 'xosan' })
+
+// VM-Group ----------------------------------------------------------------------
+
+export const startVmGroup = vmGroup => {
+  _call('vmGroup.start', { id: resolveId(vmGroup) })
+}
+export const shutdownVmGroup = vmGroup => _call('vmGroup.shutdown', { id: resolveId(vmGroup) })
+export const rebootVmGroup = async vmGroup => {
+  await shutdownVmGroup(vmGroup)
+  await startVmGroup(vmGroup)
+}
+export const editVmGroup = (vmGroup, props) => _call('vmGroup.set', { id: resolveId(vmGroup), ...props })
+export const deleteVmGroup = (vmGroup, vms) =>
+  confirm({
+    title: _('deleteVmGroupModalTitle'),
+    body: _('deleteVmGroupModalMessage')
+  }).then(() => {
+    forEach(vms, vm => removeAppliance(vm))
+    _call('vmGroup.destroy', { id: resolveId(vmGroup) })
+  }, Promise.reject())
+export const createVmGroup = ({ pool, name_label, name_description }) => _call('vmGroup.create', { id: resolveId(pool), name_label, name_description })
+export const startVmGroups = (vmGroupIds) => {
+  forEach(vmGroupIds, id => startVmGroup({id: id}))
+}
+export const shutdownVmGroups = (vmGroupIds) => {
+  forEach(vmGroupIds, id => shutdownVmGroup({id: id}))
+}
+export const rebootVmGroups = (vmGroupIds) => {
+  forEach(vmGroupIds, id => rebootVmGroup({id: id}))
+}

src/common/xo/install-xosan-pack-modal/index.js

@@ -93,14 +93,15 @@ export default class InstallXosanPackModal extends Component {
           </div>
         </div>
         : <div>
-          {_('xosanNoPackFound')}
-          <br />
-          {_('xosanPackRequirements')}
-          <ul>
-            {map(this._getXosanPacks(), ({ name, requirements }, key) => <li key={key}>
-              {_.keyValue(name, requirements && requirements.xenserver ? requirements.xenserver : '/')}
-            </li>)}
-          </ul>
+          <p>{_('xosanNoPackFound')}</p>
+          <p>
+            {_('xosanPackRequirements')}
+            <ul>
+              {map(this._getXosanPacks(), ({ name, requirements }) => <li>
+                {name}: <strong>{requirements && requirements.xenserver ? requirements.xenserver : '/'}</strong>
+              </li>)}
+            </ul>
+          </p>
         </div>
       }
     </div>

src/common/xo/migrate-vm-modal/index.js

@@ -3,23 +3,23 @@ import every from 'lodash/every'
 import forEach from 'lodash/forEach'
 import find from 'lodash/find'
 import map from 'lodash/map'
+import mapValues from 'lodash/mapValues'
 import React from 'react'
 import store from 'store'
 
 import _ from '../../intl'
-import ChooseSrForEachVdisModal from '../choose-sr-for-each-vdis-modal'
 import invoke from '../../invoke'
 import SingleLineRow from '../../single-line-row'
 import { Col } from '../../grid'
 import { getDefaultNetworkForVif } from '../utils'
 import {
   SelectHost,
-  SelectNetwork
+  SelectNetwork,
+  SelectSr
 } from '../../select-objects'
 import {
   connectStore,
-  mapPlus,
-  resolveIds
+  mapPlus
 } from '../../utils'
 import {
   createGetObjectsOfType,
@@ -138,8 +138,7 @@ export default class MigrateVmModalBody extends BaseComponent {
   get value () {
     return {
       targetHost: this.state.host && this.state.host.id,
-      sr: this.state.mainSr && this.state.mainSr.id,
-      mapVdisSrs: resolveIds(this.state.mapVdisSrs),
+      mapVdisSrs: this.state.mapVdisSrs,
       mapVifsNetworks: this.state.mapVifsNetworks,
       migrationNetwork: this.state.migrationNetworkId
     }
@@ -159,10 +158,11 @@ export default class MigrateVmModalBody extends BaseComponent {
       return
     }
 
-    const { vbds, vm } = this.props
+    const { pools, vbds, vdis, vm } = this.props
     const intraPool = vm.$pool === host.$pool
 
     // Intra-pool
+    const defaultSr = pools[host.$pool].default_SR
     if (intraPool) {
       let doNotMigrateVdis
       if (vm.$container === host.id) {
@@ -181,6 +181,7 @@ export default class MigrateVmModalBody extends BaseComponent {
         doNotMigrateVdis,
         host,
         intraPool,
+        mapVdisSrs: doNotMigrateVdis ? undefined : mapValues(vdis, vdi => defaultSr),
         mapVifsNetworks: undefined,
         migrationNetwork: undefined
       })
@@ -211,6 +212,7 @@ export default class MigrateVmModalBody extends BaseComponent {
       doNotMigrateVdis: false,
       host,
       intraPool,
+      mapVdisSrs: mapValues(vdis, vdi => defaultSr),
       mapVifsNetworks: defaultNetworksForVif,
       migrationNetworkId: defaultMigrationNetworkId
     })
@@ -224,6 +226,7 @@ export default class MigrateVmModalBody extends BaseComponent {
       doNotMigrateVdis,
       host,
       intraPool,
+      mapVdisSrs,
       mapVifsNetworks,
       migrationNetworkId
     } = this.state
@@ -242,14 +245,25 @@ export default class MigrateVmModalBody extends BaseComponent {
       </div>
       {host && !doNotMigrateVdis && <div className={styles.groupBlock}>
         <SingleLineRow>
-          <Col size={12}>
-            <ChooseSrForEachVdisModal
-              onChange={props => this.setState(props)}
-              predicate={this._getSrPredicate()}
-              vdis={vdis}
-            />
-          </Col>
+          <Col>{_('migrateVmSelectSrs')}</Col>
         </SingleLineRow>
+        <br />
+        <SingleLineRow>
+          <Col size={6}><span className={styles.listTitle}>{_('migrateVmName')}</span></Col>
+          <Col size={6}><span className={styles.listTitle}>{_('migrateVmSr')}</span></Col>
+        </SingleLineRow>
+        {map(vdis, vdi => <div className={styles.listItem} key={vdi.id}>
+          <SingleLineRow>
+            <Col size={6}>{vdi.name_label}</Col>
+            <Col size={6}>
+              <SelectSr
+                onChange={sr => this.setState({ mapVdisSrs: { ...mapVdisSrs, [vdi.id]: sr.id } })}
+                predicate={this._getSrPredicate()}
+                value={mapVdisSrs[vdi.id]}
+              />
+            </Col>
+          </SingleLineRow>
+        </div>)}
       </div>}
       {intraPool !== undefined &&
         (!intraPool &&

src/common/xo/migrate-vms-modal/index.js

@@ -12,10 +12,8 @@ import some from 'lodash/some'
 import store from 'store'
 
 import _ from '../../intl'
-import Icon from 'icon'
 import invoke from '../../invoke'
 import SingleLineRow from '../../single-line-row'
-import Tooltip from '../../tooltip'
 import { Col } from '../../grid'
 import { getDefaultNetworkForVif } from '../utils'
 import {
@@ -219,7 +217,6 @@ export default class MigrateVmsModalBody extends BaseComponent {
     const { pools, pifs } = this.props
     const defaultMigrationNetworkId = find(pifs, pif => pif.$host === host.id && pif.management).$network
     const defaultSrId = pools[host.$pool].default_SR
-    const defaultSrConnectedToHost = some(host.$PBDs, pbd => this._getObject(pbd).SR === defaultSrId)
     const doNotMigrateVmVdis = {}
     const doNotMigrateVdi = {}
     forEach(this.props.vbdsByVm, (vbds, vm) => {
@@ -237,8 +234,6 @@ export default class MigrateVmsModalBody extends BaseComponent {
     })
     const noVdisMigration = every(doNotMigrateVmVdis)
     this.setState({
-      defaultSrConnectedToHost,
-      defaultSrId,
       host,
       intraPool: every(this.props.vms, vm => vm.$pool === host.$pool),
       doNotMigrateVdi,
@@ -247,7 +242,7 @@ export default class MigrateVmsModalBody extends BaseComponent {
       networkId: defaultMigrationNetworkId,
       noVdisMigration,
       smartVifMapping: true,
-      srId: defaultSrConnectedToHost ? defaultSrId : undefined
+      srId: defaultSrId
     })
   }
   _selectMigrationNetwork = migrationNetwork => this.setState({ migrationNetworkId: migrationNetwork.id })
@@ -257,8 +252,6 @@ export default class MigrateVmsModalBody extends BaseComponent {
 
   render () {
     const {
-      defaultSrConnectedToHost,
-      defaultSrId,
       host,
       intraPool,
       migrationNetworkId,
@@ -297,24 +290,7 @@ export default class MigrateVmsModalBody extends BaseComponent {
       {host && (!intraPool || !noVdisMigration) &&
         <div key='sr' style={LINE_STYLE}>
           <SingleLineRow>
-            <Col size={6}>
-              {!intraPool ? _('migrateVmsSelectSr') : _('migrateVmsSelectSrIntraPool')}
-              {' '}
-              {(defaultSrId === undefined || !defaultSrConnectedToHost) &&
-                <Tooltip
-                  content={defaultSrId !== undefined
-                    ? _('migrateVmNotConnectedDefaultSrError')
-                    : _('migrateVmNoDefaultSrError')
-                  }
-                >
-                  <Icon
-                    icon={defaultSrId !== undefined ? 'alarm' : 'info'}
-                    className={defaultSrId !== undefined ? 'text-warning' : 'text-info'}
-                    size='lg'
-                  />
-                </Tooltip>
-              }
-            </Col>
+            <Col size={6}>{!intraPool ? _('migrateVmsSelectSr') : _('migrateVmsSelectSrIntraPool')}</Col>
             <Col size={6}>
               <SelectSr
                 onChange={this._selectSr}

src/icons.scss

@@ -79,14 +79,6 @@
     @extend .fa;
     @extend .fa-ellipsis-v;
   },
-  &-previous {
-    @extend .fa;
-    @extend .fa-chevron-left;
-  },
-  &-next {
-    @extend .fa;
-    @extend .fa-chevron-right;
-  },
   &-caret {
     @extend .fa;
     @extend .fa-caret-down;
@@ -460,10 +452,6 @@
       @extend .fa-server;
       @extend .text-warning;
     }
-    &-forget {
-      @extend .fa;
-      @extend .fa-ban;
-    }
     &-working {
       @extend .fa;
       @extend .fa-circle;
@@ -963,11 +951,4 @@
     @extend .fa;
     @extend .fa-star;
   }
-
-  // XOSAN related
-
-  &-health {
-    @extend .fa;
-    @extend .fa-heartbeat;
-  }
 }

src/xo-app/backup/new/index.js

@@ -212,7 +212,6 @@ const CONTINUOUS_REPLICATION_SCHEMA = {
   type: 'object',
   properties: {
     ...COMMON_SCHEMA.properties,
-    retention: DEPTH_PROPERTY,
     sr: {
       type: 'string',
       'xo:type': 'sr',
@@ -564,133 +563,131 @@ export default class New extends Component {
 
     return (
       <Upgrade place='newBackup' required={2}>
-        <form id='form-new-vm-backup'>
-          <Wizard>
-            <Section icon='backup' title={this.props.job ? 'editVmBackup' : 'newVmBackup'}>
-              <Container>
-                <Row>
-                  <Col>
+        <Wizard><form id='form-new-vm-backup'>
+          <Section icon='backup' title={this.props.job ? 'editVmBackup' : 'newVmBackup'}>
+            <Container>
+              <Row>
+                <Col>
+                  <fieldset className='form-group'>
+                    <label>{_('backupOwner')}</label>
+                    <SelectSubject
+                      onChange={this.linkState('job.userId', 'id')}
+                      predicate={this._subjectPredicate}
+                      required
+                      value={this._getValue('job', 'userId', this.props.currentUser.id)}
+                    />
+                  </fieldset>
+                  <fieldset className='form-group'>
+                    <label>{_('jobTimeoutPlaceHolder')}</label>
+                    <TimeoutInput
+                      className='form-control'
+                      onChange={this.linkState('job.timeout')}
+                      value={this._getValue('job', 'timeout')}
+                    />
+                  </fieldset>
+                  <fieldset className='form-group'>
+                    <label htmlFor='selectBackup'>{_('newBackupSelection')}</label>
+                    <select
+                      className='form-control'
+                      id='selectBackup'
+                      onChange={this.linkState('job.method')}
+                      required
+                      value={method}
+                    >
+                      {_('noSelectedValue', message => <option value=''>{message}</option>)}
+                      {map(BACKUP_METHOD_TO_INFO, (info, key) =>
+                        _(info.label, message => <option key={key} value={key}>{message}</option>)
+                      )}
+                    </select>
+                  </fieldset>
+                  {(method === 'vm.rollingDeltaBackup' || method === 'vm.deltaCopy') && <div className='alert alert-warning' role='alert'>
+                    <Icon icon='error' /> {_('backupVersionWarning')}
+                  </div>}
+                  {backupInfo && <div>
+                    <GenericInput
+                      label={<span><Icon icon={backupInfo.icon} /> {_(backupInfo.label)}</span>}
+                      required
+                      schema={backupInfo.schema}
+                      uiSchema={backupInfo.uiSchema}
+                      onChange={this.linkState('mainParams')}
+                      value={this._getMainParams()}
+                    />
                     <fieldset className='form-group'>
-                      <label>{_('backupOwner')}</label>
-                      <SelectSubject
-                        onChange={this.linkState('job.userId', 'id')}
-                        predicate={this._subjectPredicate}
-                        required
-                        value={this._getValue('job', 'userId', this.props.currentUser.id)}
-                      />
-                    </fieldset>
-                    <fieldset className='form-group'>
-                      <label>{_('jobTimeoutPlaceHolder')}</label>
-                      <TimeoutInput
-                        className='form-control'
-                        onChange={this.linkState('job.timeout')}
-                        value={this._getValue('job', 'timeout')}
-                      />
-                    </fieldset>
-                    <fieldset className='form-group'>
-                      <label htmlFor='selectBackup'>{_('newBackupSelection')}</label>
+                      <label htmlFor='smartMode'>{_('smartBackupModeSelection')}</label>
                       <select
                         className='form-control'
-                        id='selectBackup'
-                        onChange={this.linkState('job.method')}
+                        id='smartMode'
+                        onChange={this._handleSmartBackupMode}
                         required
-                        value={method}
+                        value={smartBackupMode ? 'smart' : 'normal'}
                       >
-                        {_('noSelectedValue', message => <option value=''>{message}</option>)}
-                        {map(BACKUP_METHOD_TO_INFO, (info, key) =>
-                          _({ key }, info.label, message => <option value={key}>{message}</option>)
-                        )}
+                        {_('normalBackup', message => <option value='normal'>{message}</option>)}
+                        {_('smartBackup', message => <option value='smart'>{message}</option>)}
                       </select>
                     </fieldset>
-                    {(method === 'vm.rollingDeltaBackup' || method === 'vm.deltaCopy') && <div className='alert alert-warning' role='alert'>
-                      <Icon icon='error' /> {_('backupVersionWarning')}
-                    </div>}
-                    {backupInfo && <div>
-                      <GenericInput
-                        label={<span><Icon icon={backupInfo.icon} /> {_(backupInfo.label)}</span>}
-                        required
-                        schema={backupInfo.schema}
-                        uiSchema={backupInfo.uiSchema}
-                        onChange={this.linkState('mainParams')}
-                        value={this._getMainParams()}
-                      />
-                      <fieldset className='form-group'>
-                        <label htmlFor='smartMode'>{_('smartBackupModeSelection')}</label>
-                        <select
-                          className='form-control'
-                          id='smartMode'
-                          onChange={this._handleSmartBackupMode}
-                          required
-                          value={smartBackupMode ? 'smart' : 'normal'}
-                        >
-                          {_('normalBackup', message => <option value='normal'>{message}</option>)}
-                          {_('smartBackup', message => <option value='smart'>{message}</option>)}
-                        </select>
-                      </fieldset>
-                      {smartBackupMode
-                        ? <Upgrade place='newBackup' required={3}>
-                          <GenericInput
-                            label={<span><Icon icon='vm' /> {_('vmsToBackup')}</span>}
-                            onChange={this.linkState('vmsParam')}
-                            required
-                            schema={SMART_SCHEMA}
-                            uiSchema={SMART_UI_SCHEMA}
-                            value={vms}
-                          />
-                        </Upgrade>
-                        : <GenericInput
+                    {smartBackupMode
+                      ? <Upgrade place='newBackup' required={3}>
+                        <GenericInput
                           label={<span><Icon icon='vm' /> {_('vmsToBackup')}</span>}
                           onChange={this.linkState('vmsParam')}
                           required
-                          schema={NO_SMART_SCHEMA}
-                          uiSchema={NO_SMART_UI_SCHEMA}
+                          schema={SMART_SCHEMA}
+                          uiSchema={SMART_UI_SCHEMA}
                           value={vms}
                         />
-                      }
-                    </div>}
-                  </Col>
-                </Row>
-              </Container>
-            </Section>
-            <Section icon='schedule' title='schedule'>
-              <Scheduler
-                onChange={this.linkState('scheduling')}
-                value={scheduling}
-              />
-            </Section>
-            <Section icon='preview' title='preview' summary>
-              <Container>
-                <Row>
-                  <Col>
-                    <SchedulePreview cronPattern={scheduling.cronPattern} />
-                    {process.env.XOA_PLAN < 4 && backupInfo && process.env.XOA_PLAN < REQUIRED_XOA_PLAN[backupInfo.jobKey]
-                      ? <Upgrade place='newBackup' available={REQUIRED_XOA_PLAN[backupInfo.jobKey]} />
-                      : (smartBackupMode && process.env.XOA_PLAN < 3
-                        ? <Upgrade place='newBackup' available={3} />
-                        : <fieldset className='pull-right pt-1'>
-                          <ActionButton
-                            btnStyle='primary'
-                            className='mr-1'
-                            disabled={!backupInfo}
-                            form='form-new-vm-backup'
-                            handler={this._handleSubmit}
-                            icon='save'
-                            redirectOnSuccess='/backup/overview'
-                            size='large'
-                          >
-                            {_('saveBackupJob')}
-                          </ActionButton>
-                          <Button onClick={this._handleReset} size='large'>
-                            {_('selectTableReset')}
-                          </Button>
-                        </fieldset>)
-                  }
-                  </Col>
-                </Row>
-              </Container>
-            </Section>
-          </Wizard>
-        </form>
+                      </Upgrade>
+                      : <GenericInput
+                        label={<span><Icon icon='vm' /> {_('vmsToBackup')}</span>}
+                        onChange={this.linkState('vmsParam')}
+                        required
+                        schema={NO_SMART_SCHEMA}
+                        uiSchema={NO_SMART_UI_SCHEMA}
+                        value={vms}
+                      />
+                    }
+                  </div>}
+                </Col>
+              </Row>
+            </Container>
+          </Section>
+          <Section icon='schedule' title='schedule'>
+            <Scheduler
+              onChange={this.linkState('scheduling')}
+              value={scheduling}
+            />
+          </Section>
+          <Section icon='preview' title='preview' summary>
+            <Container>
+              <Row>
+                <Col>
+                  <SchedulePreview cronPattern={scheduling.cronPattern} />
+                  {process.env.XOA_PLAN < 4 && backupInfo && process.env.XOA_PLAN < REQUIRED_XOA_PLAN[backupInfo.jobKey]
+                    ? <Upgrade place='newBackup' available={REQUIRED_XOA_PLAN[backupInfo.jobKey]} />
+                    : (smartBackupMode && process.env.XOA_PLAN < 3
+                      ? <Upgrade place='newBackup' available={3} />
+                      : <fieldset className='pull-right pt-1'>
+                        <ActionButton
+                          btnStyle='primary'
+                          className='mr-1'
+                          disabled={!backupInfo}
+                          form='form-new-vm-backup'
+                          handler={this._handleSubmit}
+                          icon='save'
+                          redirectOnSuccess='/backup/overview'
+                          size='large'
+                        >
+                          {_('saveBackupJob')}
+                        </ActionButton>
+                        <Button onClick={this._handleReset} size='large'>
+                          {_('selectTableReset')}
+                        </Button>
+                      </fieldset>)
+                }
+                </Col>
+              </Row>
+            </Container>
+          </Section>
+        </form></Wizard>
       </Upgrade>
     )
   }

src/xo-app/backup/overview/index.js

@@ -2,10 +2,15 @@ import _ from 'intl'
 import ActionRowButton from 'action-row-button'
 import ButtonGroup from 'button-group'
 import Component from 'base-component'
+import filter from 'lodash/filter'
+import find from 'lodash/find'
+import forEach from 'lodash/forEach'
+import get from 'lodash/get'
 import Icon from 'icon'
 import Link from 'link'
 import LogList from '../../logs'
-import NoObjects from 'no-objects'
+import map from 'lodash/map'
+import orderBy from 'lodash/orderBy'
 import React from 'react'
 import SortedTable from 'sorted-table'
 import StateButton from 'state-button'
@@ -17,14 +22,6 @@ import {
   CardHeader,
   CardBlock
 } from 'card'
-import {
-  filter,
-  find,
-  forEach,
-  get,
-  map,
-  orderBy
-} from 'lodash'
 import {
   deleteBackupSchedule,
   disableSchedule,
@@ -125,6 +122,7 @@ export default class Overview extends Component {
   constructor (props) {
     super(props)
     this.state = {
+      schedules: [],
       scheduleTable: {}
     }
   }
@@ -214,12 +212,12 @@ export default class Overview extends Component {
       <div>
         <Card>
           <CardHeader>
-            <Icon icon='schedule' /> {_('backupSchedules')}
+            <h5><Icon icon='schedule' /> {_('backupSchedules')}</h5>
           </CardHeader>
           <CardBlock>
-            <NoObjects collection={schedules} emptyMessage={_('noScheduledJobs')}>
+            {schedules.length ? (
               <SortedTable columns={JOB_COLUMNS} collection={this._getScheduleCollection()} userData={isScheduleUserMissing} />
-            </NoObjects>
+            ) : <p>{_('noScheduledJobs')}</p>}
           </CardBlock>
         </Card>
         <LogList jobKeys={Object.keys(jobKeyToLabel)} />

src/xo-app/backup/restore/index.js

@@ -1,11 +1,8 @@
 import _, { messages } from 'intl'
-import ChooseSrForEachVdisModal from 'xo/choose-sr-for-each-vdis-modal'
 import Component from 'base-component'
-import every from 'lodash/every'
 import filter from 'lodash/filter'
 import find from 'lodash/find'
 import forEach from 'lodash/forEach'
-import getEventValue from 'get-event-value'
 import groupBy from 'lodash/groupBy'
 import Icon from 'icon'
 import isEmpty from 'lodash/isEmpty'
@@ -18,27 +15,22 @@ import SortedTable from 'sorted-table'
 import uniq from 'lodash/uniq'
 import Upgrade from 'xoa-upgrade'
 import { confirm } from 'modal'
-import { createSelector } from 'selectors'
 import { addSubscriptions, noop } from 'utils'
 import { Container, Row, Col } from 'grid'
 import { FormattedDate, injectIntl } from 'react-intl'
 import { info, error } from 'notification'
 import { SelectPlainObject, Toggle } from 'form'
+import { SelectSr } from 'select-objects'
 
 import {
   importBackup,
   importDeltaBackup,
   isSrWritable,
   listRemote,
-  listRemoteBackups,
   startVm,
   subscribeRemotes
 } from 'xo'
 
-// Can 2 SRs on the same pool have 2 VDIs used by the same VM
-const areSrsCompatible = (sr1, sr2) =>
-  sr1.shared || sr2.shared || sr1.$container === sr2.$container
-
 const parseDate = date => +moment(date, 'YYYYMMDDTHHmmssZ').format('x')
 
 const backupOptionRenderer = backup => <span>
@@ -57,7 +49,7 @@ const VM_COLUMNS = [
   {
     name: _('backupTags'),
     itemRenderer: ({ tagsByRemote }) => <Container>
-      {map(tagsByRemote, ({ tags, remoteName }, key) => <Row key={key}>
+      {map(tagsByRemote, ({ tags, remoteName }) => <Row>
         <Col mediumSize={3}><strong>{remoteName}</strong></Col>
         <Col mediumSize={9}>{tags.join(', ')}</Col>
       </Row>)}
@@ -84,8 +76,8 @@ const openImportModal = ({ backups }) => confirm({
   body: <ImportModalBody vmName={backups[0].name} backups={backups} />
 }).then(doImport)
 
-const doImport = ({ backup, mainSr, start, mapVdisSrs }) => {
-  if (!mainSr || !backup) {
+const doImport = ({ backup, sr, start }) => {
+  if (!sr || !backup) {
     error(_('backupRestoreErrorTitle'), _('backupRestoreErrorMessage'))
     return
   }
@@ -95,7 +87,7 @@ const doImport = ({ backup, mainSr, start, mapVdisSrs }) => {
   }
   info(_('importBackupTitle'), _('importBackupMessage'))
   try {
-    const importPromise = importMethods[backup.type]({remote: backup.remoteId, sr: mainSr, file: backup.path, mapVdisSrs}).then(id => {
+    const importPromise = importMethods[backup.type]({remote: backup.remoteId, sr, file: backup.path}).then(id => {
       return id
     })
     if (start) {
@@ -107,59 +99,16 @@ const doImport = ({ backup, mainSr, start, mapVdisSrs }) => {
 }
 
 class _ModalBody extends Component {
-  constructor () {
-    super()
-
-    this.state = {
-      mapVdisSrs: {}
-    }
-  }
-
   get value () {
     return this.state
   }
 
-  _getSrPredicate = createSelector(
-    () => this.state.sr,
-    () => this.state.mapVdisSrs,
-    (defaultSr, mapVdisSrs) => sr =>
-      sr !== defaultSr &&
-      isSrWritable(sr) &&
-      defaultSr.$pool === sr.$pool &&
-      areSrsCompatible(defaultSr, sr) &&
-      every(mapVdisSrs, selectedSr => selectedSr == null || areSrsCompatible(selectedSr, sr))
-  )
-
-  _onChangeDefaultSr = event => {
-    const oldSr = this.state.sr
-    const newSr = getEventValue(event)
-
-    if (oldSr == null || newSr == null || oldSr.$pool !== newSr.$pool) {
-      this.setState({
-        mapVdisSrs: {}
-      })
-    } else if (!newSr.shared) {
-      const mapVdisSrs = {...this.state.mapVdisSrs}
-      forEach(mapVdisSrs, (sr, vdi) => {
-        if (sr != null && newSr !== sr && sr.$container !== newSr.$container && !sr.shared) {
-          delete mapVdisSrs[vdi]
-        }
-      })
-      this.setState({
-        mapVdisSrs
-      })
-    }
-
-    this.setState({
-      sr: newSr
-    })
-  }
-
   render () {
     const { backups, intl } = this.props
-    const vdis = this.state.backup && this.state.backup.vdis
 
     return <div>
+      <SelectSr onChange={this.linkState('sr')} predicate={isSrWritable} />
+      <br />
       <SelectPlainObject
         onChange={this.linkState('backup')}
         optionKey='path'
@@ -168,11 +117,6 @@ class _ModalBody extends Component {
         placeholder={intl.formatMessage(messages.importBackupModalSelectBackup)}
       />
       <br />
-      <ChooseSrForEachVdisModal
-        vdis={vdis}
-        onChange={props => this.setState(props)}
-      />
-      <br />
       <Toggle onChange={this.linkState('start')} /> {_('importBackupModalStart')}
     </div>
   }
@@ -192,26 +136,16 @@ export default class Restore extends Component {
   }
 
   _listAll = async remotes => {
-    const remotesInfo = await Promise.all(map(remotes, async remote => ({
-      files: await listRemote(remote.id),
-      backupsInfo: await listRemoteBackups(remote.id)
-    })))
-
+    const remotesFiles = await Promise.all(map(remotes, remote => listRemote(remote.id)))
     const backupInfoByVm = {}
-
-    forEach(remotesInfo, (remoteInfo, index) => {
+    forEach(remotesFiles, (remoteFiles, index) => {
       const remote = remotes[index]
 
-      forEach(remoteInfo.files, file => {
+      forEach(remoteFiles, file => {
         let backup
         const deltaInfo = /^vm_delta_(.*)_([^/]+)\/([^_]+)_(.*)$/.exec(file)
-
         if (deltaInfo) {
           const [ , tag, id, date, name ] = deltaInfo
-          const vdis = find(remoteInfo.backupsInfo, {
-            id: `${file}.json`
-          }).disks
-
           backup = {
             type: 'delta',
             date: parseDate(date),
@@ -220,8 +154,7 @@ export default class Restore extends Component {
             path: file,
             tag,
             remoteId: remote.id,
-            remoteName: remote.name,
-            vdis
+            remoteName: remote.name
           }
         } else {
           const backupInfo = /^([^_]+)_([^_]+)_(.*)\.xva$/.exec(file)

src/xo-app/dashboard/health/index.js

@@ -3,18 +3,17 @@ import ActionRowButton from 'action-row-button'
 import Component from 'base-component'
 import Icon from 'icon'
 import Link from 'link'
-import NoObjects from 'no-objects'
-import React from 'react'
 import SortedTable from 'sorted-table'
 import TabButton from 'tab-button'
 import Tooltip from 'tooltip'
 import Upgrade from 'xoa-upgrade'
+import React from 'react'
 import xml2js from 'xml2js'
 import { Card, CardHeader, CardBlock } from 'card'
 import { confirm } from 'modal'
-import { Container, Row, Col } from 'grid'
 import { FormattedRelative, FormattedTime } from 'react-intl'
 import { fromCallback } from 'promise-toolbox'
+import { Container, Row, Col } from 'grid'
 import {
   deleteMessage,
   deleteOrphanedVdis,
@@ -24,18 +23,18 @@ import {
   isSrWritable
 } from 'xo'
 import {
-  areObjectsFetched,
+  flatten,
+  get,
+  isEmpty,
+  map,
+  mapValues
+} from 'lodash'
+import {
   createCollectionWrapper,
   createGetObject,
   createGetObjectsOfType,
   createSelector
 } from 'selectors'
-import {
-  flatten,
-  get,
-  map,
-  mapValues
-} from 'lodash'
 import {
   connectStore,
   formatSize,
@@ -353,7 +352,6 @@ const ALARM_COLUMNS = [
     .filter([ message => message.name === 'ALARM' ])
 
   return {
-    areObjectsFetched,
     alertMessages: getAlertMessages,
     controlDomainVdis: getControlDomainVdis,
     userSrs: getUserSrs,
@@ -430,8 +428,6 @@ export default class Health extends Component {
   _getSrUrl = sr => `srs/${sr.id}`
 
   render () {
-    const { props } = this
-
     return process.env.XOA_PLAN > 3
       ? <Container>
         <Row>
@@ -441,20 +437,18 @@ export default class Health extends Component {
                 <Icon icon='disk' /> {_('srStatePanel')}
               </CardHeader>
               <CardBlock>
-                <NoObjects
-                  collection={props.areObjectsFetched ? props.userSrs : null}
-                  emptyMessage={_('noSrs')}
-                >
-                  <Row>
+                {isEmpty(this.props.userSrs)
+                  ? <p className='text-xs-center'>{_('noSrs')}</p>
+                  : <Row>
                     <Col>
                       <SortedTable
-                        collection={props.userSrs}
+                        collection={this.props.userSrs}
                         columns={SR_COLUMNS}
                         rowLink={this._getSrUrl}
                       />
                     </Col>
                   </Row>
-                </NoObjects>
+                }
               </CardBlock>
             </Card>
           </Col>
@@ -466,11 +460,9 @@ export default class Health extends Component {
                 <Icon icon='disk' /> {_('orphanedVdis')}
               </CardHeader>
               <CardBlock>
-                <NoObjects
-                  collection={props.areObjectsFetched ? props.vdiOrphaned : null}
-                  emptyMessage={_('noOrphanedObject')}
-                >
-                  <div>
+                {isEmpty(this.props.vdiOrphaned)
+                  ? <p className='text-xs-center'>{_('noOrphanedObject')}</p>
+                  : <div>
                     <Row>
                       <Col className='text-xs-right'>
                         <TabButton
@@ -487,7 +479,7 @@ export default class Health extends Component {
                       </Col>
                     </Row>
                   </div>
-                </NoObjects>
+                }
               </CardBlock>
             </Card>
           </Col>
@@ -499,12 +491,10 @@ export default class Health extends Component {
                 <Icon icon='disk' /> {_('vdisOnControlDomain')}
               </CardHeader>
               <CardBlock>
-                <NoObjects
-                  collection={props.areObjectsFetched ? props.controlDomainVdis : null}
-                  emptyMessage={_('noControlDomainVdis')}
-                >
-                  <SortedTable collection={props.controlDomainVdis} columns={CONTROL_DOMAIN_VDI_COLUMNS} />
-                </NoObjects>
+                {isEmpty(this.props.controlDomainVdis)
+                  ? <p className='text-xs-center'>{_('noControlDomainVdis')}</p>
+                  : <SortedTable collection={this.props.controlDomainVdis} columns={CONTROL_DOMAIN_VDI_COLUMNS} />
+                }
               </CardBlock>
             </Card>
           </Col>
@@ -516,12 +506,10 @@ export default class Health extends Component {
                 <Icon icon='vm' /> {_('orphanedVms')}
               </CardHeader>
               <CardBlock>
-                <NoObjects
-                  collection={props.areObjectsFetched ? props.vmOrphaned : null}
-                  emptyMessage={_('noOrphanedObject')}
-                >
-                  <SortedTable collection={props.vmOrphaned} columns={VM_COLUMNS} />
-                </NoObjects>
+                {isEmpty(this.props.vmOrphaned)
+                  ? <p className='text-xs-center'>{_('noOrphanedObject')}</p>
+                  : <SortedTable collection={this.props.vmOrphaned} columns={VM_COLUMNS} />
+                }
               </CardBlock>
             </Card>
           </Col>
@@ -533,11 +521,9 @@ export default class Health extends Component {
                 <Icon icon='alarm' /> {_('alarmMessage')}
               </CardHeader>
               <CardBlock>
-                <NoObjects
-                  collection={props.areObjectsFetched ? props.alertMessages : null}
-                  emptyMessage={_('noAlarms')}
-                >
-                  <div>
+                {isEmpty(this.props.alertMessages)
+                  ? <p className='text-xs-center'>{_('noAlarms')}</p>
+                  : <div>
                     <Row>
                       <Col className='text-xs-right'>
                         <TabButton
@@ -554,7 +540,7 @@ export default class Health extends Component {
                       </Col>
                     </Row>
                   </div>
-                </NoObjects>
+                }
               </CardBlock>
             </Card>
           </Col>

src/xo-app/home/index.js

@@ -9,7 +9,6 @@ import Icon from 'icon'
 import invoke from 'invoke'
 import Link from 'link'
 import Page from '../page'
-import propTypes from 'prop-types-decorator'
 import React from 'react'
 import Shortcuts from 'shortcuts'
 import SingleLineRow from 'single-line-row'
@@ -43,23 +42,24 @@ import {
   forgetSrs,
   isSrShared,
   migrateVms,
+  rebootVmGroups,
   reconnectAllHostsSrs,
   rescanSrs,
   restartHosts,
   restartHostsAgents,
   restartVms,
+  shutdownVmGroups,
   snapshotVms,
+  startVmGroups,
   startVms,
   stopHosts,
   stopVms,
-  subscribeResourceSets,
   subscribeServers
 } from 'xo'
 import { Container, Row, Col } from 'grid'
 import {
   SelectHost,
   SelectPool,
-  SelectResourceSet,
   SelectTag
 } from 'select-objects'
 import {
@@ -76,8 +76,7 @@ import {
   createPager,
   createSelector,
   createSort,
-  getUser,
-  isAdmin
+  getUser
 } from 'selectors'
 import {
   DropdownButton,
@@ -90,6 +89,7 @@ import {
 import styles from './index.css'
 import HostItem from './host-item'
 import PoolItem from './pool-item'
+import VmGroupItem from './vm-group-item'
 import VmItem from './vm-item'
 import TemplateItem from './template-item'
 import SrItem from './sr-item'
@@ -147,7 +147,6 @@ const OPTIONS = {
     Item: VmItem,
     showPoolsSelector: true,
     showHostsSelector: true,
-    showResourceSetsSelector: true,
     sortOptions: [
       { labelId: 'homeSortByName', sortBy: 'name_label', sortOrder: 'asc' },
       { labelId: 'homeSortByPowerstate', sortBy: 'power_state', sortOrder: 'desc' },
@@ -155,6 +154,20 @@ const OPTIONS = {
       { labelId: 'homeSortByCpus', sortBy: 'CPUs.number', sortOrder: 'desc' }
     ]
   },
+  'VmGroup': {
+    defaultFilter: '',
+    filters: homeFilters.vmGroup,
+    mainActions: [
+      { handler: shutdownVmGroups, icon: 'vm-stop', tooltip: _('stopVmLabel') },
+      { handler: startVmGroups, icon: 'vm-start', tooltip: _('startVmLabel') },
+      { handler: rebootVmGroups, icon: 'vm-reboot', tooltip: _('rebootVmLabel') }
+    ],
+    Item: VmGroupItem,
+    sortOptions: [
+      { labelId: 'homeSortByName', sortBy: 'name_label', sortOrder: 'asc' },
+      { labelId: 'homeSortByPowerstate', sortBy: 'power_state', sortOrder: 'desc' }
+    ]
+  },
   pool: {
     defaultFilter: '',
     filters: homeFilters.pool,
@@ -201,6 +214,7 @@ const OPTIONS = {
 
 const TYPES = {
   VM: _('homeTypeVm'),
+  VmGroup: _('homeTypeVmGroup'),
   'VM-template': _('homeTypeVmTemplate'),
   host: _('homeTypeHost'),
   pool: _('homeTypePool'),
@@ -210,119 +224,25 @@ const TYPES = {
 const DEFAULT_TYPE = 'VM'
 
 @addSubscriptions({
-  noRegisteredServers: cb => subscribeServers(data => cb(isEmpty(data)))
+  servers: subscribeServers
 })
 @connectStore(() => {
   const noServersConnected = invoke(
     createGetObjectsOfType('host'),
     hosts => state => isEmpty(hosts(state))
   )
+  const getType = (_, props) => props.location.query.t || DEFAULT_TYPE
+  const getObjectsByType = createGetObjectsOfType(getType)
 
-  return {
-    areObjectsFetched,
-    noServersConnected
-  }
-})
-@propTypes({
-  isAdmin: propTypes.bool.isRequired,
-  noResourceSets: propTypes.bool.isRequired
-})
-class NoObjects_ extends Component {
-  render () {
-    const {
-      areObjectsFetched,
-      isAdmin,
-      noRegisteredServers,
-      noResourceSets,
-      noServersConnected
-    } = this.props
-
-    if (!areObjectsFetched) {
-      return <CenterPanel>
-        <h2><img src='assets/loading.svg' /></h2>
-      </CenterPanel>
+  return (state, props) => {
+    const type = getType(state, props)
+    return {
+      areObjectsFetched: areObjectsFetched(state, props),
+      items: getObjectsByType(state, props),
+      noServersConnected: noServersConnected(state, props),
+      type,
+      user: getUser(state, props)
     }
-
-    if (noServersConnected && isAdmin) {
-      return <CenterPanel>
-        <Card shadow>
-          <CardHeader>{_('homeWelcome')}</CardHeader>
-          <CardBlock>
-            <Link to='/settings/servers'>
-              <Icon icon='pool' size={4} />
-              <h4>{noRegisteredServers ? _('homeAddServer') : _('homeConnectServer')}</h4>
-            </Link>
-            <p className='text-muted'>{noRegisteredServers ? _('homeWelcomeText') : _('homeConnectServerText')}</p>
-            <br /><br />
-            <h3>{_('homeHelp')}</h3>
-            <Row>
-              <Col mediumSize={6}>
-                <a href='https://xen-orchestra.com/docs/' target='_blank' className='btn btn-link'>
-                  <Icon icon='menu-about' size={4} />
-                  <h4>{_('homeOnlineDoc')}</h4>
-                </a>
-              </Col>
-              <Col mediumSize={6}>
-                <a href='https://xen-orchestra.com/#!/member/support' target='_blank' className='btn btn-link'>
-                  <Icon icon='menu-settings-users' size={4} />
-                  <h4>{_('homeProSupport')}</h4>
-                </a>
-              </Col>
-            </Row>
-          </CardBlock>
-        </Card>
-      </CenterPanel>
-    }
-
-    return <CenterPanel>
-      <Card shadow>
-        <CardHeader>{_('homeNoVms')}</CardHeader>
-        {(isAdmin || !noResourceSets) && <CardBlock>
-          <Row>
-            <Col>
-              <Link to='/vms/new'>
-                <Icon icon='vm' size={4} />
-                <h4>{_('homeNewVm')}</h4>
-              </Link>
-              <p className='text-muted'>{_('homeNewVmMessage')}</p>
-            </Col>
-          </Row>
-          {isAdmin && <div>
-            <h2>{_('homeNoVmsOr')}</h2>
-            <Row>
-              <Col mediumSize={6}>
-                <Link to='/import'>
-                  <Icon icon='menu-new-import' size={4} />
-                  <h4>{_('homeImportVm')}</h4>
-                </Link>
-                <p className='text-muted'>{_('homeImportVmMessage')}</p>
-              </Col>
-              <Col mediumSize={6}>
-                <Link to='/backup/restore'>
-                  <Icon icon='backup' size={4} />
-                  <h4>{_('homeRestoreBackup')}</h4>
-                </Link>
-                <p className='text-muted'>{_('homeRestoreBackupMessage')}</p>
-              </Col>
-            </Row>
-          </div>}
-        </CardBlock>}
-      </Card>
-    </CenterPanel>
-  }
-}
-
-@addSubscriptions({
-  noResourceSets: cb => subscribeResourceSets(data => cb(isEmpty(data)))
-})
-@connectStore(() => {
-  const type = (_, props) => props.location.query.t || DEFAULT_TYPE
-
-  return {
-    isAdmin,
-    items: createGetObjectsOfType(type),
-    type,
-    user: getUser
   }
 })
 export default class Home extends Component {
@@ -435,7 +355,6 @@ export default class Home extends Component {
       selectedHosts: properties.$container,
       selectedPools: properties.$pool,
       selectedTags: properties.tags,
-      selectedResourceSets: properties.resourceSet,
       ...sort
     })
 
@@ -473,8 +392,6 @@ export default class Home extends Component {
       pathname,
       query: { ...query, s: filter }
     })
-
-    this.page = 1
   }
 
   _clearFilter = () => this._setFilter('')
@@ -552,19 +469,6 @@ export default class Home extends Component {
       : filter::ComplexMatcher.removePropertyClause('tags')
     )
   }
-  _updateSelectedResourceSets = resourceSets => {
-    const filter = this._getParsedFilter()
-
-    this._setFilter(resourceSets.length
-      ? filter::ComplexMatcher.setPropertyClause(
-        'resourceSet',
-        ComplexMatcher.createOr(map(resourceSets, set =>
-          ComplexMatcher.createString(set.id)
-        ))
-      )
-      : filter::ComplexMatcher.removePropertyClause('resourceSet')
-    )
-  }
   _addCustomFilter = () => {
     return addCustomFilter(
       this._getType(),
@@ -647,11 +551,7 @@ export default class Home extends Component {
   // Header --------------------------------------------------------------------
 
   _renderHeader () {
-    const {
-      isAdmin,
-      noResourceSets,
-      type
-    } = this.props
+    const { type } = this.props
     const { filters } = OPTIONS[type]
     const customFilters = this._getCustomFilters()
 
@@ -673,7 +573,7 @@ export default class Home extends Component {
                         {name}
                       </MenuItem>
                     ),
-                    <MenuItem key='divider' divider />
+                    <MenuItem divider />
                   ]}
                   {map(filters, (filter, label) =>
                     <MenuItem key={label} onClick={() => this._setFilter(filter)}>
@@ -704,14 +604,13 @@ export default class Home extends Component {
             </div>
           </div>
         </Col>
-        {(isAdmin || !noResourceSets) && <Col mediumSize={3} className='text-xs-right'>
+        <Col mediumSize={3} className='text-xs-right'>
           <Link
             className='btn btn-success'
-            to='/vms/new'
-          >
+            to='/vms/new'>
             <Icon icon='vm-new' /> {_('homeNewVm')}
           </Link>
-        </Col>}
+        </Col>
       </Row>
     </Container>
   }
@@ -720,17 +619,89 @@ export default class Home extends Component {
 
   render () {
     const {
-      isAdmin,
-      noResourceSets
+      areObjectsFetched,
+      noServersConnected,
+      servers,
+      user
     } = this.props
 
-    const nItems = this._getNumberOfItems()
+    const isAdmin = user && user.permission === 'admin'
+    const noRegisteredServers = !servers || !servers.length
 
-    if (nItems < 1) {
-      return <NoObjects_
-        isAdmin={isAdmin}
-        noResourceSets={noResourceSets}
-      />
+    if (!areObjectsFetched) {
+      return <CenterPanel>
+        <h2><img src='assets/loading.svg' /></h2>
+      </CenterPanel>
+    }
+
+    if (noServersConnected && isAdmin) {
+      return <CenterPanel>
+        <Card shadow>
+          <CardHeader>{_('homeWelcome')}</CardHeader>
+          <CardBlock>
+            <Link to='/settings/servers'>
+              <Icon icon='pool' size={4} />
+              <h4>{noRegisteredServers ? _('homeAddServer') : _('homeConnectServer')}</h4>
+            </Link>
+            <p className='text-muted'>{noRegisteredServers ? _('homeWelcomeText') : _('homeConnectServerText')}</p>
+            <br /><br />
+            <h3>{_('homeHelp')}</h3>
+            <Row>
+              <Col mediumSize={6}>
+                <a href='https://xen-orchestra.com/docs/' target='_blank' className='btn btn-link'>
+                  <Icon icon='menu-about' size={4} />
+                  <h4>{_('homeOnlineDoc')}</h4>
+                </a>
+              </Col>
+              <Col mediumSize={6}>
+                <a href='https://xen-orchestra.com/#!/member/support' target='_blank' className='btn btn-link'>
+                  <Icon icon='menu-settings-users' size={4} />
+                  <h4>{_('homeProSupport')}</h4>
+                </a>
+              </Col>
+            </Row>
+          </CardBlock>
+        </Card>
+      </CenterPanel>
+    }
+
+    const nItems = this._getNumberOfItems()
+    if (!nItems) {
+      return <CenterPanel>
+        <Card shadow>
+          <CardHeader>{_('homeNoVms')}</CardHeader>
+          <CardBlock>
+            <Row>
+              <Col>
+                <Link to='/vms/new'>
+                  <Icon icon='vm' size={4} />
+                  <h4>{_('homeNewVm')}</h4>
+                </Link>
+                <p className='text-muted'>{_('homeNewVmMessage')}</p>
+              </Col>
+            </Row>
+            {isAdmin && <div>
+              <h2>{_('homeNoVmsOr')}</h2>
+              <Row>
+                <Col mediumSize={6}>
+                  <Link to='/import'>
+                    <Icon icon='menu-new-import' size={4} />
+                    <h4>{_('homeImportVm')}</h4>
+                  </Link>
+                  <p className='text-muted'>{_('homeImportVmMessage')}</p>
+                </Col>
+                <Col mediumSize={6}>
+                  <Link to='/backup/restore'>
+                    <Icon icon='backup' size={4} />
+                    <h4>{_('homeRestoreBackup')}</h4>
+                  </Link>
+                  <p className='text-muted'>{_('homeRestoreBackupMessage')}</p>
+                </Col>
+              </Row>
+            </div>}
+          </CardBlock>
+        </Card>
+      </CenterPanel>
     }
 
     const filteredItems = this._getFilteredItems()
@@ -743,7 +714,6 @@ export default class Home extends Component {
       selectedHosts,
       selectedItems,
       selectedPools,
-      selectedResourceSets,
       selectedTags,
       sortBy
     } = this.state
@@ -758,8 +728,7 @@ export default class Home extends Component {
       mainActions,
       otherActions,
       showHostsSelector,
-      showPoolsSelector,
-      showResourceSetsSelector
+      showPoolsSelector
     } = options
 
     // Necessary because indeterminate cannot be used as an attribute
@@ -839,6 +808,7 @@ export default class Home extends Component {
                       <Button btnStyle='link'><Icon icon='pool' /> {_('homeAllPools')}</Button>
                     </OverlayTrigger>
                   )}
+                  {' '}
                   {showHostsSelector && (
                     <OverlayTrigger
                       trigger='click'
@@ -858,7 +828,8 @@ export default class Home extends Component {
                       <Button btnStyle='link'><Icon icon='host' /> {_('homeAllHosts')}</Button>
                     </OverlayTrigger>
                   )}
-                  <OverlayTrigger
+                  {' '}
+                  {type !== 'VmGroup' && <OverlayTrigger
                     autoFocus
                     trigger='click'
                     rootClose
@@ -876,24 +847,8 @@ export default class Home extends Component {
                     }
                   >
                     <Button btnStyle='link'><Icon icon='tags' /> {_('homeAllTags')}</Button>
-                  </OverlayTrigger>
-                  {showResourceSetsSelector && isAdmin && !noResourceSets && <OverlayTrigger
-                    trigger='click'
-                    rootClose
-                    placement='bottom'
-                    overlay={
-                      <Popover className={styles.selectObject} id='resourceSetPopover'>
-                        <SelectResourceSet
-                          autoFocus
-                          multi
-                          onChange={this._updateSelectedResourceSets}
-                          value={selectedResourceSets}
-                        />
-                      </Popover>
-                    }
-                  >
-                    <Button btnStyle='link'><Icon icon='resource-set' /> {_('homeAllResourceSets')}</Button>
-                  </OverlayTrigger>}
+                  </OverlayTrigger> }
+                  {' '}
                   <DropdownButton bsStyle='link' id='sort' title={_('homeSortBy')}>
                     {map(options.sortOptions, ({ labelId, sortBy: _sortBy, sortOrder }, key) => (
                       <MenuItem key={key} onClick={() => this.setState({ sortBy: _sortBy, sortOrder })}>
@@ -927,7 +882,7 @@ export default class Home extends Component {
                   item={item}
                   key={item.id}
                   onSelect={this.toggleState(`selectedItems.${item.id}`)}
-                  selected={Boolean(selectedItems[item.id])}
+                  selected={selectedItems[item.id]}
                 />
               </div>
             ))

src/xo-app/home/vm-group-item.js

@@ -0,0 +1,77 @@
+import _ from 'intl'
+import Component from 'base-component'
+import Ellipsis, { EllipsisContainer } from 'ellipsis'
+import forEach from 'lodash/forEach'
+import Icon from 'icon'
+import isEmpty from 'lodash/isEmpty'
+import map from 'lodash/map'
+import React from 'react'
+import SingleLineRow from 'single-line-row'
+import Tooltip from 'tooltip'
+import { BlockLink } from 'link'
+import { Col } from 'grid'
+import { connectStore } from 'utils'
+import { createGetObject } from 'selectors'
+import { editVmGroup } from 'xo'
+import { Text } from 'editable'
+
+import styles from './index.css'
+
+@connectStore(() => {
+  return (state, props) => {
+    const vms = {}
+    forEach(props.item.$VMs, vmId => {
+      const getVM = createGetObject(() => vmId)
+      vms[vmId] = getVM(state, props)
+    })
+    return {
+      vms
+    }
+  }
+})
+export default class VmGroupItem extends Component {
+  toggleState = stateField => () => this.setState({ [stateField]: !this.state[stateField] })
+  _onSelect = () => this.props.onSelect(this.props.item.id)
+  _setNameDescription = description => editVmGroup(this.props.item, {name_description: description})
+  _setNameLabel = label => editVmGroup(this.props.item, {name_label: label})
+  _getVmGroupState = (vmGroup) => {
+    const states = map(this.props.vms, vm => vm.power_state)
+    return isEmpty(states)
+    ? 'Busy'
+    : states.indexOf('Halted') === -1
+      ? states[0]
+      : states.indexOf('Running') === -1
+        ? states[0]
+        : 'Busy'
+  }
+
+  render () {
+    const { item: vmGroup, selected, vms } = this.props
+    return <div className={styles.item}>
+      <BlockLink to={`/vm-group/${vmGroup.id}`}>
+        <SingleLineRow>
+          <Col smallSize={10} mediumSize={9} largeSize={3}>
+            <EllipsisContainer>
+              <input type='checkbox' checked={selected} onChange={this._onSelect} value={vmGroup.id} />
+              &nbsp;&nbsp;
+              <Ellipsis>
+                <Tooltip content={_(`powerStateVmGroup${this._getVmGroupState(vmGroup)}`)}>
+                  <Icon icon={isEmpty(vms) ? 'halted' : `${this._getVmGroupState(vmGroup).toLowerCase()}`} />
+                </Tooltip>
+                <Text value={vmGroup.name_label} onChange={this._setNameLabel} useLongClick />
+              </Ellipsis>
+              &nbsp;&nbsp;
+            </EllipsisContainer>
+          </Col>
+          <Col mediumSize={4} className='hidden-md-down'>
+            <EllipsisContainer>
+              <Ellipsis>
+                <Text value={vmGroup.name_description} onChange={this._setNameDescription} useLongClick />
+              </Ellipsis>
+            </EllipsisContainer>
+          </Col>
+        </SingleLineRow>
+      </BlockLink>
+    </div>
+  }
+}

src/xo-app/home/vm-item.js

@@ -54,6 +54,11 @@ export default class VmItem extends Component {
     return vm && vm.power_state === 'Running'
   }
 
+  _getMigrationPredicate = createSelector(
+    () => this.props.container,
+    container => host => host.id !== container.id
+  )
+
   _getResourceSet = createFinder(
     () => this.props.resourceSets,
     createSelector(
@@ -139,6 +144,7 @@ export default class VmItem extends Component {
                 labelProp='name_label'
                 onChange={this._migrateVm}
                 placeholder={_('homeMigrateTo')}
+                predicate={this._getMigrationPredicate()}
                 useLongClick
                 value={container}
                 xoType='host'

src/xo-app/host/action-bar.js

@@ -1,5 +1,4 @@
-import _ from 'intl'
-import ActionBar, { Action } from 'action-bar'
+import ActionBar from 'action-bar'
 import React from 'react'
 import {
   // disableHost,
@@ -13,42 +12,44 @@ import {
 const hostActionBarByState = {
   Running: ({ host }) => (
     <ActionBar
+      actions={[
+        {
+          icon: 'host-stop',
+          label: 'stopHostLabel',
+          handler: stopHost
+        },
+        {
+          icon: 'host-restart-agent',
+          label: 'restartHostAgent',
+          handler: restartHostAgent
+        },
+        {
+          icon: 'host-emergency-shutdown',
+          label: 'emergencyModeLabel',
+          handler: emergencyShutdownHost
+        },
+        {
+          icon: 'host-reboot',
+          label: 'rebootHostLabel',
+          handler: restartHost
+        }
+      ]}
       display='icon'
-      handlerParam={host}
-    >
-      <Action
-        handler={stopHost}
-        icon='host-stop'
-        label={_('stopHostLabel')}
-      />
-      <Action
-        handler={restartHostAgent}
-        icon='host-restart-agent'
-        label={_('restartHostAgent')}
-      />
-      <Action
-        handler={emergencyShutdownHost}
-        icon='host-emergency-shutdown'
-        label={_('emergencyModeLabel')}
-      />
-      <Action
-        handler={restartHost}
-        icon='host-reboot'
-        label={_('rebootHostLabel')}
-      />
-    </ActionBar>
+      param={host}
+    />
   ),
   Halted: ({ host }) => (
     <ActionBar
+      actions={[
+        {
+          icon: 'host-start',
+          label: 'startHostLabel',
+          handler: startHost
+        }
+      ]}
       display='icon'
-      handlerParam={host}
-    >
-      <Action
-        handler={startHost}
-        icon='host-start'
-        label={_('startHostLabel')}
-      />
-    </ActionBar>
+      param={host}
+    />
   )
 }
 

src/xo-app/host/index.js

@@ -255,6 +255,7 @@ export default class Host extends Component {
           </div>
         </Col>
       </Row>
+      <br />
       <Row>
         <Col>
           <NavTabs>

src/xo-app/host/tab-advanced.js

@@ -5,7 +5,7 @@ import TabButton from 'tab-button'
 import SelectFiles from 'select-files'
 import Upgrade from 'xoa-upgrade'
 import { Toggle } from 'form'
-import { enableHost, detachHost, disableHost, forgetHost, restartHost, installSupplementalPack } from 'xo'
+import { enableHost, detachHost, disableHost, restartHost, installSupplementalPack } from 'xo'
 import { FormattedRelative, FormattedTime } from 'react-intl'
 import { Container, Row, Col } from 'grid'
 import {
@@ -59,15 +59,6 @@ export default ({
         icon='host-eject'
         labelId='detachHost'
       />
-      {host.power_state !== 'Running' &&
-        <TabButton
-          btnStyle='danger'
-          handler={forgetHost}
-          handlerParam={host}
-          icon='host-forget'
-          labelId='forgetHost'
-        />
-      }
     </Col>
   </Row>
   <Row>
@@ -112,7 +103,7 @@ export default ({
           </tr>
           <tr>
             <th>{_('hostXenServerVersion')}</th>
-            <Copiable tagName='td' data={host.version}>
+            <Copiable tagName='td'>
               {host.license_params.sku_marketing_name} {host.version} ({host.license_params.sku_type})
             </Copiable>
           </tr>

src/xo-app/host/tab-console.js

@@ -92,6 +92,7 @@ export default class extends Component {
         <Row className='console'>
           <Col>
             <NoVnc ref='noVnc' url={resolveUrl(`consoles/${vmController.id}`)} onClipboardChange={this._getRemoteClipboard} />
+            <p><em><Icon icon='info' /> {_('tipLabel')} {_('tipConsoleLabel')}</em></p>
           </Col>
         </Row>
       </Container>

src/xo-app/host/tab-network.js

@@ -90,8 +90,6 @@ class ConfigureIpModal extends Component {
   vifsByNetwork: createGetObjectsOfType('VIF').groupBy('$network')
 }))
 class PifItem extends Component {
-  state = { configModes: [] }
-
   componentWillMount () {
     getIpv4ConfigModes().then(configModes =>
       this.setState({ configModes })
@@ -128,7 +126,7 @@ class PifItem extends Component {
 
     const pifInUse = some(vifsByNetwork[pif.$network], vif => vif.attached)
 
-    return <tr>
+    return <tr key={pif.id}>
       <td>{pif.device}</td>
       <td>{networks[pif.$network].name_label}</td>
       <td>
@@ -240,7 +238,7 @@ export default ({
               </tr>
             </thead>
             <tbody>
-              {map(pifs, pif => <PifItem key={pif.id} pif={pif} networks={networks} />)}
+              {map(pifs, pif => <PifItem pif={pif} networks={networks} />)}
             </tbody>
           </table>
         </span>

src/xo-app/index.js

@@ -36,6 +36,7 @@ import Sr from './sr'
 import Tasks from './tasks'
 import User from './user'
 import Vm from './vm'
+import VmGroup from './vm-group'
 import VmImport from './vm-import'
 import XoaUpdates from './xoa-updates'
 import Xosan from './xosan'
@@ -86,6 +87,7 @@ const BODY_STYLE = {
   'vms/import': VmImport,
   'vms/new': NewVm,
   'vms/:id': Vm,
+  'vm-group/:id': VmGroup,
   'xoa-update': XoaUpdates,
   'xosan': Xosan
 })

src/xo-app/jobs/new/index.js

@@ -381,7 +381,7 @@ export default class Jobs extends Component {
         />
         <input type='text' ref='name' className='form-control mb-1 mt-1' placeholder={formatMessage(messages.jobNamePlaceholder)} pattern='[^_]+' required />
         <SelectPlainObject ref='method' options={actions} optionKey='method' onChange={this._handleSelectMethod} placeholder={_('jobActionPlaceHolder')} />
-        <input type='number' onChange={this.linkState('timeout')} value={state.timeout || ''} className='form-control mb-1 mt-1' placeholder={formatMessage(messages.jobTimeoutPlaceHolder)} />
+        <input type='number' onChange={this.linkState('timeout')} value={state.timeout} className='form-control mb-1 mt-1' placeholder='Job timeout (seconds)' />
         {action && <fieldset>
           <GenericInput ref='params' schema={action.info} uiSchema={action.uiSchema} label={action.method} required />
           {job && <p className='text-warning'>{_('jobEditMessage', { name: job.name, id: job.id.slice(4, 8) })}</p>}

src/xo-app/logs/index.js

@@ -1,37 +1,30 @@
 import _, { FormattedDuration } from 'intl'
 import ActionButton from 'action-button'
 import ActionRowButton from 'action-row-button'
-import BaseComponent from 'base-component'
 import ButtonGroup from 'button-group'
 import classnames from 'classnames'
+import forEach from 'lodash/forEach'
+import get from 'lodash/get'
 import Icon from 'icon'
-import NoObjects from 'no-objects'
+import includes from 'lodash/includes'
+import map from 'lodash/map'
+import orderBy from 'lodash/orderBy'
 import propTypes from 'prop-types-decorator'
 import React, { Component } from 'react'
 import renderXoItem from 'render-xo-item'
 import SortedTable from 'sorted-table'
 import Tooltip from 'tooltip'
 import { alert, confirm } from 'modal'
+import { connectStore } from 'utils'
 import { createGetObject } from 'selectors'
 import { FormattedDate } from 'react-intl'
-import {
-  connectStore,
-  formatSize,
-  formatSpeed
-} from 'utils'
+
 import {
   Card,
   CardHeader,
   CardBlock
 } from 'card'
-import {
-  forEach,
-  get,
-  includes,
-  isEmpty,
-  map,
-  orderBy
-  } from 'lodash'
+
 import {
   deleteJobsLog,
   subscribeJobsLogs
@@ -59,9 +52,9 @@ class JobParam extends Component {
       id
     } = this.props
 
-    return object != null
-      ? _.keyValue(object.type || paramKey, renderXoItem(object))
-      : _.keyValue(paramKey, String(id))
+    return object
+    ? <span><strong>{object.type || paramKey}</strong>: {renderXoItem(object)} </span>
+    : <span><strong>{paramKey}:</strong> {String(id)} </span>
   }
 }
 
@@ -77,98 +70,33 @@ class JobReturn extends Component {
   }
 }
 
-const JobCallStateInfos = ({ end, error }) => {
-  const [ icon, tooltip ] = error !== undefined
-    ? ['halted', 'failedJobCall']
-    : end !== undefined
-      ? ['running', 'successfulJobCall']
-      : ['busy', 'jobCallInProgess']
+const Log = props => <ul className='list-group'>
+  {map(props.log.calls, call => {
+    const { returnedValue } = call
+    let id
+    if (returnedValue != null) {
+      id = returnedValue.id
+      if (id === undefined && typeof returnedValue === 'string') {
+        id = returnedValue
+      }
+    }
 
-  return <Tooltip content={_(tooltip)}>
-    <Icon icon={icon} />
-  </Tooltip>
-}
-
-const JobTransferredDataInfos = ({ start, end, size }) => <div>
-  <span><strong>{_('jobTransferredDataSize')}</strong> {formatSize(size)}</span>
-  <br />
-  <span><strong>{_('jobTransferredDataSpeed')}</strong> {formatSpeed(size, end - start)}</span>
-</div>
-
-const CALL_FILTER_OPTIONS = [
-  {label: 'successfulJobCall', value: 'success'},
-  {label: 'failedJobCall', value: 'error'},
-  {label: 'jobCallInProgess', value: 'running'},
-  {label: 'allJobCalls', value: 'all'}
-]
-
-const PREDICATES = {
-  all: () => true,
-  error: call => call.error !== undefined,
-  running: call => call.end === undefined && call.error === undefined,
-  success: call => call.end !== undefined && call.error === undefined
-}
-
-class Log extends BaseComponent {
-  state = {
-    filter: 'all'
-  }
-
-  render () {
-    const { props, state } = this
-    const predicate = PREDICATES[state.filter]
-
-    return <div>
-      <select
-        className='form-control'
-        onChange={this.linkState('filter')}
-        value={state.filter}
-      >
-        {map(CALL_FILTER_OPTIONS, ({ label, value }) => _(
-          { key: value },
-          label,
-          message => <option value={value}>{message}</option>
-        ))}
-      </select>
-      <br />
-      <ul className='list-group'>
-        {map(props.log.calls, call => {
-          const {
-            end,
-            error,
-            returnedValue,
-            start
-          } = call
-
-          let id
-          if (returnedValue != null) {
-            id = returnedValue.id
-            if (id === undefined && typeof returnedValue === 'string') {
-              id = returnedValue
-            }
+    return <li key={call.callKey} className='list-group-item'>
+      <strong className='text-info'>{call.method}: </strong><br />
+      {map(call.params, (value, key) => [ <JobParam id={value} paramKey={key} key={key} />, <br /> ])}
+      {id !== undefined && <span>{' '}<JobReturn id={id} /></span>}
+      {call.error &&
+        <span className='text-danger'>
+          <Icon icon='error' />
+          {' '}
+          {call.error.message
+            ? <strong>{call.error.message}</strong>
+            : JSON.stringify(call.error)
           }
-
-          return predicate(call) && <li key={call.callKey} className='list-group-item'>
-            <strong className='text-info'>{call.method}: </strong><JobCallStateInfos end={end} error={error} /><br />
-            {map(call.params, (value, key) => [ <JobParam id={value} paramKey={key} key={key} />, <br /> ])}
-            {end !== undefined && _.keyValue(_('jobDuration'), <FormattedDuration duration={end - start} />)}
-            {returnedValue != null && returnedValue.size !== undefined && <JobTransferredDataInfos start={start} end={end} size={returnedValue.size} />}
-            {id !== undefined && <span>{' '}<JobReturn id={id} /></span>}
-            {call.error &&
-              <span className='text-danger'>
-                <Icon icon='error' />
-                {' '}
-                {call.error.message
-                  ? <strong>{call.error.message}</strong>
-                  : JSON.stringify(call.error)
-                }
-              </span>}
-          </li>
-        })}
-      </ul>
-    </div>
-  }
-}
+        </span>}
+    </li>
+  })}
+</ul>
 
 const showCalls = log => alert(_('jobModalTitle', { job: log.jobId }), <Log log={log} />)
 
@@ -237,6 +165,7 @@ export default class LogList extends Component {
   constructor (props) {
     super(props)
     this.state = {
+      logs: [],
       logsToClear: []
     }
     this.filters = {
@@ -279,7 +208,6 @@ export default class LogList extends Component {
               callKey: logKey,
               params: data.params,
               method: data.method,
-              start: time,
               time
             }
           } else if (data.event === 'jobCall.end') {
@@ -291,7 +219,6 @@ export default class LogList extends Component {
               entry.meta = 'error'
             } else {
               call.returnedValue = data.returnedValue
-              call.end = time
             }
           }
         }
@@ -326,12 +253,12 @@ export default class LogList extends Component {
     return (
       <Card>
         <CardHeader>
-          <Icon icon='log' /> Logs<span className='pull-right'><ActionButton disabled={isEmpty(logs)} btnStyle='danger' handler={this._deleteAllLogs} icon='delete' /></span>
+          <Icon icon='log' /> Logs<span className='pull-right'><ActionButton disabled={!logs.length} btnStyle='danger' handler={this._deleteAllLogs} icon='delete' /></span>
         </CardHeader>
         <CardBlock>
-          <NoObjects collection={logs} emptyMessage={_('noLogs')}>
-            <SortedTable collection={logs} columns={LOG_COLUMNS} filters={this.filters} />
-          </NoObjects>
+          {logs.length
+            ? <SortedTable collection={logs} columns={LOG_COLUMNS} filters={this.filters} />
+            : <p>{_('noLogs')}</p>}
         </CardBlock>
       </Card>
     )

src/xo-app/menu/index.js

@@ -127,6 +127,7 @@ export default class Menu extends Component {
     const items = [
       { to: '/home', icon: 'menu-home', label: 'homePage', subMenu: [
         { to: '/home?t=VM', icon: 'vm', label: 'homeVmPage' },
+        { to: '/home?t=VmGroup', icon: 'vm', label: 'homeVmGroupPage' },
         nHosts !== 0 && { to: '/home?t=host', icon: 'host', label: 'homeHostPage' },
         !isEmpty(pools) && { to: '/home?t=pool', icon: 'pool', label: 'homePoolPage' },
         isAdmin && { to: '/home?t=VM-template', icon: 'template', label: 'homeTemplatePage' },
@@ -166,7 +167,8 @@ export default class Menu extends Component {
       { to: '/tasks', icon: 'task', label: 'taskMenu', pill: nTasks },
       isAdmin && { to: '/xosan', icon: 'menu-xosan', label: 'xosan' },
       !(noOperatablePools && noResourceSets) && { to: '/vms/new', icon: 'menu-new', label: 'newMenu', subMenu: [
-        (isAdmin || !noResourceSets) && { to: '/vms/new', icon: 'menu-new-vm', label: 'newVmPage' },
+        { to: '/vms/new', icon: 'menu-new-vm', label: 'newVmPage' },
+        { to: '/new/vm-group', icon: 'menu-new-vm', label: 'newVmGroupPage' },
         isAdmin && { to: '/new/sr', icon: 'menu-new-sr', label: 'newSrPage' },
         isAdmin && { to: '/settings/servers', icon: 'menu-settings-servers', label: 'newServerPage' },
         !noOperatablePools && { to: '/vms/import', icon: 'menu-new-import', label: 'newImport' }

src/xo-app/new-vm/index.js

@@ -69,11 +69,11 @@ import {
   firstDefined,
   formatSize,
   getCoresPerSocketPossibilities,
-  generateReadableRandomString,
   noop,
   resolveResourceSet
 } from 'utils'
 import {
+  createFilter,
   createSelector,
   createGetObject,
   createGetObjectsOfType,
@@ -90,6 +90,8 @@ const NB_VMS_MAX = 100
 
 const getObject = createGetObject((_, id) => id)
 
+const returnTrue = () => true
+
 // Sub-components
 
 const SectionContent = ({ column, children }) => (
@@ -238,6 +240,9 @@ export default class NewVm extends BaseComponent {
 
 // Utils -----------------------------------------------------------------------
 
+  getUniqueId () {
+    return this._uniqueId++
+  }
   get _isDiskTemplate () {
     const { template } = this.state.state
     return template &&
@@ -398,7 +403,7 @@ export default class NewVm extends BaseComponent {
       }
       const vdi = getObject(storeState, vbd.VDI, resourceSet)
       if (vdi) {
-        existingDisks[vbd.position] = {
+        existingDisks[this.getUniqueId()] = {
           name_label: vdi.name_label,
           name_description: vdi.name_description,
           size: vdi.size,
@@ -413,6 +418,7 @@ export default class NewVm extends BaseComponent {
     forEach(template.VIFs, vifId => {
       const vif = getObject(storeState, vifId, resourceSet)
       VIFs.push({
+        id: this.getUniqueId(),
         network: pool || isInResourceSet(vif.$network)
           ? vif.$network
           : resourceSet.objectsByType['network'][0].id
@@ -421,6 +427,7 @@ export default class NewVm extends BaseComponent {
     if (VIFs.length === 0) {
       const networkId = this._getDefaultNetworkId()
       VIFs.push({
+        id: this.getUniqueId(),
         network: networkId
       })
     }
@@ -447,10 +454,12 @@ export default class NewVm extends BaseComponent {
       // disks
       existingDisks,
       VDIs: map(template.template_info.disks, disk => {
+        const device = String(this.getUniqueId())
         return {
           ...disk,
+          device,
           name_description: disk.name_description || 'Created by XO',
-          name_label: (name_label || 'disk') + '_' + generateReadableRandomString(5),
+          name_label: (name_label || 'disk') + '_' + device,
           SR: pool
             ? pool.default_SR
             : resourceSet.objectsByType['SR'][0].id
@@ -484,6 +493,13 @@ export default class NewVm extends BaseComponent {
     objectsIds => id => includes(objectsIds, id)
   )
 
+  _getCanOperate = createSelector(
+    () => this.props.isAdmin,
+    () => this.props.permissions,
+    (isAdmin, permissions) => isAdmin
+      ? returnTrue
+      : ({ id }) => permissions && permissions[id] && permissions[id].operate
+  )
   _getVmPredicate = createSelector(
     this._getIsInPool,
     this._getIsInResourceSet,
@@ -532,7 +548,11 @@ export default class NewVm extends BaseComponent {
     },
     (networks, poolId) => filter(networks, network => network.$pool === poolId)
   )
-
+  _getOperatablePools = createFilter(
+    () => this.props.pools,
+    this._getCanOperate,
+    [ (pool, canOperate) => canOperate(pool) ]
+  )
   _getAffinityHostPredicate = createSelector(
     () => this.props.pool,
     () => this.state.state.existingDisks,
@@ -635,10 +655,12 @@ export default class NewVm extends BaseComponent {
   _addVdi = () => {
     const { state } = this.state
     const { pool } = this.props
+    const device = String(this.getUniqueId())
 
     this._setState({ VDIs: [ ...state.VDIs, {
+      device,
       name_description: 'Created by XO',
-      name_label: (state.name_label || 'disk') + '_' + generateReadableRandomString(5),
+      name_label: (state.name_label || 'disk') + '_' + device,
       SR: pool && pool.default_SR,
       type: 'system'
     }] })
@@ -652,6 +674,7 @@ export default class NewVm extends BaseComponent {
     const networkId = this._getDefaultNetworkId()
 
     this._setState({ VIFs: [ ...this.state.state.VIFs, {
+      id: this.getUniqueId(),
       network: networkId
     }] })
   }
@@ -686,10 +709,13 @@ export default class NewVm extends BaseComponent {
 // MAIN ------------------------------------------------------------------------
 
   _renderHeader = () => {
-    const {isAdmin, pool, resourceSets} = this.props
+    const { pool } = this.props
+    const showSelectPool = !isEmpty(this._getOperatablePools())
+    const showSelectResourceSet = !this.props.isAdmin && !isEmpty(this.props.resourceSets)
     const selectPool = <span className={styles.inlineSelect}>
       <SelectPool
         onChange={this._selectPool}
+        predicate={this._getCanOperate()}
         value={pool}
       />
     </span>
@@ -703,9 +729,14 @@ export default class NewVm extends BaseComponent {
       <Row>
         <Col mediumSize={12}>
           <h2>
-            {isAdmin || !isEmpty(resourceSets)
+            {showSelectPool && showSelectResourceSet
+              ? _('newVmCreateNewVmOn2', {
+                select1: selectPool,
+                select2: selectResourceSet
+              })
+              : showSelectPool || showSelectResourceSet
               ? _('newVmCreateNewVmOn', {
-                select: isAdmin ? selectPool : selectResourceSet
+                select: showSelectPool ? selectPool : selectResourceSet
               })
               : _('newVmCreateNewVmNoPermission')
             }
@@ -1159,7 +1190,7 @@ export default class NewVm extends BaseComponent {
         </div>)}
 
         {/* VDIs */}
-        {map(VDIs, (vdi, index) => <div key={index}>
+        {map(VDIs, (vdi, index) => <div key={vdi.device}>
           <LineItem>
             <Item label={_('newVmSrLabel')}>
               <span className={styles.inlineSelect}>
@@ -1245,7 +1276,6 @@ export default class NewVm extends BaseComponent {
       showAdvanced,
       tags
     } = this.state.state
-    const { isAdmin } = this.props
     const { formatMessage } = this.props.intl
     return <Section icon='new-vm-advanced' title='newVmAdvancedPanel' done={this._isAdvancedDone()}>
       <SectionContent column>
@@ -1381,7 +1411,7 @@ export default class NewVm extends BaseComponent {
             )}
           </LineItem>}
         </SectionContent>,
-        isAdmin && <SectionContent>
+        <SectionContent>
           <Item label={_('newVmAffinityHost')}>
             <SelectHost
               onChange={this._linkState('affinityHost')}

src/xo-app/new/index.js

@@ -1,9 +1,11 @@
 import { routes } from 'utils'
 
 import Sr from './sr'
+import VmGroup from './vm-group'
 
 const New = routes('vm', {
-  sr: Sr
+  sr: Sr,
+  'vm-group': VmGroup
 })(
   ({ children }) => children
 )

src/xo-app/new/sr/index.js

@@ -491,7 +491,7 @@ export default class New extends Component {
                 >
                   <option value={null}>{formatMessage(messages.noSelectedValue)}</option>
                   {map(typeGroups, (types, group) =>
-                    <optgroup key={group} label={SR_GROUP_TO_LABEL[group]}>
+                    <optgroup label={SR_GROUP_TO_LABEL[group]}>
                       {map(types, type =>
                         <option key={type} value={type}>{SR_TYPE_TO_LABEL[type]}</option>
                       )}

src/xo-app/new/vm-group/index.js

@@ -0,0 +1,153 @@
+import _ from 'intl'
+import ActionButton from 'action-button'
+import BaseComponent from 'base-component'
+import classNames from 'classnames'
+import DebounceInput from 'react-debounce-input'
+import Icon from 'icon'
+import Page from '../../page'
+import React from 'react'
+import Wizard, { Section } from 'wizard'
+import { Container, Row, Col } from 'grid'
+import {
+  createVmGroup,
+  subscribeCurrentUser,
+  subscribePermissions,
+  subscribeResourceSets
+} from 'xo'
+import {
+  createSelector,
+  createGetObjectsOfType,
+  getUser
+} from 'selectors'
+import { SelectPool } from 'select-objects'
+import { addSubscriptions, connectStore } from 'utils'
+
+import styles from '../../new-vm/index.css'
+
+const SectionContent = ({ column, children }) => (
+  <div className={classNames(
+    'form-inline',
+    styles.sectionContent,
+    column && styles.sectionContentColumn
+  )}>
+    {children}
+  </div>
+)
+
+const Item = ({ label, children, className }) => (
+  <span className={styles.item}>
+    {label && <span>{label}&nbsp;</span>}
+    <span className={classNames(styles.input, className)}>{children}</span>
+  </span>
+)
+
+@addSubscriptions({
+  resourceSets: subscribeResourceSets,
+  permissions: subscribePermissions,
+  user: subscribeCurrentUser
+})
+@connectStore(() => ({
+  isAdmin: createSelector(
+    getUser,
+    user => user && user.permission === 'admin'
+  ),
+  pools: createGetObjectsOfType('pool')
+}))
+export default class VmGroup extends BaseComponent {
+  static contextTypes = {
+    router: React.PropTypes.object
+  }
+
+  constructor () {
+    super()
+    this.state = {name_label: '', name_description: ''}
+  }
+
+  _selectPool = pool => {
+    this.setState({ pool })
+    this._reset()
+  }
+
+  _getCanOperate = createSelector(
+    () => this.props.isAdmin,
+    () => this.props.permissions,
+    (isAdmin, permissions) => isAdmin
+      ? () => true
+      : ({ id }) => permissions && permissions[id] && permissions[id].operate
+  )
+
+  _renderHeader = () => {
+    const { pool } = this.state
+    return <Container>
+      <Row>
+        <Col mediumSize={12}>
+          <h2><Icon icon='sr' /> {_('newVmGroupTitle')}
+            <SelectPool
+              onChange={this._selectPool}
+              predicate={this._getCanOperate()}
+              value={pool}
+            />
+          </h2>
+        </Col>
+      </Row>
+    </Container>
+  }
+  _reset = () => this.setState({poolId: '', name_label: '', name_description: ''})
+  _create = () => {
+    createVmGroup(this.state)
+    this.context.router.push('home?s=&t=VmGroup')
+  }
+  _getOnChange = item => ({target}) => this.setState({[item]: target.value})
+
+  render () {
+    const {pool, name_label: nameLabel, name_description: nameDescription} = this.state
+    return (
+      <Page header={this._renderHeader()}>
+        <form id='vmGroupCreation'>
+          <Wizard>
+            <Section icon='new-vm-infos' title='newVmGroupInfoPanel'>
+              <SectionContent>
+                <Item label={_('newVmGroupNameLabel')}>
+                  <DebounceInput
+                    className='form-control'
+                    // debounceTimeout={DEBOUNCE_TIMEOUT}
+                    onChange={this._getOnChange('name_label')}
+                    value={nameLabel}
+                  />
+                </Item>
+                <Item label={_('newVmGroupDescriptionLabel')}>
+                  <DebounceInput
+                    className='form-control'
+                    // debounceTimeout={DEBOUNCE_TIMEOUT}
+                    onChange={this._getOnChange('name_description')}
+                    value={nameDescription}
+                  />
+                </Item>
+              </SectionContent>
+            </Section>
+          </Wizard>
+          <div className={styles.submitSection}>
+            <ActionButton
+              className={styles.button}
+              handler={this._reset}
+              icon='new-vm-reset'
+            >
+              {_('newVmGroupReset')}
+            </ActionButton>
+            <ActionButton
+              btnStyle='primary'
+              className={styles.button}
+              disabled={nameLabel === '' || pool === undefined}
+              form='vmGroupCreation'
+              handler={this._create}
+              icon='new-vm-create'
+              redirectOnSuccess={this._getRedirectionUrl}
+            >
+              {_('newVmGroupCreate')}
+            </ActionButton>
+          </div>
+        </form>
+      </Page>
+    )
+  }
+}

src/xo-app/pool/action-bar.js

@@ -1,78 +1,39 @@
-import _ from 'intl'
-import ActionBar, { Action } from 'action-bar'
-import Component from 'base-component'
+import ActionBar from 'action-bar'
 import React from 'react'
-import { createGetObjectsOfType, createSelector } from 'selectors'
 import {
-  find
-} from 'lodash'
-import {
-  addSubscriptions,
-  connectStore,
-  noop
-} from 'utils'
-import {
-  addHostToPool,
-  disconnectServer,
-  subscribeServers
+  addHostToPool
 } from 'xo'
 
-@connectStore({
-  hosts: createGetObjectsOfType('host')
-})
-@addSubscriptions({
-  servers: subscribeServers
-})
-export default class PoolActionBar extends Component {
-  _getMasterAddress = createSelector(
-    () => this.props.pool && this.props.pool.master,
-    () => this.props.hosts,
-    (poolMaster, hosts) => {
-      const master = find(hosts, { id: poolMaster })
-
-      return master && master.address
-    }
-  )
-
-  _getServer = createSelector(
-    this._getMasterAddress,
-    () => this.props.servers,
-    (masterAddress, servers) => find(servers, { host: masterAddress })
-  )
-
-  _disconnectServer = () =>
-    disconnectServer(this._getServer())
-
-  render () {
-    const { pool } = this.props
-
-    return <ActionBar
-      display='icon'
-      handlerParam={pool}
-    >
-      <Action
-        handler={noop}
-        icon='add-sr'
-        label={_('addSrLabel')}
-        redirectOnSuccess={`new/sr?host=${pool.master}`}
-      />
-      <Action
-        handler={noop}
-        icon='add-vm'
-        label={_('addVmLabel')}
-        redirectOnSuccess={`vms/new?pool=${pool.id}`}
-      />
-      <Action
-        handler={addHostToPool}
-        icon='add-host'
-        label={_('addHostLabel')}
-      />
-      <Action
-        handler={this._disconnectServer}
-        icon='disconnect'
-        label={_('disconnectServer')}
-        redirectOnSuccess='/home'
-      />
-    </ActionBar>
-  }
+const NOT_IMPLEMENTED = () => {
+  throw new Error('not implemented')
 }
+
+const PoolActionBar = ({ pool }) => (
+  <ActionBar
+    actions={[
+      {
+        icon: 'add-sr',
+        label: 'addSrLabel',
+        redirectOnSuccess: `new/sr?host=${pool.master}`
+      },
+      {
+        icon: 'add-vm',
+        label: 'addVmLabel',
+        redirectOnSuccess: `vms/new?pool=${pool.id}`
+      },
+      {
+        icon: 'add-host',
+        label: 'addHostLabel',
+        handler: addHostToPool
+      },
+      {
+        icon: 'disconnect',
+        label: 'disconnectServer',
+        handler: NOT_IMPLEMENTED // TODO disconnect server
+      }
+    ]}
+    display='icon'
+    param={pool}
+  />
+)
+export default PoolActionBar

src/xo-app/pool/index.js

@@ -124,6 +124,7 @@ export default class Pool extends Component {
           </div>
         </Col>
       </Row>
+      <br />
       <Row>
         <Col>
           <NavTabs>

src/xo-app/pool/tab-advanced.js

@@ -1,43 +1,10 @@
-import React from 'react'
-
 import _ from 'intl'
-import Component from 'base-component'
 import Copiable from 'copiable'
+import React from 'react'
 import SelectFiles from 'select-files'
 import Upgrade from 'xoa-upgrade'
-import { connectStore } from 'utils'
-import { createGetObjectsOfType } from 'selectors'
-import { XoSelect } from 'editable'
-import { installSupplementalPackOnAllHosts, setPoolMaster } from 'xo'
-import {
-  Container,
-  Row,
-  Col
-} from 'grid'
-
-@connectStore(() => ({
-  master: createGetObjectsOfType('host').find(
-    (_, { pool }) => ({ id: pool.master })
-  )
-}))
-class PoolMaster extends Component {
-  _getPoolMasterPredicate = host => host.$pool === this.props.pool.id
-
-  _onChange = host => setPoolMaster(host)
-
-  render () {
-    const { pool, master } = this.props
-
-    return <XoSelect
-      onChange={this._onChange}
-      predicate={this._getPoolMasterPredicate}
-      value={pool.master}
-      xoType='host'
-    >
-      {master.name_label}
-    </XoSelect>
-  }
-}
+import { Container, Row, Col } from 'grid'
+import { installSupplementalPackOnAllHosts } from 'xo'
 
 export default ({
   pool
@@ -65,14 +32,6 @@ export default ({
         }
       </Col>
     </Row>
-    <Row>
-      <Col size={3}>
-        <strong>{_('setpoolMaster')}</strong>
-      </Col>
-      <Col size={9}>
-        <PoolMaster pool={pool} />
-      </Col>
-    </Row>
   </Container>
   <h3 className='mt-1 mb-1'>{_('supplementalPackPoolNew')}</h3>
   <Upgrade place='poolSupplementalPacks' required={2}>

src/xo-app/pool/tab-logs.js

@@ -1,18 +1,14 @@
 import _ from 'intl'
 import ActionRow from 'action-row-button'
+import Button from 'button'
+import isEmpty from 'lodash/isEmpty'
+import map from 'lodash/map'
 import React, { Component } from 'react'
 import TabButton from 'tab-button'
 import { deleteMessage } from 'xo'
-import { createPager, createSelector } from 'selectors'
+import { createPager } from 'selectors'
 import { FormattedRelative, FormattedTime } from 'react-intl'
 import { Container, Row, Col } from 'grid'
-import {
-  ceil,
-  isEmpty,
-  map
-} from 'lodash'
-
-const LOGS_PER_PAGE = 10
 
 export default class TabLogs extends Component {
   constructor () {
@@ -21,12 +17,7 @@ export default class TabLogs extends Component {
     this.getLogs = createPager(
       () => this.props.logs,
       () => this.state.page,
-      LOGS_PER_PAGE
-    )
-
-    this.getNPages = createSelector(
-      () => this.props.logs ? this.props.logs.length : 0,
-      nLogs => ceil(nLogs / LOGS_PER_PAGE)
+      10
     )
 
     this.state = {
@@ -35,12 +26,11 @@ export default class TabLogs extends Component {
   }
 
   _deleteAllLogs = () => map(this.props.logs, deleteMessage)
-  _nextPage = () => this.setState({ page: Math.min(this.state.page + 1, this.getNPages()) })
-  _previousPage = () => this.setState({ page: Math.max(this.state.page - 1, 1) })
+  _nextPage = () => this.setState({ page: this.state.page + 1 })
+  _previousPage = () => this.setState({ page: this.state.page - 1 })
 
   render () {
     const logs = this.getLogs()
-    const { page } = this.state
 
     return <Container>
       {isEmpty(logs)
@@ -53,21 +43,15 @@ export default class TabLogs extends Component {
         : <div>
           <Row>
             <Col className='text-xs-right'>
-              <TabButton
-                btnStyle='secondary'
-                disabled={page === 1}
-                handler={this._previousPage}
-                icon='previous'
-              />
-              <TabButton
-                btnStyle='secondary'
-                disabled={page === this.getNPages()}
-                handler={this._nextPage}
-                icon='next'
-              />
+              <Button size='large' onClick={this._previousPage}>
+                &lt;
+              </Button>
+              <Button size='large' onClick={this._nextPage}>
+                &gt;
+              </Button>
               <TabButton
                 btnStyle='danger'
-                handler={this._removeAllLogs} // FIXME: define this method
+                handler={this._removeAllLogs}
                 icon='delete'
                 labelId='logRemoveAll'
               />

src/xo-app/self/index.js

@@ -312,15 +312,15 @@ export class Edit extends Component {
 
 // -----------------------------------------------------------------------------
 
-  _onChangeIpPool = newIpPool => {
-    const { ipPools, newIpPoolQuantity } = this.state
+  _addIpPool = () => {
+    const { ipPools, newIpPool, newIpPoolQuantity } = this.state
 
     this.setState({
       ipPools: [ ...ipPools, { id: newIpPool.id, quantity: newIpPoolQuantity } ],
+      newIpPool: undefined,
       newIpPoolQuantity: ''
     })
   }
-
   _removeIpPool = index => {
     const ipPools = [ ...this.state.ipPools ]
     remove(ipPools, (_, i) => index === i)
@@ -444,30 +444,33 @@ export class Edit extends Component {
             <Row>
               <Col mediumSize={4}>
                 <Row>
-                  <Col mediumSize={3}>
-                    <strong>{_('quantity')}</strong>
-                  </Col>
                   <Col mediumSize={7}>
                     <strong>{_('ipPool')}</strong>
                   </Col>
+                  <Col mediumSize={3}>
+                    <strong>{_('quantity')}</strong>
+                  </Col>
                 </Row>
                 {map(state.ipPools, (ipPool, index) => <Row className='mb-1' key={index}>
-                  <Col mediumSize={3}>
-                    <input className='form-control' type='number' min={0} onChange={this.linkState(`ipPools.${index}.quantity`)} value={firstDefined(ipPool.quantity, '')} placeholder='∞' />
-                  </Col>
                   <Col mediumSize={7}>
                     <SelectIpPool onChange={this.linkState(`ipPools.${index}.id`, 'id')} value={ipPool.id} />
                   </Col>
+                  <Col mediumSize={3}>
+                    <input className='form-control' type='number' min={0} onChange={this.linkState(`ipPools.${index}.quantity`)} value={firstDefined(ipPool.quantity, '')} placeholder='∞' />
+                  </Col>
                   <Col mediumSize={2}>
                     <ActionButton icon='delete' handler={this._removeIpPool} handlerParam={index} />
                   </Col>
                 </Row>)}
                 <Row>
+                  <Col mediumSize={7}>
+                    <SelectIpPool onChange={this.linkState('newIpPool')} value={state.newIpPool} predicate={this._getIpPoolPredicate()} />
+                  </Col>
                   <Col mediumSize={3}>
                     <input className='form-control' type='number' min={0} onChange={this.linkState('newIpPoolQuantity')} value={state.newIpPoolQuantity || ''} placeholder='∞' />
                   </Col>
-                  <Col mediumSize={7}>
-                    <SelectIpPool onChange={this._onChangeIpPool} value='' predicate={this._getIpPoolPredicate()} />
+                  <Col mediumSize={2}>
+                    <ActionButton icon='add' handler={this._addIpPool} />
                   </Col>
                 </Row>
               </Col>
@@ -507,7 +510,7 @@ class ResourceSet extends Component {
     } = resourceSet
 
     return [
-      <li key='subjects' className='list-group-item'>
+      <li className='list-group-item'>
         <Subjects subjects={subjects} />
       </li>,
       ...map(objectsByType, (objectsSet, type) => (
@@ -515,7 +518,7 @@ class ResourceSet extends Component {
           {map(objectsSet, object => renderXoItem(object, { className: 'mr-1' }))}
         </li>
       )),
-      !isEmpty(ipPools) && <li key='ipPools' className='list-group-item'>
+      !isEmpty(ipPools) && <li className='list-group-item'>
         {map(ipPools, pool => {
           const resolvedIpPool = resolvedIpPools[pool]
           const limits = get(resourceSet, `limits[ipPool:${pool}]`)
@@ -531,7 +534,7 @@ class ResourceSet extends Component {
         }
       )}
       </li>,
-      <li key='graphs' className='list-group-item'>
+      <li className='list-group-item'>
         <Row>
           <Col mediumSize={4}>
             <Card>
@@ -613,7 +616,7 @@ class ResourceSet extends Component {
           </Col>
         </Row>
       </li>,
-      <li key='actions' className='list-group-item text-xs-center'>
+      <li className='list-group-item text-xs-center'>
         <div className='btn-toolbar'>
           <ActionButton btnStyle='primary' icon='edit' handler={this.toggleState('editionMode')}>{_('editResourceSet')}</ActionButton>
           <ActionButton btnStyle='danger' icon='delete' handler={deleteResourceSet} handlerParam={resourceSet}>{_('deleteResourceSet')}</ActionButton>

src/xo-app/settings/groups/index.js

@@ -86,7 +86,7 @@ const GROUP_COLUMNS = [
   },
   {
     name: _('addUserToGroupColumn'),
-    itemRenderer: group => <SelectSubject predicate={getPredicate(group.users)} onChange={user => user && addUserToGroup(user, group)} value={null} />
+    itemRenderer: group => <SelectSubject predicate={getPredicate(group.users)} onChange={user => user && addUserToGroup(user, group)} defaultValue={null} />
   },
   {
     name: '',

src/xo-app/settings/ips/index.js

@@ -85,9 +85,9 @@ class IpsCell extends BaseComponent {
       <Row>
         <Col mediumSize={6} offset={5}><strong>{_('ipsVifs')}</strong></Col>
       </Row>
-      {ipPool.addresses && map(formatIps(keys(ipPool.addresses)), (ip, key) => {
+      {ipPool.addresses && map(formatIps(keys(ipPool.addresses)), ip => {
         if (isObject(ip)) { // Range of IPs
-          return <Row key={key}>
+          return <Row>
             <Col mediumSize={5}>
               <strong>{ip.first} <Icon icon='arrow-right' /> {ip.last}</strong>
             </Col>
@@ -109,7 +109,7 @@ class IpsCell extends BaseComponent {
             ? map(addressVifs, (vifId, index) => {
               const vif = vifs[vifId] && vifs[vifId][0]
               const network = vif && networks[vif.$network] && networks[vif.$network][0]
-              return <span key={index} className='mr-1'>
+              return <span className='mr-1'>
                 {network && vif
                   ? `${network.name_label} #${vif.device}`
                   : <em>{_('ipPoolUnknownVif')}</em>
@@ -188,7 +188,7 @@ class NetworksCell extends BaseComponent {
     const { newNetworks, showNewNetworkForm } = this.state
 
     return <Container>
-      {map(ipPool.networks, networkId => <Row key={networkId}>
+      {map(ipPool.networks, networkId => <Row>
         <Col mediumSize={11}>
           {renderXoItemFromId(networkId)}
         </Col>

src/xo-app/settings/logs/index.js

@@ -1,19 +1,19 @@
-import React from 'react'
-import { FormattedDate } from 'react-intl'
-import { find, map } from 'lodash'
-
 import _ from 'intl'
 import ActionRowButton from 'action-row-button'
 import BaseComponent from 'base-component'
 import ButtonGroup from 'button-group'
 import Copiable from 'copiable'
-import NoObjects from 'no-objects'
+import find from 'lodash/find'
+import isEmpty from 'lodash/isEmpty'
+import map from 'lodash/map'
+import React from 'react'
 import SortedTable from 'sorted-table'
 import styles from './index.css'
 import TabButton from 'tab-button'
 import { addSubscriptions } from 'utils'
 import { alert, confirm } from 'modal'
 import { createSelector } from 'selectors'
+import { FormattedDate } from 'react-intl'
 import { subscribeApiLogs, subscribeUsers, deleteApiLog } from 'xo'
 
 const CAN_REPORT_BUG = process.env.XOA_PLAN > 1
@@ -99,7 +99,7 @@ export default class Logs extends BaseComponent {
 
   _getLogs = createSelector(
     () => this.props.logs,
-    logs => logs && map(logs, (log, id) => ({ ...log, id }))
+    logs => map(logs, (log, id) => ({ ...log, id }))
   )
 
   _showError = log => alert(
@@ -115,28 +115,29 @@ export default class Logs extends BaseComponent {
     (users, showError) => ({ users, showError })
   )
 
-  _getPredicate = logs => logs != null
-
   render () {
     const logs = this._getLogs()
 
-    return <NoObjects collection={logs} message={_('noLogs')} predicate={this._getPredicate}>
-      <div>
-        <span className='pull-right'>
-          <TabButton
-            btnStyle='danger'
-            handler={this._deleteAllLogs}
-            icon='delete'
-            labelId='logDeleteAll'
+    return <div>
+      {isEmpty(logs)
+        ? <p>{_('noLogs')}</p>
+        : <div>
+          <span className='pull-right'>
+            <TabButton
+              btnStyle='danger'
+              handler={this._deleteAllLogs}
+              icon='delete'
+              labelId='logDeleteAll'
+            />
+          </span>
+          {' '}
+          <SortedTable
+            collection={logs}
+            columns={COLUMNS}
+            userData={this._getData()}
           />
-        </span>
-        {' '}
-        <SortedTable
-          collection={logs}
-          columns={COLUMNS}
-          userData={this._getData()}
-        />
-      </div>
-    </NoObjects>
+        </div>
+      }
+    </div>
   }
 }

src/xo-app/sr/action-bar.js

@@ -1,33 +1,33 @@
-import _ from 'intl'
-import ActionBar, { Action } from 'action-bar'
+import ActionBar from 'action-bar'
 import React from 'react'
 import { forgetSr, rescanSr, reconnectAllHostsSr, disconnectAllHostsSr } from 'xo'
 
 const SrActionBar = ({ sr }) => (
   <ActionBar
+    actions={[
+      {
+        icon: 'refresh',
+        label: 'srRescan',
+        handler: rescanSr
+      },
+      {
+        icon: 'sr-reconnect-all',
+        label: 'srReconnectAll',
+        handler: reconnectAllHostsSr
+      },
+      {
+        icon: 'sr-disconnect-all',
+        label: 'srDisconnectAll',
+        handler: disconnectAllHostsSr
+      },
+      {
+        icon: 'sr-forget',
+        label: 'srForget',
+        handler: forgetSr
+      }
+    ]}
     display='icon'
-    handlerParam={sr}
-  >
-    <Action
-      handler={rescanSr}
-      label={_('srRescan')}
-      icon='refresh'
-    />
-    <Action
-      handler={reconnectAllHostsSr}
-      label={_('srReconnectAll')}
-      icon='sr-reconnect-all'
-    />
-    <Action
-      handler={disconnectAllHostsSr}
-      label={_('srDisconnectAll')}
-      icon='sr-disconnect-all'
-    />
-    <Action
-      handler={forgetSr}
-      label={_('srForget')}
-      icon='sr-forget'
-    />
-  </ActionBar>
+    param={sr}
+  />
 )
 export default SrActionBar

src/xo-app/sr/add-subvolume-modal.js

@@ -1,55 +0,0 @@
-import _ from 'intl'
-import Component from 'base-component'
-import React from 'react'
-import { SelectSr } from 'select-objects'
-import { SizeInput } from 'form'
-import { Container, Row, Col } from 'grid'
-import { createSelector } from 'selectors'
-import {
-  map,
-  min
-} from 'lodash'
-
-export default class AddSubvolumeModalBody extends Component {
-  get value () {
-    return this.state
-  }
-
-  _getSrPredicate = createSelector(
-    () => this.props.sr.$pool,
-    poolId => sr => sr.SR_type === 'lvm' && sr.$pool === poolId
-  )
-
-  _selectSrs = srs => {
-    this.setState({
-      srs,
-      brickSize: min(map(srs, sr => sr.size - sr.physical_usage))
-    })
-  }
-
-  render () {
-    return <Container>
-      <Row className='mb-1'>
-        <Col size={6}>{_('xosanSelectNSrs', { nSrs: this.props.subvolumeSize })}</Col>
-        <Col size={6}>
-          <SelectSr
-            multi
-            onChange={this._selectSrs}
-            predicate={this._getSrPredicate()}
-            value={this.state.srs}
-          />
-        </Col>
-      </Row>
-      <Row className='mb-1'>
-        <Col size={6}>{_('xosanSize')}</Col>
-        <Col size={6}>
-          <SizeInput
-            onChange={this.linkState('brickSize')}
-            required
-            value={this.state.brickSize}
-          />
-        </Col>
-      </Row>
-    </Container>
-  }
-}

src/xo-app/sr/index.js

@@ -143,6 +143,7 @@ export default class Sr extends Component {
           </div>
         </Col>
       </Row>
+      <br />
       <Row>
         <Col>
           <NavTabs>

src/xo-app/sr/replace-brick-modal.js

@@ -1,58 +0,0 @@
-import _ from 'intl'
-import Component from 'base-component'
-import React from 'react'
-import { SelectSr } from 'select-objects'
-import { Toggle, SizeInput } from 'form'
-import { Container, Row, Col } from 'grid'
-import { createSelector } from 'selectors'
-
-export default class ReplaceBrickModalBody extends Component {
-  get value () {
-    return this.state
-  }
-
-  _getSrPredicate = createSelector(
-    () => this.props.vm,
-    () => this.state.onSameVm,
-    (vm, onSameVm) => onSameVm
-      ? sr => sr.$container === vm.$container && sr.SR_type === 'lvm'
-      : sr => sr.$pool === vm.$pool && sr.SR_type === 'lvm'
-  )
-
-  _selectSr = sr => {
-    this.setState({
-      sr,
-      brickSize: sr.size - sr.physical_usage
-    })
-  }
-
-  render () {
-    return <Container>
-      <Row className='mb-1'>
-        <Col size={6}><strong>{_('xosanOnSameVm')}</strong></Col>
-        <Col size={6}>
-          <Toggle onChange={this.toggleState('onSameVm')} value={this.state.onSameVm} />
-        </Col>
-      </Row>
-      <Row className='mb-1'>
-        <Col size={6}><strong>{_('xosanUnderlyingStorage')}</strong></Col>
-        <Col size={6}>
-          <SelectSr
-            onChange={this._selectSr}
-            predicate={this._getSrPredicate()}
-            value={this.state.sr}
-          />
-        </Col>
-      </Row>
-      <Row className='mb-1'>
-        <Col size={6}><strong>{_('xosanBrickSize')}</strong></Col>
-        <Col size={6}>
-          <SizeInput
-            onChange={this.linkState('brickSize')}
-            value={this.state.brickSize}
-          />
-        </Col>
-      </Row>
-    </Container>
-  }
-}

src/xo-app/sr/tab-advanced.js

@@ -1,58 +1,9 @@
 import _ from 'intl'
 import Copiable from 'copiable'
 import React from 'react'
-import SortedTable from 'sorted-table'
 import TabButton from 'tab-button'
-import { addSubscriptions, connectStore, formatSize } from 'utils'
+import { deleteSr } from 'xo'
 import { Container, Row, Col } from 'grid'
-import { createGetObjectsOfType } from 'selectors'
-import { createSelector } from 'reselect'
-import { createSrUnhealthyVdiChainsLengthSubscription, deleteSr } from 'xo'
-import { flowRight, isEmpty, keys, sum, values } from 'lodash'
-
-// ===================================================================
-
-const COLUMNS = [
-  {
-    name: _('srUnhealthyVdiNameLabel'),
-    itemRenderer: vdi => <span>{vdi.name_label}</span>,
-    sortCriteria: vdi => vdi.name_label
-  },
-  {
-    name: _('srUnhealthyVdiSize'),
-    itemRenderer: vdi => formatSize(vdi.size),
-    sortCriteria: vdi => vdi.size
-  },
-  {
-    name: _('srUnhealthyVdiDepth'),
-    itemRenderer: (vdi, chains) => chains[vdi.uuid],
-    sortCriteria: (vdi, chains) => chains[vdi.uuid]
-  }
-]
-
-const UnhealthyVdiChains = flowRight(
-  addSubscriptions(props => ({
-    chains: createSrUnhealthyVdiChainsLengthSubscription(props.sr)
-  })),
-  connectStore(() => ({
-    vdis: createGetObjectsOfType('VDI').pick(
-      createSelector(
-        (_, props) => props.chains,
-        keys
-      )
-    )
-  }))
-)(({ chains, vdis }) => isEmpty(vdis)
-  ? null
-  : <div>
-    <h3>{_('srUnhealthyVdiTitle', { total: sum(values(chains)) })}</h3>
-    <SortedTable
-      collection={vdis}
-      columns={COLUMNS}
-      userData={chains}
-    />
-  </div>
-)
 
 export default ({
   sr
@@ -83,9 +34,4 @@ export default ({
       </table>
     </Col>
   </Row>
-  <Row>
-    <Col>
-      <UnhealthyVdiChains sr={sr} />
-    </Col>
-  </Row>
 </Container>

src/xo-app/sr/tab-disks.js

@@ -1,4 +1,5 @@
 import _ from 'intl'
+import ActionRow from 'action-row-button'
 import Component from 'base-component'
 import Icon from 'icon'
 import Link from 'link'
@@ -9,7 +10,7 @@ import { concat, isEmpty } from 'lodash'
 import { connectStore, formatSize } from 'utils'
 import { Container, Row, Col } from 'grid'
 import { createGetObject, createSelector } from 'selectors'
-import { deleteVdi, deleteVdis, editVdi } from 'xo'
+import { deleteVdi, editVdi } from 'xo'
 import { Text } from 'editable'
 
 // ===================================================================
@@ -62,21 +63,13 @@ const COLUMNS = [
         return renderXoUnknownItem()
       }
 
-      let link
-      const { type } = vm
-      if (type === 'VM') {
-        link = `/vms/${vm.id}`
-      } else if (type === 'VM-snapshot') {
-        const id = vm.$snapshot_of
-        link = id !== undefined
-          ? `/vms/${id}/snapshots`
-          : '/dashboard/health'
-      }
-
-      const item = renderXoItem(vm)
-      return link === undefined
-        ? item
-        : <Link to={link}>{item}</Link>
+      return <Link to={`/vms/${
+        vm.type === 'VM-snapshot'
+        ? `${vm.$snapshot_of}/snapshots`
+        : vm.id
+      }`}>
+        {renderXoItem(vm)}
+      </Link>
     })
   },
   {
@@ -87,23 +80,17 @@ const COLUMNS = [
     name: _('vdiSize'),
     itemRenderer: vdi => formatSize(vdi.size),
     sortCriteria: vdi => vdi.size
-  }
-]
-
-const GROUPED_ACTIONS = [
+  },
   {
-    handler: deleteVdis,
-    icon: 'delete',
-    label: _('deleteSelectedVdis')
-  }
-]
-
-const INDIVIDUAL_ACTIONS = [
-  {
-    handler: deleteVdi,
-    icon: 'delete',
-    label: _('deleteSelectedVdi'),
-    level: 'danger'
+    name: _('vdiAction'),
+    itemRenderer: vdi => (
+      <ActionRow
+        btnStyle='danger'
+        handler={deleteVdi}
+        handlerParam={vdi}
+        icon='delete'
+      />
+    )
   }
 ]
 
@@ -136,8 +123,6 @@ export default class SrDisks extends Component {
               columns={COLUMNS}
               defaultFilter='filterOnlyManaged'
               filters={FILTERS}
-              groupedActions={GROUPED_ACTIONS}
-              individualActions={INDIVIDUAL_ACTIONS}
             />
             : <h4 className='text-xs-center'>{_('srNoVdis')}</h4>
           }

src/xo-app/sr/tab-xosan.js

@@ -1,502 +1,30 @@
-import _ from 'intl'
-import ActionButton from 'action-button'
-import Collapse from 'collapse'
-import Copiable from 'copiable'
 import Component from 'base-component'
-import Icon from 'icon'
-import Link from 'link'
 import React from 'react'
-import Tooltip from 'tooltip'
-import SingleLineRow from 'single-line-row'
-import { confirm } from 'modal'
-import { error } from 'notification'
-import { Toggle } from 'form'
-import { Container, Col, Row } from 'grid'
+import { Container, Row, Col } from 'grid'
 import {
-  forEach,
-  map,
-  reduce
+  keys,
+  map
 } from 'lodash'
 import {
-  createGetObjectsOfType,
-  createSelector
-} from 'selectors'
-import {
-  connectStore,
-  formatSize
-} from 'utils'
-import {
-  addXosanBricks,
-  getVolumeInfo,
-  // TODO: uncomment when implementing subvolume deletion
-  // removeXosanBricks,
-  replaceXosanBrick,
-  startVm
+  getVolumeInfo
 } from 'xo'
 
-import ReplaceBrickModalBody from './replace-brick-modal'
-import AddSubvolumeModalBody from './add-subvolume-modal'
-
-const GIGABYTE = 1024 * 1024 * 1024
-
-const ISSUE_CODE_TO_MESSAGE = {
-  VMS_DOWN: _('xosanVmsNotRunning'),
-  VMS_NOT_FOUND: _('xosanVmsNotFound'),
-  FILES_NEED_HEALING: _('xosanFilesNeedHealing')
-}
-
-const Issues = ({ issues }) => <div>
-  {map(issues, code => <div key={code} className='alert alert-danger mb-1' role='alert'>
-    <Icon icon='error' /> <strong>{ISSUE_CODE_TO_MESSAGE[code]}</strong>
-  </div>)}
-</div>
-
-const Field = ({ title, children }) => <SingleLineRow>
-  <Col size={3}><strong>{title}</strong></Col>
-  <Col size={9}>{children}</Col>
-</SingleLineRow>
-
-@connectStore(() => ({
-  vms: createGetObjectsOfType('VM'),
-  srs: createGetObjectsOfType('SR'),
-  vbds: createGetObjectsOfType('VBD'),
-  vdis: createGetObjectsOfType('VDI')
-}))
 export default class TabXosan extends Component {
-  state = {
-    showAdvancedNodes: {}
-  }
-
-  async componentDidMount () {
-    await this._refreshInfo()
-  }
-
-  async _refreshAspect (infoType, statusVariable) {
-    const val = {}
-    val[statusVariable] = null
-    this.setState(val)
-    val[statusVariable] = await getVolumeInfo(this.props.sr.id, infoType)
-    this.setState(val)
-  }
-
-  async _refreshInfo () {
-    const otherConfig = this.props.sr.other_config['xo:xosan_config']
-    const xosanConfig = otherConfig ? JSON.parse(otherConfig) : null
-    const newState = { xosanConfig }
-    if (xosanConfig) {
-      forEach(xosanConfig.nodes, (node, i) => {
-        newState[`sr-${i}`] = null
-        newState[`brickSize-${i}`] = this.nodeSize(node)
-      })
-    }
-    this.setState(newState)
-    await Promise.all([
-      ::this._refreshAspect('heal', 'volumeHeal'),
-      ::this._refreshAspect('status', 'volumeStatus'),
-      ::this._refreshAspect('info', 'volumeInfo'),
-      ::this._refreshAspect('statusDetail', 'volumeStatusDetail')
-    ])
-  }
-
-  // Actions -------------------------------------------------------------------
-
-  _replaceBrick = async ({ brick, vm }) => {
-    const { sr, brickSize, onSameVm = false } = await confirm({
-      icon: 'refresh',
-      title: _('xosanReplace'),
-      body: <ReplaceBrickModalBody vm={vm} />
+  componentDidMount () {
+    getVolumeInfo(this.props.sr.id).then(info => {
+      this.setState({ volumeInfo: info })
     })
-
-    if (sr == null || brickSize == null) {
-      return error(_('xosanReplaceBrickErrorTitle'), _('xosanReplaceBrickErrorMessage'))
-    }
-
-    await replaceXosanBrick(this.props.sr.id, brick, sr.id, brickSize, onSameVm)
-    const newState = {}
-    forEach(this.state.xosanConfig.nodes, (node, i) => {
-      newState[`sr-${i}`] = null
-    })
-    this.setState(newState)
-    await this._refreshInfo()
   }
 
-  _addSubvolume = async () => {
-    const { srs, brickSize } = await confirm({
-      icon: 'add',
-      title: _('xosanAddSubvolume'),
-      body: <AddSubvolumeModalBody sr={this.props.sr} subvolumeSize={this._getSubvolumeSize()} />
-    })
-
-    if (brickSize == null || (srs && srs.length) !== this._getSubvolumeSize()) {
-      return error(_('xosanAddSubvolumeErrorTitle'), _('xosanAddSubvolumeErrorMessage', { nSrs: this._getSubvolumeSize() }))
-    }
-
-    return this._addBricks({ srs, brickSize })
-  }
-
-  // TODO: uncomment when implementing subvolume deletion
-  // async _removeSubVolume (bricks) {
-  //   await removeXosanBricks(this.props.sr.id, bricks)
-  //   await this._refreshInfo()
-  // }
-
-  async _addBricks ({srs, brickSize}) {
-    await addXosanBricks(this.props.sr.id, srs.map(sr => sr.id), brickSize)
-    await this._refreshInfo()
-  }
-
-  // Helpers -------------------------------------------------------------------
-
-  nodeSize (node) {
-    const { vms, vbds, vdis } = this.props
-    const vm = vms[node.vm.id]
-
-    return vm
-      ? reduce(
-        vm.$VBDs,
-        (sum, vbd) => {
-          const vdi = vdis[vbds[vbd].VDI]
-          return vdi === undefined ? sum : sum + vdi.size
-        },
-        0
-      ) : 100 * GIGABYTE
-  }
-
-  // Selectors -----------------------------------------------------------------
-
-  _getStrippedVolumeInfo = createSelector(
-    () => this.state.volumeInfo,
-    volumeInfo => volumeInfo && volumeInfo.commandStatus ? volumeInfo.result : null
-  )
-
-  _getSubvolumeSize = createSelector(
-    this._getStrippedVolumeInfo,
-    strippedVolumeInfo => strippedVolumeInfo
-      ? +strippedVolumeInfo.disperseCount || +strippedVolumeInfo.replicaCount
-      : null
-  )
-
-  // TODO: uncomment when implementing subvolume deletion
-  // _getSubvolumes = createSelector(
-  //   this._getStrippedVolumeInfo,
-  //   this._getSubvolumeSize,
-  //   (strippedVolumeInfo, subvolumeSize) => {
-  //     const subVolumes = []
-  //     if (strippedVolumeInfo) {
-  //       for (let i = 0; i < strippedVolumeInfo.bricks.length; i += subvolumeSize) {
-  //         subVolumes.push(strippedVolumeInfo.bricks.slice(i, i + subvolumeSize))
-  //       }
-  //     }
-  //
-  //     return subVolumes
-  //   }
-  // )
-
-  _getBrickByName = createSelector(
-    () => this.state.xosanConfig && this.state.xosanConfig.nodes,
-    () => this.props.vms,
-    () => this.state.volumeHeal,
-    () => this.state.volumeStatus,
-    () => this.state.volumeStatusDetail,
-    this._getStrippedVolumeInfo,
-    (nodes, vms, volumeHeal, volumeStatus, volumeStatusDetail, strippedVolumeInfo) => {
-      const brickByName = {}
-      forEach(nodes, node => {
-        brickByName[node.brickName] = {
-          config: node,
-          uuid: '-',
-          size: this.nodeSize(node),
-          vm: vms[node.vm.id]
-        }
-      })
-
-      const brickByUuid = {}
-      if (strippedVolumeInfo) {
-        forEach(strippedVolumeInfo.bricks, brick => {
-          brickByName[brick.name] = brickByName[brick.name] || {}
-          brickByName[brick.name].info = brick
-          brickByName[brick.name].uuid = brick.hostUuid
-          brickByUuid[brick.hostUuid] = brickByUuid[brick.hostUuid] || brickByName[brick.name]
-        })
-      }
-
-      if (volumeHeal && volumeHeal.commandStatus) {
-        forEach(volumeHeal.result.bricks, brick => {
-          brickByName[brick.name] = brickByName[brick.name] || {}
-          brickByName[brick.name].heal = brick
-          brickByName[brick.name].uuid = brick.hostUuid
-          brickByUuid[brick.hostUuid] = brickByUuid[brick.hostUuid] || brickByName[brick.name]
-        })
-      }
-
-      if (volumeStatus && volumeStatus.commandStatus) {
-        forEach(brickByUuid, (brick, uuid) => {
-          brick.status = volumeStatus.result.nodes[uuid]
-        })
-      }
-
-      if (volumeStatusDetail && volumeStatusDetail.commandStatus) {
-        forEach(brickByUuid, (brick, uuid) => {
-          if (uuid in volumeStatusDetail.result.nodes) {
-            brick.statusDetail = volumeStatusDetail.result.nodes[uuid][0]
-          }
-        })
-      }
-
-      return brickByName
-    }
-  )
-
-  _getOrderedBrickList = createSelector(
-    () => this.state.xosanConfig,
-    this._getBrickByName,
-    (xosanConfig, brickByName) => {
-      if (!xosanConfig && xosanConfig.nodes) {
-        return
-      }
-
-      return map(xosanConfig.nodes, node => brickByName[node.brickName])
-    }
-  )
-
-  _getIssues = createSelector(
-    this._getOrderedBrickList,
-    orderedBrickList => {
-      if (!orderedBrickList) {
-        return
-      }
-
-      const issues = []
-      if (reduce(orderedBrickList, (hasStopped, node) => hasStopped || (node.vm && node.vm.power_state.toLowerCase() !== 'running'), false)) {
-        issues.push('VMS_DOWN')
-      }
-      if (reduce(orderedBrickList, (hasNotFound, node) => hasNotFound || node.vm === undefined, false)) {
-        issues.push('VMS_NOT_FOUND')
-      }
-      if (reduce(orderedBrickList, (hasFileToHeal, node) => hasFileToHeal || (node.heal && node.heal.file && node.heal.file.length !== 0), false)) {
-        issues.push('FILES_NEED_HEALING')
-      }
-
-      return issues
-    }
-  )
-
   render () {
-    const { volumeHeal, volumeInfo, volumeStatus, xosanConfig, volumeStatusDetail, showAdvanced, showAdvancedNodes } = this.state
-    const { srs } = this.props
-
-    if (!xosanConfig) {
-      return null
-    }
-
-    if (!xosanConfig.version) {
-      return <div>
-        {_('xosanWarning')}
-      </div>
-    }
-
-    const strippedVolumeInfo = this._getStrippedVolumeInfo()
-    // const subVolumes = this._getSubvolumes() // TODO: uncomment when implementing subvolume deletion
-    const orderedBrickList = this._getOrderedBrickList()
-    const issues = this._getIssues()
-
     return <Container>
-      <Row className='text-xs-center'>
-        <Col mediumSize={3}>
-          <h2><Icon icon='sr' size='lg' color={volumeStatus ? (volumeStatus.commandStatus ? 'text-success' : volumeStatus.error) : 'text-info'} /></h2>
-        </Col>
-        <Col mediumSize={3}>
-          <h2><Icon icon='health' size='lg' color={volumeHeal ? (volumeHeal.commandStatus ? 'text-success' : volumeHeal.error) : 'text-info'} /></h2>
-        </Col>
-        <Col mediumSize={3}>
-          <h2><Icon icon='settings' size='lg' color={volumeStatusDetail ? (volumeStatusDetail.commandStatus ? 'text-success' : volumeStatusDetail.error) : 'text-info'} /></h2>
-        </Col>
-        <Col mediumSize={3}>
-          <h2><Icon icon='info' size='lg' color={volumeInfo ? (volumeInfo.commandStatus ? 'text-success' : volumeInfo.error) : 'text-info'} /></h2>
-        </Col>
-      </Row>
-      <Row>
-        <Issues issues={issues} />
-      </Row>
-      <Row>
-        {map(orderedBrickList, (node, i) =>
-          <Collapse
-            buttonText={<span>
-              <Icon
-                color={node.heal
-                  ? node.heal.status === 'Connected'
-                    ? 'text-success'
-                    : 'text-warning'
-                  : 'text-danger'
-                }
-                icon='disk'
-                size='md'
-              /> {srs[node.config.underlyingSr].name_label}
-            </span>}
-            className='mb-1'
-            key={node.config.brickName}
-          >
-            <Container className='m-1'>
-              <Field title={_('xosanVm')}>
-                {node.vm !== undefined
-                  ? <span title={node.vm.power_state}>
-                    <Icon icon={node.vm.power_state.toLowerCase()} />
-                    {' '}
-                    <Link to={`/vms/${node.config.vm.id}`}>{node.vm.name_label}</Link>
-                    {node.vm.power_state.toLowerCase() !== 'running' &&
-                      <ActionButton
-                        handler={startVm}
-                        handlerParam={node.vm}
-                        icon='vm-start'
-                      >
-                        {_('xosanRun')}
-                      </ActionButton>
-                    }
-                  </span>
-                  : <span style={{color: 'red'}}>
-                    <Icon icon='alarm' /> Could not find VM
-                  </span>
-                }
-              </Field>
-              <Field title={_('xosanUnderlyingStorage')}>
-                <Link to={`/srs/${node.config.underlyingSr}`}>{srs[node.config.underlyingSr].name_label}</Link> - Using {formatSize(node.size)}
-              </Field>
-              <Field title={_('xosanStatus')}>
-                {node.heal ? node.heal.status : 'unknown'}
-              </Field>
-              {node.statusDetail && <Field title={_('xosanUsedSpace')}>
-                <span style={{ display: 'inline-block', width: '20em', height: '1em' }}>
-                  <Tooltip content={_('spaceLeftTooltip', {
-                    used: String(Math.round(100 - (+node.statusDetail.sizeFree / +node.statusDetail.sizeTotal) * 100)),
-                    free: formatSize(+node.statusDetail.sizeFree)
-                  })}>
-                    <progress
-                      className='progress'
-                      max='100'
-                      value={100 - (+node.statusDetail.sizeFree / +node.statusDetail.sizeTotal) * 100}
-                    />
-                  </Tooltip>
-                </span>
-              </Field>}
-              {node.config.arbiter === 'True' && <Field title={_('xosanArbiter')} />}
-              <ActionButton
-                btnStyle='success'
-                icon='refresh'
-                handler={this._replaceBrick}
-                handlerParam={{ brick: node.config.brickName, vm: node.vm }}
-              >
-                {_('xosanReplace')}
-              </ActionButton>
-            </Container>
-            <Toggle onChange={this.toggleState(`showAdvancedNodes.${node.vm.id}`)} value={showAdvancedNodes && showAdvancedNodes[node.vm.id]} />
-            {' '}
-            {_('xosanAdvanced')}
-            {showAdvancedNodes[node.vm.id] && <Container>
-              <Field title={_('xosanBrickUuid')}>
-                <Copiable>{node.uuid}</Copiable>
-              </Field>
-              {node.statusDetail && [
-                <Field key='usedInodes' title={_('xosanUsedInodes')}>
-                  <span style={{ display: 'inline-block', width: '20em', height: '1em' }}>
-                    <Tooltip content={_('spaceLeftTooltip', {
-                      used: String(Math.round(100 - (+node.statusDetail.inodesFree / +node.statusDetail.inodesTotal) * 100)),
-                      free: node.statusDetail.inodesFree
-                    })}>
-                      <progress className='progress' max='100' value={100 - (+node.statusDetail.inodesFree / +node.statusDetail.inodesTotal) * 100}
-                      />
-                    </Tooltip>
-                  </span>
-                </Field>,
-                <Field key='blockSize' title={_('xosanBlockSize')}>{node.statusDetail.blockSize}</Field>,
-                <Field key='device' title={_('xosanDevice')}>{node.statusDetail.device}</Field>,
-                <Field key='fsName' title={_('xosanFsName')}>{node.statusDetail.fsName}</Field>,
-                <Field key='mountOptions' title={_('xosanMountOptions')}>{node.statusDetail.mntOptions}</Field>,
-                <Field key='path' title={_('xosanPath')}>{node.statusDetail.path}</Field>
-              ]}
-
-              {node.status && node.status.length !== 0 && <Row>
-                <Col>
-                  <table className='table'>
-                    <thead>
-                      <th>{_('xosanJob')}</th>
-                      <th>{_('xosanPath')}</th>
-                      <th>{_('xosanStatus')}</th>
-                      <th>{_('xosanPid')}</th>
-                      <th>{_('xosanPort')}</th>
-                    </thead>
-                    <tbody>
-                      {map(node.status, (job, j) => <tr key={`${node.uuid}-${job.pid}`}>
-                        <td>{job.hostname}</td>
-                        <td>{job.path}</td>
-                        <td>{job.status}</td>
-                        <td>{job.pid}</td>
-                        <td>{job.port}</td>
-                      </tr>)}
-                    </tbody>
-                  </table>
-                </Col>
-              </Row>}
-              {node.heal && node.heal.file && node.heal.file.length !== 0 && <div>
-                <h4>Files needing healing</h4>
-                {map(node.heal.file, file => <Row key={file.gfid}>
-                  <Col size={5}>{file._}</Col >
-                  <Col size={4}>{file.gfid}</Col>
-                </Row>)}
-              </div>}
-            </Container>}
-          </Collapse>
-        )}
-        <hr />
-        <h2>{_('xosanAddSubvolume')}</h2>
-        <ActionButton
-          btnStyle='success'
-          handler={this._addSubvolume}
-          icon='add'
-        >
-          {_('xosanAdd')}
-        </ActionButton>
-        {/* We will implement this later */}
-        {/* <h2>{_('xosanRemoveSubvolumes')}</h2>
-        <table className='table'>
-          {map(subVolumes, (subvolume, i) => <tr key={i}>
-            <td>
-              <ul>{map(subvolume, (brick, j) => <li key={j}>{brick.name}</li>)}</ul>
-            </td>
-            <td>
-              <ActionButton
-                btnStyle='danger'
-                icon='remove'
-                handler={::this._removeSubVolume}
-                handlerParam={map(subvolume, brick => brick.name)}
-              >
-                {_('xosanRemove')}
-              </ActionButton>
-            </td>
-          </tr>)}
-        </table> */}
-        <br />
-        <Toggle onChange={this.toggleState('showAdvanced')} value={showAdvanced} /> {_('xosanAdvanced')}
-        {strippedVolumeInfo && showAdvanced && <div>
-          <h2>{_('xosanVolume')}</h2>
-          <Container>
-            <Field title={'Name'}>{strippedVolumeInfo.name}</Field>
-            <Field title={'Status'}>{strippedVolumeInfo.statusStr}</Field>
-            <Field title={'Type'}>{strippedVolumeInfo.typeStr}</Field>
-            <Field title={'Brick Count'}>{strippedVolumeInfo.brickCount}</Field>
-            <Field title={'Stripe Count'}>{strippedVolumeInfo.stripeCount}</Field>
-            <Field title={'Replica Count'}>{strippedVolumeInfo.replicaCount}</Field>
-            <Field title={'Arbiter Count'}>{strippedVolumeInfo.arbiterCount}</Field>
-            <Field title={'Disperse Count'}>{strippedVolumeInfo.disperseCount}</Field>
-            <Field title={'Redundancy Count'}>{strippedVolumeInfo.redundancyCount}</Field>
-          </Container>
-          <h3>{_('xosanVolumeOptions')}</h3>
-          <Container>
-            {map(strippedVolumeInfo.options, option =>
-              <Field key={option.name} title={option.name}>{option.value}</Field>
-            )}
-          </Container>
-        </div>}
-      </Row>
-    </Container>
+      {this.state.volumeInfo && map(keys(this.state.volumeInfo).sort(), key => key !== 'Bricks'
+        ? <Row key={key}>
+          <Col size={3}><strong>{key}</strong></Col>
+          <Col size={4}>{this.state.volumeInfo[key]}</Col>
+        </Row>
+        : null
+      )}
+    </Container >
   }
 }

src/xo-app/tasks/index.js

@@ -2,34 +2,17 @@ import _, { messages } from 'intl'
 import ActionRowButton from 'action-row-button'
 import ButtonGroup from 'button-group'
 import CenterPanel from 'center-panel'
-import Component from 'base-component'
 import Icon from 'icon'
+import isEmpty from 'lodash/isEmpty'
+import keys from 'lodash/keys'
 import Link from 'link'
+import map from 'lodash/map'
 import React from 'react'
 import SingleLineRow from 'single-line-row'
 import { injectIntl } from 'react-intl'
-import { SelectPool } from 'select-objects'
-import {
-  Card,
-  CardBlock,
-  CardHeader
-} from 'card'
-import {
-  connectStore,
-  resolveId,
-  resolveIds
-} from 'utils'
-import {
-  Col,
-  Container,
-  Row
-} from 'grid'
-import {
-  includes,
-  isEmpty,
-  keys,
-  map
-} from 'lodash'
+import { Card, CardBlock, CardHeader } from 'card'
+import { connectStore } from 'utils'
+import { Container, Row, Col } from 'grid'
 import {
   createGetObject,
   createGetObjectsOfType,
@@ -84,37 +67,31 @@ export const TaskItem = connectStore(() => ({
   </Col>
 </SingleLineRow>)
 
-@connectStore(() => {
-  const getPendingTasks = createGetObjectsOfType('task').filter(
-    [ task => task.status === 'pending' ]
-  )
+export default injectIntl(
+  connectStore(() => {
+    const getTasks = createGetObjectsOfType('task')
 
-  const getNPendingTasks = getPendingTasks.count()
+    const getNPendingTasks = getTasks.count(
+      [ task => task.status === 'pending' ]
+    )
 
-  const getPendingTasksByPool = getPendingTasks.sort().groupBy('$pool')
+    const getPendingTasksByPool = getTasks.filter(
+      [ task => task.status === 'pending' ]
+    ).sort().groupBy('$pool')
 
-  const getPools = createGetObjectsOfType('pool').pick(
-    createSelector(getPendingTasksByPool, keys)
-  ).sort()
-
-  return {
-    nTasks: getNPendingTasks,
-    pendingTasksByPool: getPendingTasksByPool,
-    pools: getPools
-  }
-})
-@injectIntl
-export default class Tasks extends Component {
-  _showPoolTasks = pool => isEmpty(this.state.pools) || includes(resolveIds(this.state.pools), resolveId(pool))
-
-  render () {
-    const { props, state } = this
-    const {
-      intl,
-      nTasks,
-      pendingTasksByPool
-    } = props
+    const getPools = createGetObjectsOfType('pool').pick(
+      createSelector(
+        getPendingTasksByPool,
+        pendingTasksByPool => keys(pendingTasksByPool)
+      )
+    ).sort()
 
+    return (state, props) => ({
+      nTasks: getNPendingTasks(state, props),
+      pendingTasksByPool: getPendingTasksByPool(state, props),
+      pools: getPools(state, props)
+    })
+  })(({ intl, nTasks, pendingTasksByPool, pools }) => {
     if (isEmpty(pendingTasksByPool)) {
       return <Page header={HEADER} title='taskPage' formatTitle>
         <CenterPanel>
@@ -135,24 +112,19 @@ export default class Tasks extends Component {
     const { formatMessage } = intl
     return <Page header={HEADER} title={`(${nTasks}) ${formatMessage(messages.taskPage)}`}>
       <Container>
-        <Row className='mb-1'>
-          <SelectPool
-            multi
-            value={state.pools}
-            onChange={this.linkState('pools')}
-          />
-        </Row>
-        {map(props.pools, pool => this._showPoolTasks(pool) && <Row>
-          <Card>
-            <CardHeader key={pool.id}><Link to={`/pools/${pool.id}`}>{pool.name_label}</Link></CardHeader>
-            <CardBlock>
-              {map(pendingTasksByPool[pool.id], task =>
-                <TaskItem key={task.id} task={task} />
-              )}
-            </CardBlock>
-          </Card>
-        </Row>)}
+        {map(pools, pool =>
+          <Row>
+            <Card>
+              <CardHeader key={pool.id}><Link to={`/pools/${pool.id}`}>{pool.name_label}</Link></CardHeader>
+              <CardBlock>
+                {map(pendingTasksByPool[pool.id], task =>
+                  <TaskItem key={task.id} task={task} />
+                )}
+              </CardBlock>
+            </Card>
+          </Row>
+        )}
       </Container>
     </Page>
-  }
-}
+  })
+)

src/xo-app/user/index.js

@@ -329,7 +329,7 @@ export default class User extends Component {
           <Col smallSize={10}>
             <form className='form-inline' id='changePassword'>
               <input
-                autoComplete='off'
+                autocomplete='off'
                 className='form-control'
                 onChange={this._handleOldPasswordChange}
                 placeholder={formatMessage(messages.oldPasswordPlaceholder)}
@@ -339,7 +339,7 @@ export default class User extends Component {
               />
               {' '}
               <input type='password'
-                autoComplete='off'
+                autocomplete='off'
                 className='form-control'
                 onChange={this._handleNewPasswordChange}
                 placeholder={formatMessage(messages.newPasswordPlaceholder)}
@@ -348,7 +348,7 @@ export default class User extends Component {
               />
               {' '}
               <input
-                autoComplete='off'
+                autocomplete='off'
                 className='form-control'
                 onChange={this._handleConfirmPasswordChange}
                 placeholder={formatMessage(messages.confirmPasswordPlaceholder)}

src/xo-app/vm-group/action-bar.js

@@ -0,0 +1,53 @@
+import ActionBar from 'action-bar'
+import React from 'react'
+import { connectStore } from 'utils'
+import { includes } from 'lodash'
+import { isAdmin } from 'selectors'
+import {
+  rebootVmGroup,
+  startVmGroup,
+  shutdownVmGroup
+} from 'xo'
+
+const vmGroupActionBarByState = ({ isAdmin, vmGroup }) => {
+  const actions = []
+  if (vmGroup.allowed_operations.includes('start') || vmGroup.allowed_operations.length === 0) {
+    actions.push({
+      icon: 'vm-start',
+      label: 'startVmLabel',
+      handler: startVmGroup,
+      pending: includes(vmGroup.current_operations, 'start')
+    })
+  }
+  if (vmGroup.allowed_operations.includes('shutdown') || vmGroup.allowed_operations.length === 0) {
+    actions.push({
+      icon: 'vm-stop',
+      label: 'stopVmLabel',
+      handler: shutdownVmGroup,
+      pending: includes(vmGroup.current_operations, 'shutdown')
+    })
+  }
+  actions.push({
+    icon: 'vm-reboot',
+    label: 'rebootVmLabel',
+    handler: rebootVmGroup,
+    pending: includes(vmGroup.current_operations, 'shutdown') || includes(vmGroup.current_operations, 'start')
+  })
+  return <ActionBar
+    actions={actions}
+    display='icon'
+    param={vmGroup}
+  />
+}
+
+const VmGroupActionBar = connectStore({
+  isAdmin
+})(({ isAdmin, vmGroup }) => {
+  const ActionBar = vmGroupActionBarByState
+  if (!ActionBar) {
+    return <p>No action bar for state</p>
+  }
+
+  return <ActionBar isAdmin={isAdmin} vmGroup={vmGroup} />
+})
+export default VmGroupActionBar

src/xo-app/vm-group/index.js

@@ -0,0 +1,131 @@
+import _ from 'intl'
+import BaseComponent from 'base-component'
+import Icon from 'icon'
+import isEmpty from 'lodash/isEmpty'
+import React, { cloneElement } from 'react'
+import {
+  connectStore,
+  routes
+} from 'utils'
+import {
+  assign,
+  forEach,
+  map,
+  pick
+} from 'lodash'
+import { Container, Row, Col } from 'grid'
+import { createGetObject } from 'selectors'
+import { editVmGroup } from 'xo'
+import { NavLink, NavTabs } from 'nav'
+import { Text } from 'editable'
+
+import Page from '../page'
+import TabAdvanced from './tab-advanced'
+import TabGeneral from './tab-general'
+import TabManagement from './tab-management'
+import TabStats from './tab-stats'
+import VmGroupActionBar from './action-bar'
+// ===================================================================
+
+@routes('general', {
+  advanced: TabAdvanced,
+  general: TabGeneral,
+  management: TabManagement,
+  stats: TabStats
+})
+@connectStore(() => {
+  const getVmGroup = createGetObject()
+
+  return (state, props) => {
+    const vmGroup = getVmGroup(state, props)
+    if (!vmGroup) {
+      return {}
+    }
+    const vms = {}
+    forEach(vmGroup.$VMs, vmId => {
+      const getVM = createGetObject(() => vmId)
+      vms[vmId] = getVM(state, props)
+    })
+    return {
+      vmGroup,
+      vms
+    }
+  }
+})
+export default class VmGroup extends BaseComponent {
+  static contextTypes = {
+    router: React.PropTypes.object
+  }
+
+  _setNameDescription = description => editVmGroup(this.props.vmGroup, {name_description: description})
+  _setNameLabel = label => editVmGroup(this.props.vmGroup, {name_label: label})
+  _getVmGroupState = () => {
+    const states = map(this.props.vms, vm => vm.power_state)
+    return (isEmpty(states)
+    ? 'busy'
+    : states.indexOf('Halted') === -1
+      ? states[0]
+      : states.indexOf('Running') === -1
+        ? states[0]
+        : 'busy').toLowerCase()
+  }
+
+  header () {
+    const { vmGroup, vms } = this.props
+    if (!vmGroup) {
+      return <Icon icon='loading' />
+    }
+    return <Container>
+      <Row>
+        <Col mediumSize={6} className='header-title'>
+          <h2>
+            <Icon icon={isEmpty(vms) ? `vm-halted` : `vm-${this._getVmGroupState()}`} />
+            {' '}
+            <Text value={vmGroup.name_label} onChange={this._setNameLabel} />
+          </h2>
+          <span>
+            <Text
+              value={vmGroup.name_description}
+              onChange={this._setNameDescription}
+            />
+            <span className='text-muted'>
+              {' '}
+            </span>
+          </span>
+        </Col>
+        <Col mediumSize={6} className='text-xs-center'>
+          <div>
+            <VmGroupActionBar vmGroup={vmGroup} />
+          </div>
+        </Col>
+      </Row>
+      <br />
+      <Row>
+        <Col>
+          <NavTabs>
+            <NavLink to={`/vm-group/${vmGroup.id}/general`}>{_('generalTabName')}</NavLink>
+            <NavLink to={`/vm-group/${vmGroup.id}/stats`}>{_('statsTabName')}</NavLink>
+            <NavLink to={`/vm-group/${vmGroup.id}/management`}>{_('managementTabName')}</NavLink>
+            <NavLink to={`/vm-group/${vmGroup.id}/advanced`}>{_('advancedTabName')}</NavLink>
+          </NavTabs>
+        </Col>
+      </Row>
+    </Container>
+  }
+
+  render () {
+    const { container, vmGroup } = this.props
+
+    if (!vmGroup) {
+      return <h1>{_('statusLoading')}</h1>
+    }
+
+    const childProps = assign(pick(this.props, [
+      'vmGroup',
+      'vms'
+    ]))
+    return <Page header={this.header()} title={`${vmGroup.name_label}${container ? ` (${container.name_label})` : ''}`}>
+      {cloneElement(this.props.children, { ...childProps })}
+    </Page>
+  }
+}

src/xo-app/vm-group/tab-advanced.js

@@ -0,0 +1,55 @@
+import _ from 'intl'
+import Component from 'base-component'
+import Copiable from 'copiable'
+import React from 'react'
+import TabButton from 'tab-button'
+import { Container, Row, Col } from 'grid'
+import { deleteVmGroup } from 'xo'
+import { noop } from 'utils'
+
+export default class TabAdvanced extends Component {
+
+  static contextTypes = {
+    router: React.PropTypes.object
+  }
+
+  _deleteVmGroup = (vmGroup, vms) => {
+    deleteVmGroup(vmGroup, vms).then(
+      () => this.context.router.push('home?s=&t=VmGroup'),
+      noop
+    )
+  }
+
+  render () {
+    const { vmGroup, vms } = this.props
+    return (
+      <Container>
+        <Row>
+          <Col className='text-xs-right'>
+            <TabButton
+              btnStyle='danger'
+              handler={() => this._deleteVmGroup(vmGroup, vms)}
+              icon='vm-delete'
+              labelId='vmRemoveButton'
+            />
+          </Col>
+          <div>
+            <h3>{_('xenSettingsLabel')}</h3>
+            { vmGroup &&
+              <table className='table'>
+                <tbody>
+                  <tr>
+                    <th>{_('uuid')}</th>
+                    <Copiable tagName='td'>
+                      {vmGroup.id}
+                    </Copiable>
+                  </tr>
+                </tbody>
+              </table>
+            }
+          </div>
+        </Row>
+      </Container>
+    )
+  }
+}

src/xo-app/vm-group/tab-general.js

@@ -0,0 +1,67 @@
+import _ from 'intl'
+import forEach from 'lodash/forEach'
+import Icon from 'icon'
+import isEmpty from 'lodash/isEmpty'
+import map from 'lodash/map'
+import reduce from 'lodash/reduce'
+import React from 'react'
+import size from 'lodash/size'
+import { connectStore, formatSize } from 'utils'
+import { Container, Row, Col } from 'grid'
+import { getObject } from 'selectors'
+
+export default connectStore(() => {
+  const getMemoryTotal = (state, props) => {
+    const vdiIds = new Set()
+    forEach(props.vms, vm => forEach(vm.$VBDs, vbdId => vdiIds.add(getObject(state, vbdId).VDI)))
+    return reduce(Array.from(vdiIds), (sum, vdiId) => {
+      const vdi = getObject(state, vdiId)
+      return vdi !== undefined
+        ? sum + vdi.size
+        : sum
+    }, 0)
+  }
+
+  const getMemoryDynamicTotal = props => reduce(props.vms, (sum, vm) => vm.memory.dynamic[1] + sum, 0)
+
+  const getNbCPU = props => reduce(props.vms, (sum, vm) => vm.CPUs.number + sum, 0)
+
+  return (state, props) => ({
+    memoryTotal: getMemoryTotal(state, props),
+    memoryDynamical: getMemoryDynamicTotal(props),
+    nbCPU: getNbCPU(props)
+  })
+})(({ vms, memoryTotal, memoryDynamical, nbCPU, vmGroup }) => {
+  return (
+    <Container>
+      <br />
+      <div>
+        <Row className='text-xs-center'>
+          <Col mediumSize={3}>
+            <h2>{size(vms)}x <Icon icon='vm' size='lg' /></h2>
+          </Col>
+          <Col mediumSize={3}>
+            <h2>{nbCPU}x <Icon icon='cpu' size='lg' /></h2>
+          </Col>
+          <Col mediumSize={3}>
+            <h2 className='form-inline'>
+              {formatSize(memoryDynamical)}
+              &nbsp;<span><Icon icon='memory' size='lg' /></span>
+            </h2>
+          </Col>
+          <Col mediumSize={3}>
+            <h2>{formatSize(memoryTotal)} <Icon icon='disk' size='lg' /></h2>
+          </Col>
+        </Row>
+        {isEmpty(vmGroup.current_operations)
+          ? null
+          : <Row className='text-xs-center'>
+            <Col>
+              <h4>{_('vmGroupCurrentStatus')}{' '}{map(vmGroup.current_operations)[0]}</h4>
+            </Col>
+          </Row>
+        }
+      </div>
+    </Container>
+  )
+})

src/xo-app/vm-group/tab-management.js

@@ -0,0 +1,145 @@
+import _ from 'intl'
+import ActionButton from 'action-button'
+import ActionRowButton from 'action-row-button'
+import Component from 'base-component'
+import DragNDropOrder from 'drag-n-drop-order'
+import forEach from 'lodash/forEach'
+import Icon from 'icon'
+import isEmpty from 'lodash/isEmpty'
+import Link from 'link'
+import map from 'lodash/map'
+import React from 'react'
+import sortBy from 'lodash/sortBy'
+import SortedTable from 'sorted-table'
+import TabButton from 'tab-button'
+import Tooltip from 'tooltip'
+import { editVm, removeAppliance } from 'xo'
+import { Row, Col } from 'grid'
+import { SelectVm } from 'select-objects'
+
+const VM_COLUMNS = [
+  {
+    name: _('vmGroupLabel'),
+    itemRenderer: vm => (<span><Tooltip
+      content={isEmpty(vm.current_operations)
+        ? _(`powerState${vm.power_state}`)
+        : <div>{_(`powerState${vm.power_state}`)}{' ('}{map(vm.current_operations)[0]}{')'}</div>
+      }
+    >
+      {isEmpty(vm.current_operations)
+        ? <Icon icon={`${vm.power_state.toLowerCase()}`} />
+        : <Icon icon='busy' />
+      }
+    </Tooltip>
+    &nbsp;
+      <Link to={`/vms/${vm.id}`}>
+        {vm.name_label}
+      </Link>
+    </span>),
+    sortCriteria: vm => vm.name_label
+  },
+  {
+    name: _('vmGroupDescription'),
+    itemRenderer: vm => vm.name_description,
+    sortCriteria: vm => vm.name_description
+  },
+  {
+    name: _('vmGroupActions'),
+    itemRenderer: vm => (
+      <ActionRowButton
+        btnStyle='danger'
+        handler={(vm) => removeAppliance(vm)}
+        handlerParam={vm}
+        icon='delete'
+      />
+    )
+  }
+]
+
+export default class TabManagement extends Component {
+  constructor (props) {
+    super(props)
+    this.state = {
+      attachVm: false,
+      bootOrder: false
+    }
+  }
+
+  parseBootOrder = vms => {
+    // FIXME missing translation
+    var previousOrder = vms[Object.keys(vms)[0]].order
+    var toggleActive = false
+    const orderVms = sortBy(vms, vm => {
+      if (vm.order !== previousOrder) toggleActive = true
+      return vm.order
+    })
+    const order = []
+    forEach(orderVms, vm => {
+      order.push({id: vm.id, text: vm.name_label})
+    })
+    return {order, toggleActive}
+  }
+
+  setVmBootOrder = (vms, order, toggleActive) => {
+    var orderValue = 0
+    forEach(order, (vm, key) => {
+      editVm(vms[vm.id], { order: toggleActive ? orderValue : 0 })
+      orderValue += 1
+    })
+  }
+
+  _addVm = () => {
+    forEach(this.state.vmsToAdd, vm => editVm(vm, { appliance: this.props.vmGroup.id }))
+  }
+  _selectVm = vmsToAdd => this.setState({vmsToAdd})
+  _toggleBootOrder = () => this.setState({
+    bootOrder: !this.state.bootOrder,
+    attachVm: false
+  })
+  _toggleNewVm = () => this.setState({
+    attachVm: !this.state.attachVm,
+    bootOrder: false
+  })
+  _vmPredicate = vm => vm.appliance === null
+
+  render () {
+    const { vms } = this.props
+    const { attachVm, bootOrder } = this.state
+    return isEmpty(vms)
+        ? <form id='attachVm'>
+          <SelectVm multi onChange={this._selectVm} predicate={this._vmPredicate} required />
+          <span className='pull-right'>
+            <ActionButton form='attachVm' icon='add' btnStyle='primary' handler={this._addVm}>{_('add')}</ActionButton>
+          </span>
+        </form>
+        : (<div>
+          <Row>
+            <Col className='text-xs-right'>
+              <TabButton
+                btnStyle={attachVm ? 'info' : 'primary'}
+                handler={this._toggleNewVm}
+                icon='add'
+                labelId='attachVmButton'
+              />
+              <TabButton
+                btnStyle={bootOrder ? 'info' : 'primary'}
+                handler={this._toggleBootOrder}
+                icon='sort'
+                labelId='vmsBootOrder'
+              />
+            </Col>
+          </Row>
+          {bootOrder && <div><DragNDropOrder parseOrderParam={vms} parseOrder={this.parseBootOrder} setOrder={this.setVmBootOrder} toggleItems={false} onClose={this._toggleBootOrder} /><hr /></div>}
+          {attachVm && <div>
+            <form id='attachVm'>
+              <SelectVm multi onChange={this._selectVm} predicate={this._vmPredicate} required />
+              <span className='pull-right'>
+                <ActionButton form='attachVm' icon='add' btnStyle='primary' handler={this._addVm}>{_('add')}</ActionButton>
+              </span>
+            </form>
+          </div>}
+          <SortedTable collection={vms} columns={VM_COLUMNS} />
+        </div>
+    )
+  }
+}

src/xo-app/vm-group/tab-stats.js

@@ -0,0 +1,138 @@
+import _ from 'intl'
+import Component from 'base-component'
+import filter from 'lodash/filter'
+import Icon from 'icon'
+import map from 'lodash/map'
+import React from 'react'
+import Tooltip from 'tooltip'
+import Upgrade from 'xoa-upgrade'
+import { Container, Row, Col } from 'grid'
+import { Toggle } from 'form'
+import { fetchVmStats } from 'xo'
+import {
+  VmGroupCpuLineChart,
+  VmGroupMemoryLineChart,
+  VmGroupVifLineChart,
+  VmGroupXvdLineChart
+} from 'xo-line-chart'
+
+export default class TabStats extends Component {
+  constructor (props) {
+    super(props)
+    this.state.useCombinedValues = false
+  }
+
+  loop (vmGroup = this.props.vmGroup) {
+    if (this.cancel) {
+      this.cancel()
+    }
+
+    let cancelled = false
+    this.cancel = () => { cancelled = true }
+
+    Promise.all(map(filter(this.props.vms, vm => vm.power_state === 'Running'), vm =>
+      fetchVmStats(vm, this.state.granularity).then(
+        stats => ({
+          vm: vm.name_label,
+          ...stats
+        })
+      )
+    )).then(stats => {
+      if (cancelled || !stats[0]) {
+        return
+      }
+      this.cancel = null
+
+      clearTimeout(this.timeout)
+      this.setState({
+        stats,
+        selectStatsLoading: false
+      }, () => {
+        this.timeout = setTimeout(this.loop, stats[0].interval * 1000)
+      })
+    })
+  }
+  loop = ::this.loop
+
+  handleSelectStats (event) {
+    const granularity = event.target.value
+    clearTimeout(this.timeout)
+
+    this.setState({
+      granularity,
+      selectStatsLoading: true
+    }, this.loop)
+  }
+  handleSelectStats = ::this.handleSelectStats
+
+  componentWillMount () {
+    this.loop()
+  }
+
+  componentWillUnmount () {
+    clearTimeout(this.timeout)
+  }
+
+  render () {
+    const {
+      granularity,
+      selectStatsLoading,
+      stats,
+      useCombinedValues
+    } = this.state
+    return !stats
+      ? <p>No stats.</p>
+      : process.env.XOA_PLAN > 2
+        ? <Container>
+          <Row>
+            <Col mediumSize={5}>
+              <div className='form-group'>
+                <Tooltip content={_('useStackedValuesOnStats')}>
+                  <Toggle value={useCombinedValues} onChange={this.linkState('useCombinedValues')} />
+                </Tooltip>
+              </div>
+            </Col>
+            <Col mediumSize={1}>
+              {selectStatsLoading && (
+                <div className='text-xs-right'>
+                  <Icon icon='loading' size={2} />
+                </div>
+              )}
+            </Col>
+            <Col mediumSize={6}>
+              <div className='btn-tab'>
+                <select className='form-control' onChange={this.handleSelectStats} defaultValue={granularity} >
+                  {_('statLastTenMinutes', message => <option value='seconds'>{message}</option>)}
+                  {_('statLastTwoHours', message => <option value='minutes'>{message}</option>)}
+                  {_('statLastWeek', message => <option value='hours'>{message}</option>)}
+                  {_('statLastYear', message => <option value='days'>{message}</option>)}
+                </select>
+              </div>
+            </Col>
+          </Row>
+          <Row>
+            <Col mediumSize={6}>
+              <h5 className='text-xs-center'><Icon icon='cpu' size={1} /> {_('statsCpu')}</h5>
+              <VmGroupCpuLineChart addSumSeries={useCombinedValues} data={stats} />
+            </Col>
+            <Col mediumSize={6}>
+              <h5 className='text-xs-center'><Icon icon='memory' size={1} /> {_('statsMemory')}</h5>
+              <VmGroupMemoryLineChart addSumSeries={useCombinedValues} data={stats} />
+            </Col>
+          </Row>
+          <br />
+          <hr />
+          <Row>
+            <Col mediumSize={6}>
+              <h5 className='text-xs-center'><Icon icon='network' size={1} /> {_('statsNetwork')}</h5>
+              <VmGroupVifLineChart key={useCombinedValues ? 'stacked' : 'unstacked'} addSumSeries={useCombinedValues} data={stats} />
+            </Col>
+            <Col mediumSize={6}>
+              <h5 className='text-xs-center'><Icon icon='disk' size={1} /> {_('statDisk')}</h5>
+              <VmGroupXvdLineChart addSumSeries={useCombinedValues} data={stats} />
+            </Col>
+          </Row>
+        </Container>
+        : <Container><Upgrade place='hostStats' available={3} /></Container>
+  }
+}

src/xo-app/vm/action-bar.js

@@ -1,9 +1,8 @@
-import _ from 'intl'
-import ActionBar, { Action } from 'action-bar'
+import ActionBar from 'action-bar'
 import React from 'react'
-import { addSubscriptions, connectStore } from 'utils'
-import { find, includes } from 'lodash'
-import { createSelector, getCheckPermissions, getUser } from 'selectors'
+import { connectStore } from 'utils'
+import { includes } from 'lodash'
+import { isAdmin } from 'selectors'
 import {
   cloneVm,
   copyVm,
@@ -13,163 +12,142 @@ import {
   resumeVm,
   snapshotVm,
   startVm,
-  stopVm,
-  subscribeResourceSets
+  stopVm
 } from 'xo'
 
 const vmActionBarByState = {
-  Running: ({ vm, isSelfUser, canAdministrate }) => (
+  Running: ({ isAdmin, vm }) => (
     <ActionBar
-      display='icon'
-      handlerParam={vm}
-    >
-      <Action
-        handler={stopVm}
-        icon='vm-stop'
-        label={_('stopVmLabel')}
-        pending={includes(vm.current_operations, 'clean_shutdown')}
-      />
-      <Action
-        handler={restartVm}
-        icon='vm-reboot'
-        label={_('rebootVmLabel')}
-        pending={includes(vm.current_operations, 'clean_reboot')}
-      />
-      {!isSelfUser && <Action
-        handler={migrateVm}
-        icon='vm-migrate'
-        label={_('migrateVmLabel')}
-        pending={
-          includes(vm.current_operations, 'migrate_send') ||
-          includes(vm.current_operations, 'pool_migrate')
+      actions={[
+        {
+          icon: 'vm-stop',
+          label: 'stopVmLabel',
+          handler: stopVm,
+          pending: includes(vm.current_operations, 'clean_shutdown')
+        },
+        {
+          icon: 'vm-reboot',
+          label: 'rebootVmLabel',
+          handler: restartVm,
+          pending: includes(vm.current_operations, 'clean_reboot')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-migrate',
+          label: 'migrateVmLabel',
+          handler: migrateVm,
+          pending:
+            includes(vm.current_operations, 'migrate_send') ||
+            includes(vm.current_operations, 'pool_migrate')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-snapshot',
+          label: 'snapshotVmLabel',
+          handler: snapshotVm,
+          pending: includes(vm.current_operations, 'snapshot')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'export',
+          label: 'exportVmLabel',
+          handler: exportVm,
+          pending: includes(vm.current_operations, 'export')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-copy',
+          label: 'copyVmLabel',
+          handler: copyVm,
+          pending: includes(vm.current_operations, 'copy')
         }
-      />}
-      {!isSelfUser && <Action
-        handler={snapshotVm}
-        icon='vm-snapshot'
-        label={_('snapshotVmLabel')}
-        pending={includes(vm.current_operations, 'snapshot')}
-      />}
-      {!isSelfUser && canAdministrate && <Action
-        handler={exportVm}
-        icon='export'
-        label={_('exportVmLabel')}
-        pending={includes(vm.current_operations, 'export')}
-      />}
-      {!isSelfUser && canAdministrate && <Action
-        handler={copyVm}
-        icon='vm-copy'
-        label={_('copyVmLabel')}
-        pending={includes(vm.current_operations, 'copy')}
-      />}
-    </ActionBar>
-  ),
-  Halted: ({ vm, isSelfUser, canAdministrate }) => (
-    <ActionBar
+      ]}
       display='icon'
-      handlerParam={vm}
-    >
-      <Action
-        handler={startVm}
-        icon='vm-start'
-        label={_('startVmLabel')}
-        pending={includes(vm.current_operations, 'start')}
-      />
-      {!isSelfUser && canAdministrate && <Action
-        handler={cloneVm}
-        icon='vm-fast-clone'
-        label={_('fastCloneVmLabel')}
-        pending={includes(vm.current_operations, 'clone')}
-      />}
-      {!isSelfUser && <Action
-        handler={migrateVm}
-        icon='vm-migrate'
-        label={_('migrateVmLabel')}
-        pending={
-          includes(vm.current_operations, 'migrate_send') ||
-          includes(vm.current_operations, 'pool_migrate')
+      param={vm}
+    />
+  ),
+  Halted: ({ isAdmin, vm }) => (
+    <ActionBar
+      actions={[
+        {
+          icon: 'vm-start',
+          label: 'startVmLabel',
+          handler: startVm,
+          pending: includes(vm.current_operations, 'start')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-fast-clone',
+          label: 'fastCloneVmLabel',
+          handler: cloneVm,
+          pending: includes(vm.current_operations, 'clone')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-migrate',
+          label: 'migrateVmLabel',
+          handler: migrateVm,
+          pending: includes(vm.current_operations, 'pool_migrate')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-snapshot',
+          label: 'snapshotVmLabel',
+          handler: snapshotVm,
+          pending: includes(vm.current_operations, 'snapshot')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'export',
+          label: 'exportVmLabel',
+          handler: exportVm,
+          pending: includes(vm.current_operations, 'export')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-copy',
+          label: 'copyVmLabel',
+          handler: copyVm,
+          pending: includes(vm.current_operations, 'copy')
         }
-      />}
-      {!isSelfUser && <Action
-        handler={snapshotVm}
-        icon='vm-snapshot'
-        label={_('snapshotVmLabel')}
-        pending={includes(vm.current_operations, 'snapshot')}
-      />}
-      {!isSelfUser && canAdministrate && <Action
-        handler={exportVm}
-        icon='export'
-        label={_('exportVmLabel')}
-        pending={includes(vm.current_operations, 'export')}
-      />}
-      {!isSelfUser && canAdministrate && <Action
-        handler={copyVm}
-        icon='vm-copy'
-        label={_('copyVmLabel')}
-        pending={includes(vm.current_operations, 'copy')}
-      />}
-    </ActionBar>
-  ),
-  Suspended: ({ vm, isSelfUser, canAdministrate }) => (
-    <ActionBar
+      ]}
       display='icon'
-      handlerParam={vm}
-    >
-      <Action
-        handler={resumeVm}
-        icon='vm-start'
-        label={_('resumeVmLabel')}
-        pending={includes(vm.current_operations, 'start')}
-      />
-      {!isSelfUser && <Action
-        handler={snapshotVm}
-        icon='vm-snapshot'
-        label={_('snapshotVmLabel')}
-        pending={includes(vm.current_operations, 'snapshot')}
-      />}
-      {!isSelfUser && canAdministrate && <Action
-        handler={exportVm}
-        icon='export'
-        label={_('exportVmLabel')}
-        pending={includes(vm.current_operations, 'export')}
-      />}
-      {!isSelfUser && canAdministrate && <Action
-        handler={copyVm}
-        icon='vm-copy'
-        label={_('copyVmLabel')}
-        pending={includes(vm.current_operations, 'copy')}
-      />}
-    </ActionBar>
+      param={vm}
+    />
+  ),
+  Suspended: ({ isAdmin, vm }) => (
+    <ActionBar
+      actions={[
+        {
+          icon: 'vm-start',
+          label: 'resumeVmLabel',
+          handler: resumeVm,
+          pending: includes(vm.current_operations, 'start')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-snapshot',
+          label: 'snapshotVmLabel',
+          handler: snapshotVm,
+          pending: includes(vm.current_operations, 'snapshot')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'export',
+          label: 'exportVmLabel',
+          handler: exportVm,
+          pending: includes(vm.current_operations, 'export')
+        },
+        (isAdmin || !vm.resourceSet) && {
+          icon: 'vm-copy',
+          label: 'copyVmLabel',
+          handler: copyVm,
+          pending: includes(vm.current_operations, 'copy')
+        }
+      ]}
+      display='icon'
+      param={vm}
+    />
   )
 }
 
-const VmActionBar = addSubscriptions(() => ({
-  resourceSets: subscribeResourceSets
-}))(connectStore(() => ({
-  checkPermissions: getCheckPermissions,
-  userId: createSelector(getUser, user => user.id)
-}))(({ checkPermissions, vm, userId, resourceSets }) => {
-  // Is the user in the same resource set as the VM
-  const _getIsSelfUser = createSelector(
-    () => resourceSets,
-    resourceSets => {
-      const vmResourceSet = vm.resourceSet && find(resourceSets, { id: vm.resourceSet })
-
-      return vmResourceSet && includes(vmResourceSet.subjects, userId)
-    }
-  )
-
-  const _getCanAdministrate = createSelector(
-    () => checkPermissions,
-    () => vm.id,
-    (check, vmId) => check(vmId, 'administrate')
-  )
-
+const VmActionBar = connectStore({
+  isAdmin
+})(({ isAdmin, vm }) => {
   const ActionBar = vmActionBarByState[vm.power_state]
   if (!ActionBar) {
     return <p>No action bar for state {vm.power_state}</p>
   }
 
-  return <ActionBar vm={vm} isSelfUser={_getIsSelfUser()} canAdministrate={_getCanAdministrate()} />
-}))
+  return <ActionBar isAdmin={isAdmin} vm={vm} />
+})
 export default VmActionBar

src/xo-app/vm/index.js

@@ -230,6 +230,7 @@ export default class Vm extends BaseComponent {
           </div>
         </Col>
       </Row>
+      <br />
       <Row>
         <Col>
           <NavTabs>

src/xo-app/vm/tab-advanced.js

@@ -145,21 +145,19 @@ class CoresPerSocket extends Component {
         onChange={this._onChange}
         value={selectedCoresPerSocket || ''}
       >
-        {_('vmChooseCoresPerSocket', message => <option key='none' value=''>{message}</option>)}
+        {_('vmChooseCoresPerSocket', message => <option value=''>{message}</option>)}
         {this._selectedValueIsNotInOptions() &&
-          _('vmCoresPerSocketIncorrectValue', message => <option key='incorrect' value={selectedCoresPerSocket}> {message}</option>)
+          _('vmCoresPerSocketIncorrectValue', message => <option value={selectedCoresPerSocket}> {message}</option>)
         }
         {map(
           options,
-          coresPerSocket => <option
-            key={coresPerSocket}
-            value={coresPerSocket}
-          >
-            {_('vmCoresPerSocket', {
+          coresPerSocket => _(
+            'vmCoresPerSocket', {
               nSockets: vm.CPUs.number / coresPerSocket,
               nCores: coresPerSocket
-            })}
-          </option>
+            },
+            message => <option key={coresPerSocket} value={coresPerSocket}>{message}</option>
+          )
         )}
       </select>
       {' '}
@@ -394,7 +392,7 @@ export default ({
           </tr>
           <tr>
             <th>{_('osKernel')}</th>
-            <td>{(vm.os_version && vm.os_version.uname) || _('unknownOsKernel')}</td>
+            <td>{vm.os_version ? vm.os_version.uname ? vm.os_version.uname : _('unknownOsKernel') : _('unknownOsKernel')}</td>
           </tr>
         </tbody>
       </table>

src/xo-app/vm/tab-console.js

@@ -150,6 +150,7 @@ export default class TabConsole extends Component {
               scale={scale}
               url={resolveUrl(`consoles/${vm.id}`)}
             />
+            {!minimalLayout && <p><em><Icon icon='info' /> <a href='https://bugs.xenserver.org/browse/XSO-650' target='_blank'>{_('tipLabel')} {_('tipConsoleLabel')}</a></em></p>}
           </Col>
         </Row>
       </Container>

src/xo-app/vm/tab-disks.js

@@ -2,9 +2,8 @@ import _, { messages } from 'intl'
 import ActionButton from 'action-button'
 import ActionRowButton from 'action-row-button'
 import Component from 'base-component'
+import DragNDropOrder from 'drag-n-drop-order'
 import forEach from 'lodash/forEach'
-import HTML5Backend from 'react-dnd-html5-backend'
-import Icon from 'icon'
 import isEmpty from 'lodash/isEmpty'
 import IsoDevice from 'iso-device'
 import Link from 'link'
@@ -18,7 +17,6 @@ import TabButton from 'tab-button'
 import Tooltip from 'tooltip'
 import { Container, Row, Col } from 'grid'
 import { createSelector } from 'selectors'
-import { DragDropContext, DragSource, DropTarget } from 'react-dnd'
 import { injectIntl } from 'react-intl'
 import { noop } from 'utils'
 import { SelectSr, SelectVdi } from 'select-objects'
@@ -41,26 +39,6 @@ import {
   setVmBootOrder
 } from 'xo'
 
-const parseBootOrder = bootOrder => {
-  // FIXME missing translation
-  const bootOptions = {
-    c: 'Hard-Drive',
-    d: 'DVD-Drive',
-    n: 'Network'
-  }
-  const order = []
-  if (bootOrder) {
-    for (const id of bootOrder) {
-      if (id in bootOptions) {
-        order.push({id, text: bootOptions[id], active: true})
-        delete bootOptions[id]
-      }
-    }
-  }
-  forEach(bootOptions, (text, id) => { order.push({id, text, active: false}) })
-  return order
-}
-
 @injectIntl
 @propTypes({
   onClose: propTypes.func,
@@ -196,129 +174,6 @@ class AttachDisk extends Component {
   }
 }
 
-const orderItemSource = {
-  beginDrag: props => ({
-    id: props.id,
-    index: props.index
-  })
-}
-
-const orderItemTarget = {
-  hover: (props, monitor, component) => {
-    const dragIndex = monitor.getItem().index
-    const hoverIndex = props.index
-
-    if (dragIndex === hoverIndex) {
-      return
-    }
-
-    props.move(dragIndex, hoverIndex)
-    monitor.getItem().index = hoverIndex
-  }
-}
-
-@DropTarget('orderItem', orderItemTarget, connect => ({
-  connectDropTarget: connect.dropTarget()
-}))
-@DragSource('orderItem', orderItemSource, (connect, monitor) => ({
-  connectDragSource: connect.dragSource(),
-  isDragging: monitor.isDragging()
-}))
-@propTypes({
-  connectDragSource: propTypes.func.isRequired,
-  connectDropTarget: propTypes.func.isRequired,
-  index: propTypes.number.isRequired,
-  isDragging: propTypes.bool.isRequired,
-  id: propTypes.any.isRequired,
-  item: propTypes.object.isRequired,
-  move: propTypes.func.isRequired
-})
-class OrderItem extends Component {
-  _toggle = checked => {
-    const { item } = this.props
-    item.active = checked
-    this.forceUpdate()
-  }
-
-  render () {
-    const { item, connectDragSource, connectDropTarget } = this.props
-    return connectDragSource(connectDropTarget(
-      <li className='list-group-item'>
-        <Icon icon='grab' />
-        {' '}
-        <Icon icon='grab' />
-        {' '}
-        {item.text}
-        <span className='pull-right'>
-          <Toggle value={item.active} onChange={this._toggle} />
-        </span>
-      </li>
-    ))
-  }
-}
-
-@propTypes({
-  onClose: propTypes.func,
-  vm: propTypes.object.isRequired
-})
-@DragDropContext(HTML5Backend)
-class BootOrder extends Component {
-  constructor (props) {
-    super(props)
-    const { vm } = props
-    const order = parseBootOrder(vm.boot && vm.boot.order)
-    this.state = {order}
-  }
-
-  _moveOrderItem = (dragIndex, hoverIndex) => {
-    const order = this.state.order.slice()
-    const dragItem = order.splice(dragIndex, 1)
-    if (dragItem.length) {
-      order.splice(hoverIndex, 0, dragItem.pop())
-      this.setState({order})
-    }
-  }
-
-  _reset = () => {
-    const { vm } = this.props
-    const order = parseBootOrder(vm.boot && vm.boot.order)
-    this.setState({order})
-  }
-
-  _save = () => {
-    const { vm, onClose = noop } = this.props
-    const { order: newOrder } = this.state
-    let order = ''
-    forEach(newOrder, item => { item.active && (order += item.id) })
-    return setVmBootOrder(vm, order)
-      .then(onClose)
-  }
-
-  render () {
-    const { order } = this.state
-
-    return <form>
-      <ul>
-        {map(order, (item, index) => <OrderItem
-          key={index}
-          index={index}
-          id={item.id}
-          // FIXME missing translation
-          item={item}
-          move={this._moveOrderItem}
-        />)}
-      </ul>
-      <fieldset className='form-inline'>
-        <span className='pull-right'>
-          <ActionButton icon='save' btnStyle='primary' handler={this._save}>{_('saveBootOption')}</ActionButton>
-          {' '}
-          <ActionButton icon='reset' handler={this._reset}>{_('resetBootOption')}</ActionButton>
-        </span>
-      </fieldset>
-    </form>
-  }
-}
-
 class MigrateVdiModalBody extends Component {
   get value () {
     return this.state
@@ -360,6 +215,34 @@ export default class TabDisks extends Component {
     }
   }
 
+  parseBootOrder = bootOrder => {
+    // FIXME missing translation
+    const bootOptions = {
+      c: 'Hard-Drive',
+      d: 'DVD-Drive',
+      n: 'Network'
+    }
+    const order = []
+    if (bootOrder) {
+      for (const id of bootOrder) {
+        if (id in bootOptions) {
+          order.push({id, text: bootOptions[id], active: true})
+          delete bootOptions[id]
+        }
+      }
+    }
+    forEach(bootOptions, (text, id) => { order.push({id, text, active: false}) })
+    return {order}
+  }
+
+  setVmBootOrder = (_, newOrder) => {
+    const { vm } = this.props
+    let order = ''
+    forEach(newOrder, item => { item.active && (order += item.id) })
+    return setVmBootOrder(vm, order)
+      .then(noop)
+  }
+
   _toggleNewDisk = () => this.setState({
     newDisk: !this.state.newDisk,
     attachDisk: false,
@@ -432,8 +315,8 @@ export default class TabDisks extends Component {
       <Row>
         <Col>
           {newDisk && <div><NewDisk vm={vm} onClose={this._toggleNewDisk} /><hr /></div>}
-          {attachDisk && <div><AttachDisk vm={vm} vbds={vbds} onClose={this._toggleAttachDisk} /><hr /></div>}
-          {bootOrder && <div><BootOrder vm={vm} onClose={this._toggleBootOrder} /><hr /></div>}
+          {attachDisk && <div><AttachDisk vm={vm} vbds={vbds} /><hr /></div>}
+          {bootOrder && <div><DragNDropOrder parseOrderParam={vm.boot && vm.boot.order} parseOrder={this.parseBootOrder} setOrder={this.setVmBootOrder} toggleItems onClose={this._toggleBootOrder} /><hr /></div>}
         </Col>
       </Row>
       <Row>

src/xo-app/vm/tab-general.js

@@ -83,12 +83,12 @@ export default connectStore(() => {
     </Col>
     <Col mediumSize={3}>
       <BlockLink to={`/vms/${vm.id}/network`}>
-        {vm.addresses && vm.addresses['0/ip']
-          ? <Copiable tagName='p'>
-            {vm.addresses['0/ip']}
-          </Copiable>
-          : <p>{_('noIpv4Record')}</p>
-        }
+        <Copiable tagName='p'>
+          {vm.addresses && vm.addresses['0/ip']
+            ? vm.addresses['0/ip']
+            : _('noIpv4Record')
+          }
+        </Copiable>
       </BlockLink>
     </Col>
     <Col mediumSize={3}>

src/xo-app/vm/tab-network.js

@@ -403,7 +403,7 @@ export default class TabNetwork extends BaseComponent {
                   </tr>
                 </thead>
                 <tbody>
-                  {map(vm.VIFs, vif => <VifItem key={vif} vifId={vif} isVmRunning={isVmRunning(vm)} resourceSet={vm.resourceSet} />)}
+                  {map(vm.VIFs, vif => <VifItem vifId={vif} isVmRunning={isVmRunning(vm)} resourceSet={vm.resourceSet} />)}
                 </tbody>
               </table>
               {vm.addresses && !isEmpty(vm.addresses)

src/xo-app/xosan/index.js

@@ -1,24 +1,21 @@
 import _ from 'intl'
 import ActionButton from 'action-button'
-import ActionRowButton from 'action-row-button'
+import Collapse from 'collapse'
 import Component from 'base-component'
-import getEventValue from 'get-event-value'
 import Icon from 'icon'
 import Link from 'link'
 import Page from '../page'
 import React from 'react'
 import SingleLineRow from 'single-line-row'
-import SortedTable from 'sorted-table'
 import Tooltip from 'tooltip'
-import { Container, Col, Row } from 'grid'
-import { Toggle, SizeInput } from 'form'
-import { SelectPif, SelectPool } from 'select-objects'
+import { Container, Col } from 'grid'
+import { Toggle } from 'form'
+import { SelectPif } from 'select-objects'
 import {
   every,
   filter,
   find,
   forEach,
-  groupBy,
   isEmpty,
   keys,
   map,
@@ -27,7 +24,6 @@ import {
   some
 } from 'lodash'
 import {
-  createFilter,
   createGetObjectsOfType,
   createSelector,
   createSort
@@ -43,7 +39,6 @@ import {
 import {
   computeXosanPossibleOptions,
   createXosanSR,
-  deleteSr,
   downloadAndInstallXosanPack,
   getVolumeInfo,
   registerXosan,
@@ -63,170 +58,126 @@ const HEADER = <Container>
 
 // ==================================================================
 
-const XOSAN_COLUMNS = [
-  {
-    name: _('xosanSize'),
-    itemRenderer: (sr, { isInstallingXosan, status }) => {
-      if (isInstallingXosan && isInstallingXosan[sr.pool && sr.pool.id]) {
-        return <Icon icon='loading' />
-      }
-
-      if ((status && !every(status[sr.id])) || !every(map(sr.pbds, 'attached'))) {
-        return <Icon icon='halted' />
-      }
-
-      return <Icon icon='running' />
+@connectStore(() => ({
+  vifs: createGetObjectsOfType('VIF'),
+  vms: createGetObjectsOfType('VM'),
+  vbds: createGetObjectsOfType('VBD'),
+  vdis: createGetObjectsOfType('VDI')
+}))
+export class XosanVolumesTable extends Component {
+  constructor (props) {
+    super(props)
+    this.state = {
+      peers: null,
+      volumesByConfig: null,
+      volumesByID: null
     }
-  },
-  {
-    name: _('xosanPool'),
-    itemRenderer: sr => <Link to={`/pools/${sr.pool.id}`}>{sr.pool.name_label}</Link>,
-    sortCriteria: sr => sr.pool.name_label
-  },
-  {
-    name: _('xosanName'),
-    itemRenderer: sr => <Link to={`/srs/${sr.id}`}>{sr.name_label}</Link>,
-    sortCriteria: sr => sr.name_label
-  },
-  {
-    name: _('xosanHosts'),
-    itemRenderer: sr => <span>{map(sr.hosts, (host, i) => [ i ? ', ' : null, <Link to={`/hosts/${host.id}`}>{host.name_label}</Link> ])}</span>
-  },
-  {
-    name: _('xosanSize'),
-    itemRenderer: sr => formatSize(sr.size),
-    sortCriteria: sr => sr.size
-  },
-  {
-    name: _('xosanUsedSpace'),
-    itemRenderer: sr => sr.size > 0
-      ? <Tooltip content={_('spaceLeftTooltip', {
-        used: String(Math.round((sr.physical_usage / sr.size) * 100)),
-        free: formatSize(sr.size - sr.physical_usage)
-      })}>
-        <progress
-          className='progress'
-          max='100'
-          value={(sr.physical_usage * 100) / sr.size}
-        />
-      </Tooltip>
-      : null,
-    sortCriteria: sr => sr.size
-  },
-  {
-    name: 'Delete',
-    itemRenderer: sr => <ActionRowButton
-      btnStyle='danger'
-      icon='delete'
-      handler={deleteSr}
-      handlerParam={sr.id}
-    />
   }
-]
 
-const GIGABYTE = 1024 * 1024 * 1024
+  componentDidMount () {
+    if (this.props.xosansrs && this.props.xosansrs.length > 0) {
+      Promise.all(this.props.xosansrs.map(sr => getVolumeInfo(sr.id))).then(volumes => {
+        const volumeConfig = {}
+        volumes.forEach((volume, index) => {
+          volumeConfig[this.props.xosansrs[index].id] = volume
+        })
+        this.setState({
+          volumeConfig
+        })
+      })
+    }
+  }
+
+  render () {
+    const { xosansrs, hosts } = this.props
+    return <div>
+      <h3>{_('xosanSrTitle')}</h3>
+      <table className='table table-striped'>
+        <thead>
+          <tr>
+            <th>{_('xosanName')}</th>
+            <th>{_('xosanHosts')}</th>
+            <th>{_('xosanVolumeId')}</th>
+            <th>{_('xosanSize')}</th>
+            <th>{_('xosanUsedSpace')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {map(xosansrs, sr => {
+            const configsMap = {}
+            forEach(sr.pbds, pbd => { configsMap[pbd.device_config['server']] = true })
+
+            return <tr key={sr.id}>
+              <td>
+                <Link to={`/srs/${sr.id}/xosan`}>{sr.name_label}</Link>
+              </td>
+              <td>
+                { map(sr.pbds, ({ host }) => find(hosts, [ 'id', host ]).name_label).join(', ') }
+              </td>
+              <td>
+                { this.state.volumeConfig && this.state.volumeConfig[sr.id] && this.state.volumeConfig[sr.id]['Volume ID'] }
+              </td>
+              <td>
+                {formatSize(sr.size)}
+              </td>
+              <td>
+                {sr.size > 0 &&
+                  <Tooltip content={_('spaceLeftTooltip', {
+                    used: String(Math.round((sr.physical_usage / sr.size) * 100)),
+                    free: formatSize(sr.size - sr.physical_usage)
+                  })}>
+                    <progress
+                      className='progress'
+                      max='100'
+                      style={{ margin: 0 }}
+                      value={(sr.physical_usage / sr.size) * 100}
+                    />
+                  </Tooltip>
+                }
+              </td>
+            </tr>
+          })}
+        </tbody>
+      </table>
+    </div>
+  }
+}
+
+// ==================================================================
 
 const _findLatestTemplate = templates => {
   let latestTemplate = templates[0]
 
-  forEach(templates, template => {
-    if (compareVersions(template.version, latestTemplate.version) > 0) {
-      latestTemplate = template
+  forEach(templates, pack => {
+    if (compareVersions(pack.version, latestTemplate.version) > 0) {
+      latestTemplate = pack
     }
   })
 
   return latestTemplate
 }
 
-@addSubscriptions({
-  catalog: subscribeResourceCatalog
-})
-@connectStore({
-  pbds: createGetObjectsOfType('PBD'),
-  hosts: createGetObjectsOfType('host'),
-  srs: createGetObjectsOfType('SR')
-})
-class NewXosan extends Component {
+class PoolAvailableSrs extends Component {
   state = {
-    selectedSrs: {},
-    brickSize: 100 * GIGABYTE,
-    memorySize: 2 * GIGABYTE
+    selectedSrs: {}
   }
 
-  _selectPool = pool => {
-    this.setState({
-      selectedSrs: {},
-      brickSize: 100 * GIGABYTE,
-      memorySize: 2 * GIGABYTE,
-      pif: undefined,
-      pool
-    })
-
-    this._refreshSuggestions({ selectedSrs: {}, brickSize: 100 * GIGABYTE })
-  }
-
-  _getIsInPool = createSelector(
-    () => this.state.pool != null && this.state.pool.id,
-    poolId => obj => obj.$pool === poolId
-  )
-
-  _getPbdsBySr = createSelector(
-    () => this.props.pbds,
-    pbds => groupBy(filter(pbds, this._getIsInPool), 'SR')
-  )
-
-  _getHosts = createSelector(
-    () => this.props.hosts,
-    hosts => filter(hosts, this._getIsInPool)
-  )
-
-  // LVM SRs that are connected
-  _getLvmSrs = createSort(createSelector(
-    createFilter(
-      () => this.props.srs,
-      createSelector(
-        this._getHosts,
-        this._getIsInPool,
-        (hosts, isInPool) =>
-          sr =>
-            isInPool(sr) &&
-            !sr.shared &&
-            sr.SR_type === 'lvm' &&
-            find(hosts, { id: sr.$container }).power_state === 'Running'
-      )
-    ),
-    this._getPbdsBySr,
-    (srs, pbdsBySr) => mapPlus(srs, (sr, push) => {
-      let pbds
-      if ((pbds = pbdsBySr[sr.id]).length) {
-        push({ ...sr, pbds })
-      }
-    })
-  ), 'name_label')
-
-  _refreshSuggestions = async ({ selectedSrs = this.state.selectedSrs, brickSize = this.state.brickSize }) => {
-    this.setState({
-      suggestion: 0,
-      suggestions: await computeXosanPossibleOptions(keys(pickBy(selectedSrs)), brickSize)
-    })
-  }
-
-  _onBrickSizeChange = async event => {
-    const brickSize = getEventValue(event)
-    this.setState({ brickSize })
-    await this._refreshSuggestions({ brickSize })
-  }
-
-  _selectSr = async (event, sr) => {
+  _selectSr = (event, srId) => {
     const selectedSrs = { ...this.state.selectedSrs }
-    selectedSrs[sr.id] = event.target.checked
-    this.setState({ selectedSrs })
-    await this._refreshSuggestions({ selectedSrs })
+    selectedSrs[srId] = event.target.checked
+
+    computeXosanPossibleOptions(keys(pickBy(selectedSrs))).then(suggestions => {
+      this.setState({
+        selectedSrs,
+        suggestion: 0,
+        suggestions
+      })
+    })
   }
 
   _getPifPredicate = createSelector(
-    () => this.state.pool,
-    pool => pif => pif.vlan === -1 && pif.$host === (pool && pool.master)
+    () => this.props.pool,
+    pool => pif => pif.vlan === -1 && pif.$host === pool.master
   )
 
   _getNSelectedSrs = createSelector(
@@ -235,16 +186,13 @@ class NewXosan extends Component {
   )
 
   _getLatestTemplate = createSelector(
-    createFilter(
-      () => this.props.catalog && map(this.props.catalog.xosan),
-      [ ({ type }) => type === 'xva' ]
-    ),
+    () => this.props.templates,
     _findLatestTemplate
   )
 
   _getDisableSrCheckbox = createSelector(
     () => this.state.selectedSrs,
-    this._getLvmSrs,
+    () => this.props.lvmsrs,
     (selectedSrs, lvmsrs) => sr =>
       !every(keys(pickBy(selectedSrs)), selectedSrId =>
         selectedSrId === sr.id ||
@@ -262,7 +210,9 @@ class NewXosan extends Component {
   )
 
   _createXosanVm = () => {
-    const params = this.state.suggestions[this.state.suggestion]
+    const { pif, vlan, selectedSrs, suggestion, suggestions } = this.state
+
+    const params = suggestions[suggestion]
 
     if (!params) {
       return
@@ -270,23 +220,22 @@ class NewXosan extends Component {
 
     return createXosanSR({
       template: this._getLatestTemplate(),
-      pif: this.state.pif,
-      vlan: this.state.vlan || 0,
-      srs: keys(pickBy(this.state.selectedSrs)),
+      pif,
+      vlan: vlan || 0,
+      srs: keys(pickBy(selectedSrs)),
       glusterType: params.layout,
-      redundancy: params.redundancy,
-      brickSize: this.state.customBrickSize ? this.state.brickSize : undefined,
-      memorySize: this.state.memorySize
-    }).then(this.props.onSrCreated)
+      redundancy: params.redundancy
+    })
   }
 
   render () {
     const {
-      brickSize,
-      customBrickSize,
-      memorySize,
+      hosts,
+      lvmsrs,
+      pool
+    } = this.props
+    const {
       pif,
-      pool,
       selectedSrs,
       suggestion,
       suggestions,
@@ -294,326 +243,275 @@ class NewXosan extends Component {
       vlan
     } = this.state
 
-    const {
-      hostsNeedRestart,
-      noPacksByPool,
-      poolPredicate
-    } = this.props
-
-    const lvmsrs = this._getLvmSrs()
-    const hosts = this._getHosts()
-
     const disableSrCheckbox = this._getDisableSrCheckbox()
 
-    return <Container className='mb-3'>
-      <Row className='mb-1'>
-        <Col size={4}>
-          <SelectPool
-            onChange={this._selectPool}
-            predicate={poolPredicate}
-            value={pool}
-          />
-        </Col>
-        <Col size={4}>
-          <SelectPif
-            disabled={pool == null || noPacksByPool[pool.id] || !isEmpty(hostsNeedRestart)}
-            onChange={this.linkState('pif')}
-            predicate={this._getPifPredicate()}
-            value={pif}
-          />
-        </Col>
-      </Row>
-      {pool != null && noPacksByPool[pool.id] && <Row>
-        <Icon icon='error' /> {_('xosanNeedPack')}
-        <br />
-        <ActionButton
-          btnStyle='success'
-          handler={downloadAndInstallXosanPack}
-          handlerParam={pool}
-          icon='export'
-        >
-          {_('xosanInstallIt')}
-        </ActionButton>
-      </Row>}
-      {!isEmpty(hostsNeedRestart) && <Row>
-        <Icon icon='error' /> {_('xosanNeedRestart')}
-        <br />
-        <ActionButton
-          btnStyle='success'
-          handler={restartHostsAgents}
-          handlerParam={hostsNeedRestart}
-          icon='host-restart-agent'
-        >
-          {_('xosanRestartAgents')}
-        </ActionButton>
-      </Row>}
-      {pool != null && !noPacksByPool[pool.id] && isEmpty(hostsNeedRestart) && [
-        <Row>
-          <em>{_('xosanSelect2Srs')}</em>
+    return <div className='mb-3'>
+      <h3>{_('xosanAvailableSrsTitle')}</h3>
+      <table className='table table-striped'>
+        <thead>
+          <tr>
+            <th />
+            <th>{_('xosanName')}</th>
+            <th>{_('xosanHost')}</th>
+            <th>{_('xosanSize')}</th>
+            <th>{_('xosanUsedSpace')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {map(lvmsrs, sr => {
+            const host = find(hosts, [ 'id', sr.$container ])
+
+            return <tr key={sr.id}>
+              <td>
+                <input
+                  checked={selectedSrs[sr.id] || false}
+                  disabled={disableSrCheckbox(sr)}
+                  onChange={event => this._selectSr(event, sr.id)}
+                  type='checkbox'
+                />
+              </td>
+              <td>
+                <Link to={`/srs/${sr.id}/general`}>{sr.name_label}</Link>
+              </td>
+              <td>
+                <Link to={`/hosts/${host.id}/general`}>{host.name_label}</Link>
+              </td>
+              <td>
+                {formatSize(sr.size)}
+              </td>
+              <td>
+                {sr.size > 0 &&
+                <Tooltip content={_('spaceLeftTooltip', {
+                  used: String(Math.round((sr.physical_usage / sr.size) * 100)),
+                  free: formatSize(sr.size - sr.physical_usage)
+                })}>
+                  <progress
+                    className='progress'
+                    max='100'
+                    value={(sr.physical_usage / sr.size) * 100}
+                  />
+                </Tooltip>
+                }
+              </td>
+            </tr>
+          })}
+        </tbody>
+      </table>
+      <h3>{_('xosanSuggestions')}</h3>
+      {isEmpty(suggestions)
+        ? <em>{_('xosanSelect2Srs')}</em>
+        : <div>
           <table className='table table-striped'>
             <thead>
               <tr>
                 <th />
-                <th>{_('xosanName')}</th>
-                <th>{_('xosanHost')}</th>
-                <th>{_('xosanSize')}</th>
-                <th>{_('xosanUsedSpace')}</th>
+                <th>{_('xosanLayout')}</th>
+                <th>{_('xosanRedundancy')}</th>
+                <th>{_('xosanCapacity')}</th>
+                <th>{_('xosanAvailableSpace')}</th>
               </tr>
             </thead>
             <tbody>
-              {map(lvmsrs, sr => {
-                const host = find(hosts, [ 'id', sr.$container ])
-
-                return <tr key={sr.id}>
-                  <td>
-                    <input
-                      checked={selectedSrs[sr.id] || false}
-                      disabled={disableSrCheckbox(sr)}
-                      onChange={event => this._selectSr(event, sr)}
-                      type='checkbox'
-                    />
-                  </td>
-                  <td>
-                    <Link to={`/srs/${sr.id}/general`}>{sr.name_label}</Link>
-                  </td>
-                  <td>
-                    <Link to={`/hosts/${host.id}/general`}>{host.name_label}</Link>
-                  </td>
-                  <td>
-                    {formatSize(sr.size)}
-                  </td>
-                  <td>
-                    {sr.size > 0 &&
-                    <Tooltip content={_('spaceLeftTooltip', {
-                      used: String(Math.round((sr.physical_usage / sr.size) * 100)),
-                      free: formatSize(sr.size - sr.physical_usage)
-                    })}>
-                      <progress
-                        className='progress'
-                        max='100'
-                        value={(sr.physical_usage / sr.size) * 100}
-                      />
-                    </Tooltip>
-                    }
-                  </td>
-                </tr>
-              })}
+              {map(suggestions, ({ layout, redundancy, capacity, availableSpace }, index) => <tr key={index}>
+                <td>
+                  <input
+                    checked={+suggestion === index}
+                    name={`suggestion_${pool.id}`}
+                    onChange={this.linkState('suggestion')}
+                    type='radio'
+                    value={index}
+                  />
+                </td>
+                <td>{layout}</td>
+                <td>{redundancy}</td>
+                <td>{capacity}</td>
+                <td>{formatSize(availableSpace)}</td>
+              </tr>)}
             </tbody>
           </table>
-        </Row>,
-        <Row>
-          {!isEmpty(suggestions) && <div>
-            <h3>{_('xosanSuggestions')}</h3>
-            <table className='table table-striped'>
-              <thead>
-                <tr>
-                  <th />
-                  <th>{_('xosanLayout')}</th>
-                  <th>{_('xosanRedundancy')}</th>
-                  <th>{_('xosanCapacity')}</th>
-                  <th>{_('xosanAvailableSpace')}</th>
-                </tr>
-              </thead>
-              <tbody>
-                {map(suggestions, ({ layout, redundancy, capacity, availableSpace }, index) => <tr key={index}>
-                  <td>
-                    <input
-                      checked={+suggestion === index}
-                      name={`suggestion_${pool.id}`}
-                      onChange={this.linkState('suggestion')}
-                      type='radio'
-                      value={index}
-                    />
-                  </td>
-                  <td>{layout}</td>
-                  <td>{redundancy}</td>
-                  <td>{capacity}</td>
-                  <td>{formatSize(availableSpace)}</td>
-                </tr>)}
-              </tbody>
-            </table>
-            <Graph
-              height={160}
-              layout={suggestions[suggestion].layout}
-              nSrs={this._getNSelectedSrs()}
-              redundancy={suggestions[suggestion].redundancy}
-              width={600}
-            />
-            <hr />
-            <Toggle
-              onChange={this.toggleState('showAdvanced')}
-              value={this.state.showAdvanced}
-            /> {_('xosanAdvanced')}
-            {' '}
-            {this.state.showAdvanced && <Container className='mb-1'>
-              <SingleLineRow>
-                <Col>{_('xosanVlan')}</Col>
-              </SingleLineRow>
-              <SingleLineRow>
-                <Col size={1}>
-                  <Toggle onChange={this.linkState('useVlan')} value={useVlan} />
-                </Col>
-                <Col size={3}>
-                  <input
-                    className='form-control'
-                    disabled={!useVlan}
-                    onChange={this.linkState('vlan')}
-                    placeholder='VLAN'
-                    type='text'
-                    value={vlan}
-                  />
-                </Col>
-              </SingleLineRow>
-              <SingleLineRow>
-                <Col>{_('xosanBrickSize')}</Col>
-              </SingleLineRow>
-              <SingleLineRow>
-                <Col size={1}>
-                  <Toggle className='mr-1' onChange={this.linkState('customBrickSize')} value={customBrickSize} />
-                </Col>
-                <Col size={3}>
-                  <SizeInput
-                    readOnly={!customBrickSize}
-                    value={brickSize}
-                    onChange={this._onBrickSizeChange}
-                    required
-                  />
-                </Col>
-              </SingleLineRow>
-              <SingleLineRow>
-                <Col size={4}>
-                  <label>{_('xosanMemorySize')}</label>
-                  <SizeInput value={memorySize} onChange={this.linkState('memorySize')} required />
-                </Col>
-              </SingleLineRow>
-            </Container>}
-            <hr />
-          </div>}
-        </Row>,
-        <Row>
-          <Col>
-            <ActionButton
-              btnStyle='success'
-              disabled={this._getDisableCreation()}
-              handler={this._createXosanVm}
-              icon='add'
-            >
-              {_('xosanCreate')}
-            </ActionButton>
-          </Col>
-        </Row>
-      ]}
-    </Container>
+          <Graph
+            height={160}
+            layout={suggestions[suggestion].layout}
+            nSrs={this._getNSelectedSrs()}
+            redundancy={suggestions[suggestion].redundancy}
+            width={600}
+          />
+          <hr />
+          <Container>
+            <SingleLineRow>
+              <Col size={6}>
+                <SelectPif
+                  onChange={this.linkState('pif')}
+                  predicate={this._getPifPredicate()}
+                  value={pif}
+                />
+              </Col>
+              <Col size={3}>
+                <input
+                  className='form-control pull-right'
+                  disabled={!useVlan}
+                  onChange={this.linkState('vlan')}
+                  placeholder='VLAN'
+                  style={{ width: '70%' }}
+                  type='text'
+                  value={vlan}
+                />
+                <Toggle className='pull-right mr-1' onChange={this.linkState('useVlan')} value={useVlan} />
+              </Col>
+              <Col size={3}>
+                <ActionButton
+                  btnStyle='success'
+                  className='pull-right'
+                  disabled={this._getDisableCreation()}
+                  handler={this._createXosanVm}
+                  icon='add'
+                >
+                  {_('xosanCreate')}
+                </ActionButton>
+              </Col>
+            </SingleLineRow>
+          </Container>
+        </div>
+      }
+    </div>
   }
 }
 
-@connectStore(() => {
-  const getHosts = createGetObjectsOfType('host')
-  const getHostsByPool = getHosts.groupBy('$pool')
-  const getPools = createGetObjectsOfType('pool')
+// ==================================================================
 
-  const noPacksByPool = createSelector(
-    getHostsByPool,
+@connectStore(() => {
+  const getIsInPool = createSelector(
+    (_, { pool }) => pool != null && pool.id,
+    poolId => obj => obj.$pool === poolId
+  )
+
+  const getPbdsBySr = createGetObjectsOfType('PBD').filter(getIsInPool).groupBy('SR')
+  const getHosts = createGetObjectsOfType('host').filter(getIsInPool)
+
+  // LVM SRs that are connected
+  const getLvmSrs = createSort(createSelector(
+    createGetObjectsOfType('SR').filter(
+      createSelector(
+        getHosts,
+        getIsInPool,
+        (hosts, isInPool) =>
+          sr =>
+            isInPool(sr) &&
+            !sr.shared &&
+            sr.SR_type === 'lvm' &&
+            find(hosts, { id: sr.$container }).power_state === 'Running'
+      )
+    ),
+    getPbdsBySr,
+    (srs, pbdsBySr) => mapPlus(srs, (sr, push) => {
+      let pbds
+      if ((pbds = pbdsBySr[sr.id]).length) {
+        push({ ...sr, pbds })
+      }
+    })
+  ), 'name_label')
+
+  const getXosanSrs = createSort(createSelector(
+    createGetObjectsOfType('SR').filter(createSelector(
+      (_, { pool }) => pool != null && pool.id,
+      poolId =>
+        sr => sr.$pool === poolId && sr.shared && sr.SR_type === 'xosan'
+    )),
+    getPbdsBySr,
+    (srs, pbdsBySr) =>
+      map(srs, sr => ({ ...sr, pbds: pbdsBySr[sr.id] }))
+  ), 'name_label')
+
+  const getTemplates = createSelector(
+    (_, { catalog }) => catalog,
+    catalog => filter(catalog.xosan, { type: 'xva' })
+  )
+
+  // Hosts whose toolstack hasn't been restarted since XOSAN-pack installation
+  const getHostsNeedRestart = createSelector(
+    (_, { pool }) => pool && pool.xosanPackInstallationTime,
+    getHosts,
+    (xosanPackInstallationTime, hosts) => filter(hosts, host =>
+      host.power_state === 'Running' &&
+      xosanPackInstallationTime != null &&
+      xosanPackInstallationTime > host.agentStartTime
+    )
+  )
+
+  const getIsMasterOffline = createSelector(
+    getHosts,
+    (_, { pool }) => pool.master,
+    (hosts, id) => find(hosts, { id }).power_state !== 'Running'
+  )
+
+  return {
+    isMasterOffline: getIsMasterOffline,
+    hosts: getHosts,
+    lvmSrs: getLvmSrs,
+    hostsNeedRestart: getHostsNeedRestart,
+    templates: getTemplates,
+    xosanSrs: getXosanSrs
+  }
+})
+class Pool extends Component {
+  componentDidMount () {
+    this.componentWillUnmount = subscribeIsInstallingXosan(this.props.pool, isInstallingXosan => {
+      this.setState({ isInstallingXosan })
+    })
+  }
+
+  render () {
+    const { xosanSrs, lvmSrs, hosts, noPack, templates, pool, hostsNeedRestart, isMasterOffline } = this.props
+    const { isInstallingXosan } = this.state
+
+    if (isInstallingXosan) {
+      return <em><Icon icon='loading' /> {_('xosanInstalling')}</em>
+    }
+
+    if (noPack) {
+      return <div className='mb-3'>
+        <Icon icon='error' /> {_('xosanNeedPack')}
+        <br />
+        <ActionButton btnStyle='success' icon='export' handler={downloadAndInstallXosanPack} handlerParam={pool}>{_('xosanInstallIt')}</ActionButton>
+      </div>
+    }
+
+    if (isMasterOffline) {
+      return <div className='mb-3'>
+        <Icon icon='error' /> {_('xosanMasterOffline')}
+      </div>
+    }
+
+    if (!isEmpty(hostsNeedRestart)) {
+      return <div className='mb-3'>
+        <Icon icon='error' /> {_('xosanNeedRestart')}
+        <br />
+        <ActionButton btnStyle='success' icon='host-restart-agent' handler={restartHostsAgents} handlerParam={hostsNeedRestart}>{_('xosanRestartAgents')}</ActionButton>
+      </div>
+    }
+
+    return xosanSrs && xosanSrs.length
+      ? <XosanVolumesTable hosts={hosts} xosansrs={xosanSrs} lvmsrs={lvmSrs} />
+      : <PoolAvailableSrs hosts={hosts} pool={pool} lvmsrs={lvmSrs} templates={templates} />
+  }
+}
+
+// ==================================================================
+
+@connectStore(() => ({
+  pools: createGetObjectsOfType('pool'),
+  noPacksByPool: createSelector(
+    createGetObjectsOfType('host').groupBy('$pool'),
     hostsByPool => mapValues(hostsByPool, (poolHosts, poolId) =>
       !every(poolHosts, host => some(host.supplementalPacks, isXosanPack))
     )
   )
-
-  const getPbdsBySr = createGetObjectsOfType('PBD').groupBy('SR')
-  const getXosanSrs = createSelector(
-    createGetObjectsOfType('SR').filter([ sr => sr.shared && sr.SR_type === 'xosan' ]),
-    getPbdsBySr,
-    getPools,
-    getHosts,
-    (srs, pbdsBySr, pools, hosts) =>
-      map(srs, sr => ({
-        ...sr,
-        pbds: pbdsBySr[sr.id],
-        pool: find(pools, { id: sr.$pool }),
-        hosts: map(pbdsBySr[sr.id], ({ host }) => find(hosts, [ 'id', host ])),
-        config: sr.other_config['xo:xosan_config'] && JSON.parse(sr.other_config['xo:xosan_config'])
-      }))
-  )
-
-  const getIsMasterOfflineByPool = createSelector(
-    getHostsByPool,
-    getPools,
-    (hostsByPool, pools) => {
-      const isMasterOfflineByPool = {}
-      forEach(pools, pool => {
-        const poolMaster = find(hostsByPool[pool.id], { id: pool.master })
-        isMasterOfflineByPool[pool.id] = poolMaster && poolMaster.power_state !== 'Running'
-      })
-    }
-  )
-
-  // Hosts whose toolstack hasn't been restarted since XOSAN-pack installation
-  const getHostsNeedRestartByPool = createSelector(
-    getHostsByPool,
-    getPools,
-    (hostsByPool, pools) => {
-      const hostsNeedRestartByPool = {}
-      forEach(pools, pool => {
-        hostsNeedRestartByPool[pool.id] = filter(hostsByPool[pool.id], host =>
-          host.power_state === 'Running' &&
-          pool.xosanPackInstallationTime !== null &&
-          pool.xosanPackInstallationTime > host.agentStartTime
-        )
-      })
-    }
-  )
-
-  const getPoolPredicate = createSelector(
-    getXosanSrs,
-    srs => pool => every(srs, sr => sr.$pool !== pool.id)
-  )
-
-  return {
-    isMasterOfflineByPool: getIsMasterOfflineByPool,
-    hostsNeedRestartByPool: getHostsNeedRestartByPool,
-    noPacksByPool,
-    poolPredicate: getPoolPredicate,
-    pools: getPools,
-    xosanSrs: getXosanSrs
-  }
-})
+}))
 @addSubscriptions({
   catalog: subscribeResourceCatalog,
   plugins: subscribePlugins
 })
 export default class Xosan extends Component {
-  componentDidMount () {
-    this.unsubscribeIsInstallingXosan = map(this.props.pools, pool =>
-      subscribeIsInstallingXosan(pool, isInstallingXosan => {
-        this.setState({
-          isInstallingXosan: {
-            ...this.state.isInstallingXosan,
-            [pool.id]: isInstallingXosan
-          }
-        })
-      })
-    )
-  }
-
-  componentWillReceiveProps ({ xosanSrs }) {
-    const sr = xosanSrs && xosanSrs[0] && xosanSrs[0].id
-    forEach(xosanSrs, ({ id }) => {
-      Promise.all([
-        getVolumeInfo(sr, 'heal'),
-        getVolumeInfo(sr, 'status'),
-        getVolumeInfo(sr, 'info'),
-        getVolumeInfo(sr, 'statusDetail')
-      ]).then(result => {
-        this.setState({
-          status: { ...this.state.status, [id]: map(result, 'commandStatus') } })
-      })
-    })
-  }
-
-  componentWillUnmount () {
-    forEach(this.unsubscribeIsInstallingXosan, unsubscribe => unsubscribe())
-  }
-
   _getError = createSelector(
     () => this.props.plugins,
     () => this.props.catalog,
@@ -646,10 +544,8 @@ export default class Xosan extends Component {
     }
   )
 
-  _onSrCreated = () => this.setState({ showNewXosanForm: false })
-
   render () {
-    const { xosanSrs, noPacksByPool, hostsNeedRestart, poolPredicate } = this.props
+    const { pools, noPacksByPool, catalog } = this.props
     const error = this._getError()
 
     return <Page header={HEADER} title='xosan' formatTitle>
@@ -657,35 +553,15 @@ export default class Xosan extends Component {
         ? <Container>
           {error
             ? <em>{error}</em>
-            : <div>
-              <p>
-                <ActionButton
-                  btnStyle='primary'
-                  handler={this.toggleState('showNewXosanForm')}
-                  icon={this.state.showNewXosanForm ? 'minus' : 'plus'}
-                >
-                  {_('xosanNew')}
-                </ActionButton>
-              </p>
-              <p>
-                {this.state.showNewXosanForm && <NewXosan
-                  hostsNeedRestart={hostsNeedRestart}
-                  noPacksByPool={noPacksByPool}
-                  poolPredicate={poolPredicate}
-                  onSrCreated={this._onSrCreated}
-                />}
-              </p>
-              <p>
-                <SortedTable
-                  collection={xosanSrs}
-                  columns={XOSAN_COLUMNS}
-                  userData={{
-                    isInstallingXosan: this.state.isInstallingXosan,
-                    status: this.state.status
-                  }}
-                />
-              </p>
-            </div>
+            : map(pools, pool => {
+              const noPack = noPacksByPool && noPacksByPool[pool.id]
+
+              return <Collapse key={pool.id} className='mb-1' buttonText={<span>{noPack && <Icon icon='error' />} {pool.name_label}</span>}>
+                <div className='m-1'>
+                  <Pool pool={pool} noPack={noPack} catalog={catalog} />
+                </div>
+              </Collapse>
+            })
           }
         </Container>
         : <Container>

yarn.lock

@@ -19,12 +19,6 @@
     normalize-path "^2.0.1"
     through2 "^2.0.3"
 
-"@nraynaud/novnc@^0.6.1-1":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@nraynaud/novnc/-/novnc-0.6.1.tgz#995459bb6f7bd5dd9bd7899b021f68f7744cf1b3"
-  dependencies:
-    pako "^1.0.3"
-
 JSONStream@^1.0.3:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
@@ -1210,6 +1204,10 @@ bootstrap@4.0.0-alpha.5:
     jquery "1.9.1 - 3"
     tether "^1.3.7"
 
+bowser@^0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-0.7.3.tgz#4fc0cb4e0e2bdd9b394df0d2038c32c2cc2712c8"
+
 brace-expansion@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
@@ -3656,10 +3654,6 @@ ignore@^3.0.11, ignore@^3.0.9, ignore@^3.2.0:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
-immutable@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -5285,6 +5279,13 @@ notifyjs@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/notifyjs/-/notifyjs-3.0.0.tgz#7418c9d6c0533aebaa643414214af53b521d1b28"
 
+novnc-node@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/novnc-node/-/novnc-node-0.5.3.tgz#69f20a4a2ff0c54ca2f942ff59553f523eb61fa7"
+  dependencies:
+    bowser "^0.7.2"
+    debug "^2.2.0"
+
 now-and-later@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-1.0.0.tgz#23e798ccaaf0e8acbef0687f82086274746e0893"
@@ -5519,10 +5520,6 @@ p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
 
-pako@^1.0.3:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.5.tgz#d2205dfe5b9da8af797e7c163db4d1f84e4600bc"
-
 pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"