CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-27 00:55:50 +12:00
Code Issues Projects Releases Wiki Activity

Remove log and account for onEmptyFilter in grid button

Browse source
This commit is contained in:
Andrew Kingston 2023-08-21 16:53:09 +01:00
parent 86c9e2a192
commit 59559ee93c
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
View file

@ -15,6 +15,7 @@
$: tempValue = filters || [] $: tempValue = filters || []
$: schemaFields = Object.values(schema || {}) $: schemaFields = Object.values(schema || {})
$: text = getText(filters) $: text = getText(filters)
$: selected = tempValue.filter(x => !x.onEmptyFilter)?.length > 0
const getText = filters => { const getText = filters => {
const count = filters?.filter(filter => filter.field)?.length const count = filters?.filter(filter => filter.field)?.length
@ -22,13 +23,7 @@
} }
</script> </script>
<ActionButton <ActionButton icon="Filter" quiet {disabled} on:click={modal.show} {selected}>
icon="Filter"
quiet
{disabled}
on:click={modal.show}
selected={tempValue?.length > 0}
>
{text} {text}
</ActionButton> </ActionButton>
<Modal bind:this={modal}> <Modal bind:this={modal}>

8
packages/frontend-core/src/fetch/DataFetch.js
View file

@ -354,14 +354,6 @@ export default class DataFetch {
const entries = Object.entries(newOptions || {}) const entries = Object.entries(newOptions || {})
for (let [key, value] of entries) { for (let [key, value] of entries) {
if (JSON.stringify(value) !== JSON.stringify(this.options[key])) { if (JSON.stringify(value) !== JSON.stringify(this.options[key])) {
console.log(
key,
"is different",
"new",
value,
"vs old",
this.options[key]
)
refresh = true refresh = true
break break
} }