diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js index 116c0a634..4b3c6f44d 100644 --- a/packages/xo-web/src/common/intl/messages.js +++ b/packages/xo-web/src/common/intl/messages.js @@ -817,7 +817,6 @@ const messages = { vdiMigrateAll: 'Migrate all VDIs', vdiMigrateNoSr: 'No SR', vdiMigrateNoSrMessage: 'A target SR is required to migrate a VDI', - vdiDelete: 'Delete VDI', vdiForget: 'Forget', vdiRemove: 'Remove VDI', noControlDomainVdis: 'No VDIs attached to Control Domain', @@ -828,7 +827,6 @@ const messages = { vbdNoVbd: 'No disks', vbdConnect: 'Connect VBD', vbdDisconnect: 'Disconnect VBD', - vbdsDisconnect: 'Disconnect VBDs', vbdBootable: 'Bootable', vbdReadonly: 'Readonly', vbdAction: 'Action', diff --git a/packages/xo-web/src/xo-app/dashboard/health/index.js b/packages/xo-web/src/xo-app/dashboard/health/index.js index 507761469..643af6412 100644 --- a/packages/xo-web/src/xo-app/dashboard/health/index.js +++ b/packages/xo-web/src/xo-app/dashboard/health/index.js @@ -14,7 +14,7 @@ import { Card, CardHeader, CardBlock } from 'card' import { confirm } from 'modal' import { connectStore, formatSize, noop, resolveIds } from 'utils' import { Container, Row, Col } from 'grid' -import { flatten, get, includes, isEmpty, map, mapValues, some } from 'lodash' +import { flatten, get, includes, isEmpty, map, mapValues } from 'lodash' import { FormattedRelative, FormattedTime } from 'react-intl' import { fromCallback } from 'promise-toolbox' import { SelectPool } from 'select-objects' @@ -24,10 +24,7 @@ import { deleteVbd, deleteVbds, deleteVdi, - deleteVdis, deleteVm, - disconnectVbd, - disconnectVbds, isSrWritable, } from 'xo' import { @@ -179,16 +176,6 @@ const ORPHANED_VDI_COLUMNS = [ ] const CONTROL_DOMAIN_VDIS_ACTIONS = [ - { - disabled: selectedItems => some(selectedItems, ({ vbd }) => !vbd.attached), - handler: disconnectVbds, - icon: 'disconnect', - individualDisabled: ({ vbd }) => !vbd.attached, - individualHandler: disconnectVbd, - individualLabel: _('vbdDisconnect'), - label: _('vbdsDisconnect'), - level: 'danger', - }, { handler: deleteVbds, individualHandler: deleteVbd, @@ -196,14 +183,6 @@ const CONTROL_DOMAIN_VDIS_ACTIONS = [ label: _('vdiForget'), level: 'danger', }, - { - handler: selectedItems => deleteVdis(map(selectedItems, 'vdi')), - icon: 'delete', - individualHandler: ({ vdi }) => deleteVdi(vdi), - individualLabel: _('vdiDelete'), - label: _('deleteSelectedVdis'), - level: 'danger', - }, ] const AttachedVdisTable = [