From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 4D81D1FF183 for ; Wed, 10 Sep 2025 15:24:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D636221D28; Wed, 10 Sep 2025 15:24:04 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Wed, 10 Sep 2025 15:22:56 +0200 Message-ID: <20250910132331.506716-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250910132331.506716-1-d.csapak@proxmox.com> References: <20250910132331.506716-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 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 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: [pdm-devel] [PATCH datacenter-manager 2/2] server: api: resources: improve search when searching for remotes X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" currently, 'remote:foo' marks the filter as 'remote_only' so subresources will never be returned. This leads to some awkward searches that intuitively should work, for example: '+remote:foo type:qemu' to look for all vms on a specific remote by making the 'remote' category not 'remote only', and giving the remote name to the resource filter, we can make that query above work without problems. This makes the search with remote names much more intuitive Signed-off-by: Dominik Csapak --- i noticed this while trying to search for a vm on a specific remote, which is a rather common use-case IMO server/src/api/resources.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs index db705b8..6385fdc 100644 --- a/server/src/api/resources.rs +++ b/server/src/api/resources.rs @@ -91,7 +91,11 @@ impl MatchCategory { } // returns None if we can't decide if it matches, currently only for the `Remote` category` -fn resource_matches_search_term(resource: &Resource, term: &SearchTerm) -> Option { +fn resource_matches_search_term( + remote_name: &str, + resource: &Resource, + term: &SearchTerm, +) -> Option { let matches = match term.category.as_deref().map(|c| c.parse::()) { Some(Ok(category)) => match category { MatchCategory::Type => category.matches(resource.resource_type().as_str(), &term.value), @@ -105,7 +109,7 @@ fn resource_matches_search_term(resource: &Resource, term: &SearchTerm) -> Optio } _ => false, }, - MatchCategory::Remote => return None, // this has to be checked beforehand + MatchCategory::Remote => category.matches(remote_name, &term.value), }, Some(Err(_)) => false, None => resource.name().contains(&term.value) || resource.id().contains(&term.value), @@ -185,13 +189,6 @@ fn is_remotes_only(filters: &Search) -> bool { optional_terms += 1; } match term.category.as_deref() { - Some("remote") => { - if !term.is_optional() { - is_required = true; - } else { - optional_matches += 1; - } - } Some("type") if "remote".starts_with(&term.value) => { if !term.is_optional() { is_required = true; @@ -268,7 +265,7 @@ pub(crate) async fn get_resources_impl( filter.matches(|filter| { // if we get can't decide if it matches, don't filter it out - resource_matches_search_term(resource, filter).unwrap_or(true) + resource_matches_search_term(&remote_name, resource, filter).unwrap_or(true) }) }); } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel