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 2C7F29D9D3 for ; Mon, 5 Jun 2023 17:43:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 08DAB2A509 for ; Mon, 5 Jun 2023 17:43:24 +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 ; Mon, 5 Jun 2023 17:43: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 7989948A11 for ; Mon, 5 Jun 2023 17:43:22 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 5 Jun 2023 17:43:11 +0200 Message-Id: <20230605154313.181289-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230605154313.181289-1-f.ebner@proxmox.com> References: <20230605154313.181289-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.048 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: [pve-devel] [PATCH widget-toolkit 3/5] apt repositories: add classifyOrigin helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jun 2023 15:43:54 -0000 to be used again to detect mixed repositories before upgrade. Needed to convert into an actual function for the 'this' usage. Signed-off-by: Fiona Ebner --- src/node/APTRepositories.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/node/APTRepositories.js b/src/node/APTRepositories.js index ed58e5b..5971bd8 100644 --- a/src/node/APTRepositories.js +++ b/src/node/APTRepositories.js @@ -343,14 +343,15 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', { header: gettext('Origin'), dataIndex: 'Origin', width: 120, - renderer: (value, meta, rec) => { + renderer: function(value, meta, rec) { if (typeof value !== 'string' || value.length === 0) { value = gettext('Other'); } let cls = 'fa fa-fw fa-question-circle-o'; - if (value.match(/^\s*Proxmox\s*$/i)) { + let originType = this.up('proxmoxNodeAPTRepositories').classifyOrigin(value); + if (originType === 'Proxmox') { cls = 'pmx-itype-icon pmx-itype-icon-proxmox-x'; - } else if (value.match(/^\s*Debian\s*(:?Backports)?$/i)) { + } else if (originType === 'Debian') { cls = 'pmx-itype-icon pmx-itype-icon-debian-swirl'; } return ` ${value}`; @@ -404,6 +405,15 @@ Ext.define('Proxmox.node.APTRepositories', { product: 'Proxmox VE', // default + classifyOrigin: function(origin) { + if (origin.match(/^\s*Proxmox\s*$/i)) { + return 'Proxmox'; + } else if (origin.match(/^\s*Debian\s*(:?Backports)?$/i)) { + return 'Debian'; + } + return 'Other'; + }, + controller: { xclass: 'Ext.app.ViewController', -- 2.39.2