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 2A115654A3 for ; Mon, 7 Mar 2022 11:07:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1A76825A9D for ; Mon, 7 Mar 2022 11:07:27 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7F0C025A41 for ; Mon, 7 Mar 2022 11:07:25 +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 4E39146345 for ; Mon, 7 Mar 2022 11:07:25 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 7 Mar 2022 11:07:22 +0100 Message-Id: <20220307100722.257128-5-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220307100722.257128-1-a.lauterer@proxmox.com> References: <20220307100722.257128-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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 - Subject: [pve-devel] [PATCH v3 manager 4/4] 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: Mon, 07 Mar 2022 10:07:27 -0000 Signed-off-by: Aaron Lauterer --- changes since v2: * switch from generic window to proxmox edit 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 | 192 ++++++++++++++---------------- www/manager6/qemu/HardwareView.js | 1 + 2 files changed, 88 insertions(+), 105 deletions(-) diff --git a/www/manager6/qemu/HDMove.js b/www/manager6/qemu/HDMove.js index 181b7bdc..3e94479c 100644 --- a/www/manager6/qemu/HDMove.js +++ b/www/manager6/qemu/HDMove.js @@ -1,48 +1,102 @@ Ext.define('PVE.window.HDMove', { - extend: 'Ext.window.Window', + extend: 'Proxmox.window.Edit', + mixins: ['Proxmox.Mixin.CBind'], resizable: false, + modal: true, + width: 350, + border: false, + layout: 'fit', + showReset: false, + showProgress: true, + method: 'POST', + + cbindData: function() { + let me = this; + return { + disk: me.disk, + isQemu: me.type === 'qemu', + nodename: me.nodename, + url: `/nodes/${me.nodename}/${me.type}/${me.vmid}/`, + }; + }, + + cbind: { + title: get => get('isQemu') ? gettext("Move disk") : gettext('Move Volume'), + submitText: get => get('title'), + qemu: '{isQemu}', + url: '{url}', + }, + + submitUrl: function(url, values) { + url += this.qemu ? 'move_disk' : 'move_volume'; + return url; + }, + getValues: function() { + let me = this; + let values = me.formPanel.getForm().getValues(); - 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; + let params = { + storage: values.hdstorage, + }; + params[me.qemu ? 'disk':'volume'] = me.disk; - if (format && qemu) { - params.format = format; + if (values.diskformat && me.qemu) { + params.format = values.diskformat; } - if (delete_disk) { + if (values.deleteDisk) { params.delete = 1; } - - var url = '/nodes/' + me.nodename + '/' + me.type + '/' + me.vmid + '/'; - url += qemu ? 'move_disk' : 'move_volume'; - - Proxmox.Utils.API2Request({ - params: params, - url: url, - waitMsgTarget: me, - method: 'POST', - failure: function(response, opts) { - Ext.Msg.alert('Error', response.htmlStatus); - }, - 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(); }); - }, - }); + return params; }, + items: [ + { + xtype: 'form', + reference: 'moveFormPanel', + bodyPadding: 10, + border: false, + fieldDefaults: { + labelWidth: 100, + anchor: '100%', + }, + 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 +107,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 21f67cd0..cf1a67cd 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -410,6 +410,7 @@ Ext.define('PVE.qemu.HardwareView', { disk: rec.data.key, nodename: nodename, vmid: vmid, + type: 'qemu', }); win.show(); -- 2.30.2