Merge in DNS/adguard-home from feature/infinite_scroll_query_logs to master
Squashed commit of the following:
commit 4407ef2e7c055066257da791fbd65e6b0a495729
Merge: 40b74522 0a4781be
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 16:20:23 2020 +0300
Merge branch 'master' into feature/infinite_scroll_query_logs
commit 40b745225112cf8d664220ed8f484b0aa16e997c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 15:46:27 2020 +0300
Remove dynamic translation of toasts
commit f08fa7b8c6a243f6b10e924aebccc183ce7814fd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 13:59:53 2020 +0300
Remove renderLimitIdx, update isEntireLog
commit 0f1b02616faaa5759c0a3f6d8257117fa22094d9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:11:14 2020 +0300
Rename variables
commit 0928570c689c1fa704af775382620d68893e7c1c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:06:50 2020 +0300
Make query logs short polling function more expressive
commit 9e773cbd6c287a1c799fa2680f3462508462ea7a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Sep 1 11:06:19 2020 +0300
Fix Toast translation interface
commit f9c57033e5adc5788954cf086b2f114dd8938bcb
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 17:01:36 2020 +0300
Do not hide loader
commit b86ba48613437f5559a748ad9aa4cf79d15db082
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 16:56:34 2020 +0300
Add dynamic translation for all toasts
commit b9d1d9b447ca90a3c179e503fa5d4abd3516321e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 16:39:29 2020 +0300
Prevent getting query logs recursion if query is not changed
commit e25189749f7912648cca4503cfa8d0ad898c4bb6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Aug 31 10:13:20 2020 +0300
Decrease page limit to 20
commit 8b248ac5276899de838abf2dc9a69e47599cfc12
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 18:47:12 2020 +0300
Return checkFilteredLogs
commit bf2d65c4a3dca0da6b15f632ae11042b7c8e2045
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 18:33:51 2020 +0300
Review changes
commit 01b5250f9d9136a1f334086d3e2f00d1a928b37b
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Aug 28 15:29:59 2020 +0300
Remove checkFilteredLogs
commit 25b364c41e6a1489d930c8b3b39b1ab43723f29d
Merge: 1dc66034 2c666cbd
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 14:28:47 2020 +0300
Merge branch 'feature/infinite_scroll_query_logs' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/infinite_scroll_query_logs
commit 1dc6603421cde9847e792bfe77ff6546e53fbc2a
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 14:28:01 2020 +0300
disregard maxFileScanEntries only if offset is set
commit bad741ed7f1dccf6959d43d000b8c0150f526f9e
Author: Andrey Meshkov <am@adguard.com>
Date: Fri Aug 28 11:57:45 2020 +0300
Fix search behavior when limit is specified
commit 2c666cbdde465cf17434126830dd99ceedfc4cbc
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 18:50:28 2020 +0300
Hide table ref loader during data loading
commit 8b4f7fe642ef9e87a979813dcdbd7817d64c27f9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 18:43:24 2020 +0300
Repair search
commit 26fae1ae01a789999b8a2181d60b35663a20460a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 17:59:27 2020 +0300
Resetting initial render index, change loader position on search
commit e2c97ae1a288438267eef9aec71b979319674a71
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Aug 27 16:02:03 2020 +0300
Change isScrolledIntoView
... and 32 more commits
198 lines
6.8 KiB
JavaScript
198 lines
6.8 KiB
JavaScript
import React, { memo } from 'react';
|
|
import classNames from 'classnames';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
|
import propTypes from 'prop-types';
|
|
import {
|
|
captitalizeWords,
|
|
checkFiltered,
|
|
formatDateTime,
|
|
formatElapsedMs,
|
|
formatTime,
|
|
getFilterName,
|
|
processContent,
|
|
} from '../../../helpers/helpers';
|
|
import {
|
|
BLOCK_ACTIONS,
|
|
DEFAULT_SHORT_DATE_FORMAT_OPTIONS,
|
|
FILTERED_STATUS,
|
|
FILTERED_STATUS_TO_META_MAP,
|
|
LONG_TIME_FORMAT,
|
|
QUERY_STATUS_COLORS,
|
|
SCHEME_TO_PROTOCOL_MAP,
|
|
} from '../../../helpers/constants';
|
|
import { getSourceData } from '../../../helpers/trackers/trackers';
|
|
import { toggleBlocking } from '../../../actions';
|
|
import DateCell from './DateCell';
|
|
import DomainCell from './DomainCell';
|
|
import ResponseCell from './ResponseCell';
|
|
import ClientCell from './ClientCell';
|
|
import '../Logs.css';
|
|
|
|
const Row = memo(({
|
|
style,
|
|
rowProps,
|
|
rowProps: { reason },
|
|
isSmallScreen,
|
|
setDetailedDataCurrent,
|
|
setButtonType,
|
|
setModalOpened,
|
|
}) => {
|
|
const dispatch = useDispatch();
|
|
const { t } = useTranslation();
|
|
const dnssec_enabled = useSelector((state) => state.dnsConfig.dnssec_enabled);
|
|
const filters = useSelector((state) => state.filtering.filters, shallowEqual);
|
|
const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
|
|
const autoClients = useSelector((state) => state.dashboard.autoClients, shallowEqual);
|
|
|
|
const onClick = () => {
|
|
if (!isSmallScreen) { return; }
|
|
const {
|
|
answer_dnssec,
|
|
client,
|
|
domain,
|
|
elapsedMs,
|
|
info,
|
|
reason,
|
|
response,
|
|
time,
|
|
tracker,
|
|
upstream,
|
|
type,
|
|
client_proto,
|
|
filterId,
|
|
rule,
|
|
originalResponse,
|
|
status,
|
|
} = rowProps;
|
|
|
|
const hasTracker = !!tracker;
|
|
|
|
const autoClient = autoClients
|
|
.find((autoClient) => autoClient.name === client);
|
|
|
|
const { whois_info } = info;
|
|
const country = whois_info?.country;
|
|
const city = whois_info?.city;
|
|
const network = whois_info?.orgname;
|
|
|
|
const source = autoClient?.source;
|
|
|
|
const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
|
|
const isFiltered = checkFiltered(reason);
|
|
|
|
const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
|
|
|| reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
|
|
|
|
const buttonType = isFiltered ? BLOCK_ACTIONS.UNBLOCK : BLOCK_ACTIONS.BLOCK;
|
|
const onToggleBlock = () => {
|
|
dispatch(toggleBlocking(buttonType, domain));
|
|
};
|
|
|
|
const isBlockedByResponse = originalResponse.length > 0 && isBlocked;
|
|
const requestStatus = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.LABEL || reason);
|
|
|
|
const protocol = t(SCHEME_TO_PROTOCOL_MAP[client_proto]) || '';
|
|
|
|
const sourceData = getSourceData(tracker);
|
|
|
|
const filter = getFilterName(filters, whitelistFilters, filterId);
|
|
|
|
const detailedData = {
|
|
time_table_header: formatTime(time, LONG_TIME_FORMAT),
|
|
date: formatDateTime(time, DEFAULT_SHORT_DATE_FORMAT_OPTIONS),
|
|
encryption_status: isBlocked
|
|
? <div className="bg--danger">{requestStatus}</div> : requestStatus,
|
|
domain,
|
|
type_table_header: type,
|
|
protocol,
|
|
known_tracker: hasTracker && 'title',
|
|
table_name: tracker?.name,
|
|
category_label: hasTracker && captitalizeWords(tracker.category),
|
|
tracker_source: hasTracker && sourceData
|
|
&& <a
|
|
href={sourceData.url}
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
className="link--green">{sourceData.name}
|
|
</a>,
|
|
response_details: 'title',
|
|
install_settings_dns: upstream,
|
|
elapsed: formattedElapsedMs,
|
|
filter: rule ? filter : null,
|
|
rule_label: rule,
|
|
response_table_header: response?.join('\n'),
|
|
response_code: status,
|
|
client_details: 'title',
|
|
ip_address: client,
|
|
name: info?.name,
|
|
country,
|
|
city,
|
|
network,
|
|
source_label: source,
|
|
validated_with_dnssec: dnssec_enabled ? Boolean(answer_dnssec) : false,
|
|
original_response: originalResponse?.join('\n'),
|
|
[buttonType]: <div onClick={onToggleBlock}
|
|
className={classNames('title--border text-center', {
|
|
'bg--danger': isBlocked,
|
|
})}>{t(buttonType)}</div>,
|
|
};
|
|
|
|
setDetailedDataCurrent(processContent(detailedData));
|
|
setButtonType(buttonType);
|
|
setModalOpened(true);
|
|
};
|
|
|
|
const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
|
|
|
|
const className = classNames('d-flex px-5 logs__row',
|
|
`logs__row--${FILTERED_STATUS_TO_META_MAP?.[reason]?.COLOR ?? QUERY_STATUS_COLORS.WHITE}`, {
|
|
'logs__cell--detailed': isDetailed,
|
|
});
|
|
|
|
return <div style={style} className={className} onClick={onClick} role="row">
|
|
<DateCell {...rowProps} />
|
|
<DomainCell {...rowProps} />
|
|
<ResponseCell {...rowProps} />
|
|
<ClientCell {...rowProps} />
|
|
</div>;
|
|
});
|
|
|
|
Row.displayName = 'Row';
|
|
|
|
Row.propTypes = {
|
|
style: propTypes.object,
|
|
rowProps: propTypes.shape({
|
|
reason: propTypes.string.isRequired,
|
|
answer_dnssec: propTypes.bool.isRequired,
|
|
client: propTypes.string.isRequired,
|
|
domain: propTypes.string.isRequired,
|
|
elapsedMs: propTypes.string.isRequired,
|
|
info: propTypes.oneOfType([
|
|
propTypes.string,
|
|
propTypes.shape({
|
|
whois_info: propTypes.shape({
|
|
country: propTypes.string,
|
|
city: propTypes.string,
|
|
orgname: propTypes.string,
|
|
}),
|
|
})]),
|
|
response: propTypes.array.isRequired,
|
|
time: propTypes.string.isRequired,
|
|
tracker: propTypes.object,
|
|
upstream: propTypes.string.isRequired,
|
|
type: propTypes.string.isRequired,
|
|
client_proto: propTypes.string.isRequired,
|
|
filterId: propTypes.number,
|
|
rule: propTypes.string,
|
|
originalResponse: propTypes.array,
|
|
status: propTypes.string.isRequired,
|
|
}).isRequired,
|
|
isSmallScreen: propTypes.bool.isRequired,
|
|
setDetailedDataCurrent: propTypes.func.isRequired,
|
|
setButtonType: propTypes.func.isRequired,
|
|
setModalOpened: propTypes.func.isRequired,
|
|
};
|
|
|
|
export default Row;
|