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 reuse same M2M junction fields (#9789)

Browse Source 
* reuse one_field if same m2m junction collection

* remove condition preventing 'create new'
This commit is contained in:
José Varela
2021-11-24 21:04:00 +00:00
committed by GitHub
parent 1f3e0f668b
commit 485c984231
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/modules/settings/routes/data-model/field-detail/store/alterations/m2m.ts
View File

@@ -1,6 +1,6 @@
import { StateUpdates, State, HelperFunctions } from '../types';
import { set } from 'lodash';
import { useCollectionsStore, useFieldsStore } from '@/stores';
import { useCollectionsStore, useFieldsStore, useRelationsStore } from '@/stores';
export function applyChanges(updates: StateUpdates, state: State, helperFn: HelperFunctions) {
const { hasChanged } = helperFn;
@@ -241,6 +241,7 @@ export function generateCollections(updates: StateUpdates, state: State, { getCu
function generateFields(updates: StateUpdates, state: State, { getCurrent }: HelperFunctions) {
const fieldsStore = useFieldsStore();
const relationsStore = useRelationsStore();
const currentPrimaryKeyField = fieldsStore.getPrimaryKeyFieldForCollection(state.collection!);
const junctionCollection = getCurrent('relations.o2m.collection');
const junctionCurrent = getCurrent('relations.o2m.field');
@@ -249,6 +250,13 @@ function generateFields(updates: StateUpdates, state: State, { getCurrent }: Hel
const relatedCollection = getCurrent('relations.m2o.related_collection');
const relatedPrimaryKeyField =
fieldsStore.getPrimaryKeyFieldForCollection(relatedCollection) ?? getCurrent('collections.related.fields[0]');
const existsJunctionRelated = relationsStore.relations.find(
(relation) => relation.collection === junctionCollection && relation.field === junctionRelated
);
if (existsJunctionRelated) {
set(updates, 'relations.m2o.meta.one_field', existsJunctionRelated.meta?.one_field);
}
if (junctionCollection && junctionCurrent && fieldExists(junctionCollection, junctionCurrent) === false) {
set(updates, 'fields.junctionCurrent', {