Skip to content

Filter fields #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
Merged

Filter fields #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 124 additions & 28 deletions src/components/racers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,89 @@ fn format_time_delta(delta: Option<TimeDelta>) -> String {
format!("{hours:02}:{mins:02}:{secs:02}.{millis:03}")
}

// Checks whether a racer matches all active filters in the map.
// The `filters` map contains RacerField -> Option<String>. Only non-empty Some()
// values are applied. Matching is case-insensitive for string like types.
fn matches_filters(
racer: &Racer,
filters: &std::collections::HashMap<RacerField, String>,
category: Option<Category>,
) -> bool {
if let Some(cat) = category {
if !racer.categories.contains(&cat) {
return false;
}
}

for (field, val) in filters.iter() {
let filter_lowercase = val.trim().to_lowercase();
if filter_lowercase.is_empty() {
continue;
}

match field {
RacerField::StartNumber => {
if !racer.start_number.to_string().contains(&filter_lowercase) {
return false;
}
}
RacerField::FirstName => {
if !racer.first_name.to_lowercase().contains(&filter_lowercase) {
return false;
}
}
RacerField::LastName => {
if !racer.last_name.to_lowercase().contains(&filter_lowercase) {
return false;
}
}
RacerField::TagId => {
if !racer.tag.to_lowercase().contains(&filter_lowercase) {
return false;
}
}
RacerField::Track => {
if !racer.track.0.to_lowercase().contains(&filter_lowercase) {
return false;
}
}
RacerField::Start => {
if !format_time(racer.start)
.to_lowercase()
.contains(&filter_lowercase)
{
return false;
}
}
RacerField::Finish => {
if !format_time(racer.finish)
.to_lowercase()
.contains(&filter_lowercase)
{
return false;
}
}
RacerField::Time => {
if !format_time_delta(racer.time)
.to_lowercase()
.contains(&filter_lowercase)
{
return false;
}
}
}
}

true
}

#[component]
pub fn Racers(race: Race) -> Element {
let selected_category_id = use_signal(|| Option::<Category>::None);
let sorter = use_signal(|| Sorter::<RacerField>::new(RacerField::StartNumber));

let filters = use_signal(std::collections::HashMap::<RacerField, String>::new);

let mut sorted = race.racers.clone();
let field = sorter().active;
sorted.sort_by(|a, b| sorter().cmp_by(a, b, field, Racer::cmp_by));
Expand All @@ -47,46 +125,64 @@ pub fn Racers(race: Race) -> Element {
table { class: "table table-striped table-hover table-sm",
thead { class: "table-dark",
tr {
Th { sorter, field: RacerField::StartNumber, "Start number" }
Th { sorter, field: RacerField::FirstName, "First name" }
Th { sorter, field: RacerField::LastName, "Last name" }
Th { sorter, field: RacerField::Track, "Track" }
Th {
sorter,
field: RacerField::StartNumber,
filters,
"Start number"
}
Th {
sorter,
field: RacerField::FirstName,
filters,
"First name"
}
Th {
sorter,
field: RacerField::LastName,
filters,
"Last name"
}
Th {
sorter,
field: RacerField::Track,
filters,
"Track"
}
Th { sorter, field: RacerField::Start, "Start" }
Th { sorter, field: RacerField::Finish, "Finish" }
Th { sorter, field: RacerField::Time, "Time" }
th { "Track rank" }
th {
CategoriesList {
categories: race.categories,
categories: race.categories.clone(),
selected_category_id,
}
}
}
}
tbody {

for racer in sorted.iter() {
if (selected_category_id().clone())
.is_none_or(|cat_id| racer.categories.contains(&cat_id))
{
tr {
td { "{racer.start_number}" }
td { "{racer.first_name}" }
td { "{racer.last_name}" }
td { "{racer.track}" }
td { "{format_time(racer.start)}" }
td { "{format_time(racer.finish)}" }
td { "{format_time_delta(racer.time)}" }
td {
"{race.tracks_rank.get(&racer.track)
.and_then(|m| m.get(&racer.start_number))
.map(|rank| rank.to_string())
.unwrap_or_default() }"
}
td {
for category in racer.categories.clone() {
"{category} "
}
for racer in sorted
.iter()
.filter(|racer| matches_filters(racer, &filters(), selected_category_id()))
{
tr {
td { "{racer.start_number}" }
td { "{racer.first_name}" }
td { "{racer.last_name}" }
td { "{racer.track}" }
td { "{format_time(racer.start)}" }
td { "{format_time(racer.finish)}" }
td { "{format_time_delta(racer.time)}" }
td {
"{race.tracks_rank.get(&racer.track)
.and_then(|m| m.get(&racer.start_number))
.map(|rank| rank.to_string())
.unwrap_or_default() }"
}
td {
for category in racer.categories.clone() {
"{category} "
}
}
}
Expand Down
36 changes: 30 additions & 6 deletions src/sort_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,26 @@ pub struct ThProps<F: Copy + Eq + std::hash::Hash + 'static> {
pub sorter: Signal<Sorter<F>>,
pub field: F,
#[props(optional)]
pub filters: Option<Signal<std::collections::HashMap<F, String>>>,
pub children: Element,
}

/// Custom <Th> component that toggles sorting on click
#[allow(non_snake_case)]
pub fn Th<F: Copy + Eq + std::hash::Hash + 'static>(props: ThProps<F>) -> Element {
let mut sorter = props.sorter;
let filters = props.filters;
let field = props.field;

rsx! {
th {
role: "button",
onclick: move |_| {
sorter.write().toggle(field);
},
{props.children}
th { role: "button",
span {
onclick: move |_| {
sorter.write().toggle(field);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is write() needed?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is :), at least signal is not updated without it :)

},
{props.children}
}

{
let s = sorter();
if s.active == field {
Expand All @@ -40,6 +44,26 @@ pub fn Th<F: Copy + Eq + std::hash::Hash + 'static>(props: ThProps<F>) -> Elemen
}
}
}
{
if let Some(mut filters_signal) = filters {
rsx! {
div { class: "mt-1",
input {
r#type: "text",
placeholder: "Filter",
// read current value for this field from the map
value: filters_signal().get(&field).map(|s| s.as_str()).unwrap_or(""),
oninput: move |e| {
let v = e.value().trim().to_string();
filters_signal.write().insert(field, v);
},
}
}
}
} else {
rsx! {}
}
}
}
}
}
Loading