From 9e33bd52599c2039603d99f93db461cc6a6a23f4 Mon Sep 17 00:00:00 2001
From: ArtemBaskal <a.baskal@adguard.com>
Date: Thu, 3 Sep 2020 20:35:20 +0300
Subject: [PATCH] - client: Display service name for blocked services
---
client/src/components/Logs/Cells/DomainCell.js | 8 +++++++-
client/src/helpers/helpers.js | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/client/src/components/Logs/Cells/DomainCell.js b/client/src/components/Logs/Cells/DomainCell.js
index 4333089c..47d14846 100644
--- a/client/src/components/Logs/Cells/DomainCell.js
+++ b/client/src/components/Logs/Cells/DomainCell.js
@@ -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,
};
diff --git a/client/src/helpers/helpers.js b/client/src/helpers/helpers.js
index 9fdd9fad..fa3a5046 100644
--- a/client/src/helpers/helpers.js
+++ b/client/src/helpers/helpers.js
@@ -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),