CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-20 11:27:56 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14145 from Budibase/dean-fixes

Browse source 
DynamicFilter fixes
This commit is contained in:
Andrew Kingston 2024-07-22 10:26:27 +01:00 committed by GitHub
commit 3ab67e35db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/builder/src/components/design/Panel.svelte
View file

@ -1,5 +1,5 @@
<script> <script>
import { AbsTooltip, Icon, Body } from "@budibase/bbui" import { Icon, Body, TooltipPosition, TooltipType } from "@budibase/bbui"
export let title export let title
export let icon export let icon
@ -18,6 +18,7 @@
export let closeButtonIcon = "Close" export let closeButtonIcon = "Close"
export let noHeaderBorder = false export let noHeaderBorder = false
export let titleCSS = true export let titleCSS = true
$: customHeaderContent = $$slots["panel-header-content"] $: customHeaderContent = $$slots["panel-header-content"]
$: customTitleContent = $$slots["panel-title-content"] $: customTitleContent = $$slots["panel-title-content"]
</script> </script>
@ -41,9 +42,12 @@
<Icon name="ArrowLeft" hoverable on:click={onClickBackButton} /> <Icon name="ArrowLeft" hoverable on:click={onClickBackButton} />
{/if} {/if}
{#if icon} {#if icon}
<AbsTooltip type="info" text={iconTooltip}> <Icon
<Icon name={icon} /> name={icon}
</AbsTooltip> tooltipType={TooltipType.Info}
tooltip={iconTooltip}
tooltipPosition={TooltipPosition.Top}
/>
{/if} {/if}
<div class:title={titleCSS}> <div class:title={titleCSS}>
{#if customTitleContent} {#if customTitleContent}

9
packages/builder/src/constants/backend/index.js
View file

@ -299,15 +299,6 @@ export const PaginationLocations = [
{ label: "Request body", value: "body" }, { label: "Request body", value: "body" },
] ]
export const BannedSearchTypes = [
FieldType.LINK,
FieldType.ATTACHMENTS,
FieldType.FORMULA,
FieldType.JSON,
"jsonarray",
"queryarray",
]
export const DatasourceTypes = { export const DatasourceTypes = {
RELATIONAL: "Relational", RELATIONAL: "Relational",
NON_RELATIONAL: "Non-relational", NON_RELATIONAL: "Non-relational",

8
packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte
View file

@ -3,7 +3,7 @@
import { getContext, onDestroy } from "svelte" import { getContext, onDestroy } from "svelte"
import { ModalContent, Modal } from "@budibase/bbui" import { ModalContent, Modal } from "@budibase/bbui"
import FilterModal from "./FilterModal.svelte" import FilterModal from "./FilterModal.svelte"
import { QueryUtils } from "@budibase/frontend-core" import { QueryUtils, Constants } from "@budibase/frontend-core"
import Button from "../Button.svelte" import Button from "../Button.svelte"
export let dataProvider export let dataProvider
@ -22,6 +22,7 @@
$: dataProviderId = dataProvider?.id $: dataProviderId = dataProvider?.id
$: datasource = dataProvider?.datasource $: datasource = dataProvider?.datasource
$: isDSPlus = ["table", "link", "viewV2"].includes(datasource?.type)
$: addExtension = getAction( $: addExtension = getAction(
dataProviderId, dataProviderId,
ActionTypes.AddDataProviderQueryExtension ActionTypes.AddDataProviderQueryExtension
@ -69,7 +70,10 @@
} }
}) })
} }
return Object.values(clonedSchema || {}) return Object.values(clonedSchema || {})
.filter(field => !Constants.BannedSearchTypes.includes(field.type))
.concat(isDSPlus ? [{ name: "_id", type: "string" }] : [])
} }
const openEditor = () => { const openEditor = () => {
@ -94,7 +98,7 @@
onClick={openEditor} onClick={openEditor}
icon="ri-filter-3-line" icon="ri-filter-3-line"
text="Filter" text="Filter"
size="XL" {size}
type="secondary" type="secondary"
quiet quiet
active={filters?.length > 0} active={filters?.length > 0}

6
packages/frontend-core/src/components/FilterBuilder.svelte
View file

@ -36,11 +36,7 @@
) && ) &&
!schemaFields.some(field => field.name === "_id") !schemaFields.some(field => field.name === "_id")
) { ) {
schemaFields = [ schemaFields = [...schemaFields, { name: "_id", type: "string" }]
...schemaFields,
{ name: "_id", type: "string" },
{ name: "_rev", type: "string" },
]
} }
} }

2
packages/frontend-core/src/constants.js
View file

@ -15,6 +15,8 @@ export const BannedSearchTypes = [
FieldType.ATTACHMENTS, FieldType.ATTACHMENTS,
FieldType.FORMULA, FieldType.FORMULA,
FieldType.JSON, FieldType.JSON,
FieldType.ATTACHMENT_SINGLE,
FieldType.SIGNATURE_SINGLE,
"jsonarray", "jsonarray",
"queryarray", "queryarray",
] ]