From 34f6be868e9135d325813f80440fbe6e410eaaaa Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Tue, 28 Mar 2023 11:43:33 +0200
Subject: [PATCH] feat(backups,xo-web): store SR name label in logs

Similar to bbf92be65 & 92a00465e
---
 @xen-orchestra/backups/docs/VM backups/README.md            | 2 +-
 @xen-orchestra/backups/writers/DeltaReplicationWriter.js    | 1 +
 @xen-orchestra/backups/writers/FullReplicationWriter.js     | 1 +
 CHANGELOG.unreleased.md                                     | 1 +
 packages/xo-web/src/common/render-xo-item.js                | 5 +++--
 packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/@xen-orchestra/backups/docs/VM backups/README.md b/@xen-orchestra/backups/docs/VM backups/README.md
index 1f7297f0e..5db721937 100644
--- a/@xen-orchestra/backups/docs/VM backups/README.md	
+++ b/@xen-orchestra/backups/docs/VM backups/README.md	
@@ -100,7 +100,7 @@ job.start(data: { mode: Mode, reportWhen: ReportWhen })
 │  │  └─ task.end
 │  ├─ task.start(message: 'snapshot')
 │  │  └─ task.end
-│  ├─ task.start(message: 'export', data: { type: 'SR' | 'remote', id: string, isFull: boolean })
+│  ├─ task.start(message: 'export', data: { type: 'SR' | 'remote', id: string, name_label?: string, isFull: boolean })
 │  │  ├─ task.warning(message: string)
 │  │  ├─ task.start(message: 'transfer')
 │  │  │  ├─ task.warning(message: string)
diff --git a/@xen-orchestra/backups/writers/DeltaReplicationWriter.js b/@xen-orchestra/backups/writers/DeltaReplicationWriter.js
index b1c2a072c..c531120ed 100644
--- a/@xen-orchestra/backups/writers/DeltaReplicationWriter.js
+++ b/@xen-orchestra/backups/writers/DeltaReplicationWriter.js
@@ -45,6 +45,7 @@ exports.DeltaReplicationWriter = class DeltaReplicationWriter extends MixinRepli
       data: {
         id: this._sr.uuid,
         isFull,
+        name_label: this._sr.name_label,
         type: 'SR',
       },
     })
diff --git a/@xen-orchestra/backups/writers/FullReplicationWriter.js b/@xen-orchestra/backups/writers/FullReplicationWriter.js
index beb104e1c..dd5471fd8 100644
--- a/@xen-orchestra/backups/writers/FullReplicationWriter.js
+++ b/@xen-orchestra/backups/writers/FullReplicationWriter.js
@@ -21,6 +21,7 @@ exports.FullReplicationWriter = class FullReplicationWriter extends MixinReplica
         name: 'export',
         data: {
           id: props.sr.uuid,
+          name_label: this._sr.name_label,
           type: 'SR',
 
           // necessary?
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 90b63eab5..21c74188b 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -9,6 +9,7 @@
 
 - [VM] Show distro icon for opensuse-microos [Forum#6965](https://xcp-ng.org/forum/topic/6965) (PR [#6746](https://github.com/vatesfr/xen-orchestra/pull/6746))
 - [Backup] Display the VM name label in the log even if the VM is not currently connected
+- [Backup] Display the SR name label in the log even if the SR is not currently connected
 
 ### Bug fixes
 
diff --git a/packages/xo-web/src/common/render-xo-item.js b/packages/xo-web/src/common/render-xo-item.js
index 0770de70a..9d2f06aa1 100644
--- a/packages/xo-web/src/common/render-xo-item.js
+++ b/packages/xo-web/src/common/render-xo-item.js
@@ -217,9 +217,9 @@ export const Sr = decorate([
       container: getContainer(state, props),
     })
   }),
-  ({ id, sr, container, link, newTab, spaceLeft, self }) => {
+  ({ id, sr, container, link, newTab, spaceLeft, self, name }) => {
     if (sr === undefined) {
-      return unknowItem(id, 'SR')
+      return unknowItem(id, 'SR', name)
     }
 
     return (
@@ -241,6 +241,7 @@ Sr.propTypes = {
   container: PropTypes.bool,
   id: PropTypes.string.isRequired,
   link: PropTypes.bool,
+  name: PropTypes.string,
   newTab: PropTypes.bool,
   self: PropTypes.bool,
   spaceLeft: PropTypes.bool,
diff --git a/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js b/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js
index e5a14ed16..ea12a63bd 100644
--- a/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js
+++ b/packages/xo-web/src/xo-app/logs/backup-ng/log-alert-body.js
@@ -339,7 +339,7 @@ const RemoteTask = ({ children, className, task }) => (
 
 const SrTask = ({ children, className, task }) => (
   <li className={className}>
-    <Sr id={task.data.id} link newTab /> <TaskStateInfos status={task.status} />
+    <Sr id={task.data.id} name={task.data.name_label} link newTab /> <TaskStateInfos status={task.status} />
     <TaskWarnings warnings={task.warnings} />
     <TaskInfos infos={task.infos} />
     {children}