1
0
Fork 0
mirror of synced 2024-10-02 01:56:57 +13:00

Fixing issue #4337, allows internal tables to search by the _id or _rev properties in automation query block.

This commit is contained in:
mike12345567 2022-02-14 14:57:06 +00:00
parent 3d8776ed83
commit a6bc495770
3 changed files with 32 additions and 9 deletions

View file

@ -44,6 +44,11 @@
{/if} {/if}
<style> <style>
.buttons {
display: flex;
gap: var(--spacing-m);
}
.drawer { .drawer {
position: absolute; position: absolute;
bottom: 0; bottom: 0;

View file

@ -46,7 +46,6 @@
block || $automationStore.selectedBlock, block || $automationStore.selectedBlock,
$automationStore.selectedAutomation?.automation?.definition $automationStore.selectedAutomation?.automation?.definition
) )
$: inputData = testData ? testData : block.inputs $: inputData = testData ? testData : block.inputs
$: tableId = inputData ? inputData.tableId : null $: tableId = inputData ? inputData.tableId : null
$: table = tableId $: table = tableId
@ -174,7 +173,7 @@
slot="body" slot="body"
bind:filters={tempFilters} bind:filters={tempFilters}
{bindings} {bindings}
{schemaFields} {table}
panel={AutomationBindingPanel} panel={AutomationBindingPanel}
/> />
</Drawer> </Drawer>

View file

@ -16,17 +16,23 @@
import { LuceneUtils, Constants } from "@budibase/frontend-core" import { LuceneUtils, Constants } from "@budibase/frontend-core"
import { getFields } from "helpers/searchFields" import { getFields } from "helpers/searchFields"
// can pass in either the table, or the fields (if working in design,
// fields is easier to pass in from the dataBinding:getSchemaForDatasource fn
export let table
export let schemaFields export let schemaFields
export let filters = [] export let filters = []
export let bindings = [] export let bindings = []
export let panel = ClientBindingPanel export let panel = ClientBindingPanel
export let allowBindings = true export let allowBindings = true
$: enrichedSchemaFields = getFields(schemaFields || []) let fields, enrichedSchemaFields
let fieldOptions, valueTypeOptions
$: fields = schemaFields ? schemaFields : getSchemaFields(table)
$: enrichedSchemaFields = getFields(fields || [], { allowLinks: table?.sql })
$: fieldOptions = enrichedSchemaFields.map(field => field.name) || [] $: fieldOptions = enrichedSchemaFields.map(field => field.name) || []
$: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"] $: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"]
const addFilter = () => { function addFilter() {
filters = [ filters = [
...filters, ...filters,
{ {
@ -39,17 +45,30 @@
] ]
} }
const removeFilter = id => { function getSchemaFields(table) {
const base = table ? Object.values(table.schema) : []
// if internal table, can use the _id field as well
const isInternal = table && !table.sql
if (isInternal && !base.find(field => field.name === "_id")) {
base.push({ name: "_id", type: "string" })
}
if (isInternal && !base.find(field => field.name === "_rev")) {
base.push({ name: "_rev", type: "string" })
}
return base
}
function removeFilter(id) {
filters = filters.filter(field => field.id !== id) filters = filters.filter(field => field.id !== id)
} }
const duplicateFilter = id => { function duplicateFilter(id) {
const existingFilter = filters.find(filter => filter.id === id) const existingFilter = filters.find(filter => filter.id === id)
const duplicate = { ...existingFilter, id: generate() } const duplicate = { ...existingFilter, id: generate() }
filters = [...filters, duplicate] filters = [...filters, duplicate]
} }
const onFieldChange = (expression, field) => { function onFieldChange(expression, field) {
// Update the field type // Update the field type
expression.type = enrichedSchemaFields.find(x => x.name === field)?.type expression.type = enrichedSchemaFields.find(x => x.name === field)?.type
@ -72,7 +91,7 @@
} }
} }
const onOperatorChange = (expression, operator) => { function onOperatorChange(expression, operator) {
const noValueOptions = [ const noValueOptions = [
Constants.OperatorOptions.Empty.value, Constants.OperatorOptions.Empty.value,
Constants.OperatorOptions.NotEmpty.value, Constants.OperatorOptions.NotEmpty.value,
@ -83,7 +102,7 @@
} }
} }
const getFieldOptions = field => { function getFieldOptions(field) {
const schema = enrichedSchemaFields.find(x => x.name === field) const schema = enrichedSchemaFields.find(x => x.name === field)
return schema?.constraints?.inclusion || [] return schema?.constraints?.inclusion || []
} }