From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EFFB599C98 for ; Wed, 3 May 2023 14:25:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C9DDBA8BE for ; Wed, 3 May 2023 14:25:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 3 May 2023 14:25:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 456BA43096 for ; Wed, 3 May 2023 14:25:22 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 3 May 2023 14:25:18 +0200 Message-Id: <20230503122518.1800721-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230503122518.1800721-1-d.csapak@proxmox.com> References: <20230503122518.1800721-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup 2/2] ui: dashboard: show tape backups/restores on task summary X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2023 12:25:54 -0000 for that we have to increase the panel height a bit Signed-off-by: Dominik Csapak --- 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