diff --git a/CHANGELOG.md b/CHANGELOG.md index 91b0a83b9..430ba86a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [Tables] Filter input now always shows up even if the table is empty [#3295](https://github.com/vatesfr/xen-orchestra/issues/3295) (PR [#3296](https://github.com/vatesfr/xen-orchestra/pull/3296)) - [Tasks] The table is now still shown when there are no tasks (PR [#3305](https://github.com/vatesfr/xen-orchestra/pull/3305)) +- [Host / Logs] Homogenize action buttons in table and enable bulk deletion [#3179](https://github.com/vatesfr/xen-orchestra/issues/3179) (PR [#3313](https://github.com/vatesfr/xen-orchestra/pull/3313)) ### Bug fixes diff --git a/packages/xo-web/src/xo-app/host/tab-logs.js b/packages/xo-web/src/xo-app/host/tab-logs.js index 85686a171..c2614009f 100644 --- a/packages/xo-web/src/xo-app/host/tab-logs.js +++ b/packages/xo-web/src/xo-app/host/tab-logs.js @@ -1,15 +1,12 @@ import _ from 'intl' -import ActionRowButton from 'action-row-button' import Component from 'base-component' import isEmpty from 'lodash/isEmpty' -import map from 'lodash/map' import React from 'react' import SortedTable from 'sorted-table' -import TabButton from 'tab-button' -import { deleteMessage } from 'xo' import { createPager } from 'selectors' +import { Row, Col } from 'grid' +import { deleteMessage, deleteMessages } from 'xo' import { FormattedRelative, FormattedTime } from 'react-intl' -import { Container, Row, Col } from 'grid' const LOG_COLUMNS = [ { @@ -40,16 +37,16 @@ const LOG_COLUMNS = [ itemRenderer: log => log.body, sortCriteria: log => log.body, }, +] + +const LOG_ACTIONS = [ { - name: _('logAction'), - itemRenderer: log => ( - - ), + handler: deleteMessages, + individualHandler: deleteMessage, + individualLabel: _('logDelete'), + icon: 'delete', + label: _('logsDelete'), + level: 'danger', }, ] @@ -64,7 +61,6 @@ export default class TabLogs extends Component { } } - _deleteAllLogs = () => map(this.props.logs, deleteMessage) _nextPage = () => this.setState({ page: this.state.page + 1 }) _previousPage = () => this.setState({ page: this.state.page - 1 }) @@ -83,23 +79,11 @@ export default class TabLogs extends Component { } return ( - - - - - - - - - - - - + ) } }