yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-08 14:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: gracefully fail 404 results from API

Browse Source
This commit is contained in:
Josh 2022-11-02 14:21:31 +00:00
parent 55c20e9773
commit c1f8d20245
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/normalizeSearchResults.js
View File

@ -8,8 +8,9 @@ export const normalizeSearchResults = (relations, { mainFieldName }) => {
...relations, ...relations,
data: pages data: pages
.map((page) => .map((page) =>
(page ?? []).results.map((relation) => normalizeRelation(relation, { mainFieldName })) page?.results.map((relation) => normalizeRelation(relation, { mainFieldName }))
) )
.filter(Boolean)
.flat(), .flat(),
}; };
}; };

30
packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js
View File

@ -49,13 +49,26 @@ export const useRelation = (cacheKey, { name, relation, search }) => {
const relationsRes = useInfiniteQuery(['relation', cacheKey], fetchRelations, { const relationsRes = useInfiniteQuery(['relation', cacheKey], fetchRelations, {
cacheTime: 0, cacheTime: 0,
enabled: relation.enabled, enabled: relation.enabled,
/**
* @type {(lastPage:
* | { data: null }
* | { results: any[],
* pagination: {
* page: number,
* pageCount: number,
* pageSize: number,
* total: number
* }
* }
* ) => number}
*/
getNextPageParam(lastPage) { getNextPageParam(lastPage) {
const isXToOneRelation = !lastPage?.pagination; const isXToOneRelation = !lastPage?.pagination;
if ( if (
!lastPage || // the API may send an empty 204 response !lastPage || // the API may send an empty 204 response
isXToOneRelation || // xToOne relations do not have a pagination isXToOneRelation || // xToOne relations do not have a pagination
lastPage.pagination.page >= lastPage.pagination.pageCount lastPage?.pagination.page >= lastPage?.pagination.pageCount
) { ) {
return undefined; return undefined;
} }
@ -126,8 +139,21 @@ export const useRelation = (cacheKey, { name, relation, search }) => {
fetchSearch, fetchSearch,
{ {
enabled: Object.keys(searchParams).length > 0, enabled: Object.keys(searchParams).length > 0,
/**
* @type {(lastPage:
* | { data: null }
* | { results: any[],
* pagination: {
* page: number,
* pageCount: number,
* pageSize: number,
* total: number
* }
* }
* ) => number}
*/
getNextPageParam(lastPage) { getNextPageParam(lastPage) {
if (lastPage.pagination.page >= lastPage.pagination.pageCount) { if (!lastPage?.pagination || lastPage.pagination.page >= lastPage.pagination.pageCount) {
return undefined; return undefined;
} }