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 8814BD388 for ; Fri, 15 Apr 2022 09:28:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 788211BFC for ; Fri, 15 Apr 2022 09:28:26 +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 3F85C1BA3 for ; Fri, 15 Apr 2022 09:28:24 +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 15C3741E77 for ; Fri, 15 Apr 2022 09:28:24 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 15 Apr 2022 07:28:14 +0000 Message-Id: <20220415072817.14768-2-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415072817.14768-1-h.laimer@proxmox.com> References: <20220415072817.14768-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 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 KAM_SHORT 0.001 Use of a URL Shortener for very short URL SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup 1/4] ui: add summary mask when in maintenance mode 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: Fri, 15 Apr 2022 07:28:56 -0000 Signed-off-by: Hannes Laimer --- www/Makefile | 1 + www/css/ext6-pbs.css | 7 +++++++ www/datastore/Summary.js | 24 +++++++++++++++++++++++- www/images/icon-maintenance.svg | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 www/images/icon-maintenance.svg diff --git a/www/Makefile b/www/Makefile index 0952fb82..1331cff3 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,6 +1,7 @@ include ../defines.mk IMAGES := \ + images/icon-maintenance.svg \ images/icon-tape.svg \ images/icon-tape-drive.svg \ images/logo-128.png \ diff --git a/www/css/ext6-pbs.css b/www/css/ext6-pbs.css index f283bf0b..2edfa59e 100644 --- a/www/css/ext6-pbs.css +++ b/www/css/ext6-pbs.css @@ -257,6 +257,13 @@ span.snapshot-comment-column { font-weight: 800; } +.pbs-maintenance-mask div.x-mask-msg-text { + padding-top: 33px; + background-repeat: no-repeat; + background-size: 28px; + background-image:url(../images/icon-maintenance.svg); +} + /*' PBS specific icons */ .pbs-icon-tape { diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js index c3769257..d2f3c18a 100644 --- a/www/datastore/Summary.js +++ b/www/datastore/Summary.js @@ -42,8 +42,30 @@ Ext.define('PBS.DataStoreInfo', { xclass: 'Ext.app.ViewController', onLoad: function(store, data, success) { - if (!success) return; let me = this; + if (!success) { + Proxmox.Utils.API2Request({ + url: `/config/datastore/${me.view.datastore}`, + success: function(response) { + const config = response.result.data; + if (config['maintenance-mode']) { + const [_type, msg] = config['maintenance-mode'].split(/,(.+)/); + const message = msg ? ': ' + msg.split("=")[1] + .replace(/^"(.*)"$/, '$1') + .replaceAll('\\"', '"') : ''; + me.view.el.mask( + `${gettext('Datastore is in maintenance mode')}${message}`, + 'pbs-maintenance-mask', + ); + } else { + me.view.el.mask(gettext('Datastore is not available')); + } + }, + }); + return; + } + me.view.el.unmask(); + let vm = me.getViewModel(); let counts = store.getById('counts').data.value; diff --git a/www/images/icon-maintenance.svg b/www/images/icon-maintenance.svg new file mode 100644 index 00000000..7cd369d9 --- /dev/null +++ b/www/images/icon-maintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file -- 2.30.2