From 23c0c5aa1f9906e6c0801c4ab7ad5d72a3a88ccf Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Thu, 10 Feb 2022 23:48:49 +0100 Subject: [PATCH] feat(ui) - hide main searchbar for assist use default user filter --- frontend/app/components/BugFinder/BugFinder.js | 2 +- .../shared/LiveSessionSearch/LiveSessionSearch.tsx | 13 ++++++++----- frontend/app/duck/liveSearch.js | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/frontend/app/components/BugFinder/BugFinder.js b/frontend/app/components/BugFinder/BugFinder.js index 189ee2705..201bb9935 100644 --- a/frontend/app/components/BugFinder/BugFinder.js +++ b/frontend/app/components/BugFinder/BugFinder.js @@ -186,7 +186,7 @@ export default class BugFinder extends React.PureComponent { { activeTab.type === 'live' && ( <>
- + {/* */}
{ activeTab.type === 'live' && } diff --git a/frontend/app/components/shared/LiveSessionSearch/LiveSessionSearch.tsx b/frontend/app/components/shared/LiveSessionSearch/LiveSessionSearch.tsx index 546bc9745..ae7a60b28 100644 --- a/frontend/app/components/shared/LiveSessionSearch/LiveSessionSearch.tsx +++ b/frontend/app/components/shared/LiveSessionSearch/LiveSessionSearch.tsx @@ -1,14 +1,16 @@ import React from 'react'; import FilterList from 'Shared/Filters/FilterList'; import { connect } from 'react-redux'; -import { edit, addFilter } from 'Duck/liveSearch'; +import { edit, addFilter, addFilterByKeyAndValue } from 'Duck/liveSearch'; import FilterSelection from 'Shared/Filters/FilterSelection'; import { IconButton } from 'UI'; +import { FilterKey } from 'App/types/filter/filterType'; interface Props { appliedFilter: any; edit: typeof edit; addFilter: typeof addFilter; + addFilterByKeyAndValue: typeof addFilterByKeyAndValue; } function LiveSessionSearch(props: Props) { const { appliedFilter } = props; @@ -39,9 +41,10 @@ function LiveSessionSearch(props: Props) { return i !== filterIndex; }); - props.edit({ - filters: newFilters, - }); + props.edit({ filters: newFilters, }); + if (newFilters.size === 0) { + props.addFilterByKeyAndValue(FilterKey.USERID, ''); + } } const onChangeEventsOrder = (e, { name, value }) => { @@ -77,4 +80,4 @@ function LiveSessionSearch(props: Props) { export default connect(state => ({ appliedFilter: state.getIn([ 'liveSearch', 'instance' ]), -}), { edit, addFilter })(LiveSessionSearch); \ No newline at end of file +}), { edit, addFilter, addFilterByKeyAndValue })(LiveSessionSearch); \ No newline at end of file diff --git a/frontend/app/duck/liveSearch.js b/frontend/app/duck/liveSearch.js index 7b24ea6b5..9aa1cbde1 100644 --- a/frontend/app/duck/liveSearch.js +++ b/frontend/app/duck/liveSearch.js @@ -7,6 +7,7 @@ import SavedFilter from 'Types/filter/savedFilter'; import { fetchList as fetchSessionList } from './sessions'; import { liveFiltersMap } from 'Types/filter/newFilter'; import { filterMap, checkFilterValue, hasFilterApplied } from './search'; +import { FilterKey } from '../types/filter/filterType'; const name = "liveSearch"; const idKey = "searchId"; @@ -63,7 +64,6 @@ export const fetchSessions = (filter) => (dispatch, getState) => { }; export const clearSearch = () => (dispatch, getState) => { - // dispatch(applySavedSearch(new SavedFilter({}))); dispatch(edit(new Filter({ filters: [] }))); return dispatch({ type: CLEAR_SEARCH,