Skip to content
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

Correctly show list overflow error #2087

Merged
merged 11 commits into from
Jan 16, 2020
Merged

Correctly show list overflow error #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8292458
Correctly show list overflow error
MadeByMike Dec 11, 2019
f5ef40e
changesets Mike!
MadeByMike Dec 11, 2019
40a005a
Update packages/app-admin-ui/client/components/NoResults.js
MadeByMike Dec 11, 2019
899af2d
Merge branch 'master' into fix-list-overflow
MadeByMike Dec 11, 2019
209cf43
Merge branch 'master' into fix-list-overflow
MadeByMike Dec 17, 2019
1893973
Update packages/app-admin-ui/client/components/NoResults.js
MadeByMike Dec 18, 2019
ff94788
Merge branch 'master' into fix-list-overflow
MadeByMike Dec 18, 2019
a78faa8
Merge branch 'master' into fix-list-overflow
MadeByMike Jan 13, 2020
6495256
remove redundant currentPage check
MadeByMike Jan 13, 2020
c028fb2
return derp
MadeByMike Jan 15, 2020
b6296aa
Merge branch 'master' into fix-list-overflow
jesstelford Jan 15, 2020
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
5 changes: 5 additions & 0 deletions .changeset/yellow-students-argue.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystonejs/app-admin-ui': patch
---

Show a more helpful error in the AdminUI when the list page overflows the available number of items.
13 changes: 7 additions & 6 deletions packages/app-admin-ui/client/components/NoResults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,21 @@ export const NoResults = ({ currentPage, filters, list, search }) => {
</NoResultsWrapper>
);

if (currentPage !== 1) {
return pageDepthMessage;
}

if (filters && filters.length) {
return currentPage !== 1 ? (
pageDepthMessage
) : (
return (
<NoResultsWrapper>
No {list.plural.toLowerCase()} found matching the{' '}
{filters.length > 1 ? 'filters' : 'filter'}
</NoResultsWrapper>
);
}

if (search && search.length) {
return currentPage !== 1 ? (
pageDepthMessage
) : (
return (
<NoResultsWrapper>
No {list.plural.toLowerCase()} found matching &ldquo;
{search}
Expand Down