From cf0331391ba914951c96edf9f7ba6879c2ed1f62 Mon Sep 17 00:00:00 2001
From: Florent BEAUCHAMP <florent.beauchamp@vates.tech>
Date: Tue, 4 Mar 2025 08:39:11 +0100
Subject: [PATCH] fix(backups): handle undefined remote name in restore
 description (#8367)

---
 @xen-orchestra/backups/ImportVmBackup.mjs | 17 +++++++++--------
 CHANGELOG.unreleased.md                   |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/@xen-orchestra/backups/ImportVmBackup.mjs b/@xen-orchestra/backups/ImportVmBackup.mjs
index 62ba68794c2..18614f4e027 100644
--- a/@xen-orchestra/backups/ImportVmBackup.mjs
+++ b/@xen-orchestra/backups/ImportVmBackup.mjs
@@ -257,7 +257,14 @@ export class ImportVmBackup {
           : await importIncrementalVm(backup, await xapi.getRecord('SR', srRef), {
               newMacAddresses,
             })
-
+        const remoteName = adapter._handler._remote.name
+        let desc = `Restored on ${formatFilenameDate(+new Date())}`
+        if (remoteName !== undefined) {
+          desc += ` from ${remoteName}`
+        }
+        if (metadata.vm.name_description) {
+          desc += ` - ${metadata.vm.name_description}`
+        }
         await Promise.all([
           xapi.call('VM.add_tags', vmRef, 'restored from backup'),
           xapi.call(
@@ -265,13 +272,7 @@ export class ImportVmBackup {
             vmRef,
             `${metadata.vm.name_label} (${formatFilenameDate(metadata.timestamp)})`
           ),
-          xapi.call(
-            'VM.set_name_description',
-            vmRef,
-            `Restored on ${formatFilenameDate(+new Date())} from ${adapter._handler._remote.name} -
-             ${metadata.vm.name_description}
-            `
-          ),
+          xapi.call('VM.set_name_description', vmRef, desc),
         ])
 
         return {
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 6f1f1cada21..045feb8fe32 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -34,6 +34,7 @@
 
 <!--packages-start-->
 
+- @xen-orchestra/backups patch
 - @xen-orchestra/web minor
 - xo-server patch