From 3a3fa2882caf0a94315e27304febaf43eb65d897 Mon Sep 17 00:00:00 2001
From: Florent BEAUCHAMP <florent.beauchamp@vates.fr>
Date: Tue, 29 Aug 2023 14:52:44 +0200
Subject: [PATCH] fix(backup/healthcheck): mirror backup appeared detached
 (#7000)

---
 CHANGELOG.unreleased.md                       |  1 +
 .../xo-web/src/xo-app/backup/health/index.js  | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index e09d1a9ab..7d2cb6c11 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -21,6 +21,7 @@
 - [Home/VMs] Filtering with a UUID will no longer show other VMs on the same host/pool
 - [Jobs] Fixes `invalid parameters` when editing [Forum#64668](https://xcp-ng.org/forum/post/64668)
 - [Smart reboot] Fix cases where VMs remained in a suspended state (PR [#6980](https://github.com/vatesfr/xen-orchestra/pull/6980))
+- [Backup/Health dashboard] Don't show mirrored VMs as detached backups (PR [#7000](https://github.com/vatesfr/xen-orchestra/pull/7000))
 
 ### Packages to release
 
diff --git a/packages/xo-web/src/xo-app/backup/health/index.js b/packages/xo-web/src/xo-app/backup/health/index.js
index 566a22ef5..5d5b7823a 100644
--- a/packages/xo-web/src/xo-app/backup/health/index.js
+++ b/packages/xo-web/src/xo-app/backup/health/index.js
@@ -23,6 +23,7 @@ import {
   getRemotes,
   listVmBackups,
   subscribeBackupNgJobs,
+  subscribeMirrorBackupJobs,
   subscribeSchedules,
 } from 'xo'
 
@@ -147,10 +148,23 @@ const Health = decorate([
       subscribeSchedules(schedules => {
         cb(keyBy(schedules, 'id'))
       }),
-    jobs: cb =>
+    jobs: cb => {
+      let backupJobs, mirrorJobs
       subscribeBackupNgJobs(jobs => {
-        cb(keyBy(jobs, 'id'))
-      }),
+        backupJobs = jobs
+        if (mirrorJobs !== undefined) {
+          // both are loaded
+          cb(keyBy([...backupJobs, ...mirrorJobs], 'id'))
+        }
+      })
+      subscribeMirrorBackupJobs(jobs => {
+        mirrorJobs = jobs
+        if (backupJobs !== undefined) {
+          // both are loaded
+          cb(keyBy([...backupJobs, ...mirrorJobs], 'id'))
+        }
+      })
+    },
   }),
   connectStore({
     loneSnapshots: getLoneSnapshots,