a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: client: fix query log response status error 

Closes #3089

Squashed commit of the following:

commit c5f3112298b11a73b77a35ea249f24abed221425
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue May 18 16:08:56 2021 +0300

    client: fix query log response status error
This commit is contained in:
Ildar Kamalov 2021-05-18 16:31:13 +03:00
parent b2e3e4d088
commit d68c0f9f83
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/Logs/Cells/ClientCell.js
View File

@ -209,7 +209,6 @@ ClientCell.propTypes = {
client: propTypes.string.isRequired, client: propTypes.string.isRequired,
client_id: propTypes.string, client_id: propTypes.string,
client_info: propTypes.shape({ client_info: propTypes.shape({
ids: propTypes.arrayOf(propTypes.string).isRequired,
name: propTypes.string.isRequired, name: propTypes.string.isRequired,
whois: propTypes.shape({ whois: propTypes.shape({
country: propTypes.string, country: propTypes.string,

1
client/src/components/Logs/Cells/index.js
View File

@ -231,7 +231,6 @@ Row.propTypes = {
client_proto: propTypes.string.isRequired, client_proto: propTypes.string.isRequired,
client_id: propTypes.string, client_id: propTypes.string,
client_info: propTypes.shape({ client_info: propTypes.shape({
ids: propTypes.arrayOf(propTypes.string).isRequired,
name: propTypes.string.isRequired, name: propTypes.string.isRequired,
whois: propTypes.shape({ whois: propTypes.shape({
country: propTypes.string, country: propTypes.string,

8
client/src/components/Logs/index.js
View File

@ -63,8 +63,8 @@ const Logs = () => {
const history = useHistory(); const history = useHistory();
const { const {
response_status: response_status_url_param = '', response_status: response_status_url_param,
search: search_url_param = '', search: search_url_param,
} = queryString.parse(history.location.search); } = queryString.parse(history.location.search);
const { const {
@ -76,8 +76,8 @@ const Logs = () => {
const filter = useSelector((state) => state.queryLogs.filter, shallowEqual); const filter = useSelector((state) => state.queryLogs.filter, shallowEqual);
const logs = useSelector((state) => state.queryLogs.logs, shallowEqual); const logs = useSelector((state) => state.queryLogs.logs, shallowEqual);
const search = filter?.search || search_url_param; const search = filter?.search || search_url_param || '';
const response_status = filter?.response_status || response_status_url_param; const response_status = filter?.response_status || response_status_url_param || '';
const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth < SMALL_SCREEN_SIZE); const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth < SMALL_SCREEN_SIZE);
const [detailedDataCurrent, setDetailedDataCurrent] = useState({}); const [detailedDataCurrent, setDetailedDataCurrent] = useState({});