Skip to content

Commit

Permalink
Merge branch 'master' into 1992-conf-timeouts
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneOne1 committed Aug 27, 2021
2 parents 05f71c3 + 5954416 commit 1050c54
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions client/src/components/Logs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({});
Expand Down

0 comments on commit 1050c54

Please sign in to comment.