Skip to content

chore: With an empty collection we should show 0-0 instead of 1-1 VSCODE-771 #1295

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
tculig merged 3 commits into from
Apr 2, 2026
Merged

chore: With an empty collection we should show 0-0 instead of 1-1 VSCODE-771 #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cf66a8
Update empty state view
tculig Mar 27, 2026
dcf8b33
Merge branch 'main' into VSCODE-771-empty-collection-display
tculig Apr 2, 2026
50b3a51
Remove obsolete unit test
tculig Apr 2, 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
16 changes: 4 additions & 12 deletions src/test/suite/views/data-browsing-app/documentQuerySlice.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,18 +387,10 @@ describe('documentQuerySlice', function () {
expect(result.endItem).to.equal(3);
});

it('endItem uses the larger term when startItem is smaller for cursor queries', function () {
const pageTwoCursorState: DocumentQueryState = {
...cursorState,
currentPage: 2,
itemsPerPage: 10,
};
const docs = [];

const result = reducer(pageTwoCursorState, documentsReceived(docs));

expect(result.startItem).to.equal(11);
expect(result.endItem).to.equal(11);
it('shows 0-0 when cursor query returns no documents on page 1', function () {
const result = reducer(cursorState, documentsReceived([]));
expect(result.startItem).to.equal(0);
expect(result.endItem).to.equal(0);
});

Comment thread
tculig marked this conversation as resolved.
it('totalCountReceived(null) keeps totalPages null for cursor queries', function () {
Expand Down
21 changes: 13 additions & 8 deletions src/views/data-browsing-app/store/documentQuerySlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,19 @@ const recalculatePaginationValues = (
// next/previous page and amount per page
state.totalDocuments = null;
state.totalPages = null;
state.startItem = (state.currentPage - 1) * state.itemsPerPage + 1;
state.endItem = Math.max(
Math.min(
state.currentPage * state.itemsPerPage,
state.startItem + state.displayedDocuments.length - 1,
),
state.startItem,
);
if (state.displayedDocuments.length === 0) {
state.startItem = 0;
state.endItem = 0;
} else {
state.startItem = (state.currentPage - 1) * state.itemsPerPage + 1;
state.endItem = Math.max(
Math.min(
state.currentPage * state.itemsPerPage,
state.startItem + state.displayedDocuments.length - 1,
),
state.startItem,
);
}
Comment thread
tculig marked this conversation as resolved.
}
};

Expand Down
Loading