From 72ab904d471982b346ad76d784f2ec7ab0308cf4 Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Tue, 8 Feb 2022 20:40:33 +0100 Subject: [PATCH] feat(ui) - filters and metrics fixes --- frontend/app/duck/search.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/app/duck/search.js b/frontend/app/duck/search.js index d615b0c3a..a6fe1dd67 100644 --- a/frontend/app/duck/search.js +++ b/frontend/app/duck/search.js @@ -92,8 +92,16 @@ export default mergeReducers( }), ); +const checkValues = (key, value) => { + if (key === FilterKey.DURATION) { + return value[0] === '' || value[0] === null ? [0, value[1]] : value; + } + return value.filter(i => i !== '' && i !== null); +} + export const filterMap = ({category, value, key, operator, sourceOperator, source, custom, isEvent }) => ({ - value: value.filter(i => i !== '' && i !== null), + // value: value.filter(i => i !== '' && i !== null), + value: checkValues(key, value), custom, type: category === FilterCategory.METADATA ? FilterKey.METADATA : key, operator, @@ -197,7 +205,7 @@ export const clearSearch = () => (dispatch, getState) => { } export const addFilter = (filter) => (dispatch, getState) => { - // filter.value = filter.value && filter.value.length === 0 ? filter.value : ['']; + filter.value = filter.value && filter.value.length === 0 ? filter.value : ['']; const instance = getState().getIn([ 'search', 'instance']); const filters = instance.filters.push(filter); return dispatch(edit(instance.set('filters', filters)));