public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v2] ui: dc/Cluster: show errors on 'join' info in the view
Date: Fri, 29 Oct 2021 11:14:08 +0200	[thread overview]
Message-ID: <20211029091408.1963182-1-d.csapak@proxmox.com> (raw)

so instead of getting the 'standalone node' message, the grid
is masked with the actual api error

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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





             reply	other threads:[~2021-10-29  9:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-29  9:14 Dominik Csapak [this message]
2021-11-07 20:04 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211029091408.1963182-1-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal