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 }) =>
) : null
-const VmTask = ({ children, restartVmJob, task }) => (
-
+const VmTask = ({ children, className, restartVmJob, task }) => (
+
{' '}
{restartVmJob !== undefined && hasTaskFailed(task) && (
@@ -190,11 +190,11 @@ const VmTask = ({ children, restartVmJob, task }) => (
)}
{task.isFull !== undefined &&
_.keyValue(_('exportType'), task.isFull ? 'full' : 'delta')}
-
+
)
-const PoolTask = ({ children, task }) => (
-
+const PoolTask = ({ children, className, task }) => (
+
{' '}
@@ -203,11 +203,11 @@ const PoolTask = ({ children, task }) => (
-
+
)
-const XoTask = ({ children, task }) => (
-
+const XoTask = ({ children, className, task }) => (
+
XO
{children}
@@ -215,22 +215,22 @@ const XoTask = ({ children, task }) => (
-
+
)
-const SnapshotTask = ({ task }) => (
-
+const SnapshotTask = ({ className, task }) => (
+
{_('snapshotVmLabel')}{' '}
-
+
)
-const RemoteTask = ({ children, task }) => (
-
+const RemoteTask = ({ children, className, task }) => (
+
{' '}
@@ -239,11 +239,11 @@ const RemoteTask = ({ children, task }) => (
-
+
)
-const SrTask = ({ children, task }) => (
-
+const SrTask = ({ children, className, task }) => (
+
{children}
@@ -251,13 +251,17 @@ const SrTask = ({ children, task }) => (
-
+
)
-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 (
-
+
{task.message}{' '}
@@ -275,7 +279,7 @@ const TransferMergeTask = ({ task }) => {
)}
)}
-
+
)
}
@@ -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 (
-
-
-
- )
+ return
}
const SEARCH_BAR_FILTERS = { name: 'name:' }