- {!isUnknown && renderKnownTrackerButtons(
+ {!isUnidentified && renderKnownTrackerButtons(
tracker.ss_allowed,
tracker.ss_blocked,
this.clickTrackerTrust,
this.clickTrackerRestrict,
this.clickTrackerStatus,
)}
- {isUnknown && renderUnknownTrackerButtons(
+ {isUnidentified && renderUnidentifiedTrackerButtons(
this.handleCliqzTrackerWhitelist,
tracker.whitelisted,
tracker.siteRestricted,
@@ -396,7 +396,7 @@ class Tracker extends React.Component {
{showMoreInfo && (
- {!isUnknown && (
+ {!isUnidentified && (
{description}
diff --git a/app/panel/components/Blocking/Trackers.jsx b/app/panel/components/Blocking/Trackers.jsx
index 9bb8ce9ff..6568074e5 100644
--- a/app/panel/components/Blocking/Trackers.jsx
+++ b/app/panel/components/Blocking/Trackers.jsx
@@ -43,7 +43,7 @@ class Trackers extends React.Component {
const {
actions,
trackers,
- isUnknown,
+ isUnidentified,
globalBlocking,
showToast,
language,
@@ -87,7 +87,7 @@ class Trackers extends React.Component {
language={language}
smartBlockActive={smartBlockActive}
smartBlock={smartBlock}
- isUnknown={isUnknown}
+ isUnidentified={isUnidentified}
/>
));
}
diff --git a/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx b/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx
index 3bfbb1ae5..e8583d4db 100644
--- a/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx
+++ b/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx
@@ -53,10 +53,10 @@ export const renderKnownTrackerButtons = (
);
-export const renderUnknownTrackerButtons = (
+export const renderUnidentifiedTrackerButtons = (
handleCliqzTrackerWhitelist, whitelisted, siteRestricted, type, contextType
) => {
- const svgContainerClasses = ClassNames('unknown-svg-container', {
+ const svgContainerClasses = ClassNames('unidentified-svg-container', {
whitelisted: whitelisted && !siteRestricted,
siteRestricted,
});
diff --git a/app/panel/components/BuildingBlocks/DonutGraph.jsx b/app/panel/components/BuildingBlocks/DonutGraph.jsx
index 9cab95c7b..defd5607f 100644
--- a/app/panel/components/BuildingBlocks/DonutGraph.jsx
+++ b/app/panel/components/BuildingBlocks/DonutGraph.jsx
@@ -66,7 +66,7 @@ class DonutGraph extends React.Component {
return '#87d7ef';
case 'social_media':
return '#388ee8';
- case 'unknown':
+ case 'unidentified':
return '#8459a5';
default:
return '#e8e8e8';
@@ -163,11 +163,11 @@ class DonutGraph extends React.Component {
return;
}
- if (!prevAntiTracking.unknownTrackerCount && !antiTracking.unknownTrackerCount
- && !prevAdBlock.unknownTrackerCount && !adBlock.unknownTrackerCount) { return; }
- const prevUnknownDataPoints = prevAntiTracking.unknownTrackerCount + prevAdBlock.unknownTrackerCount;
- const unknownDataPoints = antiTracking.unknownTrackerCount + adBlock.unknownTrackerCount;
- if (prevUnknownDataPoints !== unknownDataPoints) {
+ if (!prevAntiTracking.unidentifiedTrackerCount && !antiTracking.unidentifiedTrackerCount
+ && !prevAdBlock.unidentifiedTrackerCount && !adBlock.unidentifiedTrackerCount) { return; }
+ const prevUnidentifiedDataPoints = prevAntiTracking.unidentifiedTrackerCount + prevAdBlock.unidentifiedTrackerCount;
+ const unidentifiedDataPoints = antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount;
+ if (prevUnidentifiedDataPoints !== unidentifiedDataPoints) {
this.nextPropsDonut(this.props);
}
}
@@ -213,7 +213,7 @@ class DonutGraph extends React.Component {
} = options;
const graphData = [];
const animationDuration = categories.length > 0 ? 500 : 0;
- const categoryCount = categories.length + antiTracking.unknownTrackerCount + adBlock.unknownTrackerCount;
+ const categoryCount = categories.length + antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount;
// Process categories into graphData
if (categoryCount === 0) {
@@ -233,11 +233,11 @@ class DonutGraph extends React.Component {
graphData.sort((a, b) => a.value < b.value);
}
- if (antiTracking.unknownTrackerCount || adBlock.unknownTrackerCount) {
+ if (antiTracking.unidentifiedTrackerCount || adBlock.unidentifiedTrackerCount) {
graphData.push({
- id: 'unknown',
- name: 'Unknown',
- value: antiTracking.unknownTrackerCount + adBlock.unknownTrackerCount,
+ id: 'unidentified',
+ name: 'Unidentified',
+ value: antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount,
});
}
@@ -252,9 +252,9 @@ class DonutGraph extends React.Component {
tooltip.classList.remove('DonutGraph__tooltip--show');
}
});
- const unknown_tooltip = document.getElementById('unknown_tooltip');
- if (unknown_tooltip) {
- unknown_tooltip.classList.remove('DonutGraph__tooltip--show');
+ const unidentified_tooltip = document.getElementById('unidentified_tooltip');
+ if (unidentified_tooltip) {
+ unidentified_tooltip.classList.remove('DonutGraph__tooltip--show');
}
// CONNECT NEW DATA
@@ -382,13 +382,13 @@ class DonutGraph extends React.Component {
{cat.name}
))}
- {(!!antiTracking.unknownTrackerCount || !!adBlock.unknownTrackerCount) && (
+ {(!!antiTracking.unidentifiedTrackerCount || !!adBlock.unidentifiedTrackerCount) && (
- {t('unknown')}
+ {t('unidentified')}
)}
@@ -422,8 +422,8 @@ DonutGraph.propTypes = {
DonutGraph.defaultProps = {
categories: [],
- adBlock: { unknownTrackerCount: 0 },
- antiTracking: { unknownTrackerCount: 0 },
+ adBlock: { unidentifiedTrackerCount: 0 },
+ antiTracking: { unidentifiedTrackerCount: 0 },
clickDonut: () => {},
isSmall: false,
};
diff --git a/app/panel/components/BuildingBlocks/__tests__/DonutGraph.jsx b/app/panel/components/BuildingBlocks/__tests__/DonutGraph.jsx
index 29d3d9311..0968d0058 100644
--- a/app/panel/components/BuildingBlocks/__tests__/DonutGraph.jsx
+++ b/app/panel/components/BuildingBlocks/__tests__/DonutGraph.jsx
@@ -63,8 +63,8 @@ describe('app/panel/components/DonutGraph.jsx', () => {
num_total: 4
},
]}
- adBlock={{ unknownTrackerCount: 8 }}
- antiTracking={{ unknownTrackerCount: 8 }}
+ adBlock={{ unidentifiedTrackerCount: 8 }}
+ antiTracking={{ unidentifiedTrackerCount: 8 }}
renderRedscale
renderGreyscale={false}
totalCount={8}
@@ -101,8 +101,8 @@ describe('app/panel/components/DonutGraph.jsx', () => {
num_total: 4
},
]}
- adBlock={{ unknownTrackerCount: 8 }}
- antiTracking={{ unknownTrackerCount: 8 }}
+ adBlock={{ unidentifiedTrackerCount: 8 }}
+ antiTracking={{ unidentifiedTrackerCount: 8 }}
renderRedscale={false}
renderGreyscale
totalCount={38}
diff --git a/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap b/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap
index b960d1f0e..e6531c1ff 100644
--- a/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap
+++ b/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap
@@ -33,9 +33,9 @@ exports[`app/panel/components/DonutGraph.jsx Snapshot tests with react-test-rend
- unknown
+ unidentified
- unknown
+ unidentified
{
},
antiTracking: {
totalUnsafeCount: 5,
- totalUnknownCount: 3,
+ totalUnidentifiedCount: 3,
trackerCount: 1
}
};
@@ -87,7 +87,7 @@ describe('app/panel/reducers/summary.js', () => {
},
antiTracking: {
totalUnsafeCount: 1,
- totalUnknownCount: 0,
+ totalUnidentifiedCount: 0,
trackerCount: 0
}
});
diff --git a/app/panel/reducers/blocking.js b/app/panel/reducers/blocking.js
index cbbc6243b..71314a8de 100644
--- a/app/panel/reducers/blocking.js
+++ b/app/panel/reducers/blocking.js
@@ -16,7 +16,7 @@ import {
FILTER_TRACKERS,
UPDATE_BLOCK_ALL_TRACKERS,
UPDATE_CATEGORIES,
- UPDATE_UNKNOWN_CATEGORY_HIDE,
+ UPDATE_UNIDENTIFIED_CATEGORY_HIDE,
UPDATE_CATEGORY_BLOCKED,
UPDATE_TRACKER_BLOCKED,
UPDATE_TRACKER_TRUST_RESTRICT,
@@ -40,14 +40,14 @@ const initialState = {
},
site_specific_unblocks: {},
site_specific_blocks: {},
- unknownCategory: {
+ unidentifiedCategory: {
totalUnsafeCount: 0, // The amount of data points scrubbed by Anti-Tracking and Ad Block
- totalUnknownCount: 0, // The amount of data points scrubbed by Anti-Tracking and Ad Block for Trackers not in the Ghostery DB
+ totalUnidentifiedCount: 0, // The amount of data points scrubbed by Anti-Tracking and Ad Block for Trackers not in the Ghostery DB
trackerCount: 0, // The amount of trackers scrubbed by Anti-Tracking and Ad Block (which are each associated with 1 or more data points)
- unknownTrackerCount: 0, // The amount of unknown trackers scrubbed by Anti-Tracking and Ad Block
- unknownTrackers: [], // An array of objects associated with each unknown Tracker (includes both blocked and whitelisted trackers for this site)
+ unidentifiedTrackerCount: 0, // The amount of unidentified trackers scrubbed by Anti-Tracking and Ad Block
+ unidentifiedTrackers: [], // An array of objects associated with each unidentified Tracker (includes both blocked and whitelisted trackers for this site)
whitelistedUrls: {}, // An object of whitelisted url domains pointing to an object with the associated tracker name and an array of whitelisted host domains
- hide: false, // Whether or not to display the Unknown category
+ hide: false, // Whether or not to display the Unidentified category
}
};
@@ -126,18 +126,18 @@ const _updateTrackerTrustRestrict = (state, action) => {
* @return {Object} updated categories and site-specific blocking counters
*/
const _updateCliqzModuleWhitelist = (state, action) => {
- const updatedUnknownCategory = JSON.parse(JSON.stringify(state.unknownCategory));
- const { whitelistedUrls } = updatedUnknownCategory;
- const { unknownTracker, pageHost } = action.data;
+ const updatedUnidentifiedCategory = JSON.parse(JSON.stringify(state.unidentifiedCategory));
+ const { whitelistedUrls } = updatedUnidentifiedCategory;
+ const { unidentifiedTracker, pageHost } = action.data;
const addToWhitelist = () => {
- unknownTracker.domains.forEach((domain) => {
+ unidentifiedTracker.domains.forEach((domain) => {
if (whitelistedUrls.hasOwnProperty(domain)) {
- whitelistedUrls[domain].name = unknownTracker.name;
+ whitelistedUrls[domain].name = unidentifiedTracker.name;
whitelistedUrls[domain].hosts.push(pageHost);
} else {
whitelistedUrls[domain] = {
- name: unknownTracker.name,
+ name: unidentifiedTracker.name,
hosts: [pageHost],
};
}
@@ -156,11 +156,11 @@ const _updateCliqzModuleWhitelist = (state, action) => {
}
};
- if (unknownTracker.whitelisted) {
- unknownTracker.domains.forEach(removeFromWhitelist);
+ if (unidentifiedTracker.whitelisted) {
+ unidentifiedTracker.domains.forEach(removeFromWhitelist);
Object.keys(whitelistedUrls).forEach((domain) => {
- if (whitelistedUrls[domain].name === unknownTracker.name) {
+ if (whitelistedUrls[domain].name === unidentifiedTracker.name) {
removeFromWhitelist(domain);
}
});
@@ -168,15 +168,15 @@ const _updateCliqzModuleWhitelist = (state, action) => {
addToWhitelist();
}
- updatedUnknownCategory.unknownTrackers.forEach((trackerEl) => {
- if (trackerEl.name === unknownTracker.name) {
+ updatedUnidentifiedCategory.unidentifiedTrackers.forEach((trackerEl) => {
+ if (trackerEl.name === unidentifiedTracker.name) {
trackerEl.whitelisted = !trackerEl.whitelisted;
}
});
sendMessage('setPanelData', { cliqz_module_whitelist: whitelistedUrls });
- return updatedUnknownCategory;
+ return updatedUnidentifiedCategory;
};
/**
@@ -206,8 +206,8 @@ export default (state = initialState, action) => {
case UPDATE_CATEGORIES: {
return { ...state, categories: action.data };
}
- case UPDATE_UNKNOWN_CATEGORY_HIDE: {
- return { ...state, unknownCategory: action.data };
+ case UPDATE_UNIDENTIFIED_CATEGORY_HIDE: {
+ return { ...state, unidentifiedCategory: action.data };
}
case UPDATE_CATEGORY_BLOCKED: {
const updated = updateCategoryBlocked(state, action);
@@ -226,23 +226,23 @@ export default (state = initialState, action) => {
return { ...state, ...updated };
}
case UPDATE_CLIQZ_MODULE_WHITELIST: {
- const unknownCategory = _updateCliqzModuleWhitelist(state, action);
- return { ...state, unknownCategory };
+ const unidentifiedCategory = _updateCliqzModuleWhitelist(state, action);
+ return { ...state, unidentifiedCategory };
}
case UPDATE_CLIQZ_MODULE_DATA:
case UPDATE_SUMMARY_DATA: {
if (action.data.antiTracking && action.data.adBlock) {
const { antiTracking, adBlock } = action.data;
- const unknownCategory = {
+ const unidentifiedCategory = {
totalUnsafeCount: antiTracking.totalUnsafeCount + adBlock.totalUnsafeCount,
- totalUnknownCount: antiTracking.totalUnknownCount + adBlock.totalUnknownCount,
+ totalUnidentifiedCount: antiTracking.totalUnidentifiedCount + adBlock.totalUnidentifiedCount,
trackerCount: antiTracking.trackerCount + adBlock.trackerCount,
- unknownTrackerCount: antiTracking.unknownTrackerCount + adBlock.unknownTrackerCount,
- unknownTrackers: Array.from(new Set(antiTracking.unknownTrackers.concat(adBlock.unknownTrackers))),
+ unidentifiedTrackerCount: antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount,
+ unidentifiedTrackers: Array.from(new Set(antiTracking.unidentifiedTrackers.concat(adBlock.unidentifiedTrackers))),
whitelistedUrls: { ...antiTracking.whitelistedUrls, ...adBlock.whitelistedUrls },
- hide: state.unknownCategory.hide,
+ hide: state.unidentifiedCategory.hide,
};
- return { ...state, unknownCategory };
+ return { ...state, unidentifiedCategory };
}
return state;
}
diff --git a/app/panel/reducers/summary.js b/app/panel/reducers/summary.js
index 514cc8e4c..8b634537b 100644
--- a/app/panel/reducers/summary.js
+++ b/app/panel/reducers/summary.js
@@ -36,19 +36,19 @@ const initialState = {
},
tab_id: 0,
antiTracking: {
- totalUnknownCount: 0, // The amount of data points scrubbed by Anti-Tracking for Trackers not in the Ghostery DB
+ totalUnidentifiedCount: 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
+ unidentifiedTrackerCount: 0, // The amount of unidentified trackers scrubbed by Anti-Tracking
+ unidentifiedTrackers: [], // List of anti-tracking trackers not matched to Ghostery bug IDs
whitelistedUrls: {},
},
adBlock: {
- totalUnknownCount: 0, // The amount of data points blocked by Ad Blocking for Trackers not in the Ghostery DB
+ totalUnidentifiedCount: 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
+ unidentifiedTrackerCount: 0, // The amount of unidentified trackers blocked by Ad Blocking
+ unidentifiedTrackers: [], // List of ad-block trackers not matched to Ghostery bug IDs
whitelistedUrls: {},
}
};
diff --git a/app/scss/android/_blocking_tab.scss b/app/scss/android/_blocking_tab.scss
index d876f5b93..3ce6eeb0d 100644
--- a/app/scss/android/_blocking_tab.scss
+++ b/app/scss/android/_blocking_tab.scss
@@ -44,7 +44,7 @@
text-transform: uppercase;
}
- &.BlockingCategory__unknown:before {
+ &.BlockingCategory__unidentified:before {
content: "";
position: relative;
top: -1px;
@@ -326,7 +326,7 @@
}
}
-.UnknownSVGContainer {
+.UnidentifiedSVGContainer {
position: relative;
margin-right: 7px;
display: flex;
diff --git a/app/scss/partials/_blocking_tracker.scss b/app/scss/partials/_blocking_tracker.scss
index b0394175f..d2fdaa266 100644
--- a/app/scss/partials/_blocking_tracker.scss
+++ b/app/scss/partials/_blocking_tracker.scss
@@ -124,7 +124,7 @@
margin-right: 10px;
overflow-y: hidden;
@extend %nowrap;
- &.unknown {
+ &.unidentified {
margin: 0 10px 0 0;
color: #4a4a4a;
}
@@ -148,7 +148,7 @@
}
}
- .unknown-svg-container {
+ .unidentified-svg-container {
position: relative;
top: 3px;
width: 42px;
diff --git a/src/utils/cliqzModulesData.js b/src/utils/cliqzModulesData.js
index ed0cc52cd..c31c43f26 100644
--- a/src/utils/cliqzModulesData.js
+++ b/src/utils/cliqzModulesData.js
@@ -30,10 +30,10 @@ const { adblocker, antitracking } = cliqz.modules;
*/
export function getCliqzData(tabId, tabHostUrl, antiTracking) {
let totalUnsafeCount = 0;
- let totalUnknownCount = 0;
+ let totalUnidentifiedCount = 0;
let trackerCount = 0;
- let unknownTrackerCount = 0;
- const unknownTrackers = [];
+ let unidentifiedTrackerCount = 0;
+ const unidentifiedTrackers = [];
const whitelistedUrls = conf.cliqz_module_whitelist;
const cliqzModule = antiTracking ? antitracking : adblocker;
const cliqzModuleEnabled = antiTracking ? conf.enable_anti_tracking : conf.enable_ad_block;
@@ -41,10 +41,10 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) {
if (!cliqzModuleEnabled || !cliqzModule.background) {
return {
totalUnsafeCount,
- totalUnknownCount,
+ totalUnidentifiedCount,
trackerCount,
- unknownTrackerCount,
- unknownTrackers,
+ unidentifiedTrackerCount,
+ unidentifiedTrackers,
whitelistedUrls,
};
}
@@ -81,9 +81,9 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) {
if (dataPoints) {
totalUnsafeCount += dataPoints;
- totalUnknownCount += dataPoints;
+ totalUnidentifiedCount += dataPoints;
trackerCount++;
- unknownTrackerCount++;
+ unidentifiedTrackerCount++;
}
if (dataPoints || whitelisted) {
@@ -92,7 +92,7 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) {
name, domains, ads, cookies, fingerprints, wtm
} = other;
- unknownTrackers.push({
+ unidentifiedTrackers.push({
name, domains, ads, cookies, fingerprints, whitelisted, type, wtm
});
}
@@ -100,10 +100,10 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) {
return {
totalUnsafeCount,
- totalUnknownCount,
+ totalUnidentifiedCount,
trackerCount,
- unknownTrackerCount,
- unknownTrackers,
+ unidentifiedTrackerCount,
+ unidentifiedTrackers,
whitelistedUrls,
};
}