diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 536692eecc..d188073b95 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -481,6 +481,7 @@ const getSelectedRowsBindings = asset => { block._id + "-table" )}.${makePropSafe("selectedRows")}`, readableBinding: `${block._instanceName}.Selected rows`, + category: "Selected rows", })) ) } @@ -1004,7 +1005,10 @@ const bindingReplacement = ( * {{ literal [componentId] }} */ const extractLiteralHandlebarsID = value => { - return value?.match(/{{\s*literal\s*\[+([^\]]+)].*}}/)?.[1] + if (!value || typeof value !== "string") { + return null + } + return value.match(/{{\s*literal\s*\[+([^\]]+)].*}}/)?.[1] } /** diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index 24353c8f58..d495e37216 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -32,8 +32,8 @@ const { getValidOperatorsForType } = LuceneUtils const KeyedFieldRegex = /\d[0-9]*:/g const behaviourOptions = [ - { value: "and", label: "Match all of the following filters" }, - { value: "or", label: "Match any of the following filters" }, + { value: "and", label: "Match all filters" }, + { value: "or", label: "Match any filter" }, ] let rawFilters @@ -173,15 +173,9 @@
- - {#if !rawFilters?.length} - Add your first filter expression. - {:else} - Results are filtered to only those which match all of the following - constraints. - {/if} - - {#if rawFilters?.length} + {#if !rawFilters?.length} + Add your first filter expression. + {:else}