Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v8.4.3 Bug Fixes #446

Merged
merged 8 commits into from Sep 6, 2019

GH-1845 Fixes issue where Unknown category does not show if not other…

… categories are present
  • Loading branch information
christophertino committed Sep 4, 2019
commit 9eb55ba1b5b14d95b99967e33d54c126592ed54b
@@ -301,7 +301,6 @@ class Blocking extends React.Component {
blockingClasses,
disableBlocking
} = this.state;

return (
<div id="content-blocking">
<BlockingHeader
@@ -318,7 +317,7 @@ class Blocking extends React.Component {
<NotScanned />
) : (
<div className={`${blockingClasses} blocking-trackers show-warnings`}>
{categories.length > 0 && (
{(categories.length > 0 || unknownCategory.unknownTrackers.length > 0) && (
<Categories
expandAll={expand_all_trackers}
categories={categories}
@@ -204,7 +204,7 @@ class DonutGraph extends React.Component {
} = options;
const graphData = [];
const animationDuration = categories.length > 0 ? 500 : 0;
const categoryCount = categories.length;
const categoryCount = categories.length + antiTracking.unknownTrackerCount + adBlock.unknownTrackerCount;

// Process categories into graphData
if (categoryCount === 0) {
@@ -37,14 +37,20 @@ const initialState = {
},
tab_id: 0,
antiTracking: {
totalUnsafeCount: 0, // The amount of data points scrubbed by Anti-Tracking
totalUnknownCount: 0, // The amount of data points scrubbed by Anti-Tracking for Trackers not in the Ghostery DB
totalUnsafeCount: 0, // The amount of data points scrubbed by Anti-Tracking
trackerCount: 0, // The amount of trackers scrubbed by Anti-Tracking (which are each associated with 1 or more data points)
unknownTrackerCount: 0, // The amount of unknown trackers scrubbed by Anti-Tracking
unknownTrackers: [], // List of anti-tracking trackers not matched to Ghostery bug IDs
whitelistedUrls: {},
},
adBlock: {
totalCount: 0, // The amount of ads blocked by Ad Blocking
totalUnknownCount: 0, // The amount of data points blocked by Ad Blocking for Trackers not in the Ghostery DB
totalUnsafeCount: 0, // The amount of data points blocked by Ad Blocking
trackerCount: 0, // The amount of trackers blocked by Ad Blocking (which are each associated with 1 or more ads)
unknownTrackerCount: 0, // The amount of unknown trackers blocked by Ad Blocking
unknownTrackers: [], // List of ad-block trackers not matched to Ghostery bug IDs
whitelistedUrls: {},
}
};
/**
ProTip! Use n and p to navigate between commits in a pull request.