Skip to content

fix: filtering list must reset pagination #364

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 2 commits into from
Dec 18, 2023
Merged

fix: filtering list must reset pagination #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32219a4
test: filtering the books list does not reset the pagination
vincentchalamon Dec 18, 2023
bb86845
fix: filtering the books list resets the pagination
vincentchalamon Dec 18, 2023
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
2 changes: 1 addition & 1 deletion pwa/components/book/Filters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const Filters: FunctionComponent<Props> = ({ filters, mutation }) => (
enableReinitialize={true}
onSubmit={(values, { setSubmitting, setStatus, setErrors }) => {
mutation.mutate(
values,
{ ...values, page: 1 },
{
onSuccess: () => {
setStatus({
Expand Down
2 changes: 1 addition & 1 deletion pwa/components/book/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const List: NextPage<Props> = ({ data, hubURL, filters, page }) => {
value={filters.order?.title ?? ""}
displayEmpty
onChange={(event) => {
filtersMutation.mutate({ ...filters, order: event.target.value ? { title: event.target.value } : undefined });
filtersMutation.mutate({ ...filters, page: 1, order: event.target.value ? { title: event.target.value } : undefined });
}}
>
<MenuItem value="">Relevance</MenuItem>
Expand Down
19 changes: 19 additions & 0 deletions pwa/tests/BooksList.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,25 @@ test.describe("Books list", () => {
await expect(page.getByTestId("nb-books")).toHaveText(`${totalBooks} book(s) found`);
await expect(page.getByTestId("book").or(page.getByTestId("loading"))).toHaveCount(30);

// filtering must reset the pagination
await page.getByLabel("Go to next page").click();
await expect(page).toHaveURL(/\/books\?page=2$/);
await expect(page.getByTestId("book").or(page.getByTestId("loading"))).toHaveCount(30);
await expect(await bookPage.getDefaultBook()).not.toBeVisible();
await bookPage.filter({ author: "Dan Simmons" });
await expect(page).toHaveURL(/\/books\?author=Dan\+Simmons/);
await expect(page.getByTestId("nb-books")).toHaveText("1 book(s) found");
await expect(page.getByTestId("book").or(page.getByTestId("loading"))).toHaveCount(1);
await expect(page.getByTestId("pagination")).toHaveCount(0);
await expect(await bookPage.getDefaultBook()).toBeVisible();

// clear author field
await page.getByTestId("filter-author").clear();
await expect(page.getByTestId("filter-author")).toHaveValue("");
await expect(page).toHaveURL(/\/books$/);
await expect(page.getByTestId("nb-books")).toHaveText(`${totalBooks} book(s) found`);
await expect(page.getByTestId("book").or(page.getByTestId("loading"))).toHaveCount(30);

// filter by title, author and condition
await bookPage.filter({ author: "Dan Simmons", title: "Hyperion", condition: "Used" });
await expect(page).toHaveURL(/\/books\?author=Dan\+Simmons&title=Hyperion&condition%5B%5D=https%3A%2F%2Fschema\.org%2FUsedCondition$/);
Expand Down