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

fix: make pagination work properly

Browse Source
This commit is contained in:
Bassel Kanso 2024-01-19 10:25:50 +02:00
parent efeb53f7ab
commit 0d380ed3ae
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/core/content-manager/server/src/controllers/relations.ts
View File

@ -1,4 +1,4 @@
import { prop, isEmpty, uniq, flow, concat, uniqBy } from 'lodash/fp'; import { prop, isEmpty, uniq, flow, uniqBy, concat } from 'lodash/fp';
import { isOperatorOfType, contentTypes, relations } from '@strapi/utils'; import { isOperatorOfType, contentTypes, relations } from '@strapi/utils';
import { getService } from '../utils'; import { getService } from '../utils';
import { validateFindAvailable, validateFindExisting } from './validation/relations'; import { validateFindAvailable, validateFindExisting } from './validation/relations';
@ -254,7 +254,8 @@ export default {
const permissionQuery = await permissionChecker.sanitizedQuery.read(queryParams); const permissionQuery = await permissionChecker.sanitizedQuery.read(queryParams);
if (isAnyToMany(attribute)) { if (isAnyToMany(attribute)) {
const resWithIds = await strapi.entityService.loadPages( const [resWithIds, res] = await Promise.all([
strapi.entityService.loadPages(
model, model,
{ id }, { id },
targetField, targetField,
@ -265,9 +266,8 @@ export default {
page: ctx.request.query.page, page: ctx.request.query.page,
pageSize: ctx.request.query.pageSize, pageSize: ctx.request.query.pageSize,
} }
); ),
strapi.entityService.loadPages(
const res = await strapi.entityService.loadPages(
model, model,
{ id }, { id },
targetField, targetField,
@ -279,9 +279,15 @@ export default {
page: ctx.request.query.page, page: ctx.request.query.page,
pageSize: ctx.request.query.pageSize, pageSize: ctx.request.query.pageSize,
} }
); ),
]);
// Filter out the results that don't exist in resWithIds to preserve correct pagination
const results = res.results.filter((item: any) =>
resWithIds.results.some((s: any) => item.id === s.id)
);
res.results = uniqBy('id', concat(results, resWithIds.results));
res.results = uniqBy('id', concat(res.results, resWithIds.results));
ctx.body = res; ctx.body = res;
} else { } else {
const result = await strapi.entityService.load(model, { id }, targetField, queryParams); const result = await strapi.entityService.load(model, { id }, targetField, queryParams);