AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-14 18:51:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge: - client: Display service name for blocked services

Browse Source 
Merge in DNS/adguard-home from fix/2038 to master

* commit '9e33bd52599c2039603d99f93db461cc6a6a23f4':
  - client: Display service name for blocked services
This commit is contained in:
Andrey Meshkov 2020-09-04 13:37:05 +03:00
commit 340052090c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/Logs/Cells/DomainCell.js
View File

@ -14,6 +14,7 @@ import IconTooltip from './IconTooltip';
const DomainCell = ({
answer_dnssec,
service_name,
client_proto,
domain,
time,
@ -49,6 +50,10 @@ const DomainCell = ({
protocol,
};
if (service_name) {
requestDetailsObj.check_service = service_name;
}
const sourceData = getSourceData(tracker);
const knownTrackerDataObj = {
@ -98,7 +103,7 @@ const DomainCell = ({
xlinkHref='privacy' contentItemClass='key-colon' renderContent={renderContent}
place='bottom' />
<div className={valueClass}>
<div className="text-truncate" title={domain}>{domain}</div>
<div className="text-truncate" title={domain}>{service_name || domain}</div>
{details && isDetailed
&& <div className="detailed-info d-none d-sm-block text-truncate"
title={details}>{details}</div>}
@ -112,6 +117,7 @@ DomainCell.propTypes = {
domain: propTypes.string.isRequired,
time: propTypes.string.isRequired,
type: propTypes.string.isRequired,
service_name: propTypes.string,
tracker: propTypes.object,
};

2
client/src/helpers/helpers.js
View File

@ -97,7 +97,7 @@ export const normalizeLogs = (logs) => logs.map((log) => {
filterId,
rule,
status,
serviceName: service_name,
service_name,
originalAnswer: original_answer,
originalResponse: processResponse(original_answer),
tracker: getTrackerData(domain),