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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with UTF8SMTPS id 1FC94641DB for ; Tue, 6 Oct 2020 08:56:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with UTF8SMTP id 0E24B226E2 for ; Tue, 6 Oct 2020 08:56:56 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with UTF8SMTPS id B36A8226D2 for ; Tue, 6 Oct 2020 08:56:54 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with UTF8SMTP id 714AC45808; Tue, 6 Oct 2020 08:56:54 +0200 (CEST) To: Thomas Lamprecht , Proxmox Backup Server development discussion References: <20201005134317.12425-1-d.csapak@proxmox.com> <20201005134317.12425-5-d.csapak@proxmox.com> From: Dominik Csapak Message-ID: Date: Tue, 6 Oct 2020 08:56:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101 Thunderbird/82.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.521 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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: Re: [pbs-devel] [PATCH proxmox-backup 5/7] 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 06:56:56 -0000 On 10/5/20 4:52 PM, Thomas Lamprecht wrote: > On 05.10.20 15:43, Dominik Csapak wrote: >> 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 >> --- >> www/dashboard/TaskSummary.js | 31 +++++++++++++++++++++---------- >> 1 file changed, 21 insertions(+), 10 deletions(-) >> >> diff --git a/www/dashboard/TaskSummary.js b/www/dashboard/TaskSummary.js >> index 0cf049cd..efbd011d 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'; >> @@ -42,16 +56,13 @@ Ext.define('PBS.TaskSummary', { >> >> updateTasks: function(data) { >> 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 = []; > > This introduces an linter error: > >> [./dashboard/TaskSummary.js]: >> ERR : line 60 col 6: null - Parsing error: Identifier 'data' has already been declared > > You're overwriting the function parameter "data" scope here. > >> + controller.types.forEach((type) => { >> + source[type].type = controller.titles[type]; > > "source" is not declared anywhere? ah yes, this went wrong when i separated the patches the function signature should be: updateTasks: function(source) { (after patch 7/7 it's ok again) i'll send a v2 later > >> + data.push(source[type]); >> + }); >> + me.lookup('grid').getStore().setData(data); >> }, >> >> layout: 'fit', >> >