From: Filip Schauer <f.schauer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH manager 3/3] ui: qemu hd edit: allow importing a disk from the import storage
Date: Mon, 17 Mar 2025 12:05:16 +0100 [thread overview]
Message-ID: <4c3c6f3c-deb1-4adb-879c-468716ca9aad@proxmox.com> (raw)
In-Reply-To: <20250313111756.1560235-5-d.csapak@proxmox.com>
I ran into a bug when creating a VM in the Web UI:
On the "Disks" tab the wizard does not let me proceed with the default
configuration. When selecting an image to import and then unchecking the
"Import Image" box again, the wizard lets me proceed again.
On the other hand, adding a qcow2 image to an existing VM via the Web UI
works fine.
On 13/03/2025 12:17, Dominik Csapak wrote:
> adds a checkbox 'import image' above the storage selector which:
> * hides the original storage selector
> * shows a 'source storage' selector
> * shows a 'import file' selector
> * shows a 'target storage' selector
>
> Since the wizard and the hd edit share this panel, this also works in
> the wizard.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> www/manager6/qemu/HDEdit.js | 72 ++++++++++++++++++++++++++++++++++++-
> 1 file changed, 71 insertions(+), 1 deletion(-)
>
> diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js
> index b78647ec..a235815d 100644
> --- a/www/manager6/qemu/HDEdit.js
> +++ b/www/manager6/qemu/HDEdit.js
> @@ -78,11 +78,17 @@ Ext.define('PVE.qemu.HDInputPanel', {
> if (values.hdimage) {
> me.drive.file = values.hdimage;
> } else {
> - me.drive.file = values.hdstorage + ":" + values.disksize;
> + let disksize = values.disksize;
> + if (values['import-from']) {
> + PVE.Utils.propertyStringSet(me.drive, values['import-from'], 'import-from');
> + disksize = 0;
> + }
> + me.drive.file = `${values.hdstorage}:${disksize}`;
> }
> me.drive.format = values.diskformat;
> }
>
> +
> PVE.Utils.propertyStringSet(me.drive, !values.backup, 'backup', '0');
> PVE.Utils.propertyStringSet(me.drive, values.noreplicate, 'replicate', 'no');
> PVE.Utils.propertyStringSet(me.drive, values.discard, 'discard', 'on');
> @@ -168,6 +174,11 @@ Ext.define('PVE.qemu.HDInputPanel', {
> var me = this;
> me.down('#hdstorage').setNodename(nodename);
> me.down('#hdimage').setStorage(undefined, nodename);
> +
> + me.lookup('new-disk').setNodename(nodename);
> + me.lookup('import-source').setNodename(nodename);
> + me.lookup('import-source-file').setNodename(nodename);
> + me.lookup('import-target').setNodename(nodename);
> },
>
> hasAdvanced: true,
> @@ -221,12 +232,71 @@ Ext.define('PVE.qemu.HDInputPanel', {
> column1.push(me.unusedDisks);
> } else if (me.isCreate) {
> column1.push({
> + xtype: 'proxmoxcheckbox',
> + isFormField: false,
> + fieldLabel: gettext("Import Image"),
> + listeners: {
> + change: function(_cb, value) {
> + me.lookup('new-disk').setVisible(!value);
> + me.lookup('new-disk').setDisabled(!!value);
> +
> + me.lookup('import-source').setVisible(!!value);
> + me.lookup('import-source').setDisabled(!value);
> + me.lookup('import-source-file').setVisible(!!value);
> +
> + me.lookup('import-target').setVisible(!!value);
> + me.lookup('import-target').setDisabled(!value);
> + },
> + },
> + });
> + column1.push({
> + reference: 'new-disk',
> xtype: 'pveDiskStorageSelector',
> storageContent: 'images',
> name: 'disk',
> nodename: me.nodename,
> autoSelect: me.insideWizard,
> });
> + column1.push({
> + xtype: 'pveStorageSelector',
> + reference: 'import-source',
> + fieldLabel: gettext('Import Storage'),
> + name: 'import-source-storage',
> + hidden: true,
> + disabled: true,
> + storageContent: 'import',
> + nodename: me.nodename,
> + autoSelect: me.insideWizard,
> + listeners: {
> + change: function(_selector, storage) {
> + me.lookup('import-source-file').setDisabled(!storage);
> + me.lookup('import-source-file').setStorage(storage);
> + },
> + },
> + });
> + column1.push({
> + xtype: 'pveFileSelector',
> + reference: 'import-source-file',
> + fieldLabel: gettext("Select Image"),
> + hidden: true,
> + disabled: true,
> + storageContent: 'import',
> + name: 'import-from',
> + filter: (rec) => rec?.data?.format === 'qcow2',
> + nodename: me.nodename,
> + });
> + column1.push({
> + xtype: 'pveDiskStorageSelector',
> + reference: 'import-target',
> + storageLabel: gettext('Target Storage'),
> + hidden: true,
> + disabled: true,
> + hideSize: true,
> + storageContent: 'images',
> + name: 'target',
> + nodename: me.nodename,
> + autoSelect: me.insideWizard,
> + });
> } else {
> column1.push({
> xtype: 'textfield',
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
prev parent reply other threads:[~2025-03-17 11:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 11:17 [pve-devel] [PATCH storage/manager] allow upload & import of qcow2 in the web UI Dominik Csapak
2025-03-13 11:17 ` [pve-devel] [PATCH storage 1/1] import: allow upload of qcow2 files into import storage Dominik Csapak
2025-03-13 11:17 ` [pve-devel] [PATCH manager 1/3] ui: storage content: allow upload of qcow2 for import type Dominik Csapak
2025-03-13 11:17 ` [pve-devel] [PATCH manager 2/3] ui: form: file selector: allow optional filter Dominik Csapak
2025-03-13 11:17 ` [pve-devel] [PATCH manager 3/3] ui: qemu hd edit: allow importing a disk from the import storage Dominik Csapak
2025-03-17 11:05 ` Filip Schauer [this message]
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=4c3c6f3c-deb1-4adb-879c-468716ca9aad@proxmox.com \
--to=f.schauer@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal