Skip to content

Including pagination into the home page. #17

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Including pagination into the home page. #17

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0437b4a
Initial set-up of multi-page pagination
Allentro Jul 31, 2025
3fbc8da
Slicing filtered data for page_rows
Allentro Jul 31, 2025
a2dfb5d
Removing comments
Allentro Jul 31, 2025
8008e2f
Fix formatting of pagination (same column as the table
Allentro Jul 31, 2025
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
83 changes: 39 additions & 44 deletions src/sauce/home.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use serde::Serialize;
use web_sys::{console, HtmlInputElement, InputEvent};
use yew_hooks::use_set;
use yew_hooks::use_async;
// use yew_custom_components::pagination::Pagination;
use yew_custom_components::pagination::Pagination;
use yew_custom_components::table::{Options, Table};
use yew_custom_components::table::types::{ColumnBuilder, TableData};
use crate::types::mock_data::Entry;
Expand Down Expand Up @@ -254,7 +254,6 @@ pub fn home() -> Html {
let library_search = (*library_search_term).as_ref().cloned();

let page = use_state(|| 0usize);
let current_page = (*page).clone();

let selected_ids = use_set(HashSet::<i32>::new());
let sum = selected_ids.current().len();
Expand Down Expand Up @@ -434,23 +433,16 @@ pub fn home() -> Html {
};

let limit = 10;
let current_page = if filtered_data.is_empty() {
0
} else {
current_page.min((filtered_data.len() - 1) / limit)
};

let start = current_page * limit;
let end = (start + limit).min(filtered_data.len());

let paginated_data = if filtered_data.is_empty() {
Vec::new()
} else {
filtered_data[start..end].to_vec()
};
let total_rows = filtered_data.len();
let current_page = (*page).min(total_rows.saturating_sub(1) / limit);

let start = current_page * limit;
let end = (start + limit).min(total_rows);

// let total = filtered_data.len().max(1);
let page_rows = if total_rows == 0 { Vec::new() } else { filtered_data[start..end].to_vec() };


let oninput_element_search = {
let element_search_term = element_search_term.clone();
Callback::from(move |e: InputEvent| {
Expand Down Expand Up @@ -522,21 +514,21 @@ pub fn home() -> Html {
})
};

// let pagination_options = yew_custom_components::pagination::Options::default()
// .show_prev_next(true)
// .show_first_last(true)
// .list_classes(vec!(String::from("pagination")))
// .item_classes(vec!(String::from("page-item")))
// .link_classes(vec!(String::from("page-link")))
// .active_item_classes(vec!(String::from("active")))
// .disabled_item_classes(vec!(String::from("disabled")));

// let handle_page = {
// let page = page.clone();
// Callback::from(move |new_page: usize| {
// page.set(new_page);
// })
// };
let pagination_options = yew_custom_components::pagination::Options::default()
.show_prev_next(true)
.show_first_last(true)
.list_classes(vec!(String::from("pagination")))
.item_classes(vec!(String::from("page-item")))
.link_classes(vec!(String::from("page-link")))
.active_item_classes(vec!(String::from("active")))
.disabled_item_classes(vec!(String::from("disabled")));

let handle_page = {
let page = page.clone();
Callback::from(move |new_page: usize| {
page.set(new_page);
})
};

html!(
<>
Expand Down Expand Up @@ -642,30 +634,33 @@ pub fn home() -> Html {
</button>

</div>
// First column
<div class="d-flex mb-2">
<div class="flex-grow-1 p-2 input-group me-2">
<Table<TableLine>
options={options.clone()}
limit={Some(limit)}
page={current_page}
// search={element_search.clone()}
classes={classes!("table", "table-hover")}
columns={columns.clone()}
data={paginated_data}
data={page_rows.clone()}
orderable={true}
/>
<h5>{sum}{" / 41337"}</h5>
<div class="d-flex justify-content-between align-items-center mt-2 w-100">
<h5 class="mb-0 align-self-center">{ sum }{ " / 41337" }</h5>
<div class="my-auto">
<Pagination
total={total_rows}
limit={limit}
max_pages={1}
options={pagination_options.clone()}
on_page={Some(handle_page)}
/>
</div>
</div>
</div>

// Second column
<div class="flex-grow-1 p-2 input-group">

// <Pagination
// total={total}
// limit={limit}
// max_pages={6}
// options={pagination_options}
// on_page={Some(handle_page)}
// />
<div class="flex-grow-1 p-2 input-group me-2">
<PlotComponent
selected_ids={(*selected_ids.current()).clone()}
Expand Down