Fix search relationships

This commit is contained in:
Adria Navarro 2024-08-12 13:10:38 +02:00
parent 59a164f4df
commit 08b0b6af19
1 changed files with 52 additions and 4 deletions

View File

@ -1,9 +1,12 @@
import {
EmptyFilterOption,
FieldType,
Row,
RowSearchParams,
SearchResponse,
SortOrder,
Table,
TableSchema,
} from "@budibase/types"
import { isExternalTableID } from "../../../integrations/utils"
import * as internal from "./search/internal"
@ -87,10 +90,10 @@ export async function search(
options.fields = visibleTableFields
}
options.query = removeInvalidFilters(options.query, [
"_id",
...options.fields,
])
options.query = removeInvalidFilters(
options.query,
await getQueriableFields(options.fields, table.schema)
)
let result: SearchResponse<Row>
if (isExternalTable) {
@ -134,3 +137,48 @@ export async function fetchView(
): Promise<Row[]> {
return pickApi(tableId).fetchView(viewName, params)
}
async function getQueriableFields(
fields: string[],
schema: TableSchema
): Promise<string[]> {
const handledTables: Record<string, Table> = {}
const extractTableFields = async (
fromField: string,
tableId: string
): Promise<string[]> => {
const result = []
if (handledTables[tableId]) {
return []
}
const table = await sdk.tables.getTable(tableId)
handledTables[tableId] = table
for (const field of Object.keys(table.schema)) {
const formattedColumn = `${fromField}.${field}`
const subSchema = table.schema[field]
if (subSchema.type === FieldType.LINK) {
result.push(
...(await extractTableFields(formattedColumn, subSchema.tableId))
)
} else {
result.push(formattedColumn)
}
}
return result
}
const result = [
"_id", // Querying by _id is always allowed, even if it's never part of the schema
]
for (const field of fields) {
if (schema[field].type === FieldType.LINK) {
result.push(...(await extractTableFields(field, schema[field].tableId)))
} else {
result.push(field)
}
}
return result
}