chore: filter undefined operators (#20157)

This commit is contained in:
Yongjie Zhao 2022-05-23 18:24:32 +08:00 committed by GitHub
parent 56e96950c1
commit d7e3ac306f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 11 deletions

View File

@ -61,18 +61,25 @@ export default function buildQueryContext(
} = typeof options === 'function'
? { buildQuery: options, queryFields: {} }
: options || {};
const queries = buildQuery(buildQueryObject(formData, queryFields), {
extras: {},
ownState,
hooks: {
setDataMask: () => {},
setCachedChanges: () => {},
...hooks,
},
});
queries.forEach(query => {
if (Array.isArray(query.post_processing)) {
// eslint-disable-next-line no-param-reassign
query.post_processing = query.post_processing.filter(Boolean);
}
});
return {
datasource: new DatasourceKey(formData.datasource).toObject(),
force: formData.force || false,
queries: buildQuery(buildQueryObject(formData, queryFields), {
extras: {},
ownState,
hooks: {
setDataMask: () => {},
setCachedChanges: () => {},
...hooks,
},
}),
queries,
form_data: formData,
result_format: formData.result_format || 'json',
result_type: formData.result_type || 'full',

View File

@ -86,7 +86,7 @@ export default function buildQuery(formData: QueryFormData) {
is_timeseries,
}),
flattenOperator(fd, queryObject),
].filter(Boolean),
],
} as QueryObject;
return [normalizeOrderBy(tmpQueryObject)];
}),

View File

@ -100,7 +100,7 @@ export default function buildQuery(formData: QueryFormData) {
flattenOperator(formData, baseQueryObject),
// todo: move prophet before flatten
prophetOperator(formData, baseQueryObject),
].filter(Boolean),
],
},
];
});