mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Vladislav Abdulmyanov 2023-03-22 12:55:53 +03:00
parent c3edab4387
commit 194ead3479
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/Dashboard/BlockedDomains.js
View File

@ -29,8 +29,11 @@ const BlockedDomains = ({
blockedFiltering, blockedFiltering,
replacedSafebrowsing, replacedSafebrowsing,
replacedParental, replacedParental,
replacedSafesearch,
}) => { }) => {
const totalBlocked = blockedFiltering + replacedSafebrowsing + replacedParental; const totalBlocked = (
blockedFiltering + replacedSafebrowsing + replacedParental + replacedSafesearch
);
return ( return (
<Card <Card
@ -71,6 +74,7 @@ BlockedDomains.propTypes = {
topBlockedDomains: PropTypes.array.isRequired, topBlockedDomains: PropTypes.array.isRequired,
blockedFiltering: PropTypes.number.isRequired, blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired, replacedSafebrowsing: PropTypes.number.isRequired,
replacedSafesearch: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired, replacedParental: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired, refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired, subtitle: PropTypes.string.isRequired,

1
client/src/components/Dashboard/index.js
View File

@ -151,6 +151,7 @@ const Dashboard = ({
topBlockedDomains={stats.topBlockedDomains} topBlockedDomains={stats.topBlockedDomains}
blockedFiltering={stats.numBlockedFiltering} blockedFiltering={stats.numBlockedFiltering}
replacedSafebrowsing={stats.numReplacedSafebrowsing} replacedSafebrowsing={stats.numReplacedSafebrowsing}
replacedSafesearch={stats.numReplacedSafesearch}
replacedParental={stats.numReplacedParental} replacedParental={stats.numReplacedParental}
refreshButton={refreshButton} refreshButton={refreshButton}
/> />