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 C4FD3827CE for ; Tue, 30 Nov 2021 10:21:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BB2F014409 for ; Tue, 30 Nov 2021 10:21:16 +0100 (CET) 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 id 19A86143E0 for ; Tue, 30 Nov 2021 10:21:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E0E2244689 for ; Tue, 30 Nov 2021 10:21:15 +0100 (CET) To: pbs-devel@lists.proxmox.com References: <20210722132735.2260448-1-f.ebner@proxmox.com> <20210722132735.2260448-2-f.ebner@proxmox.com> From: Fabian Ebner Message-ID: <7c917503-310b-76c4-7c05-433466f24288@proxmox.com> Date: Tue, 30 Nov 2021 10:21:10 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210722132735.2260448-2-f.ebner@proxmox.com> 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.832 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -1.317 Looks like a legit reply (A) 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 1/1] ui: dashboard: node status: use repo status widget from widget-toolkit 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, 30 Nov 2021 09:21:16 -0000 Ping. Still applies and a quick re-test seemed fine. Am 22.07.21 um 15:27 schrieb Fabian Ebner: > Signed-off-by: Fabian Ebner > --- > www/Dashboard.js | 7 +++-- > www/panel/NodeInfo.js | 68 ++----------------------------------------- > 2 files changed, 8 insertions(+), 67 deletions(-) > > diff --git a/www/Dashboard.js b/www/Dashboard.js > index 70c2305b..7d3244fd 100644 > --- a/www/Dashboard.js > +++ b/www/Dashboard.js > @@ -62,7 +62,8 @@ Ext.define('PBS.Dashboard', { > updateRepositoryStatus: function(store, records, success) { > if (!success) { return; } > let me = this; > - me.lookup('nodeInfo').setRepositoryInfo(records[0].data['standard-repos']); > + let repoStatus = me.lookup('nodeInfo').down('#repositoryStatus'); > + repoStatus.setRepositoryInfo(records[0].data['standard-repos']); > }, > > updateSubscription: function(store, records, success) { > @@ -72,7 +73,9 @@ Ext.define('PBS.Dashboard', { > // 2 = all good, 1 = different leves, 0 = none > let subStatus = status.toLowerCase() === 'active' ? 2 : 0; > me.lookup('subscription').setSubStatus(subStatus); > - me.lookup('nodeInfo').setSubscriptionStatus(subStatus); > + > + let repoStatus = me.lookup('nodeInfo').down('#repositoryStatus'); > + repoStatus.setSubscriptionStatus(subStatus); > }, > > updateTasks: function(store, records, success) { > diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js > index ff96e8fc..f41eb3a3 100644 > --- a/www/panel/NodeInfo.js > +++ b/www/panel/NodeInfo.js > @@ -20,37 +20,6 @@ Ext.define('PBS.NodeInfoPanel', { > padding: '0 10 5 10', > }, > > - viewModel: { > - data: { > - subscriptionActive: '', > - noSubscriptionRepo: '', > - enterpriseRepo: '', > - testRepo: '', > - }, > - formulas: { > - repoStatus: function(get) { > - if (get('subscriptionActive') === '' || get('enterpriseRepo') === '') { > - return ''; > - } > - > - if (get('noSubscriptionRepo') || get('testRepo')) { > - return 'non-production'; > - } else if (get('subscriptionActive') && get('enterpriseRepo')) { > - return 'ok'; > - } else if (!get('subscriptionActive') && get('enterpriseRepo')) { > - return 'no-sub'; > - } else if (!get('enterpriseRepo') || !get('noSubscriptionRepo') || !get('testRepo')) { > - return 'no-repo'; > - } > - return 'unknown'; > - }, > - repoStatusMessage: function(get) { > - const status = get('repoStatus'); > - return Proxmox.Utils.formatNodeRepoStatus(status, 'Proxmox Backup Server'); > - }, > - }, > - }, > - > controller: { > xclass: 'Ext.app.ViewController', > > @@ -179,16 +148,10 @@ Ext.define('PBS.NodeInfoPanel', { > value: '', > }, > { > + xtype: 'pmxNodeInfoRepoStatus', > itemId: 'repositoryStatus', > - colspan: 2, > - printBar: false, > - title: gettext('Repository Status'), > - setValue: function(value) { // for binding below > - this.updateValue(value); > - }, > - bind: { > - value: '{repoStatusMessage}', > - }, > + product: 'Proxmox Backup Server', > + repoLink: '#pbsServerAdministration:aptrepositories', > }, > ], > > @@ -198,31 +161,6 @@ Ext.define('PBS.NodeInfoPanel', { > me.setTitle(Proxmox.NodeName + ' (' + gettext('Uptime') + ': ' + uptime + ')'); > }, > > - setRepositoryInfo: function(standardRepos) { > - let me = this; > - let vm = me.getViewModel(); > - > - for (const standardRepo of standardRepos) { > - const handle = standardRepo.handle; > - const status = standardRepo.status; > - > - if (handle === "enterprise") { > - vm.set('enterpriseRepo', status); > - } else if (handle === "no-subscription") { > - vm.set('noSubscriptionRepo', status); > - } else if (handle === "test") { > - vm.set('testRepo', status); > - } > - } > - }, > - > - setSubscriptionStatus: function(status) { > - let me = this; > - let vm = me.getViewModel(); > - > - vm.set('subscriptionActive', status); > - }, > - > initComponent: function() { > let me = this; > >