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 9E02770E6E for ; Tue, 17 May 2022 08:52:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8DF592484A for ; Tue, 17 May 2022 08:52:18 +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 E37C524829 for ; Tue, 17 May 2022 08:52:16 +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 B61044366E for ; Tue, 17 May 2022 08:52:16 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 17 May 2022 08:52:13 +0200 Message-Id: <20220517065215.327699-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220517065215.327699-1-d.csapak@proxmox.com> References: <20220517065215.327699-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.119 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [activetasks.read] Subject: [pbs-devel] [PATCH proxmox-backup 3/5] ui: form/DataStoreSelector: show maintenance mode in selector 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, 17 May 2022 06:52:18 -0000 to not having to query the activeTasks everywhere, change the renderer to omit the check/spinner when no activeTasks are given Signed-off-by: Dominik Csapak --- www/Utils.js | 17 ++++++++++------- www/form/DataStoreSelector.js | 9 +++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/www/Utils.js b/www/Utils.js index 838b4511..b277cd99 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -662,14 +662,17 @@ Ext.define('PBS.Utils', { let [type, message] = PBS.Utils.parseMaintenanceMode(mode); - const conflictingTasks = activeTasks.write + (type === 'offline' ? activeTasks.read : 0); - let extra = ''; - if (conflictingTasks > 0) { - extra += '| '; - extra += Ext.String.format(gettext('{0} conflicting tasks still active.'), conflictingTasks); - } else { - extra += ''; + + if (activeTasks !== undefined) { + const conflictingTasks = activeTasks.write + (type === 'offline' ? activeTasks.read : 0); + + if (conflictingTasks > 0) { + extra += '| '; + extra += Ext.String.format(gettext('{0} conflicting tasks still active.'), conflictingTasks); + } else { + extra += ''; + } } if (message) { diff --git a/www/form/DataStoreSelector.js b/www/form/DataStoreSelector.js index a1471a84..90f20bee 100644 --- a/www/form/DataStoreSelector.js +++ b/www/form/DataStoreSelector.js @@ -29,6 +29,15 @@ Ext.define('PBS.form.DataStoreSelector', { renderer: Ext.String.htmlEncode, flex: 1, }, + { + header: gettext('Maintenance'), + sortable: true, + dataIndex: 'maintenance', + renderer: (value) => { + return PBS.Utils.renderMaintenance(value); + }, + flex: 1, + } ], }, }); -- 2.30.2