github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-29 22:57:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Save as Copy" for relational fields (#10418)

Browse Source 
* fix "save as copy" for relational fields

* use router replace instead of push
This commit is contained in:
Azri Kahar
2022-03-05 08:50:35 +08:00
committed by GitHub
parent 2312a0e20d
commit c51ca2e67b
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/composables/use-item/use-item.ts
View File

@@ -1,5 +1,6 @@
import api from '@/api';
import { useCollection } from '@directus/shared/composables';
import { useFieldsStore, useRelationsStore } from '@/stores/';
import { VALIDATION_TYPES } from '@/constants';
import { i18n } from '@/lang';
import { APIError } from '@/types';
@@ -166,6 +167,54 @@ export function useItem(collection: Ref<string>, primaryKey: Ref<string | number
delete newItem[primaryKeyField.value.field];
}
// Make sure to delete nested relational primary keys
const fieldsStore = useFieldsStore();
const relationsStore = useRelationsStore();
const relations = relationsStore.getRelationsForCollection(collection.value);
for (const relation of relations) {
const relatedPrimaryKeyField = fieldsStore.getPrimaryKeyFieldForCollection(relation.collection);
const existsJunctionRelated = relationsStore.relations.find(
(r) => r.collection === relation.collection && r.meta?.many_field === relation.meta?.junction_field
);
if (relation.meta?.one_field && relation.meta.one_field in newItem) {
const fieldsToFetch = fields
.filter((field) => field.startsWith(relation.meta!.one_field!))
.map((field) => field.split('.').slice(1).join('.'));
const existingIds = newItem[relation.meta.one_field].filter((item: any) => typeof item !== 'object');
let existingItems: any[] = [];
if (existingIds.length > 0) {
const response = await api.get(getEndpoint(relation.collection), {
params: {
fields: [relatedPrimaryKeyField!.field, ...fieldsToFetch],
[`filter[${relatedPrimaryKeyField!.field}][_in]`]: existingIds.join(','),
},
});
existingItems = response.data.data;
}
newItem[relation.meta.one_field] = newItem[relation.meta.one_field].map((relatedItem: any) => {
if (typeof relatedItem !== 'object' && existingItems.length > 0) {
relatedItem = existingItems.find((existingItem: any) => existingItem.id === relatedItem);
}
delete relatedItem[relatedPrimaryKeyField!.field];
if (relation.meta?.junction_field && existsJunctionRelated?.related_collection) {
const junctionRelatedPrimaryKeyField = fieldsStore.getPrimaryKeyFieldForCollection(
existsJunctionRelated.related_collection
);
delete relatedItem[relation.meta.junction_field][junctionRelatedPrimaryKeyField!.field];
}
return relatedItem;
});
}
}
const errors = validate(newItem);
if (errors.length > 0) {

2
app/src/modules/content/routes/item.vue
View File

@@ -474,7 +474,7 @@ export default defineComponent({
async function saveAsCopyAndNavigate() {
try {
const newPrimaryKey = await saveAsCopy();
if (newPrimaryKey) router.push(`/content/${props.collection}/${encodeURIComponent(newPrimaryKey)}`);
if (newPrimaryKey) router.replace(`/content/${props.collection}/${encodeURIComponent(newPrimaryKey)}`);
} catch {
// Save shows unexpected error dialog
}