MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Spelling fix.

This commit is contained in:
mike12345567 2023-10-03 17:33:58 +01:00
parent 02bfaa4378
commit 2c20d0b738
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte
View File

@ -3,19 +3,19 @@
Body, Body,
Button, Button,
Combobox, Combobox,
Multiselect,
DatePicker, DatePicker,
DrawerContent, DrawerContent,
Icon, Icon,
Input, Input,
Layout,
Select,
Label, Label,
Layout,
Multiselect,
Select,
} from "@budibase/bbui" } from "@budibase/bbui"
import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte" import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte" import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
import {generate} from "shortid" import {generate} from "shortid"
import { LuceneUtils, Constants } from "@budibase/frontend-core" import {Constants, LuceneUtils} from "@budibase/frontend-core"
import {getFields} from "helpers/searchFields" import {getFields} from "helpers/searchFields"
import {FieldType} from "@budibase/types" import {FieldType} from "@budibase/types"
import {createEventDispatcher, onMount} from "svelte" import {createEventDispatcher, onMount} from "svelte"
@ -122,7 +122,7 @@
return enrichedSchemaFields.find(field => field.name === filter.field) return enrichedSchemaFields.find(field => field.name === filter.field)
} }
const santizeTypes = filter => { const sanitizeTypes = filter => {
// Update type based on field // Update type based on field
const fieldSchema = enrichedSchemaFields.find(x => x.name === filter.field) const fieldSchema = enrichedSchemaFields.find(x => x.name === filter.field)
filter.type = fieldSchema?.type filter.type = fieldSchema?.type
@ -131,7 +131,7 @@
filter.externalType = getSchema(filter)?.externalType filter.externalType = getSchema(filter)?.externalType
} }
const santizeOperator = filter => { const sanitizeOperator = filter => {
// Ensure a valid operator is selected // Ensure a valid operator is selected
const operators = getValidOperatorsForType(filter).map(x => x.value) const operators = getValidOperatorsForType(filter).map(x => x.value)
if (!operators.includes(filter.operator)) { if (!operators.includes(filter.operator)) {
@ -146,7 +146,7 @@
filter.noValue = noValueOptions.includes(filter.operator) filter.noValue = noValueOptions.includes(filter.operator)
} }
const santizeValue = (filter, previousType) => { const sanitizeValue = (filter, previousType) => {
// Check if the operator allows a value at all // Check if the operator allows a value at all
if (filter.noValue) { if (filter.noValue) {
filter.value = null filter.value = null
@ -171,18 +171,18 @@
const onFieldChange = filter => { const onFieldChange = filter => {
const previousType = filter.type const previousType = filter.type
santizeTypes(filter) sanitizeTypes(filter)
santizeOperator(filter) sanitizeOperator(filter)
santizeValue(filter, previousType) sanitizeValue(filter, previousType)
} }
const onOperatorChange = filter => { const onOperatorChange = filter => {
santizeOperator(filter) sanitizeOperator(filter)
santizeValue(filter) sanitizeValue(filter)
} }
const onValueTypeChange = filter => { const onValueTypeChange = filter => {
santizeValue(filter) sanitizeValue(filter)
} }
const getFieldOptions = field => { const getFieldOptions = field => {
@ -195,13 +195,11 @@
return [] return []
} }
const operators = LuceneUtils.getValidOperatorsForType( return LuceneUtils.getValidOperatorsForType(
filter.type, filter.type,
filter.field, filter.field,
datasource datasource
) )
return operators
} }
</script> </script>