From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0FC451FF183 for <inbox@lore.proxmox.com>; Wed, 21 May 2025 15:39:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 80573196B6; Wed, 21 May 2025 15:39:19 +0200 (CEST) Message-ID: <915ebb31-499d-4ca7-9aa8-9e9d2e2080c7@proxmox.com> Date: Wed, 21 May 2025 15:39:15 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>, Markus Frank <m.frank@proxmox.com> References: <20250307092546.102655-1-m.frank@proxmox.com> <20250307092546.102655-4-m.frank@proxmox.com> Content-Language: en-US From: Fiona Ebner <f.ebner@proxmox.com> In-Reply-To: <20250307092546.102655-4-m.frank@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -1.335 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy ENA_SUBJ_ODD_CASE 2.6 Subject has odd case KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH manager v3 3/4] ui: add hideFormatWhenStorageEmpty option to DiskStorageSelector X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> 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.frank@proxmox.com> With the eslint issue below fixed: Reviewed-by: Fiona Ebner <f.ebner@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