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 D9E65CD59 for ; Tue, 19 Sep 2023 15:38:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C235DB482 for ; Tue, 19 Sep 2023 15:38:29 +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, 19 Sep 2023 15:38:29 +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 E806F47FCC for ; Tue, 19 Sep 2023 15:38:28 +0200 (CEST) Message-ID: <3ac692ba-d767-4443-8382-4edafe1ecc6d@proxmox.com> Date: Tue, 19 Sep 2023 15:38:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Lukas Wagner To: Proxmox Backup Server development discussion , Hannes Laimer References: <20230915065457.352953-1-h.laimer@proxmox.com> <20230915065457.352953-12-h.laimer@proxmox.com> Content-Language: de-AT, en-US In-Reply-To: <20230915065457.352953-12-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.032 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup 11/23] ui: add (un)mount button to summary 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, 19 Sep 2023 13:38:29 -0000 Same nit as in 10/23 regarding the use of `const` On 9/15/23 08:54, Hannes Laimer wrote: > And only try to load datastore information if the datastore is > available. > > Signed-off-by: Hannes Laimer > --- > www/datastore/Summary.js | 88 ++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 84 insertions(+), 4 deletions(-) > > diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js > index d67e81cc..dfff6e7f 100644 > --- a/www/datastore/Summary.js > +++ b/www/datastore/Summary.js > @@ -218,8 +218,6 @@ Ext.define('PBS.DataStoreSummary', { > padding: 5, > }, > > - tbar: ['->', { xtype: 'proxmoxRRDTypeSelector' }], > - > items: [ > { > xtype: 'container', > @@ -292,7 +290,76 @@ Ext.define('PBS.DataStoreSummary', { > model: 'pve-rrd-datastore', > }); > > - me.callParent(); > + me.statusStore = Ext.create('Proxmox.data.ObjectStore', { > + url: `/api2/json/admin/datastore/${me.datastore}/status`, > + interval: 1000, > + }); > + > + let unmountBtn = Ext.create('Ext.Button', { > + text: gettext('Unmount'), > + hidden: true, > + handler: () => { > + Proxmox.Utils.API2Request({ > + url: `/admin/datastore/${me.datastore}/unmount`, > + method: 'POST', > + failure: function(response) { > + Ext.Msg.alert(gettext('Error'), response.htmlStatus); > + }, > + success: function(response, options) { > + Ext.create('Proxmox.window.TaskViewer', { > + upid: response.result.data, > + }).show(); > + }, > + }); > + }, > + }); > + > + let mountBtn = Ext.create('Ext.Button', { > + text: gettext('Mount'), > + hidden: true, > + handler: () => { > + Proxmox.Utils.API2Request({ > + url: `/admin/datastore/${me.datastore}/mount`, > + method: 'POST', > + failure: function(response) { > + Ext.Msg.alert(gettext('Error'), response.htmlStatus); > + }, > + success: function(response, options) { > + Ext.create('Proxmox.window.TaskViewer', { > + upid: response.result.data, > + }).show(); > + }, > + }); > + }, > + }); > + > + Ext.apply(me, { > + tbar: [unmountBtn, mountBtn, '->', { xtype: 'proxmoxRRDTypeSelector' }], > + }); > + > + me.mon(me.statusStore, 'load', (s, records, success) => { > + if (!success) { > + me.down('pbsDataStoreInfo').fireEvent('deactivate'); > + Proxmox.Utils.API2Request({ > + url: `/config/datastore/${me.datastore}`, > + success: response => { > + if (!response.result.data['backing-device']) { > + return; > + } > + const maintenanceString = response.result.data['maintenance-mode']; > + const [type, _msg] = PBS.Utils.parseMaintenanceMode(maintenanceString); > + const isUnplugged = type === 'unplugged'; > + > + unmountBtn.setDisabled(isUnplugged); > + mountBtn.setDisabled(!isUnplugged); > + }, > + }); > + } else { > + me.down('pbsDataStoreInfo').fireEvent('activate'); > + unmountBtn.setDisabled(false); > + mountBtn.setDisabled(true); > + } > + }); > > let sp = Ext.state.Manager.getProvider(); > me.mon(sp, 'statechange', function(provider, key, value) { > @@ -305,11 +372,17 @@ Ext.define('PBS.DataStoreSummary', { > Proxmox.Utils.updateColumns(me); > }); > > + me.callParent(); > + > Proxmox.Utils.API2Request({ > url: `/config/datastore/${me.datastore}`, > waitMsgTarget: me.down('pbsDataStoreInfo'), > success: function(response) { > - let path = Ext.htmlEncode(response.result.data.path); > + let data = response.result.data; > + let path = Ext.htmlEncode(data.path); > + const removable = Object.prototype.hasOwnProperty.call(data, "backing-device"); > + unmountBtn.setHidden(!removable); > + mountBtn.setHidden(!removable); > me.down('pbsDataStoreInfo').setTitle(`${me.datastore} (${path})`); > me.down('pbsDataStoreNotes').setNotes(response.result.data.comment); > }, > @@ -327,6 +400,13 @@ Ext.define('PBS.DataStoreSummary', { > let hasIoTicks = records?.some((rec) => rec?.data?.io_ticks !== undefined); > me.down('#ioDelayChart').setVisible(!success || hasIoTicks); > }, undefined, { single: true }); > + me.on('afterrender', () => { > + me.statusStore.startUpdate(); > + }); > + > + me.on('destroy', () => { > + me.statusStore.stopUpdate(); > + }); > > me.query('proxmoxRRDChart').forEach((chart) => { > chart.setStore(me.rrdstore); -- - Lukas