From 194ead3479a43a74d6232754fc1547ec153010bf Mon Sep 17 00:00:00 2001
From: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed, 22 Mar 2023 12:55:53 +0300
Subject: [PATCH] Pull request 1777: client: include safesearch to count
percent
Updates #5568.
Squashed commit of the following:
commit 3d3a8c187b27307b69b160283f3cd6f9c40cc68e
Merge: 7f4b6357 c3edab43
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 11:53:06 2023 +0200
Merge branch 'master' into 5568-save-search-percent
commit 7f4b6357c6f7941eb37175a83972a9821dd08974
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 13:36:14 2023 +0200
client: include safesearch to count percent
---
client/src/components/Dashboard/BlockedDomains.js | 6 +++++-
client/src/components/Dashboard/index.js | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/client/src/components/Dashboard/BlockedDomains.js b/client/src/components/Dashboard/BlockedDomains.js
index 144f5bee..73829a1b 100644
--- a/client/src/components/Dashboard/BlockedDomains.js
+++ b/client/src/components/Dashboard/BlockedDomains.js
@@ -29,8 +29,11 @@ const BlockedDomains = ({
blockedFiltering,
replacedSafebrowsing,
replacedParental,
+ replacedSafesearch,
}) => {
- const totalBlocked = blockedFiltering + replacedSafebrowsing + replacedParental;
+ const totalBlocked = (
+ blockedFiltering + replacedSafebrowsing + replacedParental + replacedSafesearch
+ );
return (
<Card
@@ -71,6 +74,7 @@ BlockedDomains.propTypes = {
topBlockedDomains: PropTypes.array.isRequired,
blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired,
+ replacedSafesearch: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired,
diff --git a/client/src/components/Dashboard/index.js b/client/src/components/Dashboard/index.js
index ff66820e..cc19acf0 100644
--- a/client/src/components/Dashboard/index.js
+++ b/client/src/components/Dashboard/index.js
@@ -151,6 +151,7 @@ const Dashboard = ({
topBlockedDomains={stats.topBlockedDomains}
blockedFiltering={stats.numBlockedFiltering}
replacedSafebrowsing={stats.numReplacedSafebrowsing}
+ replacedSafesearch={stats.numReplacedSafesearch}
replacedParental={stats.numReplacedParental}
refreshButton={refreshButton}
/>