Close #2124 Squashed commit of the following: commit 574726e88e4fe7df745dfc964706e1e26f8da59f Merge: 3bc770fbdc61744dAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 23 19:32:38 2020 +0300 Merge branch 'master' into feature/2124 commit 3bc770fba6d06bbd965ee181aed7b0a050175f58 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 23 11:22:07 2020 +0300 minor commit 90c0d739d1bd09dbcf5f27ff9e6c3f761bf81686 Merge: 5d1f26421d36abd1Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 23 11:17:24 2020 +0300 Merge branch 'master' into feature/2124 commit 5d1f264212686ac7ecab30401b4f0e3c020dbee9 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 22 17:23:08 2020 +0300 Display elapsed if there is no service_name in blocked service commit af86cedc31d566238764e02c5c8e465fa41292c6 Merge: b61976a7756f97edAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 22 16:55:40 2020 +0300 Merge branch 'master' into feature/2124 commit b61976a7f811e1d01327cad8b0925bd110c6e135 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 22 16:52:48 2020 +0300 Rename params to blocked_services, update service name display on client commit d5b8e5f7b2c4a3d6701cf8845d31b28f55c6a808 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 22 15:59:46 2020 +0300 Update docs, return global blocked status commit adc9a294f76070dea2d845155814c21c52fc6c7f Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 22 15:24:34 2020 +0300 + querylog: Extract filteringStatusBlockedService commit ee8c1dce0d7520be0d0fcfe6f798dd11f13c9262 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 22 13:54:16 2020 +0300 + client: Add blocked service filter support
122 lines
4.2 KiB
JavaScript
122 lines
4.2 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 {
|
|
formatElapsedMs,
|
|
getFilterName,
|
|
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,
|
|
rule,
|
|
filterId,
|
|
service_name,
|
|
}) => {
|
|
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 filter = getFilterName(filters, whitelistFilters, filterId);
|
|
|
|
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: upstream,
|
|
elapsed: formattedElapsedMs,
|
|
response_code: status,
|
|
...(service_name ? { service_name: getServiceName(service_name) } : { filter }),
|
|
rule_label: rule,
|
|
response_table_header: renderResponses(response),
|
|
original_response: renderResponses(originalResponse),
|
|
};
|
|
|
|
const content = rule
|
|
? 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:
|
|
return filter;
|
|
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,
|
|
rule: propTypes.string,
|
|
filterId: propTypes.number,
|
|
service_name: propTypes.string,
|
|
};
|
|
|
|
export default ResponseCell;
|