From 3d8c8fd745f7fd45f46b481eb8180268969926be Mon Sep 17 00:00:00 2001
From: badrAZ <azizbibadr@gmail.com>
Date: Tue, 6 Oct 2020 16:08:12 +0200
Subject: [PATCH] feat(xo-web/backup-reports): hide merge task when no merge
 (#5263)

---
 CHANGELOG.unreleased.md                       |  2 +
 .../xo-server-backup-reports/src/index.js     |  2 +
 .../xo-app/logs/backup-ng/log-alert-body.js   | 56 +++++++++----------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 6135b87fe..cb38a1d1c 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -8,6 +8,7 @@
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
 - [Host/Advanced] Add the field `IOMMU` if it is defined (PR [#5294](https://github.com/vatesfr/xen-orchestra/pull/5294))
+- [Backup logs/report] Hide merge task when no merge is done (PR [#5263](https://github.com/vatesfr/xen-orchestra/pull/5263))
 
 ### Bug fixes
 
@@ -37,5 +38,6 @@
 >
 > In case of conflict, the highest (lowest in previous list) `$version` wins.
 
+- xo-server-backup-reports patch
 - xo-server minor
 - xo-web minor
diff --git a/packages/xo-server-backup-reports/src/index.js b/packages/xo-server-backup-reports/src/index.js
index 1009c22ae..05974c715 100644
--- a/packages/xo-server-backup-reports/src/index.js
+++ b/packages/xo-server-backup-reports/src/index.js
@@ -513,6 +513,8 @@ class BackupReportsXoPlugin {
             } else {
               globalTransferSize += size
             }
+          } else if (operationLog.status === 'success') {
+            return
           }
 
           const operationText = [
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 befc214fc..0844b5192 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
@@ -136,8 +136,8 @@ const Warnings = ({ warnings }) =>
     </div>
   ) : null
 
-const VmTask = ({ children, restartVmJob, task }) => (
-  <div>
+const VmTask = ({ children, className, restartVmJob, task }) => (
+  <li className={className}>
     <Vm id={task.data.id} link newTab /> <TaskStateInfos status={task.status} />{' '}
     {restartVmJob !== undefined && hasTaskFailed(task) && (
       <ButtonGroup>
@@ -190,11 +190,11 @@ const VmTask = ({ children, restartVmJob, task }) => (
     )}
     {task.isFull !== undefined &&
       _.keyValue(_('exportType'), task.isFull ? 'full' : 'delta')}
-  </div>
+  </li>
 )
 
-const PoolTask = ({ children, task }) => (
-  <div>
+const PoolTask = ({ children, className, task }) => (
+  <li className={className}>
     <Pool id={task.data.id} link newTab />{' '}
     <TaskStateInfos status={task.status} />
     <Warnings warnings={task.warnings} />
@@ -203,11 +203,11 @@ const PoolTask = ({ children, task }) => (
     <TaskEnd task={task} />
     <TaskDuration task={task} />
     <TaskError task={task} />
-  </div>
+  </li>
 )
 
-const XoTask = ({ children, task }) => (
-  <div>
+const XoTask = ({ children, className, task }) => (
+  <li className={className}>
     <Icon icon='menu-xoa' /> XO <TaskStateInfos status={task.status} />
     <Warnings warnings={task.warnings} />
     {children}
@@ -215,22 +215,22 @@ const XoTask = ({ children, task }) => (
     <TaskEnd task={task} />
     <TaskDuration task={task} />
     <TaskError task={task} />
-  </div>
+  </li>
 )
 
-const SnapshotTask = ({ task }) => (
-  <div>
+const SnapshotTask = ({ className, task }) => (
+  <li className={className}>
     <Icon icon='task' /> {_('snapshotVmLabel')}{' '}
     <TaskStateInfos status={task.status} />
     <Warnings warnings={task.warnings} />
     <TaskStart task={task} />
     <TaskEnd task={task} />
     <TaskError task={task} />
-  </div>
+  </li>
 )
 
-const RemoteTask = ({ children, task }) => (
-  <div>
+const RemoteTask = ({ children, className, task }) => (
+  <li className={className}>
     <Remote id={task.data.id} link newTab />{' '}
     <TaskStateInfos status={task.status} />
     <Warnings warnings={task.warnings} />
@@ -239,11 +239,11 @@ const RemoteTask = ({ children, task }) => (
     <TaskEnd task={task} />
     <TaskDuration task={task} />
     <TaskError task={task} />
-  </div>
+  </li>
 )
 
-const SrTask = ({ children, task }) => (
-  <div>
+const SrTask = ({ children, className, task }) => (
+  <li className={className}>
     <Sr id={task.data.id} link newTab /> <TaskStateInfos status={task.status} />
     <Warnings warnings={task.warnings} />
     {children}
@@ -251,13 +251,17 @@ const SrTask = ({ children, task }) => (
     <TaskEnd task={task} />
     <TaskDuration task={task} />
     <TaskError task={task} />
-  </div>
+  </li>
 )
 
-const TransferMergeTask = ({ task }) => {
-  const size = get(() => task.result.size)
+const TransferMergeTask = ({ className, task }) => {
+  const size = defined(() => task.result.size, 0)
+  if (task.status === 'success' && size === 0) {
+    return null
+  }
+
   return (
-    <div>
+    <li className={className}>
       <Icon icon='task' /> {task.message}{' '}
       <TaskStateInfos status={task.status} />
       <Warnings warnings={task.warnings} />
@@ -275,7 +279,7 @@ const TransferMergeTask = ({ task }) => {
           )}
         </div>
       )}
-    </div>
+    </li>
   )
 }
 
@@ -293,7 +297,7 @@ const COMPONENT_BY_MESSAGE = {
   transfer: TransferMergeTask,
 }
 
-const TaskLi = ({ className, task, ...props }) => {
+const TaskLi = ({ task, ...props }) => {
   let Component
   if (
     (Component = defined(
@@ -305,11 +309,7 @@ const TaskLi = ({ className, task, ...props }) => {
   ) {
     return null
   }
-  return (
-    <li className={className}>
-      <Component task={task} {...props} />
-    </li>
-  )
+  return <Component task={task} {...props} />
 }
 
 const SEARCH_BAR_FILTERS = { name: 'name:' }