github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Error applying schemas with nested collection(s) (#13949)

Browse Source 
* Fix nested collection creation when parent exists

* tests

* desc | comments

* typo

* minor tweak

Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
This commit is contained in:
Ian Pirro
2022-07-21 00:29:12 -07:00
committed by GitHub
parent 53168f75ad
commit 23912e5232
4 changed files with 747 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
api/src/utils/apply-snapshot.ts
View File

@@ -96,12 +96,38 @@ export async function applySnapshot(
}
};
// create top level collections (no group) first, then continue with nested collections recursively
await createCollections(
snapshotDiff.collections.filter(
({ diff }) => diff[0].kind === 'N' && (diff[0] as DiffNew<Collection>).rhs.meta?.group === null
)
);
// Finds all collections that need to be created
const filterCollectionsForCreation = ({ diff }: { collection: string; diff: Diff<Collection | undefined>[] }) => {
// Check new collections only
const isNewCollection = diff[0].kind === 'N';
if (!isNewCollection) return false;
// Create now if no group
const groupName = (diff[0] as DiffNew<Collection>).rhs.meta?.group;
if (!groupName) return true;
// Check if parent collection already exists in schema
const parentExists = current.collections.find((c) => c.collection === groupName) !== undefined;
// If this is a new collection and the parent collection doesn't exist in current schema ->
// Check if the parent collection will be created as part of applying this snapshot ->
// If yes -> this collection will be created recursively
// If not -> create now
// (ex.)
// TopLevelCollection - I exist in current schema
// NestedCollection - I exist in snapshotDiff as a new collection
// TheCurrentCollectionInIteration - I exist in snapshotDiff as a new collection but will be created as part of NestedCollection
const parentWillBeCreatedInThisApply =
snapshotDiff.collections.filter(({ collection, diff }) => diff[0].kind === 'N' && collection === groupName)
.length > 0;
// Has group, but parent is not new, parent is also not being created in this snapshot apply
if (parentExists && !parentWillBeCreatedInThisApply) return true;
return false;
};
// Create top level collections (no group, or highest level in existing group) first,
// then continue with nested collections recursively
await createCollections(snapshotDiff.collections.filter(filterCollectionsForCreation));
// delete top level collections (no group) first, then continue with nested collections recursively
await deleteCollections(