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 D5102642F6 for ; Tue, 6 Oct 2020 12:26:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C8F992474D for ; Tue, 6 Oct 2020 12:25:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 3051524723 for ; Tue, 6 Oct 2020 12:25:29 +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 E402745BC6 for ; Tue, 6 Oct 2020 12:25:28 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 6 Oct 2020 12:25:26 +0200 Message-Id: <20201006102528.15383-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201006102528.15383-1-d.csapak@proxmox.com> References: <20201006102528.15383-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.515 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v2 4/6] ui: Dashboard/TaskSummary: refactor types and title 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: Tue, 06 Oct 2020 10:26:00 -0000 by moving the definition into the controller and dynamically use them in the updateTasks function we will reuse/extend this later Signed-off-by: Dominik Csapak --- changes from v1: * correctly change function signature www/dashboard/TaskSummary.js | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/www/dashboard/TaskSummary.js b/www/dashboard/TaskSummary.js index 0cf049cd..c5095751 100644 --- a/www/dashboard/TaskSummary.js +++ b/www/dashboard/TaskSummary.js @@ -7,6 +7,20 @@ Ext.define('PBS.TaskSummary', { controller: { xclass: 'Ext.app.ViewController', + types: [ + "backup", + "prune", + "garbage_collection", + "sync", + ], + + titles: { + "backup": gettext('Backups'), + "prune": gettext('Prunes'), + "garbage_collection": gettext('Garbage collections'), + "sync": gettext('Syncs'), + }, + render_icon: function(state, count) { let cls = 'question'; let color = 'faded'; @@ -40,18 +54,15 @@ Ext.define('PBS.TaskSummary', { }, }, - updateTasks: function(data) { + updateTasks: function(source) { let me = this; - data.backup.type = gettext('Backups'); - data.prune.type = gettext('Prunes'); - data.garbage_collection.type = gettext('Garbage collections'); - data.sync.type = gettext('Syncs'); - me.lookup('grid').getStore().setData([ - data.backup, - data.prune, - data.garbage_collection, - data.sync, - ]); + let controller = me.getController(); + let data = []; + controller.types.forEach((type) => { + source[type].type = controller.titles[type]; + data.push(source[type]); + }); + me.lookup('grid').getStore().setData(data); }, layout: 'fit', -- 2.20.1