From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v3 2/6] ui: vm: improve code readability of CDROM and CloudInit edit modals
Date: Wed, 23 Oct 2024 14:37:18 +0200 [thread overview]
Message-ID: <20241023123722.124478-3-d.kral@proxmox.com> (raw)
In-Reply-To: <20241023123722.124478-1-d.kral@proxmox.com>
Improves the readability of the CDROM and CloudInit edit modals by
making them consistent with each other, i.e. having more readable
variable names and storing significant subcomponents in variables.
This does not intend any functional changes in the behavior or
appearance of either component.
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
www/manager6/qemu/CDEdit.js | 14 ++++-----
www/manager6/qemu/CIDriveEdit.js | 54 ++++++++++++++++++--------------
2 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js
index fd8e5233..d26d8631 100644
--- a/www/manager6/qemu/CDEdit.js
+++ b/www/manager6/qemu/CDEdit.js
@@ -27,8 +27,8 @@ Ext.define('PVE.qemu.CDInputPanel', {
setVMConfig: function(vmconfig) {
let me = this;
- if (me.bussel) {
- me.bussel.setVMConfig(vmconfig, 'cdrom');
+ if (me.busSelector) {
+ me.busSelector.setVMConfig(vmconfig, 'cdrom');
}
},
@@ -54,7 +54,7 @@ Ext.define('PVE.qemu.CDInputPanel', {
setNodename: function(nodename) {
let me = this;
- me.isosel.setNodename(nodename);
+ me.isoSelector.setNodename(nodename);
},
initComponent: function() {
@@ -65,10 +65,10 @@ Ext.define('PVE.qemu.CDInputPanel', {
let items = [];
if (!me.confid) {
- me.bussel = Ext.create('PVE.form.ControllerSelector', {
+ me.busSelector = Ext.create('PVE.form.ControllerSelector', {
withVirtIO: false,
});
- items.push(me.bussel);
+ items.push(me.busSelector);
}
items.push({
@@ -94,13 +94,13 @@ Ext.define('PVE.qemu.CDInputPanel', {
});
- me.isosel = Ext.create('PVE.form.IsoSelector', {
+ me.isoSelector = Ext.create('PVE.form.IsoSelector', {
nodename: me.nodename,
insideWizard: me.insideWizard,
name: 'cdimage',
});
- items.push(me.isosel);
+ items.push(me.isoSelector);
items.push({
xtype: 'radiofield',
diff --git a/www/manager6/qemu/CIDriveEdit.js b/www/manager6/qemu/CIDriveEdit.js
index a8f57963..006f9565 100644
--- a/www/manager6/qemu/CIDriveEdit.js
+++ b/www/manager6/qemu/CIDriveEdit.js
@@ -11,10 +11,12 @@ Ext.define('PVE.qemu.CIDriveInputPanel', {
let drive = {};
let params = {};
+ let confid = values.controller + values.deviceid;
drive.file = values.hdstorage + ":cloudinit";
drive.format = values.diskformat;
- params[values.controller + values.deviceid] = PVE.Parser.printQemuDrive(drive);
+
+ params[confid] = PVE.Parser.printQemuDrive(drive);
return params;
},
@@ -29,7 +31,7 @@ Ext.define('PVE.qemu.CIDriveInputPanel', {
setVMConfig: function(config) {
let me = this;
- me.down('#drive').setVMConfig(config, 'cdrom');
+ me.busSelector.setVMConfig(config, 'cdrom');
},
initComponent: function() {
@@ -37,22 +39,24 @@ Ext.define('PVE.qemu.CIDriveInputPanel', {
me.drive = {};
- me.items = [
- {
- xtype: 'pveControllerSelector',
- withVirtIO: false,
- itemId: 'drive',
- fieldLabel: gettext('CloudInit Drive'),
- name: 'drive',
- },
- {
- xtype: 'pveDiskStorageSelector',
- itemId: 'storselector',
- storageContent: 'images',
- nodename: me.nodename,
- hideSize: true,
- },
- ];
+ let items = [];
+
+ me.busSelector = Ext.create('PVE.form.ControllerSelector', {
+ withVirtIO: false,
+ fieldLabel: gettext('CloudInit Drive'),
+ });
+
+ items.push(me.busSelector);
+ items.push({
+ xtype: 'pveDiskStorageSelector',
+ itemId: 'storselector',
+ storageContent: 'images',
+ nodename: me.nodename,
+ hideSize: true,
+ });
+
+ me.items = items;
+
me.callParent();
},
});
@@ -62,7 +66,6 @@ Ext.define('PVE.qemu.CIDriveEdit', {
xtype: 'pveCIDriveEdit',
isCreate: true,
- subject: gettext('CloudInit Drive'),
initComponent: function() {
let me = this;
@@ -72,17 +75,20 @@ Ext.define('PVE.qemu.CIDriveEdit', {
throw "no node name specified";
}
- me.items = [{
- xtype: 'pveCIDriveInputPanel',
- itemId: 'cipanel',
+ let ipanel = Ext.create('PVE.qemu.CIDriveInputPanel', {
nodename: nodename,
- }];
+ });
+
+ Ext.applyIf(me, {
+ subject: gettext('CloudInit Drive'),
+ items: [ipanel],
+ });
me.callParent();
me.load({
success: function(response, opts) {
- me.down('#cipanel').setVMConfig(response.result.data);
+ ipanel.setVMConfig(response.result.data);
},
});
},
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-10-23 12:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 12:37 [pve-devel] [PATCH manager v3 0/6] fix #5430: ocfs2 io_uring read write Daniel Kral
2024-10-23 12:37 ` [pve-devel] [PATCH manager v3 1/6] ui: vm: change var to let in CDROM and CloudInit edit modals Daniel Kral
2024-10-23 12:37 ` Daniel Kral [this message]
2024-10-23 12:37 ` [pve-devel] [PATCH manager v3 3/6] ui: vm: factor out async I/O type selector Daniel Kral
2024-10-23 12:37 ` [pve-devel] [PATCH manager v3 4/6] fix #5430: ui: vm: allow editing cdrom aio and cache options Daniel Kral
2024-10-23 12:37 ` [pve-devel] [PATCH manager v3 5/6] ui: vm: make cloudinit drive editable Daniel Kral
2024-10-23 12:37 ` [pve-devel] [PATCH manager v3 6/6] fix #5430: ui: vm: allow editing cloudinit aio and cache options Daniel Kral
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241023123722.124478-3-d.kral@proxmox.com \
--to=d.kral@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox