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

sort fields when getting them from the store (#4154)

Browse Source
This commit is contained in:
Nitwel
2021-02-18 18:54:49 +01:00
committed by GitHub
parent 7a2a4c311a
commit 52922866ef
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue
View File

@@ -193,14 +193,12 @@ export default defineComponent({
const fields = computed(() => {
if (!state.relations[0].many_collection) return [];
return fieldsStore.state.fields
.filter((field) => field.collection === state.relations[0].many_collection)
.map((field) => ({
text: field.field,
value: field.field,
disabled:
!field.schema || field.schema?.is_primary_key || field.type !== currentCollectionPrimaryKey.value.type,
}));
return fieldsStore.getFieldsForCollection(state.relations[0].many_collection).map((field: Field) => ({
text: field.field,
value: field.field,
disabled:
!field.schema || field.schema?.is_primary_key || field.type !== currentCollectionPrimaryKey.value.type,
}));
});
const collectionMany = computed({

8
app/src/stores/fields.ts
View File

@@ -222,7 +222,13 @@ export const useFieldsStore = createStore({
return primaryKeyField;
},
getFieldsForCollection(collection: string) {
return this.state.fields.filter((field) => field.collection === collection);
return this.state.fields
.filter((field) => field.collection === collection)
.sort((a, b) => {
if (a.field < b.field) return -1;
else if (a.field > b.field) return 1;
else return 1;
});
},
getField(collection: string, fieldKey: string) {
if (fieldKey.includes('.')) {