From 595441603f278f7743caaf5429de53ed0c778e4a Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Fri, 27 Aug 2021 19:38:29 +0300 Subject: [PATCH] Pull request: 3312: set search input from query params Closes #3312. Squashed commit of the following: commit b3070b623b6539b98922897042d3bd19ce15bf9c Merge: 74e683da d1de47b6 Author: Ainar Garipov Date: Fri Aug 27 19:34:08 2021 +0300 Merge branch 'master' into 3312-search-input commit 74e683da9f8a01f9e16cfc519c9b3106796712d1 Author: Ildar Kamalov Date: Fri Aug 27 18:25:28 2021 +0300 client: set search input from query params --- client/src/components/Logs/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/Logs/index.js b/client/src/components/Logs/index.js index 2c159e2a..1416d21d 100644 --- a/client/src/components/Logs/index.js +++ b/client/src/components/Logs/index.js @@ -76,8 +76,8 @@ const Logs = () => { const filter = useSelector((state) => state.queryLogs.filter, shallowEqual); const logs = useSelector((state) => state.queryLogs.logs, shallowEqual); - const search = filter?.search || search_url_param || ''; - const response_status = filter?.response_status || response_status_url_param || ''; + const search = search_url_param || filter?.search || ''; + const response_status = response_status_url_param || filter?.response_status || ''; const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth < SMALL_SCREEN_SIZE); const [detailedDataCurrent, setDetailedDataCurrent] = useState({});