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 000F268AC6 for ; Thu, 22 Jul 2021 15:31:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F1B3611C95 for ; Thu, 22 Jul 2021 15:31:44 +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 id 0204111C8A for ; Thu, 22 Jul 2021 15:31:44 +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 B7CAB40BBE for ; Thu, 22 Jul 2021 15:31:43 +0200 (CEST) From: Fabian Ebner To: pmg-devel@lists.proxmox.com Date: Thu, 22 Jul 2021 15:31:39 +0200 Message-Id: <20210722133139.2341350-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.488 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-gui] dashboard: node status: use repo status widget from widget-toolkit X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 13:31:45 -0000 Signed-off-by: Fabian Ebner --- Depends on https://lists.proxmox.com/pipermail/pbs-devel/2021-July/003764.html and needs a dependency bump for it. js/Dashboard.js | 6 ++-- js/dashboard/NodeInfo.js | 72 ++-------------------------------------- 2 files changed, 7 insertions(+), 71 deletions(-) diff --git a/js/Dashboard.js b/js/Dashboard.js index 3d8bca3..03965c6 100644 --- a/js/Dashboard.js +++ b/js/Dashboard.js @@ -140,7 +140,8 @@ Ext.define('PMG.Dashboard', { var subscriptionPanel = me.lookup('subscription'); subscriptionPanel.setSubStatus(subStatus); - me.lookup('nodeInfo').setSubscriptionStatus(subStatus); + let repoStatus = me.lookup('nodeInfo').down('#repositoryStatus'); + repoStatus.setSubscriptionStatus(subStatus); // the node info already displays this information in case there is no cluster me.lookup('clusterResources').setHidden(records.length === 1); @@ -174,7 +175,8 @@ Ext.define('PMG.Dashboard', { } 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']); }, init: function(view) { diff --git a/js/dashboard/NodeInfo.js b/js/dashboard/NodeInfo.js index bdf8f85..7952d03 100644 --- a/js/dashboard/NodeInfo.js +++ b/js/dashboard/NodeInfo.js @@ -17,41 +17,6 @@ Ext.define('PMG.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'); - let repoLink = ` - - `; - return Proxmox.Utils.formatNodeRepoStatus(status, 'Proxmox Mail Gateway') + repoLink; - }, - }, - }, - items: [ { itemId: 'nodecpu', @@ -127,16 +92,10 @@ Ext.define('PMG.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 Mail Gateway', + repoLink: '#pmgServerAdministration:aptrepositories', }, ], @@ -146,31 +105,6 @@ Ext.define('PMG.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 || 0; - - 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; -- 2.30.2