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 4D9647B132 for ; Fri, 29 Oct 2021 11:14:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3B094B301 for ; Fri, 29 Oct 2021 11:14:10 +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 9E347B2F8 for ; Fri, 29 Oct 2021 11:14:09 +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 7201642994 for ; Fri, 29 Oct 2021 11:14:09 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 29 Oct 2021 11:14:08 +0200 Message-Id: <20211029091408.1963182-1-d.csapak@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.259 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 manager v2] ui: dc/Cluster: show errors on 'join' info in the view 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, 29 Oct 2021 09:14:10 -0000 so instead of getting the 'standalone node' message, the grid is masked with the actual api error Signed-off-by: Dominik Csapak --- changes from v1: * only show error if it does not match the 'standalone' error not sure if matching the *exact* error message is very robust, but AFAICS, this did not change for a while now, and even if we'd change it, it would be very apparent, as we could not create a cluster in the gui anymore. www/manager6/dc/Cluster.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/manager6/dc/Cluster.js b/www/manager6/dc/Cluster.js index 12fd9468..10834b66 100644 --- a/www/manager6/dc/Cluster.js +++ b/www/manager6/dc/Cluster.js @@ -62,9 +62,15 @@ Ext.define('PVE.ClusterAdministration', { view.on('destroy', view.store.stopUpdate); }, - onLoad: function(store, records, success) { + onLoad: function(store, records, success, operation) { let vm = this.getViewModel(); if (!success || !records || !records[0].data) { + let error = operation.getError(); + let msg = Proxmox.Utils.getResponseErrorMessage(error); + if (msg !== 'node is not in a cluster, no join info available! (500)') { + // show the real message + Proxmox.Utils.setErrorMask(this.getView(), msg); + } vm.set('totem', {}); vm.set('isInCluster', false); vm.set('nodelist', []); -- 2.30.2