feat: add mirror backup jobs in backup overview

vatesfr · May 26, 2023 · 4413cf9 · 4413cf9
1 parent 80ab7b1
commit 4413cf9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
@@ -219,6 +219,7 @@ const messages = {
   xoConfig: 'XO config',
   backupVms: 'Backup VMs',
   backupMetadata: 'Backup metadata',
+  mirrorBackup: 'Mirror backup',
   mirrorBackupVms: 'Mirror Backup VMs',
   jobsOverviewPage: 'Overview',
   jobsNewPage: 'New',

diff --git a/packages/xo-web/src/common/xo/index.js b/packages/xo-web/src/common/xo/index.js
@@ -2467,7 +2467,10 @@ export const deleteMetadataBackups = async (backups = []) => {
 
 // Mirror backup ---------------------------------------------------------
 
-export const createMirrorBackupJob = props => _call('mirrorBackup.createJob', props) // @TODO: refresh subscriptions
+export const subscribeMirrorBackupJobs = createSubscription(() => _call('mirrorBackup.getAllJobs'))
+
+export const createMirrorBackupJob = props =>
+  _call('mirrorBackup.createJob', props)::tap(subscribeMirrorBackupJobs.forceRefresh)
 
 // Plugins -----------------------------------------------------------
 

diff --git a/packages/xo-web/src/xo-app/backup/overview/tab-jobs.js b/packages/xo-web/src/xo-app/backup/overview/tab-jobs.js
@@ -32,6 +32,7 @@ import {
   subscribeBackupNgJobs,
   subscribeBackupNgLogs,
   subscribeMetadataBackupJobs,
+  subscribeMirrorBackupJobs,
   subscribeSchedules,
 } from 'xo'
 
@@ -50,6 +51,10 @@ const Li = props => (
 )
 
 const MODES = [
+  {
+    label: 'mirrorBackup',
+    test: job => job?.type === 'mirrorBackup',
+  },
   {
     label: 'rollingSnapshot',
     test: job => some(job.settings, ({ snapshotRetention }) => snapshotRetention > 0),
@@ -235,6 +240,7 @@ const SchedulePreviewBody = decorate([
 @addSubscriptions({
   jobs: subscribeBackupNgJobs,
   metadataJobs: subscribeMetadataBackupJobs,
+  mirrorBackupJobs: subscribeMirrorBackupJobs,
   schedulesByJob: cb =>
     subscribeSchedules(schedules => {
       cb(groupBy(schedules, 'jobId'))
@@ -307,7 +313,7 @@ class JobsTable extends React.Component {
           } = getSettingsWithNonDefaultValue(job.mode, {
             compression: job.compression,
             proxyId: job.proxy,
-            ...job.settings[''],
+            ...job.settings?.[''],
           })
 
           return (
@@ -382,7 +388,8 @@ class JobsTable extends React.Component {
     createSelector(
       () => this.props.jobs,
       () => this.props.metadataJobs,
-      (jobs = [], metadataJobs = []) => [...jobs, ...metadataJobs]
+      () => this.props.mirrorBackupJobs,
+      (jobs = [], metadataJobs = [], mirrorJobs = []) => [...jobs, ...metadataJobs, ...mirrorJobs]
     ),
     () => this.props.predicate
   )