From: "Shannon Sterz" <s.sterz@proxmox.com>
To: "Christian Ebner" <c.ebner@proxmox.com>, <pdm-devel@lists.proxmox.com>
Subject: Re: [PATCH datacenter-manager v2] ui: auto-installer: filter by country name and code
Date: Tue, 26 May 2026 16:06:31 +0200 [thread overview]
Message-ID: <DISO01PO7FVV.14UULMUGKIM99@proxmox.com> (raw)
In-Reply-To: <20260526140113.581117-1-c.ebner@proxmox.com>
On Tue May 26, 2026 at 4:01 PM CEST, Christian Ebner wrote:
> The country filed for answer files expects a 2 character country
> code as input, while showing the full country name for items. The
> filter therefore currently applies to country codes only, not
> matching on country (common) names.
>
> Filter based on both, matching name or country code instead.
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> Changes since version 1 (thanks @Shannon):
> - match country name by containing string instead of starting with
> query string.
>
> .../auto_installer/prepared_answer_form.rs | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/ui/src/remotes/auto_installer/prepared_answer_form.rs b/ui/src/remotes/auto_installer/prepared_answer_form.rs
> index c1d2bab..a68c5cd 100644
> --- a/ui/src/remotes/auto_installer/prepared_answer_form.rs
> +++ b/ui/src/remotes/auto_installer/prepared_answer_form.rs
> @@ -171,6 +171,22 @@ pub fn render_global_options_form(
> }
> })
> .value(config.country.clone())
> + .filter(|item: &AttrValue, query: &str| {
> + let query = query.to_string().to_lowercase();
> + let item = item.to_string();
> +
> + // match by country code
> + if item.starts_with(&query) {
> + return true;
> + }
> +
> + // match by country (common) name
> + if let Some(name) = COUNTRY_INFO.deref().get(&item) {
> + return name.to_lowercase().contains(&query);
> + }
> +
> + false
> + })
> .autoselect_filter(true)
> .required(true),
> )
Gave this a quick spin, lgtm, so consider this:
Reviewed-by: Shannon Sterz <s.sterz@proxmox.com>
Tested-by: Shannon Sterz <s.sterz@proxmox.com>
next prev parent reply other threads:[~2026-05-26 14:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-26 14:01 [PATCH datacenter-manager v2] ui: auto-installer: filter by country name and code Christian Ebner
2026-05-26 14:06 ` Shannon Sterz [this message]
2026-05-26 14:12 ` Lukas Wagner
2026-05-26 14:14 ` applied: " Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DISO01PO7FVV.14UULMUGKIM99@proxmox.com \
--to=s.sterz@proxmox.com \
--cc=c.ebner@proxmox.com \
--cc=pdm-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox