github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-23 09:38:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix nested m2m updates

Browse Source 
Fixes #849
This commit is contained in:
rijkvanzanten
2020-11-03 17:51:16 -05:00
parent bd388b93d9
commit e5d70ebde2
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,6 +325,8 @@ export class PayloadService {
const relatedRecord: Partial<Item> = payload[relation.many_field];
const hasPrimaryKey = relatedRecord.hasOwnProperty(relation.one_primary);
if (['string', 'number'].includes(typeof relatedRecord)) continue;
let relatedPrimaryKey: PrimaryKey = relatedRecord[relation.one_primary];
const exists = hasPrimaryKey && !!(await itemsService.readByKey(relatedPrimaryKey));

22
app/src/interfaces/many-to-many/use-sort.ts
View File

@@ -10,6 +10,17 @@ export default function useSort(
) {
const sort = ref<Sort>({ by: sortField.value || fields.value[0], desc: false });
const sortedItems = computed(() => {
const sField = sortField.value;
if (sField === null || sort.value.by !== sField) return null;
const desc = sort.value.desc;
const sorted = sortBy(items.value, [sField]);
return desc ? sorted.reverse() : sorted;
});
return { sort, sortItems, sortedItems };
function sortItems(newItems: Record<string, any>[]) {
const sField = sortField.value;
if (sField === null) return;
@@ -21,15 +32,4 @@ export default function useSort(
emit(itemsSorted);
}
const sortedItems = computed(() => {
const sField = sortField.value;
if (sField === null || sort.value.by !== sField) return null;
const desc = sort.value.desc;
const sorted = sortBy(items.value, [sField]);
return desc ? sorted.reverse() : sorted;
});
return { sort, sortItems, sortedItems };
}