Skip to content

fix: "Showing 1-0 of 0" in TUI, cache unfiltered total count through search reset #196

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
jason-rl merged 1 commit into from
Apr 7, 2026
Merged

fix: "Showing 1-0 of 0" in TUI, cache unfiltered total count through search reset #196

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
18 changes: 11 additions & 7 deletions src/components/ResourcePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,17 @@ export function ResourcePicker<T>({
)}
</>
)}
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
{endIndex > startIndex && (
<>
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
</>
)}
</Box>

{/* Help Bar */}
Expand Down
48 changes: 35 additions & 13 deletions src/hooks/useCursorPagination.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ export function useCursorPagination<T>(
// Abort controller for cancelling in-flight count requests
const countAbortRef = React.useRef<AbortController | null>(null);

// Cache the unfiltered (initial deps) total count to avoid re-fetching on filter clear
const initialDepsKeyRef = React.useRef<string>(JSON.stringify(deps));
const baseTotalCountRef = React.useRef<number | null>(null);
const depsKeyRef = React.useRef<string>(JSON.stringify(deps));

// Cursor history: cursorHistory[N] = last item ID of page N
// Used to determine startingAt for page N+1
const cursorHistoryRef = React.useRef<(string | undefined)[]>([]);
Expand Down Expand Up @@ -206,8 +211,13 @@ export function useCursorPagination<T>(
// Cancel the background count request if still pending.
if (!result.hasMore && !hasCachedTotalCountRef.current) {
countAbortRef.current?.abort();
setTotalCount(page * pageSizeRef.current + result.items.length);
const computedTotal =
page * pageSizeRef.current + result.items.length;
setTotalCount(computedTotal);
hasCachedTotalCountRef.current = true;
if (depsKeyRef.current === initialDepsKeyRef.current) {
baseTotalCountRef.current = computedTotal;
}
}
} catch (err) {
if (!isMountedRef.current) return;
Expand All @@ -226,6 +236,7 @@ export function useCursorPagination<T>(
// Reset when deps change (e.g., filters, search)
const depsKey = JSON.stringify(deps);
React.useEffect(() => {
depsKeyRef.current = depsKey;
// Clear cursor history when deps change
cursorHistoryRef.current = [];
hasCachedTotalCountRef.current = false;
Expand All @@ -243,18 +254,29 @@ export function useCursorPagination<T>(
// Data fetch
fetchPageData(0, true);

// Background count fetch — fires immediately alongside data
fetchPageRef
.current({ limit: 0, startingAt: undefined, includeTotalCount: true })
.then((result) => {
if (cancelled || countAbort.signal.aborted || !isMountedRef.current)
return;
if (result.totalCount !== undefined) {
setTotalCount(result.totalCount);
hasCachedTotalCountRef.current = true;
}
})
.catch(() => {}); // count failure is non-critical
// If returning to unfiltered state and we have a cached base count, reuse it
const isUnfiltered = depsKey === initialDepsKeyRef.current;
if (isUnfiltered && baseTotalCountRef.current !== null) {
setTotalCount(baseTotalCountRef.current);
hasCachedTotalCountRef.current = true;
} else {
// Background count fetch — fires immediately alongside data
fetchPageRef
.current({ limit: 0, startingAt: undefined, includeTotalCount: true })
.then((result) => {
if (cancelled || countAbort.signal.aborted || !isMountedRef.current)
return;
if (result.totalCount !== undefined) {
setTotalCount(result.totalCount);
hasCachedTotalCountRef.current = true;
// Cache the unfiltered total count
if (isUnfiltered) {
baseTotalCountRef.current = result.totalCount;
}
}
})
.catch(() => {}); // count failure is non-critical
}

return () => {
cancelled = true;
Expand Down
18 changes: 11 additions & 7 deletions src/screens/BenchmarkJobListScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,13 +635,17 @@ export function BenchmarkJobListScreen() {
)}
</>
)}
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
{endIndex > startIndex && (
<>
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
</>
)}
</Box>
)}

Expand Down
18 changes: 11 additions & 7 deletions src/screens/BenchmarkListScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,17 @@ export function BenchmarkListScreen() {
)}
</>
)}
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
{endIndex > startIndex && (
<>
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
</>
)}
</Box>
)}

Expand Down
18 changes: 11 additions & 7 deletions src/screens/BenchmarkRunListScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,17 @@ export function BenchmarkRunListScreen() {
)}
</>
)}
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
{endIndex > startIndex && (
<>
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
</>
)}
</Box>
)}

Expand Down
18 changes: 11 additions & 7 deletions src/screens/ScenarioRunListScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,17 @@ export function ScenarioRunListScreen({
)}
</>
)}
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
{endIndex > startIndex && (
<>
<Text color={colors.textDim} dimColor>
{" "}
•{" "}
</Text>
<Text color={colors.textDim} dimColor>
Showing {startIndex + 1}-{endIndex} of {totalCount}
</Text>
</>
)}
{benchmarkRunId && (
<>
<Text color={colors.textDim} dimColor>
Expand Down
Loading