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

Prevent bindings from being used when filtering tables in the data UI

This commit is contained in:
Andrew Kingston 2021-09-29 09:18:08 +01:00
parent 98341b7237
commit 43eac99730
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
View File

@ -30,7 +30,11 @@
onConfirm={() => dispatch("change", tempValue)} onConfirm={() => dispatch("change", tempValue)}
> >
<div class="wrapper"> <div class="wrapper">
<FilterDrawer bind:filters={tempValue} {schemaFields} /> <FilterDrawer
allowBindings={false}
bind:filters={tempValue}
{schemaFields}
/>
</div> </div>
</ModalContent> </ModalContent>
</Modal> </Modal>

4
packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
View File

@ -19,12 +19,14 @@
export let filters = [] export let filters = []
export let bindings = [] export let bindings = []
export let panel = BindingPanel export let panel = BindingPanel
export let allowBindings = true
const BannedTypes = ["link", "attachment", "formula"] const BannedTypes = ["link", "attachment", "formula"]
$: fieldOptions = (schemaFields ?? []) $: fieldOptions = (schemaFields ?? [])
.filter(field => !BannedTypes.includes(field.type)) .filter(field => !BannedTypes.includes(field.type))
.map(field => field.name) .map(field => field.name)
$: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"]
const addFilter = () => { const addFilter = () => {
filters = [ filters = [
@ -117,7 +119,7 @@
/> />
<Select <Select
disabled={filter.noValue || !filter.field} disabled={filter.noValue || !filter.field}
options={["Value", "Binding"]} options={valueTypeOptions}
bind:value={filter.valueType} bind:value={filter.valueType}
placeholder={null} placeholder={null}
/> />