Change query defaulting behaviour
This commit is contained in:
parent
19609434f7
commit
6b610bd982
|
@ -177,16 +177,11 @@ export default class DataFetch {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let defaultQuery = {
|
|
||||||
logicalOperator: FilterGroupLogicalOperator.ALL,
|
|
||||||
groups: [],
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build the query
|
// Build the query
|
||||||
let query = this.options.query
|
let query = this.options.query
|
||||||
|
|
||||||
if (!query && this.features.supportsSearch) {
|
if (!query && this.features.supportsSearch) {
|
||||||
query = buildQuery(filter || defaultQuery)
|
query = buildQuery(filter)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update store
|
// Update store
|
||||||
|
|
|
@ -574,12 +574,7 @@ export const buildQueryLegacy = (
|
||||||
export const buildQuery = (
|
export const buildQuery = (
|
||||||
filter?: SearchFilterGroup | SearchFilter[]
|
filter?: SearchFilterGroup | SearchFilter[]
|
||||||
): SearchFilters | undefined => {
|
): SearchFilters | undefined => {
|
||||||
const parsedFilter: SearchFilterGroup | undefined =
|
const parsedFilter: SearchFilterGroup = processSearchFilters(filter)
|
||||||
processSearchFilters(filter)
|
|
||||||
|
|
||||||
if (!parsedFilter) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const operatorMap: { [key in FilterGroupLogicalOperator]: LogicalOperator } =
|
const operatorMap: { [key in FilterGroupLogicalOperator]: LogicalOperator } =
|
||||||
{
|
{
|
||||||
|
|
|
@ -98,16 +98,17 @@ export function trimOtherProps(object: any, allowedProps: string[]) {
|
||||||
*/
|
*/
|
||||||
export const processSearchFilters = (
|
export const processSearchFilters = (
|
||||||
filters: SearchFilter[] | SearchFilterGroup | undefined
|
filters: SearchFilter[] | SearchFilterGroup | undefined
|
||||||
): SearchFilterGroup | undefined => {
|
): SearchFilterGroup => {
|
||||||
if (!filters) {
|
// Base search config.
|
||||||
return
|
|
||||||
}
|
|
||||||
const defaultCfg: SearchFilterGroup = {
|
const defaultCfg: SearchFilterGroup = {
|
||||||
logicalOperator: FilterGroupLogicalOperator.ALL,
|
logicalOperator: FilterGroupLogicalOperator.ALL,
|
||||||
onEmptyFilter: EmptyFilterOption.RETURN_NONE,
|
|
||||||
groups: [],
|
groups: [],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!filters) {
|
||||||
|
return defaultCfg
|
||||||
|
}
|
||||||
|
|
||||||
const filterWhitelistKeys = [
|
const filterWhitelistKeys = [
|
||||||
"field",
|
"field",
|
||||||
"operator",
|
"operator",
|
||||||
|
@ -182,7 +183,7 @@ export const processSearchFilters = (
|
||||||
|
|
||||||
return migratedSetting
|
return migratedSetting
|
||||||
} else if (!filters?.groups) {
|
} else if (!filters?.groups) {
|
||||||
return
|
return defaultCfg
|
||||||
}
|
}
|
||||||
return filters
|
return filters
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue