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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9785DE6BA for ; Sat, 23 Apr 2022 11:38:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 89F2D2D5B4 for ; Sat, 23 Apr 2022 11:38:37 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id ED1E92D5A9 for ; Sat, 23 Apr 2022 11:38:36 +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 C4587427EF for ; Sat, 23 Apr 2022 11:38:36 +0200 (CEST) Message-ID: <29993f47-77f1-2701-e8d6-dd11a6b21a29@proxmox.com> Date: Sat, 23 Apr 2022 11:38:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101 Thunderbird/100.0 Content-Language: en-US To: Proxmox VE development discussion , Fabian Ebner References: <20220421112659.74011-1-f.ebner@proxmox.com> <20220421112659.74011-12-f.ebner@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20220421112659.74011-12-f.ebner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.614 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 NICE_REPLY_A -1.165 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH v2 manager 1/3] ui: restore: disallow empty storage selection if it wouldn't work X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2022 09:38:37 -0000 On 21.04.22 13:26, Fabian Ebner wrote: > Namely, if there is a storage in the backup configuration that's not > available on the current node. Better than the status quo, but in the long run all the "force all volumes to a single storage" on restore and also migrate isn't ideal for the case where one or more storages do not exist on the target node. An per-volume override would be nicer, but may require some gui adaptions to present that in a sensible way with good UX. > > Signed-off-by: Fabian Ebner > --- > > New in v2. > > www/manager6/window/Restore.js | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js > index e7b3e945..25babf89 100644 > --- a/www/manager6/window/Restore.js > +++ b/www/manager6/window/Restore.js > @@ -15,6 +15,40 @@ Ext.define('PVE.window.Restore', { > }, > }, > }, > + > + afterRender: function() { > + let view = this.getView(); > + > + Proxmox.Utils.API2Request({ > + url: `/nodes/${view.nodename}/vzdump/extractconfig`, > + method: 'GET', > + params: { > + volume: view.volid, > + }, > + failure: (response) => Ext.Msg.alert('Error', response.htmlStatus), nit: no parenthesis required for single parameter arrow fns > + success: function(response, options) { > + let storagesAvailable = true; > + > + response.result.data.split('\n').forEach(function(line) { style nit: makes no big difference but for new code we prefer arrow fns for inline closures. > + let match = line.match( > + /^#qmdump#map:(\S+):(\S+):(\S*):(\S*):$/, > + ); fits in 100 cc so would rather keep in in a single line > + if (match) { > + let currentAvailable = !!PVE.data.ResourceStore.getById( > + `storage/${view.nodename}/${match[3]}`, > + ); > + storagesAvailable = storagesAvailable && currentAvailable; JS has a &&= operator, so could be: storagesAvailable &&= !!PVE.data.ResourceStore.getById( `storage/${view.nodename}/${match[3]}`); but as we only want to do one thing if any storage is not available we could do: ``` let allStoragesAvailable = response.result.data.split('\n').every(line => { let match = line.match(/^#qmdump#map:(\S+):(\S+):(\S*):(\S*):$/); if (match) { return !!PVE.data.ResourceStore.getById(`storage/${view.nodename}/${match[3]}`); } return true; } if (!allStoragesAvailable) { // ... } ``` IMO a bit easier to follow. > + } > + }); > + > + if (!storagesAvailable) { > + let storagesel = view.down('pveStorageSelector[name=storage]'); > + storagesel.allowBlank = false; > + storagesel.setEmptyText(''); > + } > + }, > + }); > + }, > }, > > initComponent: function() {