]> git.proxmox.com Git - pve-manager.git/commitdiff
ui: guest import: handle new disk api format
authorDominik Csapak <d.csapak@proxmox.com>
Mon, 11 Mar 2024 14:35:49 +0000 (15:35 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 14 Mar 2024 14:17:43 +0000 (15:17 +0100)
and render the size if we have it (for disks that make sense)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
www/manager6/window/GuestImport.js

index ec04e8c05f75b4fc7e0cefe3437f559e162f86a8..872738e63bdcccf2869fafaec3a2cf37b84fb8ee 100644 (file)
@@ -174,6 +174,7 @@ Ext.define('PVE.window.GuestImport', {
                            };
                            delete data.enable;
                            delete data.id;
+                           delete data.size;
                            if (!data.file) {
                                data.file = defaultStorage;
                                data.format = defaultFormat;
@@ -410,6 +411,16 @@ Ext.define('PVE.window.GuestImport', {
                                        return value.replace(/^.*\//, '');
                                    },
                                },
+                               {
+                                   text: gettext('Size'),
+                                   dataIndex: 'size',
+                                   renderer: (value) => {
+                                       if (Ext.isNumeric(value)) {
+                                           return Proxmox.Utils.render_size(value);
+                                       }
+                                       return value ?? Proxmox.Utils.unknownText;
+                                   },
+                               },
                                {
                                    text: gettext('Storage'),
                                    dataIndex: 'file',
@@ -644,10 +655,17 @@ Ext.define('PVE.window.GuestImport', {
 
                let disks = [];
                for (const [id, value] of Object.entries(data.disks ?? {})) {
+                   let volid = Ext.htmlEncode('<none>');
+                   let size = 'auto';
+                   if (Ext.isObject(value)) {
+                       volid = value.volid;
+                       size = value.size;
+                   }
                    disks.push({
                        id,
                        enable: true,
-                       'import-from': id === 'efidisk0' ? Ext.htmlEncode('<none>') : value,
+                       size,
+                       'import-from': volid,
                        format: 'raw',
                    });
                }