Skip to content

Commit

Permalink
Fix advanced filter sidebar detail
Browse files Browse the repository at this point in the history
Fixes #7004
  • Loading branch information
rijkvanzanten committed Jul 27, 2021
1 parent 99435b5 commit 5c43ead
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<v-list>
<v-list-item
v-for="operator in parsedField.operators"
v-for="operator in filterOperators"
:key="operator"
:active="operator === activeOperator"
clickable
Expand All @@ -35,7 +35,7 @@
/>
</div>
<div class="field">
<filter-input v-model="value" :type="parsedField.type" :operator="activeOperator" :disabled="disabled" />
<filter-input v-model="value" :type="field.type" :operator="activeOperator" :disabled="disabled" />
</div>
</div>
</template>
Expand Down Expand Up @@ -92,12 +92,13 @@ export default defineComponent({
return getNameForFieldKey(props.filter.field);
});
const parsedField = computed(() => {
const field = getFieldForKey(props.filter.field);
return getFilterOperatorsForType(field.type);
const field = computed(() => getFieldForKey(props.filter.field));
const filterOperators = computed(() => {
return getFilterOperatorsForType(field.value.type);
});
return { t, activeOperator, value, name, parsedField };
return { t, activeOperator, value, name, field, filterOperators };
function getFieldForKey(fieldKey: string) {
return fieldsStore.getField(props.collection, fieldKey);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export default defineComponent({
function addFilterForField(fieldKey: string) {
const field = fieldsStore.getField(props.collection, fieldKey) as Field;
const defaultOperator = getFilterOperatorsForType(field.type).operators[0];
const defaultOperator = getFilterOperatorsForType(field.type)[0];
emit('update:modelValue', [
...props.modelValue,
Expand Down

0 comments on commit 5c43ead

Please sign in to comment.