[pbs-devel] [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary

[pbs-devel] [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary

[Dominik Csapak]

we want to count types 'prune' and 'prunejobs' for this

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/Dashboard.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/Dashboard.js b/www/Dashboard.js
index 4a7d84c4..64f15789 100644
--- a/www/Dashboard.js
+++ b/www/Dashboard.js
@@ -106,6 +106,10 @@ Ext.define('PBS.Dashboard', {
 		    type = 'verify';
 		}
 
+		if (type.startsWith('prune')) {
+		    type = 'prune';
+		}
+
 		if (data[type] && task.status) {
 		    let parsed = Proxmox.Utils.parse_task_status(task.status);
 		    data[type][parsed]++;
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores on task summary

[Dominik Csapak]

for that we have to increase the panel height a bit

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/Dashboard.js             | 10 ++++++++--
 www/dashboard/TaskSummary.js |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/www/Dashboard.js b/www/Dashboard.js
index 64f15789..8d6a8d8e 100644
--- a/www/Dashboard.js
+++ b/www/Dashboard.js
@@ -93,6 +93,8 @@ Ext.define('PBS.Dashboard', {
 		garbage_collection: { error: 0, warning: 0, ok: 0 },
 		sync: { error: 0, warning: 0, ok: 0 },
 		verify: { error: 0, warning: 0, ok: 0 },
+		'tape-backup': { error: 0, warning: 0, ok: 0 },
+		'tape-restore': { error: 0, warning: 0, ok: 0 },
 	    };
 
 	    records.forEach(record => {
@@ -110,6 +112,10 @@ Ext.define('PBS.Dashboard', {
 		    type = 'prune';
 		}
 
+		if (type.startsWith('tape-backup')) {
+		    type = 'tape-backup';
+		}
+
 		if (data[type] && task.status) {
 		    let parsed = Proxmox.Utils.parse_task_status(task.status);
 		    data[type][parsed]++;
@@ -258,13 +264,13 @@ Ext.define('PBS.Dashboard', {
 		Ext.String.format(gettext('{0} days'), '{days}') + ')',
 	    },
 	    xtype: 'pbsTaskSummary',
-	    height: 200,
+	    height: 250,
 	    reference: 'tasksummary',
 	},
 	{
 	    iconCls: 'fa fa-ticket',
 	    title: 'Subscription',
-	    height: 200,
+	    height: 250,
 	    reference: 'subscription',
 	    xtype: 'pbsSubscriptionInfo',
 	},
diff --git a/www/dashboard/TaskSummary.js b/www/dashboard/TaskSummary.js
index ac2b6292..68f6f6ef 100644
--- a/www/dashboard/TaskSummary.js
+++ b/www/dashboard/TaskSummary.js
@@ -17,6 +17,8 @@ Ext.define('PBS.TaskSummary', {
 	"garbage_collection",
 	"sync",
 	"verify",
+	"tape-backup",
+	"tape-restore",
     ],
 
     typeFilterMap: {
@@ -29,6 +31,8 @@ Ext.define('PBS.TaskSummary', {
 	"garbage_collection": gettext('Garbage collections'),
 	"sync": gettext('Syncs'),
 	"verify": gettext('Verify'),
+	"tape-backup": gettext('Tape Backup'),
+	"tape-restore": gettext('Tape Restore'),
     },
 
     // set true to show the onclick panel as modal grid
-- 
2.30.2

[pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary

[Thomas Lamprecht]

Am 03/05/2023 um 14:25 schrieb Dominik Csapak:
> we want to count types 'prune' and 'prunejobs' for this
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  www/Dashboard.js | 4 ++++
>  1 file changed, 4 insertions(+)
> 
>

applied, thanks!

[pbs-devel] applied: [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores on task summary

[Thomas Lamprecht]

Am 03/05/2023 um 14:25 schrieb Dominik Csapak:
> for that we have to increase the panel height a bit
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  www/Dashboard.js             | 10 ++++++++--
>  www/dashboard/TaskSummary.js |  4 ++++
>  2 files changed, 12 insertions(+), 2 deletions(-)
> 
>

applied, thanks!