feat(xo-web/backup NG): remove delete button on logs (#3235)

Fixes #3153
This commit is contained in:
Pierre Donias 2018-07-26 11:49:59 +02:00 committed by GitHub
parent ac2e490569
commit 9c4bd0d0dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions

View File

@ -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)) - [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)) - [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)) - [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 ### Bug fixes

View File

@ -14,11 +14,7 @@ import { Card, CardHeader, CardBlock } from 'card'
import { keyBy } from 'lodash' import { keyBy } from 'lodash'
import { FormattedDate } from 'react-intl' import { FormattedDate } from 'react-intl'
import { get } from 'xo-defined' import { get } from 'xo-defined'
import { import { subscribeBackupNgJobs, subscribeBackupNgLogs } from 'xo'
deleteJobsLogs,
subscribeBackupNgJobs,
subscribeBackupNgLogs,
} from 'xo'
import LogAlertBody from './log-alert-body' import LogAlertBody from './log-alert-body'
@ -104,6 +100,7 @@ const LOG_COLUMNS = [
const { className, label } = STATUS_LABELS[log.status] const { className, label } = STATUS_LABELS[log.status]
return <span className={`tag tag-${className}`}>{_(label)}</span> return <span className={`tag tag-${className}`}>{_(label)}</span>
}, },
sortCriteria: 'status',
}, },
] ]
@ -144,14 +141,6 @@ const LOG_INDIVIDUAL_ACTIONS = [
}, },
] ]
const LOG_ACTIONS = [
{
handler: deleteJobsLogs,
icon: 'delete',
label: _('remove'),
},
]
const LOG_FILTERS = { const LOG_FILTERS = {
jobFailed: 'status: failure', jobFailed: 'status: failure',
jobInterrupted: 'status: interrupted', jobInterrupted: 'status: interrupted',
@ -172,7 +161,6 @@ export default [
</CardHeader> </CardHeader>
<CardBlock> <CardBlock>
<NoObjects <NoObjects
actions={LOG_ACTIONS}
collection={logs} collection={logs}
columns={LOG_COLUMNS} columns={LOG_COLUMNS}
component={SortedTable} component={SortedTable}