diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b0e6a17a..06aedc5ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [Health / Orphaned VMs] Homogenize action buttons in table and enable bulk deletion [#3179](https://github.com/vatesfr/xen-orchestra/issues/3179) (PR [#3274](https://github.com/vatesfr/xen-orchestra/pull/3274)) - [Health / Orphaned snapshot VDIs] Homogenize action buttons in table and enable bulk deletion [#3179](https://github.com/vatesfr/xen-orchestra/issues/3179) (PR [#3270](https://github.com/vatesfr/xen-orchestra/pull/3270)) - [Health / Alarms] Homogenize action buttons in table and enable bulk deletion [#3179](https://github.com/vatesfr/xen-orchestra/issues/3179) (PR [#3271](https://github.com/vatesfr/xen-orchestra/pull/3271)) +- [Backup NG Overview] List the Backup NG job's modes [#3169](https://github.com/vatesfr/xen-orchestra/issues/3169) (PR [#3277](https://github.com/vatesfr/xen-orchestra/pull/3277)) ### Bug fixes diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js index 0711f2837..09c59511f 100644 --- a/packages/xo-web/src/common/intl/messages.js +++ b/packages/xo-web/src/common/intl/messages.js @@ -286,7 +286,7 @@ const messages = { jobId: 'ID', jobType: 'Type', jobName: 'Name', - jobMode: 'Mode', + jobModes: 'Modes', jobNamePlaceholder: 'Name of your job (forbidden: "_")', jobStart: 'Start', jobEnd: 'End', diff --git a/packages/xo-web/src/xo-app/backup-ng/index.js b/packages/xo-web/src/xo-app/backup-ng/index.js index 00f598178..cc765d8ed 100644 --- a/packages/xo-web/src/xo-app/backup-ng/index.js +++ b/packages/xo-web/src/xo-app/backup-ng/index.js @@ -5,11 +5,12 @@ import Icon from 'icon' import React from 'react' import SortedTable from 'sorted-table' import StateButton from 'state-button' -import { confirm } from 'modal' -import { map, groupBy } from 'lodash' import { Card, CardHeader, CardBlock } from 'card' +import { confirm } from 'modal' import { constructQueryString } from 'smart-backup' import { Container, Row, Col } from 'grid' +import { get } from 'xo-defined' +import { isEmpty, map, groupBy, some } from 'lodash' import { NavLink, NavTabs } from 'nav' import { routes } from 'utils' import { @@ -30,6 +31,17 @@ import New from './new' import FileRestore from './file-restore' import Restore from './restore' import Health from './health' +import { destructPattern } from './utils' + +const Ul = props =>