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 4321262891 for ; Tue, 22 Feb 2022 10:47:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3274422874 for ; Tue, 22 Feb 2022 10:46:42 +0100 (CET) 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 111DA22868 for ; Tue, 22 Feb 2022 10:46:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DB7D44250E; Tue, 22 Feb 2022 10:46:40 +0100 (CET) Message-ID: <74b6ba4f-922f-cfac-bb5f-d103fd90cba4@proxmox.com> Date: Tue, 22 Feb 2022 10:46:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:98.0) Gecko/20100101 Thunderbird/98.0 Content-Language: en-US To: Proxmox VE development discussion , Aaron Lauterer References: <20211115150209.717122-1-a.lauterer@proxmox.com> <20211115150209.717122-4-a.lauterer@proxmox.com> From: Dominik Csapak In-Reply-To: <20211115150209.717122-4-a.lauterer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.156 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 -0.001 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 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. [params.storage] Subject: Re: [pve-devel] [PATCH v2 manager] ui: hdmove: modernize/refactor 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: Tue, 22 Feb 2022 09:47:12 -0000 some comments inline On 11/15/21 16:02, Aaron Lauterer wrote: > Signed-off-by: Aaron Lauterer > --- > > changes since v1: much of the feedback to the HDReassign.js from the > first patch has been incorporated here as well. > > * reducing predefined cbind values for more arrow functions > * using more arrow functions in general > * template strings > > www/manager6/qemu/HDMove.js | 239 +++++++++++++++++------------- > www/manager6/qemu/HardwareView.js | 1 + > 2 files changed, 134 insertions(+), 106 deletions(-) > > diff --git a/www/manager6/qemu/HDMove.js b/www/manager6/qemu/HDMove.js > index 181b7bdc..210e6ce8 100644 > --- a/www/manager6/qemu/HDMove.js > +++ b/www/manager6/qemu/HDMove.js > @@ -1,48 +1,147 @@ > Ext.define('PVE.window.HDMove', { > extend: 'Ext.window.Window', > + mixins: ['Proxmox.Mixin.CBind'], > > resizable: false, > + modal: true, > + width: 350, > + border: false, > + layout: 'fit', > + > + cbindData: function() { > + let me = this; > + return { > + isQemu: me.type === 'qemu', > + disk: me.disk, > + nodename: me.nodename, > + }; > + }, > > + cbind: { > + title: get => get('isQemu') ? gettext("Move disk") : gettext('Move Volume'), > + }, > > - move_disk: function(disk, storage, format, delete_disk) { > - var me = this; > - var qemu = me.type === 'qemu'; > - var params = {}; > - params.storage = storage; > - params[qemu ? 'disk':'volume'] = disk; > - > - if (format && qemu) { > - params.format = format; > - } > - > - if (delete_disk) { > - params.delete = 1; > - } > + controller: { > + xclass: 'Ext.app.ViewController', > + > + move_disk: function(disk, storage, format, delete_disk) { as with the other patch, this should probably be 'moveDisk' > + let me = this; > + let view = me.getView(); > + let qemu = view.type === 'qemu'; > + let params = { > + storage: storage, > + }; > + params[qemu ? 'disk':'volume'] = disk; > + > + if (format && qemu) { > + params.format = format; > + } > + > + if (delete_disk) { > + params.delete = 1; > + } > + > + let url = `/nodes/${view.nodename}/${view.type}/${view.vmid}/`; > + url += qemu ? 'move_disk' : 'move_volume'; > + > + Proxmox.Utils.API2Request({ > + params: params, > + url: url, > + waitMsgTarget: me.getView(), > + method: 'POST', > + failure: function(response, opts) { > + Ext.Msg.alert('Error', response.htmlStatus); > + }, > + success: function(response, options) { > + let upid = response.result.data; > + Ext.create('Proxmox.window.TaskViewer', { > + upid: upid, > + autoShow: true, > + listeners: { > + destroy: () => view.close(), > + }, > + }); > + }, > + }); > + }, > + > + onMoveClick: function() { > + let me = this; > + let view = me.getView(); > + let form = me.lookup('moveFormPanel').getForm(); > + if (form.isValid()) { > + let values = form.getValues(); > + me.move_disk(view.disk, values.hdstorage, values.diskformat, > + values.deleteDisk); > + } > + }, > > - var url = '/nodes/' + me.nodename + '/' + me.type + '/' + me.vmid + '/'; > - url += qemu ? 'move_disk' : 'move_volume'; > + validateForm: function(fp, isValid) { imho the name is confusing, since it does not actually validate the form, but is called after the form was (succesfully or not) validated > + this.getView().lookup('submitButton').setDisabled(!isValid); > + }, > + }, > > - Proxmox.Utils.API2Request({ > - params: params, > - url: url, > - waitMsgTarget: me, > - method: 'POST', > - failure: function(response, opts) { > - Ext.Msg.alert('Error', response.htmlStatus); > + buttons: [ > + { > + xtype: 'button', > + reference: 'submitButton', > + cbind: { > + text: get => get('isQemu') ? gettext("Move disk") : gettext('Move Volume'), > }, > - success: function(response, options) { > - var upid = response.result.data; > - var win = Ext.create('Proxmox.window.TaskViewer', { > - upid: upid, > - }); > - win.show(); > - win.on('destroy', function() { me.close(); }); > + handler: 'onMoveClick', > + disabled: true, > + }, > + ], > + > + items: [ > + { > + xtype: 'form', > + reference: 'moveFormPanel', > + bodyPadding: 10, > + border: false, > + fieldDefaults: { > + labelWidth: 100, > + anchor: '100%', > }, > - }); > - }, > + listeners: { > + validitychange: 'validateForm', > + }, > + items: [ > + { > + xtype: 'displayfield', > + cbind: { > + name: get => get('isQemu') ? 'disk' : 'volume', > + fieldLabel: get => get('isQemu') > + ? gettext('Disk') > + : gettext('Mount Point'), > + value: '{disk}', > + }, > + vtype: 'StorageId', > + allowBlank: false, > + }, > + { > + xtype: 'pveDiskStorageSelector', > + storageLabel: gettext('Target Storage'), > + cbind: { > + nodename: '{nodename}', > + storageContent: get => get('isQemu') ? 'images' : 'rootdir', > + hideFormat: get => get('disk') === 'tpmstate0', > + }, > + hideSize: true, > + }, > + { > + xtype: 'proxmoxcheckbox', > + fieldLabel: gettext('Delete source'), > + name: 'deleteDisk', > + uncheckedValue: 0, > + checked: false, > + }, > + ], > + }, > + ], > > initComponent: function() { > - var me = this; > + let me = this; > > if (!me.nodename) { > throw "no node name specified"; > @@ -53,81 +152,9 @@ Ext.define('PVE.window.HDMove', { > } > > if (!me.type) { > - me.type = 'qemu'; > + throw "no type specified"; > } > > - var qemu = me.type === 'qemu'; > - > - var items = [ > - { > - xtype: 'displayfield', > - name: qemu ? 'disk' : 'volume', > - value: me.disk, > - fieldLabel: qemu ? gettext('Disk') : gettext('Mount Point'), > - vtype: 'StorageId', > - allowBlank: false, > - }, > - ]; > - > - items.push({ > - xtype: 'pveDiskStorageSelector', > - storageLabel: gettext('Target Storage'), > - nodename: me.nodename, > - storageContent: qemu ? 'images' : 'rootdir', > - hideSize: true, > - hideFormat: me.disk === 'tpmstate0', > - }); > - > - items.push({ > - xtype: 'proxmoxcheckbox', > - fieldLabel: gettext('Delete source'), > - name: 'deleteDisk', > - uncheckedValue: 0, > - checked: false, > - }); > - > - me.formPanel = Ext.create('Ext.form.Panel', { > - bodyPadding: 10, > - border: false, > - fieldDefaults: { > - labelWidth: 100, > - anchor: '100%', > - }, > - items: items, > - }); > - > - var form = me.formPanel.getForm(); > - > - var submitBtn; > - > - me.title = qemu ? gettext("Move disk") : gettext('Move Volume'); > - submitBtn = Ext.create('Ext.Button', { > - text: me.title, > - handler: function() { > - if (form.isValid()) { > - var values = form.getValues(); > - me.move_disk(me.disk, values.hdstorage, values.diskformat, > - values.deleteDisk); > - } > - }, > - }); > - > - Ext.apply(me, { > - modal: true, > - width: 350, > - border: false, > - layout: 'fit', > - buttons: [submitBtn], > - items: [me.formPanel], > - }); > - > - > me.callParent(); > - > - me.mon(me.formPanel, 'validitychange', function(fp, isValid) { > - submitBtn.setDisabled(!isValid); > - }); > - > - me.formPanel.isValid(); > }, > }); > diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js > index b76814e8..54946651 100644 > --- a/www/manager6/qemu/HardwareView.js > +++ b/www/manager6/qemu/HardwareView.js > @@ -415,6 +415,7 @@ Ext.define('PVE.qemu.HardwareView', { > disk: rec.data.key, > nodename: nodename, > vmid: vmid, > + type: 'qemu', > }); > > win.show();