yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-29 08:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter populate to exclude undefined

Browse Source
This commit is contained in:
Alexandre Bodin 2021-07-30 10:53:29 +02:00
parent 89fee54582
commit 884539a70c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/database/lib/query/helpers.js
View File

@ -541,7 +541,7 @@ const applyPopulate = async (results, populate, ctx) => {
} = attribute.joinColumn;
const referencedValues = _.uniq(
results.map(r => r[joinColumnName]).filter(value => !_.isNull(value))
results.map(r => r[joinColumnName]).filter(value => !_.isNil(value))
);
if (_.isEmpty(referencedValues)) {
@ -644,7 +644,7 @@ const applyPopulate = async (results, populate, ctx) => {
} = attribute.joinColumn;
const referencedValues = _.uniq(
results.map(r => r[joinColumnName]).filter(value => !_.isNull(value))
results.map(r => r[joinColumnName]).filter(value => !_.isNil(value))
);
if (_.isEmpty(referencedValues)) {
@ -808,7 +808,7 @@ const applyPopulate = async (results, populate, ctx) => {
const { idColumn, typeColumn } = targetAttribute.morphColumn;
const referencedValues = _.uniq(
results.map(r => r[idColumn.referencedColumn]).filter(value => !_.isNull(value))
results.map(r => r[idColumn.referencedColumn]).filter(value => !_.isNil(value))
);
if (_.isEmpty(referencedValues)) {
@ -844,7 +844,7 @@ const applyPopulate = async (results, populate, ctx) => {
const { idColumn, typeColumn } = morphColumn;
const referencedValues = _.uniq(
results.map(r => r[idColumn.referencedColumn]).filter(value => !_.isNull(value))
results.map(r => r[idColumn.referencedColumn]).filter(value => !_.isNil(value))
);
if (_.isEmpty(referencedValues)) {
@ -900,7 +900,7 @@ const applyPopulate = async (results, populate, ctx) => {
// fetch join table to create the ids map then do the same as morphToOne without the first
const referencedValues = _.uniq(
results.map(r => r[joinColumn.referencedColumn]).filter(value => !_.isNull(value))
results.map(r => r[joinColumn.referencedColumn]).filter(value => !_.isNil(value))
);
const qb = db.entityManager.createQueryBuilder(joinTable.name);