Am 07.03.25 um 10:25 schrieb Markus Frank:
> Prerequisite for "ui: restore window: add diskformat option"
>
> The hide condition is copied from the format selector item in the same
> file.
>
> Signed-off-by: Markus Frank <m.fr...@proxmox.com>
With the eslint issue below fixed:
Reviewed-by: Fiona Ebner <f.eb...@proxmox.com>
> ---
> v3:
> * added (me.hideFormatWhenStorageEmpty && !me.autoSelect) to the hide
> condition in initComponent instead of manually hiding it in the next
> patch (4/4).
>
> www/manager6/form/DiskStorageSelector.js | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/www/manager6/form/DiskStorageSelector.js
> b/www/manager6/form/DiskStorageSelector.js
> index 0ef48f51..37cb8b4b 100644
> --- a/www/manager6/form/DiskStorageSelector.js
> +++ b/www/manager6/form/DiskStorageSelector.js
> @@ -30,6 +30,7 @@ Ext.define('PVE.form.DiskStorageSelector', {
>
> // hides the format field (e.g. for TPM state)
> hideFormat: false,
> + hideFormatWhenStorageEmpty: false,
>
> // sets the initial size value
> // string because else we get a type confusion
> @@ -47,6 +48,9 @@ Ext.define('PVE.form.DiskStorageSelector', {
> hdfilesel.setVisible(false);
>
> formatsel.setDisabled(true);
> + if (me.hideFormatWhenStorageEmpty) {
> + formatsel.setVisible(false);
> + }
> return;
> }
>
> @@ -73,6 +77,11 @@ Ext.define('PVE.form.DiskStorageSelector', {
>
> var select = !!rec.data.select_existing && !me.hideSelection;
>
> + // This is needed to make the format selector visible
> + // after it has been hidden because of hideFormatWhenStorageEmpty.
> + let hideFormatCondition = me.hideFormat || me.storageContent ===
> 'rootdir';
> + formatsel.setVisible(!hideFormatCondition);
> +
> formatsel.setDisabled(me.hideFormat || Ext.Object.getSize(validFormats)
> <= 1);
> formatsel.setValue(selectFormat);
>
> @@ -161,7 +170,8 @@ Ext.define('PVE.form.DiskStorageSelector', {
> fieldLabel: gettext('Format'),
> nodename: me.nodename,
> disabled: true,
> - hidden: me.hideFormat || me.storageContent === 'rootdir',
> + hidden: me.hideFormat || me.storageContent === 'rootdir'
> + || (me.hideFormatWhenStorageEmpty && !me.autoSelect),
eslint complains:
[./form/DiskStorageSelector.js]:
WARN: line 174 col 7: operator-linebreak - '||' should be placed at the
end of the line. (*)
> value: 'qcow2',
> allowBlank: false,
> },
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
