Merge in DNS/adguard-home from 3772-cache-upstreams to master
Updates #3772.
Squashed commit of the following:
commit 809e874fe8847fdbd7f8a7221f18393509f41339
Merge: 5774798c 2d328ea8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 7 17:15:59 2021 +0300
Merge branch 'master' into 3772-cache-upstreams
commit 5774798ce1897bf292be49410794ce06cd084f93
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:48:38 2021 +0300
client: fix formatting
commit 4b4bb668c762c9b4d47cf40a007f34fe47a6e260
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:47:18 2021 +0300
client: remove comment
commit a2a9f904a6ab52194bb811a2a83967660a25f2cc
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:45:31 2021 +0300
client: handle cached upstream
commit a56804c4910da838cb10c8ef0af2a525e9722b1c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:33:43 2021 +0300
querylog: rm todo
commit 16c0a62ad2dfc7fcb5a6adbc868b296b7840fd27
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:31:53 2021 +0300
all: revise log of changes
commit 9f4b793205f17b6e85d74e83126093ed09eb24e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:23:42 2021 +0300
WIP
commit 7fbc6d596295570d2c61c3e507160f65c9adccb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:03:42 2021 +0300
all: imp upstream info in querylog
135 lines
4.7 KiB
JavaScript
135 lines
4.7 KiB
JavaScript
import { useTranslation } from 'react-i18next';
|
|
import { shallowEqual, useSelector } from 'react-redux';
|
|
import classNames from 'classnames';
|
|
import React from 'react';
|
|
import propTypes from 'prop-types';
|
|
import {
|
|
getRulesToFilterList,
|
|
formatElapsedMs,
|
|
getFilterNames,
|
|
getServiceName,
|
|
} from '../../../helpers/helpers';
|
|
import { FILTERED_STATUS, FILTERED_STATUS_TO_META_MAP } from '../../../helpers/constants';
|
|
import IconTooltip from './IconTooltip';
|
|
|
|
const ResponseCell = ({
|
|
elapsedMs,
|
|
originalResponse,
|
|
reason,
|
|
response,
|
|
status,
|
|
upstream,
|
|
rules,
|
|
service_name,
|
|
cached,
|
|
}) => {
|
|
const { t } = useTranslation();
|
|
const filters = useSelector((state) => state.filtering.filters, shallowEqual);
|
|
const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
|
|
const isDetailed = useSelector((state) => state.queryLogs.isDetailed);
|
|
|
|
const formattedElapsedMs = formatElapsedMs(elapsedMs, t);
|
|
|
|
const isBlocked = reason === FILTERED_STATUS.FILTERED_BLACK_LIST
|
|
|| reason === FILTERED_STATUS.FILTERED_BLOCKED_SERVICE;
|
|
|
|
const isBlockedByResponse = originalResponse.length > 0 && isBlocked;
|
|
|
|
const statusLabel = t(isBlockedByResponse ? 'blocked_by_cname_or_ip' : FILTERED_STATUS_TO_META_MAP[reason]?.LABEL || reason);
|
|
const boldStatusLabel = <span className="font-weight-bold">{statusLabel}</span>;
|
|
const upstreamString = cached
|
|
? t('served_from_cache', { value: upstream, i: <i /> })
|
|
: upstream;
|
|
|
|
const renderResponses = (responseArr) => {
|
|
if (!responseArr || responseArr.length === 0) {
|
|
return '';
|
|
}
|
|
|
|
return <div>{responseArr.map((response) => {
|
|
const className = classNames('white-space--nowrap', {
|
|
'overflow-break': response.length > 100,
|
|
});
|
|
|
|
return <div key={response} className={className}>{`${response}\n`}</div>;
|
|
})}</div>;
|
|
};
|
|
|
|
const COMMON_CONTENT = {
|
|
encryption_status: boldStatusLabel,
|
|
install_settings_dns: upstreamString,
|
|
elapsed: formattedElapsedMs,
|
|
response_code: status,
|
|
...(service_name
|
|
&& { service_name: getServiceName(service_name) }
|
|
),
|
|
...(rules.length > 0
|
|
&& { rule_label: getRulesToFilterList(rules, filters, whitelistFilters) }
|
|
),
|
|
response_table_header: renderResponses(response),
|
|
original_response: renderResponses(originalResponse),
|
|
};
|
|
|
|
const content = rules.length > 0
|
|
? Object.entries(COMMON_CONTENT)
|
|
: Object.entries({
|
|
...COMMON_CONTENT,
|
|
filter: '',
|
|
});
|
|
|
|
const getDetailedInfo = (reason) => {
|
|
switch (reason) {
|
|
case FILTERED_STATUS.FILTERED_BLOCKED_SERVICE:
|
|
if (!service_name) {
|
|
return formattedElapsedMs;
|
|
}
|
|
return getServiceName(service_name);
|
|
case FILTERED_STATUS.FILTERED_BLACK_LIST:
|
|
case FILTERED_STATUS.NOT_FILTERED_WHITE_LIST:
|
|
return getFilterNames(rules, filters, whitelistFilters).join(', ');
|
|
default:
|
|
return formattedElapsedMs;
|
|
}
|
|
};
|
|
|
|
const detailedInfo = getDetailedInfo(reason);
|
|
|
|
return (
|
|
<div className="logs__cell logs__cell--response" role="gridcell">
|
|
<IconTooltip
|
|
className={classNames('icons mr-4 icon--24 icon--lightgray', { 'my-3': isDetailed })}
|
|
columnClass='grid grid--limited'
|
|
tooltipClass='px-5 pb-5 pt-4 mw-75 custom-tooltip__response-details'
|
|
contentItemClass='text-truncate key-colon o-hidden'
|
|
xlinkHref='question'
|
|
title='response_details'
|
|
content={content}
|
|
placement='bottom'
|
|
/>
|
|
<div className="text-truncate">
|
|
<div className="text-truncate" title={statusLabel}>{statusLabel}</div>
|
|
{isDetailed && <div
|
|
className="detailed-info d-none d-sm-block pt-1 text-truncate"
|
|
title={detailedInfo}>{detailedInfo}</div>}
|
|
</div>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
ResponseCell.propTypes = {
|
|
elapsedMs: propTypes.string.isRequired,
|
|
originalResponse: propTypes.array.isRequired,
|
|
reason: propTypes.string.isRequired,
|
|
response: propTypes.array.isRequired,
|
|
status: propTypes.string.isRequired,
|
|
upstream: propTypes.string.isRequired,
|
|
cached: propTypes.bool.isRequired,
|
|
rules: propTypes.arrayOf(propTypes.shape({
|
|
text: propTypes.string.isRequired,
|
|
filter_list_id: propTypes.number.isRequired,
|
|
})),
|
|
service_name: propTypes.string,
|
|
};
|
|
|
|
export default ResponseCell;
|