From 9c4bd0d0dd7b851840b9ab6d78532041970bd931 Mon Sep 17 00:00:00 2001 From: Pierre Donias Date: Thu, 26 Jul 2018 11:49:59 +0200 Subject: [PATCH] feat(xo-web/backup NG): remove delete button on logs (#3235) Fixes #3153 --- CHANGELOG.md | 1 + .../xo-web/src/xo-app/logs/backup-ng-logs.js | 16 ++-------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b89addefc..9f8ad1ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - [Remotes] Ability to change the type of a remote [#2423](https://github.com/vatesfr/xen-orchestra/issues/2423) (PR [#3207](https://github.com/vatesfr/xen-orchestra/pull/3207)) - [Backup NG new] Ability to set a job's timeout [#2978](https://github.com/vatesfr/xen-orchestra/issues/2978) (PR [#3222](https://github.com/vatesfr/xen-orchestra/pull/3222)) - [Remotes] Ability to edit/delete a remote with an invalid URL [#3182](https://github.com/vatesfr/xen-orchestra/issues/3182) (PR [#3226](https://github.com/vatesfr/xen-orchestra/pull/3226)) +- [Backup NG logs] Prevent user from deleting logs to help resolving issues [#3153](https://github.com/vatesfr/xen-orchestra/issues/3153) (PR [#3235](https://github.com/vatesfr/xen-orchestra/pull/3235)) ### Bug fixes diff --git a/packages/xo-web/src/xo-app/logs/backup-ng-logs.js b/packages/xo-web/src/xo-app/logs/backup-ng-logs.js index cd307bcab..e52c1d9e9 100644 --- a/packages/xo-web/src/xo-app/logs/backup-ng-logs.js +++ b/packages/xo-web/src/xo-app/logs/backup-ng-logs.js @@ -14,11 +14,7 @@ import { Card, CardHeader, CardBlock } from 'card' import { keyBy } from 'lodash' import { FormattedDate } from 'react-intl' import { get } from 'xo-defined' -import { - deleteJobsLogs, - subscribeBackupNgJobs, - subscribeBackupNgLogs, -} from 'xo' +import { subscribeBackupNgJobs, subscribeBackupNgLogs } from 'xo' import LogAlertBody from './log-alert-body' @@ -104,6 +100,7 @@ const LOG_COLUMNS = [ const { className, label } = STATUS_LABELS[log.status] return {_(label)} }, + sortCriteria: 'status', }, ] @@ -144,14 +141,6 @@ const LOG_INDIVIDUAL_ACTIONS = [ }, ] -const LOG_ACTIONS = [ - { - handler: deleteJobsLogs, - icon: 'delete', - label: _('remove'), - }, -] - const LOG_FILTERS = { jobFailed: 'status: failure', jobInterrupted: 'status: interrupted', @@ -172,7 +161,6 @@ export default [