Merge branch 'master' of github.com:payloadcms/payload into feat/extensible-auth-strategies

This commit is contained in:
James
2022-07-11 11:45:48 -07:00
3 changed files with 51 additions and 14 deletions

View File

@@ -51,12 +51,18 @@ const optionsReducer = (state: Option[], action: Action): Option[] => {
}
return docs;
},
ids.map((id) => ({
label: labelKey === 'id' ? id : `Untitled - ID: ${id}`,
value: id,
}))),
[]),
];
ids.forEach((id) => {
if (!loadedIDs.includes(id)) {
options.push({
label: labelKey === 'id' ? id : `Untitled - ID: ${id}`,
value: id,
});
}
});
return sort ? sortOptions(options) : options;
}
@@ -78,14 +84,16 @@ const optionsReducer = (state: Option[], action: Action): Option[] => {
}
return docs;
},
[
...ids.map((id) => ({
label: labelKey === 'id' ? id : `Untitled - ID: ${id}`,
value: id,
relationTo: relation,
})),
]);
}, []);
ids.forEach((id) => {
if (!loadedIDs.includes(id)) {
newSubOptions.push({
label: labelKey === 'id' ? id : `Untitled - ID: ${id}`,
value: id,
});
}
});
if (optionsToAddTo) {
const subOptions = [