MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent overriding onEmptyFilter behaviour for views

This commit is contained in:
Andrew Kingston 2023-08-21 12:01:17 +01:00
parent 6d46fb2963
commit 729b93532b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/src/api/controllers/row/views.ts
View File

@ -39,12 +39,16 @@ export async function searchView(
?.filter(filter => filter.field) ?.filter(filter => filter.field)
.map(filter => db.removeKeyNumbering(filter.field)) || [] .map(filter => db.removeKeyNumbering(filter.field)) || []
// Prevent using an "OR" search // Delete extraneous search params that cannot be overridden
delete body.query.allOr delete body.query.allOr
delete body.query.onEmptyFilter
// Carry over filters for unused fields // Carry over filters for unused fields
Object.keys(body.query).forEach(key => { Object.keys(body.query).forEach(key => {
const operator = key as keyof Omit<SearchFilters, "allOr"> const operator = key as keyof Omit<
SearchFilters,
"allOr" | "onEmptyFilter"
>
Object.keys(body.query[operator] || {}).forEach(field => { Object.keys(body.query[operator] || {}).forEach(field => {
if (!existingFields.includes(db.removeKeyNumbering(field))) { if (!existingFields.includes(db.removeKeyNumbering(field))) {
query[operator]![field] = body.query[operator]![field] query[operator]![field] = body.query[operator]![field]