tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fixes bug with links always populating

Browse Source
This commit is contained in:
James
2022-09-07 16:52:32 -07:00
parent a99d9c98c3
commit eb963066f7
3 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/fields/richText/richTextRelationshipPromise.ts
View File

@@ -36,49 +36,16 @@ export const recurseRichText = ({
}: RecurseRichTextArgs): void => {
if (Array.isArray(children)) {
(children as any[]).forEach((element) => {
if ((element.type === 'relationship' || element.type === 'upload')
&& element?.value?.id
&& (depth && currentDepth <= depth)) {
const collection = req.payload.collections[element?.relationTo];
if (collection) {
promises.push(populate({
req,
id: element.value.id,
data: element,
key: 'value',
overrideAccess,
depth,
currentDepth,
field,
collection,
showHiddenFields,
}));
}
if (element.type === 'upload' && Array.isArray(field.admin?.upload?.collections?.[element?.relationTo]?.fields)) {
recurseNestedFields({
promises,
data: element.fields || {},
fields: field.admin.upload.collections[element.relationTo].fields,
req,
overrideAccess,
depth,
currentDepth,
showHiddenFields,
});
}
}
if (element.type === 'link') {
if (element?.doc?.value && element?.doc?.relationTo) {
const collection = req.payload.collections[element?.doc?.relationTo];
if ((depth && currentDepth <= depth)) {
if ((element.type === 'relationship' || element.type === 'upload')
&& element?.value?.id) {
const collection = req.payload.collections[element?.relationTo];
if (collection) {
promises.push(populate({
req,
id: element.doc.value,
data: element.doc,
id: element.value.id,
data: element,
key: 'value',
overrideAccess,
depth,
@@ -88,19 +55,53 @@ export const recurseRichText = ({
showHiddenFields,
}));
}
if (element.type === 'upload' && Array.isArray(field.admin?.upload?.collections?.[element?.relationTo]?.fields)) {
recurseNestedFields({
promises,
data: element.fields || {},
fields: field.admin.upload.collections[element.relationTo].fields,
req,
overrideAccess,
depth,
currentDepth,
showHiddenFields,
});
}
}
if (Array.isArray(field.admin?.link?.fields)) {
recurseNestedFields({
promises,
data: element.fields || {},
fields: field.admin?.link?.fields,
req,
overrideAccess,
depth,
currentDepth,
showHiddenFields,
});
if (element.type === 'link') {
if (element?.doc?.value && element?.doc?.relationTo) {
const collection = req.payload.collections[element?.doc?.relationTo];
if (collection) {
promises.push(populate({
req,
id: element.doc.value,
data: element.doc,
key: 'value',
overrideAccess,
depth,
currentDepth,
field,
collection,
showHiddenFields,
}));
}
}
if (Array.isArray(field.admin?.link?.fields)) {
recurseNestedFields({
promises,
data: element.fields || {},
fields: field.admin?.link?.fields,
req,
overrideAccess,
depth,
currentDepth,
showHiddenFields,
});
}
}
}