fix(backups): handle undefined remote name in restore description (#8367

)
vatesfr · Mar 4, 2025 · cf03313 · cf03313
1 parent 2a2c966
commit cf03313
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/@xen-orchestra/backups/ImportVmBackup.mjs b/@xen-orchestra/backups/ImportVmBackup.mjs
@@ -257,21 +257,22 @@ 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(
             'VM.set_name_label',
             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
@@ -34,6 +34,7 @@
 
 <!--packages-start-->
 
+- @xen-orchestra/backups patch
 - @xen-orchestra/web minor
 - xo-server patch