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 61B4A7491D; Fri, 9 Jul 2021 14:44:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5DF5B25D93; Fri, 9 Jul 2021 14:44:21 +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 C6BF025D89; Fri, 9 Jul 2021 14:44:20 +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 9A02A40AFB; Fri, 9 Jul 2021 14:44:20 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 9 Jul 2021 14:44:15 +0200 Message-Id: <20210709124416.129299-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210709124416.129299-1-f.ebner@proxmox.com> References: <20210709124416.129299-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.526 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] [PATCH pve-manager 1/1] ui: node status: use helper for formatting repository status 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: Fri, 09 Jul 2021 12:44:21 -0000 Signed-off-by: Fabian Ebner --- Dependency bump for widget-toolkit is needed. www/manager6/node/StatusView.js | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/www/manager6/node/StatusView.js b/www/manager6/node/StatusView.js index d7a08529..3c52ce95 100644 --- a/www/manager6/node/StatusView.js +++ b/www/manager6/node/StatusView.js @@ -27,26 +27,7 @@ Ext.define('PVE.node.StatusView', { return 'unknown'; }, repoStatusMessage: function(get) { - const status = get('repoStatus'); - - let fmt = (txt, cls) => `${txt}`; - - let getUpdates = Ext.String.format(gettext('{0} updates'), 'Proxmox VE'); - - if (status === 'ok') { - return fmt(getUpdates, 'check-circle good') + ' ' + - fmt(gettext('Production-ready Enterprise repository enabled'), 'check-circle good'); - } else if (status === 'no-sub') { - return fmt(gettext('Production-ready Enterprise repository enabled'), 'check-circle good') + ' ' + - fmt(gettext('Enterprise repository needs valid subscription'), 'exclamation-circle warning'); - } else if (status === 'non-production') { - return fmt(getUpdates, 'check-circle good') + ' ' + - fmt(gettext('Non production-ready repository enabled!'), 'exclamation-circle warning'); - } else if (status === 'no-repo') { - return fmt(gettext('No Proxmox VE repository enabled!'), 'exclamation-circle critical'); - } - - return Proxmox.Utils.unknownText; + return Proxmox.Utils.formatNodeRepoStatus(get('repoStatus'), 'Proxmox VE'); }, }, }, -- 2.30.2