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 filters + autofocus new rows

Browse Source 
Fixes #269
This commit is contained in:
rijkvanzanten
2020-09-21 18:30:22 -04:00
parent e956c304ca
commit 33d912f638
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/composables/use-collection/use-collection.ts
View File

@@ -25,7 +25,7 @@ export function useCollection(collectionKey: string | Ref<string>) {
});
const userCreatedField = computed(() => {
return fields.value?.find((field) => field.meta?.special?.includes('user_created')) || null;
return fields.value?.find((field) => (field.meta?.special || []).includes('user_created')) || null;
});
const sortField = computed(() => {

8
app/src/composables/use-field-tree/use-field-tree.ts
View File

@@ -10,7 +10,10 @@ export default function useFieldTree(collection: Ref<string>) {
const tree = computed<FieldTree[]>(() => {
return fieldsStore
.getFieldsForCollection(collection.value)
.filter((field: Field) => field.meta?.hidden === false && field.meta?.special?.includes('alias') === false)
.filter(
(field: Field) =>
field.meta?.hidden === false && (field.meta?.special || []).includes('alias') === false
)
.map((field: Field) => parseField(field, []));
function parseField(field: Field, parents: Field[]) {
@@ -39,7 +42,8 @@ export default function useFieldTree(collection: Ref<string>) {
.getFieldsForCollection(relatedCollection)
.filter(
(field: Field) =>
field.meta?.hidden === false && field.meta?.special?.includes('alias') === false
field.meta?.hidden === false &&
(field.meta?.special || []).includes('alias') === false
);
})
.flat()

8
app/src/views/private/components/filter-drawer-detail/filter-drawer-detail.vue
View File

@@ -79,7 +79,10 @@ export default defineComponent({
const fieldTree = computed<FieldTree[]>(() => {
return fieldsStore
.getFieldsForCollection(props.collection)
.filter((field: Field) => field.meta?.hidden !== true && field.meta?.special?.includes('alias') === false)
.filter(
(field: Field) =>
field.meta?.hidden !== true && (field.meta?.special || []).includes('alias') === false
)
.map((field: Field) => parseField(field, []));
function parseField(field: Field, parents: Field[]) {
@@ -108,7 +111,8 @@ export default defineComponent({
.getFieldsForCollection(relatedCollection)
.filter(
(field: Field) =>
field.meta?.hidden !== true && field.meta?.special?.includes('alias') === false
field.meta?.hidden !== true &&
(field.meta?.special || []).includes('alias') === false
);
})
.flat()

11
app/src/views/private/components/filter-drawer-detail/filter-input.vue
View File

@@ -7,6 +7,7 @@
@input="setCSV(0, $event)"
:disabled="disabled"
:placeholder="$t('lower_limit')"
autofocus
>
<template #append>
<v-icon name="vertical_align_top" />
@@ -33,6 +34,7 @@
@input="setCSV(index, $event)"
:disabled="disabled"
:placeholder="$t('enter_a_value')"
autofocus
>
<template #append>
<v-icon v-if="csvValue.length > 1" name="close" @click="removeCSV(val)" />
@@ -45,7 +47,14 @@
</template>
<template v-else-if="['empty', 'nempty'].includes(operator) === false">
<v-checkbox v-if="type === 'checkbox'" :inputValue="_value" :disabled="disabled" />
<v-input :disabled="disabled" v-else v-model="_value" :type="type" :placeholder="$t('enter_a_value')" />
<v-input
:disabled="disabled"
v-else
autofocus
v-model="_value"
:type="type"
:placeholder="$t('enter_a_value')"
/>
</template>
</div>
</template>