diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js index 5dc5464aab..df42ed858d 100644 --- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js +++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js @@ -30,12 +30,11 @@ export const RelationInputDataManger = ({ const { formatMessage } = useIntl(); const { connectRelation, disconnectRelation, loadRelation, modifiedData, slug, initialData } = useCMEditViewDataManager(); - const relationsCount = initialData[name]?.count ?? 0; const [{ query }] = useQueryParams(); const { relations, search, searchFor } = useRelation(`${slug}-${name}-${initialData?.id ?? ''}`, { relation: { - enabled: relationsCount > 0 && !!endpoints.relation, + enabled: initialData[name]?.count !== 0 && !!endpoints.relation, endpoint: endpoints.relation, pageParams: { ...defaultParams, @@ -141,13 +140,10 @@ export const RelationInputDataManger = ({ description={description} disabled={isDisabled} id={name} - label={formatMessage( - { - id: intlLabel.id, - defaultMessage: `${intlLabel.defaultMessage} ({numberOfEntries})`, - }, - { numberOfEntries: relationsCount } - )} + label={`${formatMessage({ + id: intlLabel.id, + defaultMessage: intlLabel.defaultMessage, + })} ${initialData[name]?.count ? `(${initialData[name].count})` : ''}`} labelAction={labelAction} labelLoadMore={ // TODO: only display if there are more; derive from count diff --git a/packages/core/content-manager/server/controllers/relations.js b/packages/core/content-manager/server/controllers/relations.js index 8d3ce208c1..c51c407343 100644 --- a/packages/core/content-manager/server/controllers/relations.js +++ b/packages/core/content-manager/server/controllers/relations.js @@ -208,7 +208,8 @@ module.exports = { ctx.body = await strapi.entityService.findPage(targetedModel.uid, queryParams); } else { const results = await strapi.entityService.findMany(targetedModel.uid, queryParams); - ctx.body = results[0]; + // TODO: Temporary fix (use data instead) + ctx.body = { results, pagination: { page: 1, pageSize: 5, pageCount: 1, total: 1 } }; } }, };