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 F0ADC73200 for ; Mon, 5 Jul 2021 15:51:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CB221202D8 for ; Mon, 5 Jul 2021 15:50:41 +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 2DAE1202BD for ; Mon, 5 Jul 2021 15:50:40 +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 0326540BCF for ; Mon, 5 Jul 2021 15:50:40 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 5 Jul 2021 15:50:32 +0200 Message-Id: <20210705135033.101390-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210705135033.101390-1-f.ebner@proxmox.com> References: <20210705135033.101390-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.573 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: [pve-devel] [RFC proxmox-widget-toolkit 2/2] node: repos: show components warnings from the backend 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 Jul 2021 13:51:41 -0000 There's no need to show anything new in the top status, as the test and no-subscription repository already trigger a message. Signed-off-by: Fabian Ebner --- Depends on the new backend behavior. I felt like this was a good fit for using the existing info/warnings mechanism again, so I didn't go for what the FIXME suggested, but I can switch and use that approach if preferred. src/node/APTRepositories.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/node/APTRepositories.js b/src/node/APTRepositories.js index e9e8d92..13e19a1 100644 --- a/src/node/APTRepositories.js +++ b/src/node/APTRepositories.js @@ -307,21 +307,23 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', { if (components === undefined) { return ''; } - let err = ''; - if (components.length === 1) { - // FIXME: this should be a flag set to the actual repsotiories, i.e., a tristate - // like production-ready = (Option) - if (components[0].match(/\w+(-no-subscription|test)\s*$/i)) { - metaData.tdCls = 'proxmox-warning-row'; - err = ' '; - let qtip = components[0].match(/no-subscription/) - ? gettext('The no-subscription repository is NOT production-ready') - : gettext('The test repository may contain unstable updates') - ; - metaData.tdAttr = `data-qtip="${Ext.htmlEncode(qtip)}"`; - } + if (!record.data.warnings) { + return components.join(' '); } + + const warningTexts = record.data.warnings.filter( + warning => warning.property === 'Components', + ).map(warning => warning.message); + + let err = ''; + if (warningTexts.length > 0) { + const qtip = warningTexts.join('
'); + metaData.tdCls = 'proxmox-warning-row'; + err = ' '; + metaData.tdAttr = `data-qtip="${Ext.htmlEncode(qtip)}"`; + } + return components.join(' ') + err; }, width: 170, -- 2.30.2