From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 16535C188D for ; Tue, 16 Jan 2024 15:58:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D912238952 for ; Tue, 16 Jan 2024 15:57:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 16 Jan 2024 15:57:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E943E49133 for ; Tue, 16 Jan 2024 15:57:29 +0100 (CET) Message-ID: <4a4ed643-8f18-43a1-9add-31874750d1f1@proxmox.com> Date: Tue, 16 Jan 2024 15:57:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20240116143022.359921-1-s.hanreich@proxmox.com> <20240116143022.359921-2-s.hanreich@proxmox.com> From: Mira Limbeck In-Reply-To: <20240116143022.359921-2-s.hanreich@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.215 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 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH pve-manager v2 2/2] firewall: properly detect changes when ip / cidr is used in rule X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2024 14:58:01 -0000 On 1/16/24 15:30, Stefan Hanreich wrote: > With the current implementation using queryDelay, this means that the > change event for the input never completes. This in turn leads to > the input panel never changing its dirty status. By using the > beforequery event we can simply cancel the query without resorting to > the queryDelay hack. > > Reported-By: Mira Limbeck > Signed-off-by: Stefan Hanreich > --- > www/manager6/form/IPRefSelector.js | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js > index 7e5eea63a..d41cde5f5 100644 > --- a/www/manager6/form/IPRefSelector.js > +++ b/www/manager6/form/IPRefSelector.js > @@ -56,15 +56,6 @@ Ext.define('PVE.form.IPRefSelector', { > }, > }); > > - var disable_query_for_ips = function(f, value) { > - if (value === null || > - value.match(/^\d/)) { // IP address starts with \d > - f.queryDelay = 9999999999; // hack: disable with long delay > - } else { > - f.queryDelay = 10; > - } > - }; > - > var columns = []; > > if (!me.ref_type) { > @@ -109,7 +100,9 @@ Ext.define('PVE.form.IPRefSelector', { > }, > }); > > - me.on('change', disable_query_for_ips); > + me.on('beforequery', function(queryPlan) { > + return !(queryPlan.query === null || queryPlan.query.match(/^\d/)); > + }); > > me.callParent(); > }, Tested this with ~900 ipsets and ~1000 aliases. Did not notice any worse delay or issues with this patch applied. Tested-by: Mira Limbeck Reviewed-by: Mira Limbeck