From c893cd485f2da07a7f186b9aca9982ea4f0bb5a1 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 10 Jul 2023 11:33:10 +0100 Subject: [PATCH 1/2] Make sure displayed filter count is correct --- .../design/settings/controls/FilterEditor/FilterEditor.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte index 9d48789947f..511ee24b51a 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte @@ -20,7 +20,7 @@ $: datasource = getDatasourceForProvider($currentAsset, componentInstance) $: schema = getSchemaForDatasource($currentAsset, datasource)?.schema $: schemaFields = Object.values(schema || {}) - $: text = getText(value) + $: text = getText(value.filter(filter => filter.field)) async function saveFilter() { dispatch("change", tempValue) From 48811155a73b43ab391423e5d18705ea6ad3a3e3 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 10 Jul 2023 13:57:32 +0100 Subject: [PATCH 2/2] Fix for false boolean filter --- packages/backend-core/src/db/lucene.ts | 3 +++ .../design/settings/controls/FilterEditor/FilterEditor.svelte | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts index d501bb2166d..a491451a62c 100644 --- a/packages/backend-core/src/db/lucene.ts +++ b/packages/backend-core/src/db/lucene.ts @@ -433,6 +433,9 @@ export class QueryBuilder { if (!value) { return null } + if (typeof value === "boolean") { + return `(*:* AND !${key}:${value})` + } return `!${key}:${builder.preprocess(value, allPreProcessingOpts)}` }) } diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte index 511ee24b51a..88c3842f54d 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte @@ -20,7 +20,7 @@ $: datasource = getDatasourceForProvider($currentAsset, componentInstance) $: schema = getSchemaForDatasource($currentAsset, datasource)?.schema $: schemaFields = Object.values(schema || {}) - $: text = getText(value.filter(filter => filter.field)) + $: text = getText(value?.filter(filter => filter.field)) async function saveFilter() { dispatch("change", tempValue)