From 65704cc2a88729479fb15ec2a5b3df683b8f2aac Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 26 Sep 2023 17:55:34 +0200 Subject: [PATCH] ui: avoid trivial decompression widget, only used once MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- www/manager6/Makefile | 2 -- www/manager6/form/DecompressionSelector.js | 13 ------------- www/manager6/window/DownloadUrlToStorage.js | 9 ++++++++- 3 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 www/manager6/form/DecompressionSelector.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 87e66ece..5bb8fa06 100644 --- 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 index abd19316..00000000 --- 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 36ad13fa..481cb2ed 100644 --- 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', }, -- 2.39.2