ui: avoid trivial decompression widget, only used once

Currently it was only used once and it had not really any benefit, as
the one thing it did is defining a list of compressors – the
KVComboBox is made such, so that this can be done on definition
directly, no need for inheritance.

Also, if one would think about adopting this more for other similar
selectors: While we have some uses of compressors all over the place,
and most of them are not really coupled to each other, so having a
single widget for them does not make sense.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 87e66ece785e32cad3fe27cd978504097589fef3..5bb8fa0622f6f50bbf0bce81751f019e9dc76320 100644 (file)
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -30,11 +30,9 @@ JSSRC=                                                       \
        form/CephPoolSelector.js                        \
        form/CephFSSelector.js                          \
        form/ComboBoxSetStoreNode.js                    \
-       form/CompressionSelector.js                     \
        form/ContentTypeSelector.js                     \
        form/ControllerSelector.js                      \
        form/DayOfWeekSelector.js                       \
-       form/DecompressionSelector.js                   \
        form/DiskFormatSelector.js                      \
        form/DiskStorageSelector.js                     \
        form/FileSelector.js                            \

diff --git a/www/manager6/form/DecompressionSelector.js b/www/manager6/form/DecompressionSelector.js
deleted file mode 100644 (file)
index abd1931..0000000
--- a/www/manager6/form/DecompressionSelector.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Ext.define('PVE.form.DecompressionSelector', {
-    extend: 'Proxmox.form.KVComboBox',
-    alias: ['widget.pveDecompressionSelector'],
-    config: {
-       deleteEmpty: false,
-    },
-    comboItems: [
-               ['__default__', Proxmox.Utils.NoneText],
-               ['lzo', 'LZO'],
-               ['gz', 'GZIP'],
-               ['zst', 'ZSTD'],
-    ],
-});

diff --git a/www/manager6/window/DownloadUrlToStorage.js b/www/manager6/window/DownloadUrlToStorage.js
index 36ad13fa44adba9e5631a8f11c4fdd49b915baf1..481cb2ed47f0f781640a9b05787633038148eea7 100644 (file)
--- a/www/manager6/window/DownloadUrlToStorage.js
+++ b/www/manager6/window/DownloadUrlToStorage.js
@@ -206,12 +206,19 @@ Ext.define('PVE.window.DownloadUrlToStorage', {
                    },
                },
                {
-                   xtype: 'pveDecompressionSelector',
+                   xtype: 'proxmoxKVComboBox',
                    name: 'compression',
                    fieldLabel: gettext('Decompression algorithm'),
                    allowBlank: true,
                    hasNoneOption: true,
+                   deleteEmpty: false,
                    value: '__default__',
+                   comboItems: [
+                               ['__default__', Proxmox.Utils.NoneText],
+                               ['lzo', 'LZO'],
+                               ['gz', 'GZIP'],
+                               ['zst', 'ZSTD'],
+                   ],
                    cbind: {
                        hidden: get => get('content') !== 'iso',
                    },