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

Merge pull request #3846 from directus/issue/3315

Browse Source 
Use sort value in m2a preview values
This commit is contained in:
Rijk van Zanten
2021-01-29 10:39:50 -05:00
committed by GitHub
parent 4c00ad9fd3 77e10a7130
commit af5b14469f
1 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
app/src/interfaces/m2a-builder/m2a-builder.vue
View File

@@ -21,10 +21,7 @@
<v-icon class="drag-handle" name="drag_handle" @click.stop v-if="sortField" />
<span class="collection">{{ collections[item[anyRelation.one_collection_field]].name }}:</span>
<span
v-if="
typeof item[anyRelation.many_field] === 'number' ||
typeof item[anyRelation.many_field] === 'string'
"
v-if="typeof item[anyRelation.many_field] === 'number' || typeof item[anyRelation.many_field] === 'string'"
>
{{ item[anyRelation.many_field] }}
</span>
@@ -200,12 +197,8 @@ export default defineComponent({
return relationsStore.getRelationsForField(props.collection, props.field);
});
const o2mRelation = computed(
() => relationsForField.value.find((relation) => relation.one_collection !== null)!
);
const anyRelation = computed(
() => relationsForField.value.find((relation) => relation.one_collection === null)!
);
const o2mRelation = computed(() => relationsForField.value.find((relation) => relation.one_collection !== null)!);
const anyRelation = computed(() => relationsForField.value.find((relation) => relation.one_collection === null)!);
return { relationsForField, o2mRelation, anyRelation };
}
@@ -231,9 +224,7 @@ export default defineComponent({
const keys: Record<string, string> = {};
for (const collection of Object.values(collections.value)) {
keys[collection.collection] = fieldsStore.getPrimaryKeyFieldForCollection(
collection.collection
).field!;
keys[collection.collection] = fieldsStore.getPrimaryKeyFieldForCollection(collection.collection).field!;
}
return keys;
@@ -244,8 +235,7 @@ export default defineComponent({
for (const collection of Object.values(collections.value)) {
const primaryKeyField = fieldsStore.getPrimaryKeyFieldForCollection(collection.collection);
templates[collection.collection] =
collection.meta?.display_template || `{{${primaryKeyField.field}}}`;
templates[collection.collection] = collection.meta?.display_template || `{{${primaryKeyField.field}}}`;
}
return templates;
@@ -284,32 +274,37 @@ export default defineComponent({
})
.filter((val) => val);
return values.map((val) => {
// Find and nest the related item values for use in the preview
const collection = val[anyRelation.value.one_collection_field!];
return values
.map((val) => {
// Find and nest the related item values for use in the preview
const collection = val[anyRelation.value.one_collection_field!];
const key = isPlainObject(val[anyRelation.value.many_field])
? val[anyRelation.value.many_field][primaryKeys.value[collection]]
: val[anyRelation.value.many_field];
const key = isPlainObject(val[anyRelation.value.many_field])
? val[anyRelation.value.many_field][primaryKeys.value[collection]]
: val[anyRelation.value.many_field];
const item = relatedItemValues.value[collection]?.find(
(item) => item[primaryKeys.value[collection]] == key
);
const item = relatedItemValues.value[collection]?.find(
(item) => item[primaryKeys.value[collection]] == key
);
// When this item is created new and it has a uuid / auto increment id, there's no key to lookup
if (key && item) {
if (isPlainObject(val[anyRelation.value.many_field])) {
val[anyRelation.value.many_field] = {
...item,
...val[anyRelation.value.many_field],
};
} else {
val[anyRelation.value.many_field] = cloneDeep(item);
// When this item is created new and it has a uuid / auto increment id, there's no key to lookup
if (key && item) {
if (isPlainObject(val[anyRelation.value.many_field])) {
val[anyRelation.value.many_field] = {
...item,
...val[anyRelation.value.many_field],
};
} else {
val[anyRelation.value.many_field] = cloneDeep(item);
}
}
}
return val;
});
return val;
})
.sort((a, b) => {
if (!props.sortField) return 1;
return a[props.sortField] > b[props.sortField] ? 1 : -1;
});
});
return { fetchValues, previewValues, loading, junctionRowMap, relatedItemValues };
@@ -380,6 +375,7 @@ export default defineComponent({
o2mRelation.value.many_primary,
anyRelation.value.many_field,
anyRelation.value.one_collection_field!,
props.sortField,
],
},
});
@@ -402,8 +398,7 @@ export default defineComponent({
const fields = getFieldsFromTemplate(templates.value[collection]);
// Make sure to always fetch the primary key, so we can match that with the value
if (fields.includes(primaryKeys.value[collection]) === false)
fields.push(primaryKeys.value[collection]);
if (fields.includes(primaryKeys.value[collection]) === false) fields.push(primaryKeys.value[collection]);
return api.get(getEndpoint(collection), {
params: {
@@ -600,6 +595,10 @@ export default defineComponent({
}
.loader {
.v-skeleton-loader {
height: 52px;
}
.v-skeleton-loader + .v-skeleton-loader {
margin-top: 12px;
}