From b56ba5595e829d124e9126f9afa71c6388130a93 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 1 Oct 2020 13:51:51 -0400 Subject: [PATCH 1/6] Rename unknown to unidentified --- _locales/en/messages.json | 10 +++++----- app/panel-android/components/PanelAndroid.jsx | 4 ++-- app/panel/components/Blocking/Categories.jsx | 4 ++-- app/panel/components/BuildingBlocks/DonutGraph.jsx | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index ceb9eafaf..7da0073aa 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1507,7 +1507,7 @@ "message": "Choose which trackers to block" }, "hub_setup_antisuite_description_antitracking": { - "message": "Anonymize unblocked and unknown trackers for greater browsing protection." + "message": "Anonymize unblocked and unidentified trackers for greater browsing protection." }, "hub_setup_feature_already_active": { "message": "This feature is already active in Cliqz by default. $LINK_LM_START$Learn More$LINK_LM_END$", @@ -2324,11 +2324,11 @@ "OFFERS_ENDS": { "message": "" }, - "unknown": { - "message": "Unknown" + "unidentified": { + "message": "Unidentified" }, - "unknown_description": { - "message": "Unknown trackers scrubbed by Anti-Tracking" + "unidentified_description": { + "message": "Unidentified trackers scrubbed by Anti-Tracking" }, "ghostery_is_ready": { "message": "Ghostery is Ready!" diff --git a/app/panel-android/components/PanelAndroid.jsx b/app/panel-android/components/PanelAndroid.jsx index 0dbd1bfa2..6711afd16 100644 --- a/app/panel-android/components/PanelAndroid.jsx +++ b/app/panel-android/components/PanelAndroid.jsx @@ -223,8 +223,8 @@ class PanelAndroid extends React.Component { }); const unknownCategory = { id: 'unknown', - name: t('unknown'), - description: t('unknown_description'), + name: t('unidentified'), + description: t('unidentified_description'), img_name: 'unknown', num_total: unknownTrackers.length, num_blocked: 0, // We don't want to see the Trackers Blocked text diff --git a/app/panel/components/Blocking/Categories.jsx b/app/panel/components/Blocking/Categories.jsx index 3c5dd05b7..9a7d01f12 100644 --- a/app/panel/components/Blocking/Categories.jsx +++ b/app/panel/components/Blocking/Categories.jsx @@ -53,8 +53,8 @@ class Categories extends React.Component { const unknownCategoryMapping = isUnknown ? ( { id: 'unknown', - name: t('unknown'), - description: t('unknown_description'), + name: t('unidentified'), + description: t('unidentified_description'), img_name: 'unknown', num_total: unknownCategory.unknownTrackers.length, num_blocked: unknownCategory.unknownTrackerCount, diff --git a/app/panel/components/BuildingBlocks/DonutGraph.jsx b/app/panel/components/BuildingBlocks/DonutGraph.jsx index 9cab95c7b..ce90d2dfe 100644 --- a/app/panel/components/BuildingBlocks/DonutGraph.jsx +++ b/app/panel/components/BuildingBlocks/DonutGraph.jsx @@ -388,7 +388,7 @@ class DonutGraph extends React.Component { id="unknown_tooltip" key="unknown" > - {t('unknown')} + {t('unidentified')} )} From 3387205a6740cd21e3e1fdd4c7e6430174502a2f Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 1 Oct 2020 14:00:54 -0400 Subject: [PATCH 2/6] Update snapshot --- .../__tests__/__snapshots__/DonutGraph.jsx.snap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap b/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap index b960d1f0e..95c229b28 100644 --- a/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap +++ b/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap @@ -35,7 +35,7 @@ exports[`app/panel/components/DonutGraph.jsx Snapshot tests with react-test-rend className="DonutGraph__tooltip tooltip top" id="unknown_tooltip" > - unknown + unidentified
- unknown + unidentified
Date: Tue, 6 Oct 2020 14:26:52 -0400 Subject: [PATCH 3/6] unknownTracker -> unidentifiedTracker global replace --- app/panel-android/actions/blockingActions.js | 22 +++++++-------- app/panel-android/components/PanelAndroid.jsx | 16 +++++------ .../components/content/BlockingTracker.jsx | 2 +- app/panel/actions/BlockingActions.js | 4 +-- app/panel/components/Blocking.jsx | 2 +- app/panel/components/Blocking/Categories.jsx | 28 +++++++++---------- .../components/BuildingBlocks/DonutGraph.jsx | 20 ++++++------- .../BuildingBlocks/__tests__/DonutGraph.jsx | 8 +++--- app/panel/reducers/__tests__/summary.js | 8 +++--- app/panel/reducers/blocking.js | 26 ++++++++--------- app/panel/reducers/summary.js | 8 +++--- src/utils/cliqzModulesData.js | 16 +++++------ 12 files changed, 80 insertions(+), 80 deletions(-) diff --git a/app/panel-android/actions/blockingActions.js b/app/panel-android/actions/blockingActions.js index 4ff46c5fe..d8c248a3c 100644 --- a/app/panel-android/actions/blockingActions.js +++ b/app/panel-android/actions/blockingActions.js @@ -73,17 +73,17 @@ export function anonymizeSiteTracker({ actionData, state }) { const updatedcliqzModuleData = JSON.parse(JSON.stringify(state.cliqzModuleData)); const { antiTracking, adBlock } = state.cliqzModuleData; const whitelistedUrls = { ...antiTracking.whitelistedUrls, ...adBlock.whitelistedUrls }; - const { unknownTracker } = actionData; + const { unidentifiedTracker } = actionData; const { pageHost } = state.summary; const addToWhitelist = () => { - unknownTracker.sources.forEach((domain) => { + unidentifiedTracker.sources.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], }; } @@ -102,11 +102,11 @@ export function anonymizeSiteTracker({ actionData, state }) { } }; - if (unknownTracker.whitelisted) { - unknownTracker.sources.forEach(removeFromWhitelist); + if (unidentifiedTracker.whitelisted) { + unidentifiedTracker.sources.forEach(removeFromWhitelist); Object.keys(whitelistedUrls).forEach((domain) => { - if (whitelistedUrls[domain].name === unknownTracker.name) { + if (whitelistedUrls[domain].name === unidentifiedTracker.name) { removeFromWhitelist(domain); } }); @@ -115,14 +115,14 @@ export function anonymizeSiteTracker({ actionData, state }) { } // Update Ad Blocking trackers - updatedcliqzModuleData.adBlock.unknownTrackers.forEach((trackerEl) => { - if (trackerEl.name === unknownTracker.name) { + updatedcliqzModuleData.adBlock.unidentifiedTrackers.forEach((trackerEl) => { + if (trackerEl.name === unidentifiedTracker.name) { trackerEl.whitelisted = !trackerEl.whitelisted; } }); // Update Anti-Tracking trackers - updatedcliqzModuleData.antiTracking.unknownTrackers.forEach((trackerEl) => { - if (trackerEl.name === unknownTracker.name) { + updatedcliqzModuleData.antiTracking.unidentifiedTrackers.forEach((trackerEl) => { + if (trackerEl.name === unidentifiedTracker.name) { trackerEl.whitelisted = !trackerEl.whitelisted; } }); diff --git a/app/panel-android/components/PanelAndroid.jsx b/app/panel-android/components/PanelAndroid.jsx index 6711afd16..ff26929c9 100644 --- a/app/panel-android/components/PanelAndroid.jsx +++ b/app/panel-android/components/PanelAndroid.jsx @@ -54,8 +54,8 @@ class PanelAndroid extends React.Component { categories: [], }, cliqzModuleData: { - adBlock: { trackerCount: 0, unknownTrackers: [] }, - antiTracking: { trackerCount: 0, unknownTrackers: [] }, + adBlock: { trackerCount: 0, unidentifiedTrackers: [] }, + antiTracking: { trackerCount: 0, unidentifiedTrackers: [] }, }, }; } @@ -207,9 +207,9 @@ class PanelAndroid extends React.Component { const { categories, toggle_individual_trackers } = blocking; const { adBlock, antiTracking } = cliqzModuleData; - const unknownTrackers = Array.from(new Set([ - ...antiTracking.unknownTrackers.map(this.massageCliqzTrackers), - ...adBlock.unknownTrackers.map(this.massageCliqzTrackers), + const unidentifiedTrackers = Array.from(new Set([ + ...antiTracking.unidentifiedTrackers.map(this.massageCliqzTrackers), + ...adBlock.unidentifiedTrackers.map(this.massageCliqzTrackers), ])).sort((a, b) => { const nameA = a.name.toLowerCase(); const nameB = b.name.toLowerCase(); @@ -226,9 +226,9 @@ class PanelAndroid extends React.Component { name: t('unidentified'), description: t('unidentified_description'), img_name: 'unknown', - num_total: unknownTrackers.length, + num_total: unidentifiedTrackers.length, num_blocked: 0, // We don't want to see the Trackers Blocked text - trackers: unknownTrackers, + trackers: unidentifiedTrackers, }; return ( @@ -248,7 +248,7 @@ class PanelAndroid extends React.Component { ) : (
- {(categories.length > 0 || unknownCategory.unknownTrackers.length > 0) && ( + {(categories.length > 0 || unknownCategory.unidentifiedTrackers.length > 0) && ( { - if (unknownTracker.whitelisted) { whitelistedTotal++; } + num_total: unknownCategory.unidentifiedTrackers.length, + num_blocked: unknownCategory.unidentifiedTrackerCount, + num_shown: unknownCategory.hide ? 0 : unknownCategory.unidentifiedTrackers.length, + trackers: unknownCategory.unidentifiedTrackers.map((unidentifiedTracker) => { + if (unidentifiedTracker.whitelisted) { whitelistedTotal++; } return { - name: unknownTracker.name, - domains: unknownTracker.domains, - whitelisted: unknownTracker.whitelisted, - type: unknownTracker.type, + name: unidentifiedTracker.name, + domains: unidentifiedTracker.domains, + whitelisted: unidentifiedTracker.whitelisted, + type: unidentifiedTracker.type, siteRestricted: sitePolicy === 1, blocked: false, catId: 'unknown', description: '', - id: unknownTracker.name + unknownTracker.domains[0], + id: unidentifiedTracker.name + unidentifiedTracker.domains[0], shouldShow: true, - cliqzAdCount: unknownTracker.ads, - cliqzCookieCount: unknownTracker.cookies, - cliqzFingerprintCount: unknownTracker.fingerprints, + cliqzAdCount: unidentifiedTracker.ads, + cliqzCookieCount: unidentifiedTracker.cookies, + cliqzFingerprintCount: unidentifiedTracker.fingerprints, }; }), whitelistedTotal, @@ -104,7 +104,7 @@ class Categories extends React.Component { }; const categoryList = categories.map((category, index) => renderCategory(category, index)); - const renderUnknownCategory = unknownCategory && unknownCategory.unknownTrackers.length + const renderUnknownCategory = unknownCategory && unknownCategory.unidentifiedTrackers.length ? renderCategory(null, categoryList.length, true) : null; return ( diff --git a/app/panel/components/BuildingBlocks/DonutGraph.jsx b/app/panel/components/BuildingBlocks/DonutGraph.jsx index ce90d2dfe..688de22cd 100644 --- a/app/panel/components/BuildingBlocks/DonutGraph.jsx +++ b/app/panel/components/BuildingBlocks/DonutGraph.jsx @@ -163,10 +163,10 @@ 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 (!prevAntiTracking.unidentifiedTrackerCount && !antiTracking.unidentifiedTrackerCount + && !prevAdBlock.unidentifiedTrackerCount && !adBlock.unidentifiedTrackerCount) { return; } + const prevUnknownDataPoints = prevAntiTracking.unidentifiedTrackerCount + prevAdBlock.unidentifiedTrackerCount; + const unknownDataPoints = antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount; if (prevUnknownDataPoints !== unknownDataPoints) { 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, + value: antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount, }); } @@ -382,7 +382,7 @@ class DonutGraph extends React.Component { {cat.name} ))} - {(!!antiTracking.unknownTrackerCount || !!adBlock.unknownTrackerCount) && ( + {(!!antiTracking.unidentifiedTrackerCount || !!adBlock.unidentifiedTrackerCount) && ( {}, 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/reducers/__tests__/summary.js b/app/panel/reducers/__tests__/summary.js index 3bb1531cd..2365c6ee7 100644 --- a/app/panel/reducers/__tests__/summary.js +++ b/app/panel/reducers/__tests__/summary.js @@ -39,16 +39,16 @@ const initialState = Immutable({ totalUnknownCount: 0, totalUnsafeCount: 0, trackerCount: 0, - unknownTrackerCount: 0, - unknownTrackers: [], + unidentifiedTrackerCount: 0, + unidentifiedTrackers: [], whitelistedUrls: {}, }, adBlock: { totalUnknownCount: 0, totalUnsafeCount: 0, trackerCount: 0, - unknownTrackerCount: 0, - unknownTrackers: [], + unidentifiedTrackerCount: 0, + unidentifiedTrackers: [], whitelistedUrls: {}, }, }); diff --git a/app/panel/reducers/blocking.js b/app/panel/reducers/blocking.js index cbbc6243b..b9bc95b1b 100644 --- a/app/panel/reducers/blocking.js +++ b/app/panel/reducers/blocking.js @@ -44,8 +44,8 @@ const initialState = { 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 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 unknown trackers scrubbed by Anti-Tracking and Ad Block + unidentifiedTrackers: [], // An array of objects associated with each unknown 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 } @@ -128,16 +128,16 @@ const _updateTrackerTrustRestrict = (state, action) => { const _updateCliqzModuleWhitelist = (state, action) => { const updatedUnknownCategory = JSON.parse(JSON.stringify(state.unknownCategory)); const { whitelistedUrls } = updatedUnknownCategory; - const { unknownTracker, pageHost } = action.data; + 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,8 +168,8 @@ const _updateCliqzModuleWhitelist = (state, action) => { addToWhitelist(); } - updatedUnknownCategory.unknownTrackers.forEach((trackerEl) => { - if (trackerEl.name === unknownTracker.name) { + updatedUnknownCategory.unidentifiedTrackers.forEach((trackerEl) => { + if (trackerEl.name === unidentifiedTracker.name) { trackerEl.whitelisted = !trackerEl.whitelisted; } }); @@ -237,8 +237,8 @@ export default (state = initialState, action) => { totalUnsafeCount: antiTracking.totalUnsafeCount + adBlock.totalUnsafeCount, totalUnknownCount: antiTracking.totalUnknownCount + adBlock.totalUnknownCount, 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, }; diff --git a/app/panel/reducers/summary.js b/app/panel/reducers/summary.js index 514cc8e4c..017967b2f 100644 --- a/app/panel/reducers/summary.js +++ b/app/panel/reducers/summary.js @@ -39,16 +39,16 @@ const initialState = { 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 + unidentifiedTrackerCount: 0, // The amount of unknown 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 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 unknown trackers blocked by Ad Blocking + unidentifiedTrackers: [], // List of ad-block trackers not matched to Ghostery bug IDs whitelistedUrls: {}, } }; diff --git a/src/utils/cliqzModulesData.js b/src/utils/cliqzModulesData.js index ed0cc52cd..635bc0cd0 100644 --- a/src/utils/cliqzModulesData.js +++ b/src/utils/cliqzModulesData.js @@ -32,8 +32,8 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) { let totalUnsafeCount = 0; let totalUnknownCount = 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; @@ -43,8 +43,8 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) { totalUnsafeCount, totalUnknownCount, trackerCount, - unknownTrackerCount, - unknownTrackers, + unidentifiedTrackerCount, + unidentifiedTrackers, whitelistedUrls, }; } @@ -83,7 +83,7 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) { totalUnsafeCount += dataPoints; totalUnknownCount += 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 }); } @@ -102,8 +102,8 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) { totalUnsafeCount, totalUnknownCount, trackerCount, - unknownTrackerCount, - unknownTrackers, + unidentifiedTrackerCount, + unidentifiedTrackers, whitelistedUrls, }; } From 99285705677158423b1188a92030fedb86e42efc Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 6 Oct 2020 15:55:26 -0400 Subject: [PATCH 4/6] Global replace Unknown -> Unidentified, UNKNOWN -> Unidentified. Rename unknown.svg -> unidentified.svg --- CHANGELOG.md | 6 ++-- .../{unknown.svg => unidentified.svg} | 0 app/panel-android/components/PanelAndroid.jsx | 8 ++--- .../components/content/BlockingCategory.jsx | 12 +++---- .../components/content/BlockingTracker.jsx | 10 +++--- app/panel/actions/BlockingActions.js | 6 ++-- app/panel/components/Blocking.jsx | 14 ++++---- app/panel/components/Blocking/Categories.jsx | 30 ++++++++-------- app/panel/components/Blocking/Category.jsx | 24 ++++++------- app/panel/components/Blocking/Tracker.jsx | 14 ++++---- app/panel/components/Blocking/Trackers.jsx | 4 +-- .../Blocking/trackerButtonRenderHelpers.jsx | 4 +-- .../components/BuildingBlocks/DonutGraph.jsx | 22 ++++++------ .../__snapshots__/DonutGraph.jsx.snap | 4 +-- app/panel/constants/constants.js | 2 +- app/panel/reducers/__tests__/summary.js | 8 ++--- app/panel/reducers/blocking.js | 36 +++++++++---------- app/panel/reducers/summary.js | 8 ++--- app/scss/android/_blocking_tab.scss | 4 +-- app/scss/partials/_blocking_tracker.scss | 4 +-- src/utils/cliqzModulesData.js | 8 ++--- 21 files changed, 114 insertions(+), 114 deletions(-) rename app/images/panel-android/categories/{unknown.svg => unidentified.svg} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7a547c8e..0875a4107 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,7 +55,7 @@ + Migrate to the new Chromium-based Edge browser (#492) + Disable Purplebox on Firefox Android (#494) + Allow white-listing of wildcard domains (#501) -+ Allow site-specific white-listing of Unknown Trackers caught by Ad-Blocker (#503) ++ Allow site-specific white-listing of Unidentified Trackers caught by Ad-Blocker (#503) + Fixes issue when adding localhost to Trusted Sites with port value (Fixes #470) + Add locale-appropriate formatting to historical stats numbers (#498) + Remove email opt-in from account creation in panel and hub (#495) @@ -86,7 +86,7 @@ ### GHOSTERY 8.4.3 (October 1, 2019) -+ Fixes issue where Detail View is blank when there are only Unknown trackers found (#446) ++ Fixes issue where Detail View is blank when there are only Unidentified trackers found (#446) + New opt-in flow for Ghostery Rewards (#444) + Uncheck email promotions options for create account view (#446) + Revert Rewards opt-in setting for Firefox (#446) @@ -109,7 +109,7 @@ ### GHOSTERY 8.4.1 (August 6, 2019) -+ Add new Unknown tracker category in detail view with anti-tracking whitelist (#417, #433) ++ Add new Unidentified tracker category in detail view with anti-tracking whitelist (#417, #433) + Fixes broken `target=_blank` links in Opera (#426) + Fixes error `Uncaught TypeError: c.querySelectorAll` (#406) + Show ad-blocking icons in detail view tracker list (#411) diff --git a/app/images/panel-android/categories/unknown.svg b/app/images/panel-android/categories/unidentified.svg similarity index 100% rename from app/images/panel-android/categories/unknown.svg rename to app/images/panel-android/categories/unidentified.svg diff --git a/app/panel-android/components/PanelAndroid.jsx b/app/panel-android/components/PanelAndroid.jsx index ff26929c9..43eb6eacd 100644 --- a/app/panel-android/components/PanelAndroid.jsx +++ b/app/panel-android/components/PanelAndroid.jsx @@ -221,11 +221,11 @@ class PanelAndroid extends React.Component { } return 0; }); - const unknownCategory = { - id: 'unknown', + const unidentifiedCategory = { + id: 'unidentified', name: t('unidentified'), description: t('unidentified_description'), - img_name: 'unknown', + img_name: 'unidentified', num_total: unidentifiedTrackers.length, num_blocked: 0, // We don't want to see the Trackers Blocked text trackers: unidentifiedTrackers, @@ -248,7 +248,7 @@ class PanelAndroid extends React.Component { tracker.ss_allowed)) { @@ -136,8 +136,8 @@ class BlockingCategory extends React.Component { renderCategorySelect() { const categorySelect = this.categorySelectStatus; - // Hide category blocking for Unknown trackers - if (categorySelect === 'unknown') { + // Hide category blocking for Unidentified trackers + if (categorySelect === 'unidentified') { return false; } const categorySelectClassNames = ClassNames('BlockingSelectButton', { @@ -212,7 +212,7 @@ class BlockingCategory extends React.Component { const categoryImage = `/app/images/panel-android/categories/${img_name}.svg`; const categoryClassNames = ClassNames('BlockingCategory', { - BlockingCategory__unknown: id === 'unknown', + BlockingCategory__unidentified: id === 'unidentified', }); return ( @@ -238,7 +238,7 @@ class BlockingCategory extends React.Component {
{t('blocking_category_trackers')} - {category.id === 'unknown' ? t('android_anonymized') : t('blocking_category_blocked')} + {category.id === 'unidentified' ? t('android_anonymized') : t('blocking_category_blocked')}
{name}
{this.renderTrackerModified()}
- {(trackerSelect === 'antiTracking' || trackerSelect === 'adBlock') ? this.renderUnknownTrackerStatus() : this.renderTrackerStatus()} + {(trackerSelect === 'antiTracking' || trackerSelect === 'adBlock') ? this.renderUnidentifiedTrackerStatus() : this.renderTrackerStatus()} {this.renderTrackerOverflow()}
); diff --git a/app/panel/actions/BlockingActions.js b/app/panel/actions/BlockingActions.js index 0d702d035..eea7d0edd 100644 --- a/app/panel/actions/BlockingActions.js +++ b/app/panel/actions/BlockingActions.js @@ -15,7 +15,7 @@ import { UPDATE_BLOCKING_DATA, UPDATE_BLOCK_ALL_TRACKERS, UPDATE_CATEGORIES, - UPDATE_UNKNOWN_CATEGORY_HIDE, + UPDATE_UNIDENTIFIED_CATEGORY_HIDE, UPDATE_CATEGORY_BLOCKED, UPDATE_TRACKER_BLOCKED, UPDATE_TRACKER_TRUST_RESTRICT, @@ -64,9 +64,9 @@ export function updateCategories(data) { * @param {Object} data * @return {Object} */ -export function updateUnknownCategoryHide(data) { +export function updateUnidentifiedCategoryHide(data) { return { - type: UPDATE_UNKNOWN_CATEGORY_HIDE, + type: UPDATE_UNIDENTIFIED_CATEGORY_HIDE, data, }; } diff --git a/app/panel/components/Blocking.jsx b/app/panel/components/Blocking.jsx index 703512af9..0a2dac64b 100644 --- a/app/panel/components/Blocking.jsx +++ b/app/panel/components/Blocking.jsx @@ -120,9 +120,9 @@ class Blocking extends React.Component { * @param {string} filterName */ setShow(filterName) { - const { actions, categories, unknownCategory } = this.props; + const { actions, categories, unidentifiedCategory } = this.props; const updated_categories = JSON.parse(JSON.stringify(categories)); // deep clone - const updatedUnknownCategory = JSON.parse(JSON.stringify(unknownCategory)); // deep clone + const updatedUnidentifiedCategory = JSON.parse(JSON.stringify(unidentifiedCategory)); // deep clone updated_categories.forEach((categoryEl) => { let count = 0; @@ -141,9 +141,9 @@ class Blocking extends React.Component { categoryEl.num_shown = (show) ? count : 0; }); - updatedUnknownCategory.hide = !(filterName === 'all' || filterName === 'unknown'); + updatedUnidentifiedCategory.hide = !(filterName === 'all' || filterName === 'unidentified'); actions.updateCategories(updated_categories); - actions.updateUnknownCategoryHide(updatedUnknownCategory); + actions.updateUnidentifiedCategoryHide(updatedUnidentifiedCategory); } /** @@ -316,7 +316,7 @@ class Blocking extends React.Component { const { actions, categories, - unknownCategory, + unidentifiedCategory, enable_anti_tracking, expand_all_trackers, is_expanded, @@ -349,7 +349,7 @@ class Blocking extends React.Component { ) : (
- {(categories.length > 0 || unknownCategory.unidentifiedTrackers.length > 0) && ( + {(categories.length > 0 || unidentifiedCategory.unidentifiedTrackers.length > 0) && ( )} diff --git a/app/panel/components/Blocking/Categories.jsx b/app/panel/components/Blocking/Categories.jsx index 095334455..1c5699935 100644 --- a/app/panel/components/Blocking/Categories.jsx +++ b/app/panel/components/Blocking/Categories.jsx @@ -33,7 +33,7 @@ class Categories extends React.Component { actions, categories, expandAll, - unknownCategory, + unidentifiedCategory, enable_anti_tracking, sitePolicy, globalBlocking, @@ -48,18 +48,18 @@ class Categories extends React.Component { const globalBlockingBool = !!globalBlocking; const filteredBool = !!filtered; - const renderCategory = (category, index, isUnknown) => { + const renderCategory = (category, index, isUnidentified) => { let whitelistedTotal = 0; - const unknownCategoryMapping = isUnknown ? ( + const unidentifiedCategoryMapping = isUnidentified ? ( { - id: 'unknown', + id: 'unidentified', name: t('unidentified'), description: t('unidentified_description'), - img_name: 'unknown', - num_total: unknownCategory.unidentifiedTrackers.length, - num_blocked: unknownCategory.unidentifiedTrackerCount, - num_shown: unknownCategory.hide ? 0 : unknownCategory.unidentifiedTrackers.length, - trackers: unknownCategory.unidentifiedTrackers.map((unidentifiedTracker) => { + img_name: 'unidentified', + num_total: unidentifiedCategory.unidentifiedTrackers.length, + num_blocked: unidentifiedCategory.unidentifiedTrackerCount, + num_shown: unidentifiedCategory.hide ? 0 : unidentifiedCategory.unidentifiedTrackers.length, + trackers: unidentifiedCategory.unidentifiedTrackers.map((unidentifiedTracker) => { if (unidentifiedTracker.whitelisted) { whitelistedTotal++; } return { name: unidentifiedTracker.name, @@ -68,7 +68,7 @@ class Categories extends React.Component { type: unidentifiedTracker.type, siteRestricted: sitePolicy === 1, blocked: false, - catId: 'unknown', + catId: 'unidentified', description: '', id: unidentifiedTracker.name + unidentifiedTracker.domains[0], shouldShow: true, @@ -86,9 +86,9 @@ class Categories extends React.Component { expandAll={expandAll} globalBlocking={globalBlockingBool} index={index} - category={isUnknown ? unknownCategoryMapping : category} + category={isUnidentified ? unidentifiedCategoryMapping : category} actions={actions} - key={isUnknown ? unknownCategoryMapping.id : category.id} + key={isUnidentified ? unidentifiedCategoryMapping.id : category.id} filtered={filteredBool} showToast={showToast} show_tracker_urls={show_tracker_urls} @@ -98,19 +98,19 @@ class Categories extends React.Component { smartBlockActive={smartBlockActive} smartBlock={smartBlock} enable_anti_tracking={enable_anti_tracking} - isUnknown={isUnknown} + isUnidentified={isUnidentified} /> ); }; const categoryList = categories.map((category, index) => renderCategory(category, index)); - const renderUnknownCategory = unknownCategory && unknownCategory.unidentifiedTrackers.length + const renderUnidentifiedCategory = unidentifiedCategory && unidentifiedCategory.unidentifiedTrackers.length ? renderCategory(null, categoryList.length, true) : null; return (
{categoryList} - {renderUnknownCategory} + {renderUnidentifiedCategory}
); } diff --git a/app/panel/components/Blocking/Category.jsx b/app/panel/components/Blocking/Category.jsx index 513107107..d84be888c 100644 --- a/app/panel/components/Blocking/Category.jsx +++ b/app/panel/components/Blocking/Category.jsx @@ -194,11 +194,11 @@ class Category extends React.Component { _renderCaret() { const { isExpanded } = this.state; - const { isUnknown } = this.props; + const { isUnidentified } = this.props; const caretClasses = ClassNames(this.context, { 'caret-down': !isExpanded, 'caret-up': isExpanded, - Category__antiTrackingCaret: isUnknown + Category__antiTrackingCaret: isUnidentified }); return ( @@ -218,7 +218,7 @@ class Category extends React.Component { category, paused_blocking, sitePolicy, - isUnknown, + isUnidentified, globalBlocking, index, filtered, @@ -251,8 +251,8 @@ class Category extends React.Component { return (
-
- {isUnknown && ( +
+ {isUnidentified && (
)}
@@ -278,14 +278,14 @@ class Category extends React.Component { { (category.num_total === 1) ? t('blocking_category_tracker') : t('blocking_category_trackers') }
- {((!isUnknown && !!trackersBlockedCount) - || (isUnknown && !!category.whitelistedTotal && sitePolicy !== 1)) && ( -
+ {((!isUnidentified && !!trackersBlockedCount) + || (isUnidentified && !!category.whitelistedTotal && sitePolicy !== 1)) && ( +
- {isUnknown ? `${category.whitelistedTotal} ` : `${trackersBlockedCount} `} + {isUnidentified ? `${category.whitelistedTotal} ` : `${trackersBlockedCount} `} - {isUnknown ? t('blocking_category_whitelisted') : t('blocking_category_blocked') } + {isUnidentified ? t('blocking_category_whitelisted') : t('blocking_category_blocked') }
)} @@ -293,7 +293,7 @@ class Category extends React.Component {
{ this._renderCaret() } - {!isUnknown && ( + {!isUnidentified && (
@@ -337,7 +337,7 @@ class Category extends React.Component { language={language} smartBlockActive={smartBlockActive} smartBlock={smartBlock} - isUnknown={isUnknown} + isUnidentified={isUnidentified} /> )}
diff --git a/app/panel/components/Blocking/Tracker.jsx b/app/panel/components/Blocking/Tracker.jsx index a74ed851d..89b2a0260 100644 --- a/app/panel/components/Blocking/Tracker.jsx +++ b/app/panel/components/Blocking/Tracker.jsx @@ -18,7 +18,7 @@ import ThemeContext from '../../contexts/ThemeContext'; import globals from '../../../../src/classes/Globals'; import { log } from '../../../../src/utils/common'; import { sendMessageInPromise } from '../../utils/msg'; -import { renderKnownTrackerButtons, renderUnknownTrackerButtons } from './trackerButtonRenderHelpers'; +import { renderKnownTrackerButtons, renderUnidentifiedTrackerButtons } from './trackerButtonRenderHelpers'; /** * @class Implement Tracker component which represents single tracker * in the Blocking view. @@ -261,7 +261,7 @@ class Tracker extends React.Component { } /** - * Implement handler for clicking on the trust or scrub SVGs for an unknown tracker + * Implement handler for clicking on the trust or scrub SVGs for an unidentified tracker * Trigger actions which persist the new setting and notify user * that the page should be reloaded. */ @@ -327,7 +327,7 @@ class Tracker extends React.Component { */ render() { const { - tracker, isUnknown, language, show_tracker_urls + tracker, isUnidentified, language, show_tracker_urls } = this.props; const { trackerClasses, @@ -353,7 +353,7 @@ class Tracker extends React.Component { )); } else if (tracker.domains) { sources = tracker.domains.map(domain => ( -

{domain}

+

{domain}

)); } @@ -377,14 +377,14 @@ class Tracker extends React.Component { {!tracker.whitelisted && this._renderCliqzStatsContainer()}
- {!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 688de22cd..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'; @@ -165,9 +165,9 @@ class DonutGraph extends React.Component { if (!prevAntiTracking.unidentifiedTrackerCount && !antiTracking.unidentifiedTrackerCount && !prevAdBlock.unidentifiedTrackerCount && !adBlock.unidentifiedTrackerCount) { return; } - const prevUnknownDataPoints = prevAntiTracking.unidentifiedTrackerCount + prevAdBlock.unidentifiedTrackerCount; - const unknownDataPoints = antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount; - if (prevUnknownDataPoints !== unknownDataPoints) { + const prevUnidentifiedDataPoints = prevAntiTracking.unidentifiedTrackerCount + prevAdBlock.unidentifiedTrackerCount; + const unidentifiedDataPoints = antiTracking.unidentifiedTrackerCount + adBlock.unidentifiedTrackerCount; + if (prevUnidentifiedDataPoints !== unidentifiedDataPoints) { this.nextPropsDonut(this.props); } } @@ -235,8 +235,8 @@ class DonutGraph extends React.Component { if (antiTracking.unidentifiedTrackerCount || adBlock.unidentifiedTrackerCount) { graphData.push({ - id: 'unknown', - name: 'Unknown', + 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 @@ -385,8 +385,8 @@ class DonutGraph extends React.Component { {(!!antiTracking.unidentifiedTrackerCount || !!adBlock.unidentifiedTrackerCount) && ( {t('unidentified')} diff --git a/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap b/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap index 95c229b28..e6531c1ff 100644 --- a/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap +++ b/app/panel/components/BuildingBlocks/__tests__/__snapshots__/DonutGraph.jsx.snap @@ -33,7 +33,7 @@ exports[`app/panel/components/DonutGraph.jsx Snapshot tests with react-test-rend unidentified @@ -110,7 +110,7 @@ exports[`app/panel/components/DonutGraph.jsx Snapshot tests with react-test-rend unidentified diff --git a/app/panel/constants/constants.js b/app/panel/constants/constants.js index 7c321d3b2..c4edec8ec 100644 --- a/app/panel/constants/constants.js +++ b/app/panel/constants/constants.js @@ -38,7 +38,7 @@ export const SEND_SIGNAL = 'SEND_SIGNAL'; // blocking export const UPDATE_BLOCKING_DATA = 'UPDATE_BLOCKING_DATA'; export const UPDATE_CATEGORIES = 'UPDATE_CATEGORIES'; -export const UPDATE_UNKNOWN_CATEGORY_HIDE = 'UPDATE_UNKNOWN_CATEGORY_HIDE'; +export const UPDATE_UNIDENTIFIED_CATEGORY_HIDE = 'UPDATE_UNIDENTIFIED_CATEGORY_HIDE'; export const UPDATE_CATEGORY_BLOCKED = 'UPDATE_CATEGORY_BLOCKED'; export const UPDATE_TRACKER_BLOCKED = 'UPDATE_TRACKER_BLOCKED'; export const UPDATE_TRACKER_TRUST_RESTRICT = 'UPDATE_TRACKER_TRUST_RESTRICT'; diff --git a/app/panel/reducers/__tests__/summary.js b/app/panel/reducers/__tests__/summary.js index 2365c6ee7..5eb7caaf8 100644 --- a/app/panel/reducers/__tests__/summary.js +++ b/app/panel/reducers/__tests__/summary.js @@ -36,7 +36,7 @@ const initialState = Immutable({ }, tab_id: 0, antiTracking: { - totalUnknownCount: 0, + totalUnidentifiedCount: 0, totalUnsafeCount: 0, trackerCount: 0, unidentifiedTrackerCount: 0, @@ -44,7 +44,7 @@ const initialState = Immutable({ whitelistedUrls: {}, }, adBlock: { - totalUnknownCount: 0, + totalUnidentifiedCount: 0, totalUnsafeCount: 0, trackerCount: 0, unidentifiedTrackerCount: 0, @@ -74,7 +74,7 @@ describe('app/panel/reducers/summary.js', () => { }, 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 b9bc95b1b..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) - unidentifiedTrackerCount: 0, // The amount of unknown trackers scrubbed by Anti-Tracking and Ad Block - unidentifiedTrackers: [], // 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,8 +126,8 @@ 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 updatedUnidentifiedCategory = JSON.parse(JSON.stringify(state.unidentifiedCategory)); + const { whitelistedUrls } = updatedUnidentifiedCategory; const { unidentifiedTracker, pageHost } = action.data; const addToWhitelist = () => { @@ -168,7 +168,7 @@ const _updateCliqzModuleWhitelist = (state, action) => { addToWhitelist(); } - updatedUnknownCategory.unidentifiedTrackers.forEach((trackerEl) => { + updatedUnidentifiedCategory.unidentifiedTrackers.forEach((trackerEl) => { if (trackerEl.name === unidentifiedTracker.name) { trackerEl.whitelisted = !trackerEl.whitelisted; } @@ -176,7 +176,7 @@ const _updateCliqzModuleWhitelist = (state, action) => { 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, 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 017967b2f..8b634537b 100644 --- a/app/panel/reducers/summary.js +++ b/app/panel/reducers/summary.js @@ -36,18 +36,18 @@ 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) - unidentifiedTrackerCount: 0, // The amount of unknown trackers scrubbed by Anti-Tracking + 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) - unidentifiedTrackerCount: 0, // The amount of unknown trackers blocked by Ad Blocking + 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 635bc0cd0..c31c43f26 100644 --- a/src/utils/cliqzModulesData.js +++ b/src/utils/cliqzModulesData.js @@ -30,7 +30,7 @@ const { adblocker, antitracking } = cliqz.modules; */ export function getCliqzData(tabId, tabHostUrl, antiTracking) { let totalUnsafeCount = 0; - let totalUnknownCount = 0; + let totalUnidentifiedCount = 0; let trackerCount = 0; let unidentifiedTrackerCount = 0; const unidentifiedTrackers = []; @@ -41,7 +41,7 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) { if (!cliqzModuleEnabled || !cliqzModule.background) { return { totalUnsafeCount, - totalUnknownCount, + totalUnidentifiedCount, trackerCount, unidentifiedTrackerCount, unidentifiedTrackers, @@ -81,7 +81,7 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) { if (dataPoints) { totalUnsafeCount += dataPoints; - totalUnknownCount += dataPoints; + totalUnidentifiedCount += dataPoints; trackerCount++; unidentifiedTrackerCount++; } @@ -100,7 +100,7 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) { return { totalUnsafeCount, - totalUnknownCount, + totalUnidentifiedCount, trackerCount, unidentifiedTrackerCount, unidentifiedTrackers, From 9fa003478b8e692ac3122d120173c100516a1ebf Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 10:39:17 -0400 Subject: [PATCH 5/6] Update changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e59863bf..0313066b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,7 +63,7 @@ See the complete GitHub [milestone](https://github.com/ghostery/ghostery-extensi + Migrate to the new Chromium-based Edge browser (#492) + Disable Purplebox on Firefox Android (#494) + Allow white-listing of wildcard domains (#501) -+ Allow site-specific white-listing of Unidentified Trackers caught by Ad-Blocker (#503) ++ Allow site-specific white-listing of Unknown Trackers caught by Ad-Blocker (#503) + Fixes issue when adding localhost to Trusted Sites with port value (Fixes #470) + Add locale-appropriate formatting to historical stats numbers (#498) + Remove email opt-in from account creation in panel and hub (#495) @@ -94,7 +94,7 @@ See the complete GitHub [milestone](https://github.com/ghostery/ghostery-extensi ### GHOSTERY 8.4.3 (October 1, 2019) -+ Fixes issue where Detail View is blank when there are only Unidentified trackers found (#446) ++ Fixes issue where Detail View is blank when there are only Unknown trackers found (#446) + New opt-in flow for Ghostery Rewards (#444) + Uncheck email promotions options for create account view (#446) + Revert Rewards opt-in setting for Firefox (#446) @@ -117,7 +117,7 @@ See the complete GitHub [milestone](https://github.com/ghostery/ghostery-extensi ### GHOSTERY 8.4.1 (August 6, 2019) -+ Add new Unidentified tracker category in detail view with anti-tracking whitelist (#417, #433) ++ Add new Unknown tracker category in detail view with anti-tracking whitelist (#417, #433) + Fixes broken `target=_blank` links in Opera (#426) + Fixes error `Uncaught TypeError: c.querySelectorAll` (#406) + Show ad-blocking icons in detail view tracker list (#411) From 91926188e62dc5d66e7247d4bb5eb5fd8879601f Mon Sep 17 00:00:00 2001 From: Ben Date: Tue, 27 Oct 2020 10:39:30 -0400 Subject: [PATCH 6/6] Rename unknown -> unidentified.svg --- app/images/panel/{unknown.svg => unidentified.svg} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename app/images/panel/{unknown.svg => unidentified.svg} (98%) diff --git a/app/images/panel/unknown.svg b/app/images/panel/unidentified.svg similarity index 98% rename from app/images/panel/unknown.svg rename to app/images/panel/unidentified.svg index 0b5dc198c..65df04033 100644 --- a/app/images/panel/unknown.svg +++ b/app/images/panel/unidentified.svg @@ -1 +1 @@ - \ No newline at end of file +