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 8353C9715A for ; Tue, 16 Apr 2024 17:25:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE3AE1ECA4 for ; Tue, 16 Apr 2024 17:24:33 +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 ; Tue, 16 Apr 2024 17:24:32 +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 3DF0345A4D for ; Tue, 16 Apr 2024 17:24:30 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 17:24:15 +0200 Message-Id: <20240416152416.96561-22-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416152416.96561-1-h.laimer@proxmox.com> References: <20240416152416.96561-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.055 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 PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v4 21/22] ui: add datastore status mask for unplugged removable datastores X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2024 15:25:29 -0000 Signed-off-by: Hannes Laimer --- www/css/ext6-pbs.css | 12 ++++++++++++ www/datastore/Summary.js | 21 +++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css index 706e681e..891189ae 100644 --- a/www/css/ext6-pbs.css +++ b/www/css/ext6-pbs.css @@ -261,6 +261,18 @@ span.snapshot-comment-column { content: "\f0ad"; } +.pbs-unplugged-mask div.x-mask-msg-text { + background: None; + padding: 12px 0 0; +} + +.pbs-unplugged-mask:before { + font-size: 3em; + display: flex; + justify-content: center; + content: "\f1e6"; +} + /* the small icons TODO move to proxmox-widget-toolkit */ .pmx-tree-icon-custom:after { position: relative; diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js index ee8bad16..d1c515b0 100644 --- a/www/datastore/Summary.js +++ b/www/datastore/Summary.js @@ -61,16 +61,21 @@ Ext.define('PBS.DataStoreInfo', { Proxmox.Utils.API2Request({ url: `/config/datastore/${me.view.datastore}`, success: function(response) { - const config = response.result.data; - if (config['maintenance-mode']) { - const [_type, msg] = PBS.Utils.parseMaintenanceMode(config['maintenance-mode']); - me.view.el.mask( - `${gettext('Datastore is in maintenance mode')}${msg ? ': ' + msg : ''}`, - 'fa pbs-maintenance-mask', - ); - } else { + let maintenanceString = response.result.data['maintenance-mode']; + let removable = !!response.result.data['backing-device']; + if (!maintenanceString && !removable) { me.view.el.mask(gettext('Datastore is not available')); + return; } + + let [_type, msg] = PBS.Utils.parseMaintenanceMode(maintenanceString); + let isUnplugged = !maintenanceString && removable; + let maskMessage = isUnplugged + ? gettext('Datastore is not mounted') + : `${gettext('Datastore is in maintenance mode')}${msg ? ': ' + msg : ''}`; + + let maskIcon = isUnplugged ? 'fa pbs-unplugged-mask' : 'fa pbs-maintenance-mask'; + me.view.el.mask(maskMessage, maskIcon); }, }); return; -- 2.39.2