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

Fix o2m updates not saving revisions nested

Browse Source
This commit is contained in:
rijkvanzanten
2021-05-24 21:05:50 -04:00
parent 2337b5b39f
commit 95307cee97
2 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/services/items.ts
View File

@@ -559,7 +559,7 @@ export class ItemsService<Item extends AnyItem = AnyItem> implements AbstractSer
const primaryKeys: PrimaryKey[] = [];
for (const payload of payloads) {
const primaryKey = await service.upsertOne(payload, { autoPurgeCache: false });
const primaryKey = await service.upsertOne(payload, { ...(opts || {}), autoPurgeCache: false });
primaryKeys.push(primaryKey);
}
@@ -576,7 +576,7 @@ export class ItemsService<Item extends AnyItem = AnyItem> implements AbstractSer
/**
* Delete multiple items by query
*/
async deleteByQuery(query: Query): Promise<PrimaryKey[]> {
async deleteByQuery(query: Query, opts?: MutationOptions): Promise<PrimaryKey[]> {
const primaryKeyField = this.schema.collections[this.collection].primary;
const readQuery = cloneDeep(query);
readQuery.fields = [primaryKeyField];
@@ -592,7 +592,7 @@ export class ItemsService<Item extends AnyItem = AnyItem> implements AbstractSer
if (keys.length === 0) return [];
return await this.deleteMany(keys);
return await this.deleteMany(keys, opts);
}
/**

44
api/src/services/payload.ts
View File

@@ -393,7 +393,9 @@ export class PayloadService {
.first());
if (exists) {
await itemsService.updateOne(relatedPrimaryKey, relatedRecord);
await itemsService.updateOne(relatedPrimaryKey, relatedRecord, {
onRevisionCreate: (id) => revisions.push(id),
});
} else {
relatedPrimaryKey = await itemsService.createOne(relatedRecord, {
onRevisionCreate: (id) => revisions.push(id),
@@ -474,7 +476,9 @@ export class PayloadService {
});
}
const savedPrimaryKeys = await itemsService.upsertMany(relatedRecords);
const savedPrimaryKeys = await itemsService.upsertMany(relatedRecords, {
onRevisionCreate: (id) => revisions.push(id),
});
const query: Query = {
filter: {
@@ -495,9 +499,16 @@ export class PayloadService {
// Nullify all related items that aren't included in the current payload
if (relation.meta.one_deselect_action === 'delete') {
// There's no revision for a deletion
await itemsService.deleteByQuery(query);
} else {
await itemsService.updateByQuery(query, { [relation.field]: null });
await itemsService.updateByQuery(
query,
{ [relation.field]: null },
{
onRevisionCreate: (id) => revisions.push(id),
}
);
}
}
// "Updates" object w/ create/update/delete
@@ -511,7 +522,10 @@ export class PayloadService {
alterations.create.map((item) => ({
...item,
[relation.field]: parent || payload[currentPrimaryKeyField],
}))
})),
{
onRevisionCreate: (id) => revisions.push(id),
}
);
}
@@ -519,10 +533,16 @@ export class PayloadService {
const primaryKeyField = this.schema.collections[this.collection].primary;
for (const item of alterations.update) {
await itemsService.updateOne(item[primaryKeyField], {
...item,
[relation.field]: parent || payload[currentPrimaryKeyField],
});
await itemsService.updateOne(
item[primaryKeyField],
{
...item,
[relation.field]: parent || payload[currentPrimaryKeyField],
},
{
onRevisionCreate: (id) => revisions.push(id),
}
);
}
}
@@ -547,7 +567,13 @@ export class PayloadService {
if (relation.meta.one_deselect_action === 'delete') {
await itemsService.deleteByQuery(query);
} else {
await itemsService.updateByQuery(query, { [relation.field]: null });
await itemsService.updateByQuery(
query,
{ [relation.field]: null },
{
onRevisionCreate: (id) => revisions.push(id),
}
);
}
}
}