Skip to content

fix(account): fix "load more" button state for filtered results (@d1rshan) #8020

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
Miodec merged 4 commits into from
Jun 2, 2026
+8 −8
Merged

fix(account): fix "load more" button state for filtered results (@d1rshan) #8020

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b78d78
fix
d1rshan May 28, 2026
d518f71
use has more approach
d1rshan May 28, 2026
e70be26
remove unused getResultsSize
d1rshan May 28, 2026
7e2cfd7
cleanup
d1rshan May 28, 2026
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
4 changes: 0 additions & 4 deletions frontend/src/ts/collections/results.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,10 +667,6 @@ export async function waitForResultsReady(): Promise<void> {
await resultsCollection.stateWhenReady();
}

export function getResultsSize(): number {
return resultsCollection.size;
}

/**
*
*/
Expand Down
15 changes: 9 additions & 6 deletions frontend/src/ts/components/pages/account/AccountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { createMemo, createSignal, JSXElement, Show } from "solid-js";
import {
createResultsQueryState,
getResultsQueryOnce,
getResultsSize,
Comment thread
d1rshan marked this conversation as resolved.
useResultsLiveQuery,
} from "../../../collections/results";
import { SnapshotResult } from "../../../constants/default-snapshot";
Expand Down Expand Up @@ -46,7 +45,13 @@ export function AccountPage(): JSXElement {
);
const [isExporting, setIsExporting] = createSignal(false);

const resultsQuery = useResultsLiveQuery({ queryState, sorting, limit });
const queryLimit = createMemo(() => limit() + 1);
Comment thread
d1rshan marked this conversation as resolved.
Outdated
const resultsQuery = useResultsLiveQuery({
queryState,
sorting,
limit: queryLimit,
});
const hasMoreResults = createMemo(() => resultsQuery()?.length > limit());
Comment thread
d1rshan marked this conversation as resolved.
Outdated

return (
<Show when={isAuthenticated() && isOpen()}>
Expand Down Expand Up @@ -117,15 +122,13 @@ export function AccountPage(): JSXElement {
{({ resultsQueryData }) => (
<>
<Table
data={[...resultsQueryData()]}
data={resultsQueryData().slice(0, limit())}
onSortingChange={(val) => setSorting(val)}
selectedRowId={selectedResultId}
/>
<Button
text="load more"
disabled={
resultsQuery.isLoading || getResultsSize() < limit() + 10
}
disabled={resultsQuery.isLoading || !hasMoreResults()}
onClick={() => setLimit((limit) => limit + 10)}
class="w-full text-center"
/>
Expand Down
Loading