Merge pull request #14792 from Budibase/fix-view-queryui-transform

Prevent view queryUI transforms mutating state
This commit is contained in:
Andrew Kingston 2024-10-14 13:15:35 +01:00 committed by GitHub
commit 0ba7f7eeca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 7 deletions

View File

@ -6,16 +6,22 @@ import { dataFilters } from "@budibase/shared-core"
function convertToSearchFilters(view) {
// convert from SearchFilterGroup type
if (view?.query) {
view.queryUI = view.query
view.query = dataFilters.buildQuery(view.query)
return {
...view,
queryUI: view.query,
query: dataFilters.buildQuery(view.query),
}
}
return view
}
function convertToSearchFilterGroup(view) {
if (view?.queryUI) {
view.query = view.queryUI
delete view.queryUI
return {
...view,
query: view.queryUI,
queryUI: undefined,
}
}
return view
}

View File

@ -3,9 +3,12 @@ import { dataFilters } from "@budibase/shared-core"
function convertToSearchFilters(view) {
// convert from SearchFilterGroup type
if (view.query) {
view.queryUI = view.query
view.query = dataFilters.buildQuery(view.query)
if (view?.query) {
return {
...view,
queryUI: view.query,
query: dataFilters.buildQuery(view.query),
}
}
return view
}