* [pbs-devel] [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary @ 2023-05-03 12:25 Dominik Csapak 2023-05-03 12:25 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores " Dominik Csapak 2023-05-17 9:24 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs " Thomas Lamprecht 0 siblings, 2 replies; 4+ messages in thread From: Dominik Csapak @ 2023-05-03 12:25 UTC (permalink / raw) To: pbs-devel 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores on task summary 2023-05-03 12:25 [pbs-devel] [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary Dominik Csapak @ 2023-05-03 12:25 ` Dominik Csapak 2023-05-17 9:24 ` [pbs-devel] applied: " Thomas Lamprecht 2023-05-17 9:24 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs " Thomas Lamprecht 1 sibling, 1 reply; 4+ messages in thread From: Dominik Csapak @ 2023-05-03 12:25 UTC (permalink / raw) To: pbs-devel 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores on task summary 2023-05-03 12:25 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores " Dominik Csapak @ 2023-05-17 9:24 ` Thomas Lamprecht 0 siblings, 0 replies; 4+ messages in thread From: Thomas Lamprecht @ 2023-05-17 9:24 UTC (permalink / raw) To: Proxmox Backup Server development discussion, Dominik Csapak 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! ^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary 2023-05-03 12:25 [pbs-devel] [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary Dominik Csapak 2023-05-03 12:25 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores " Dominik Csapak @ 2023-05-17 9:24 ` Thomas Lamprecht 1 sibling, 0 replies; 4+ messages in thread From: Thomas Lamprecht @ 2023-05-17 9:24 UTC (permalink / raw) To: Proxmox Backup Server development discussion, Dominik Csapak 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! ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-17 9:24 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-05-03 12:25 [pbs-devel] [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs on task summary Dominik Csapak 2023-05-03 12:25 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores " Dominik Csapak 2023-05-17 9:24 ` [pbs-devel] applied: " Thomas Lamprecht 2023-05-17 9:24 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: dashboard: fix missing prune jobs " Thomas Lamprecht
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox