Skip to content

Fix List shows empty page too often #10190

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
djhi merged 1 commit into from
Sep 10, 2024
Merged

Fix List shows empty page too often #10190

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
22 changes: 19 additions & 3 deletions packages/ra-ui-materialui/src/list/ListView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,17 @@ export const ListView = <RecordType extends RaRecord = any>(
empty = defaultEmpty,
...rest
} = props;
const { defaultTitle, data, error, isPending, filterValues, resource } =
useListContext<RecordType>();
const {
defaultTitle,
data,
error,
isPending,
filterValues,
resource,
total,
hasNextPage,
hasPreviousPage,
} = useListContext<RecordType>();

if (!children || (!data && isPending && emptyWhileLoading)) {
return null;
Expand All @@ -58,9 +67,16 @@ export const ListView = <RecordType extends RaRecord = any>(
empty !== false && <div className={ListClasses.noResults}>{empty}</div>;

const shouldRenderEmptyPage =
// the list is not loading data for the first time
!isPending &&
data?.length === 0 &&
// the API returned no data (using either normal or partial pagination)
(total === 0 ||
(total == null &&
hasPreviousPage === false &&
hasNextPage === false)) &&
// the user didn't set any filters
!Object.keys(filterValues).length &&
// there is an empty page component
empty !== false;

return (
Expand Down