temporarily remove whitelist buttons from ad-block unknowns

CHANGELOG.md

@@ -1,6 +1,6 @@
 ### GHOSTERY 8.4.1 (UNRELEASED)
 
-+ Add new Data Points tracker category in detail view with anti-tracking whitelist (#417)
++ 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)

CODEOWNERS

@@ -13,21 +13,21 @@
 /src/classes/PolicySmartBlock.js @jsignanini
 /src/classes/Conf.js @zarembsky
 /src/classes/ConfData.js @zarembsky
-/src/classes/PanelData.js @zarembsky
+/src/classes/PanelData.js @wlycdgr
 
 # Background
 /src/background.js @zarembsky
 
 # The Ghostery Hub
-/app/hub/ @IAmThePan
+/app/hub/ @Eden12345
 
 # Shared Components
-/app/shared-components @IAmThePan
+/app/shared-components @wlycdgr
 
 # Build Tools
 .eslintrc.js @christophertino
 babel.config.js @christophertino
 webpack.config.js @christophertino
 
 # Unit Tests
-/test/ @IAmThePan
+/test/ @Eden12345

app/panel/actions/BlockingActions.js

@@ -119,7 +119,7 @@ export function updateTrackerTrustRestrict(data) {
 }
 
 /**
- * Called from Tracker.handleAntiTrackingWhitelist()
+ * Called from Tracker.handleCliqzTrackerWhitelist()
  * @param  {Object} data
  * @return {Object} dispatch
  */

app/panel/components/Blocking/Tracker.jsx

@@ -42,7 +42,7 @@ class Tracker extends React.Component {
 		this.clickTrackerStatus = this.clickTrackerStatus.bind(this);
 		this.clickTrackerTrust = this.clickTrackerTrust.bind(this);
 		this.clickTrackerRestrict = this.clickTrackerRestrict.bind(this);
-		this.handleAntiTrackingWhitelist = this.handleAntiTrackingWhitelist.bind(this);
+		this.handleCliqzTrackerWhitelist = this.handleCliqzTrackerWhitelist.bind(this);
 	}
 
 	/**
@@ -217,7 +217,7 @@ class Tracker extends React.Component {
 	 * Trigger actions which persist the new setting and notify user
 	 * that the page should be reloaded.
 	 */
-	handleAntiTrackingWhitelist() {
+	handleCliqzTrackerWhitelist() {
 		const { tracker } = this.props;
 
 		this.props.actions.updateCliqzModuleWhitelist(tracker);
@@ -335,14 +335,15 @@ class Tracker extends React.Component {
 						{!tracker.whitelisted && this._renderCliqzStatsContainer()}
 					</div>
 					<div className="columns shrink align-self-justify collapse-right">
-						{!isUnknown ? renderKnownTrackerButtons(
+						{!isUnknown && renderKnownTrackerButtons(
 							this.props.tracker.ss_allowed,
 							this.props.tracker.ss_blocked,
 							this.clickTrackerTrust,
 							this.clickTrackerRestrict,
 							this.clickTrackerStatus,
-						) : renderUnknownTrackerButtons(
-							this.handleAntiTrackingWhitelist,
+						)}
+						{isUnknown && tracker.type === 'antiTracking' && renderUnknownTrackerButtons(
+							this.handleCliqzTrackerWhitelist,
 							tracker.whitelisted,
 							tracker.siteRestricted,
 							tracker.type,

app/panel/components/Blocking/trackerButtonRenderHelpers.jsx

@@ -54,7 +54,7 @@ export const renderKnownTrackerButtons = (
 );
 
 export const renderUnknownTrackerButtons = (
-	handleAntiTrackingWhitelist, whitelisted, siteRestricted, type
+	handleCliqzTrackerWhitelist, whitelisted, siteRestricted, type
 ) => {
 	const svgContainerClasses = ClassNames('unknown-svg-container', {
 		whitelisted: whitelisted && !siteRestricted,
@@ -65,7 +65,7 @@ export const renderUnknownTrackerButtons = (
 		<div className={svgContainerClasses}>
 			{/* USE INLINE SVG FOR TRUST CIRCLE TO CHANGE COLORS WITH CSS */}
 			<span className="t-tooltip-up-left" data-g-tooltip={t('panel_tracker_trust_tooltip')}>
-				<svg className="anti-track-trust" onClick={handleAntiTrackingWhitelist} width="20px" height="20px" viewBox="0 0 20 20">
+				<svg className="cliqz-tracker-trust" onClick={handleCliqzTrackerWhitelist} width="20px" height="20px" viewBox="0 0 20 20">
 					<g transform="translate(1 1)" fill="none" fillRule="evenodd">
 						<path className="border" stroke="#96c761" d="M-.5-.5h18.3v18.217H-.5z" />
 						<path className="background" stroke="#FFF" fill="#96c761" d="M.5.5h16.3v16.217H.5z" />
@@ -78,7 +78,7 @@ export const renderUnknownTrackerButtons = (
 
 			{/* USE INLINE SVG FOR ANTI-TRACKING SHIELD TO CHANGE COLORS WITH CSS */}
 			<span className="t-tooltip-up-left" data-g-tooltip={t('panel_tracker_scrub_tooltip')}>
-				<svg className="anti-track-scrub" onClick={handleAntiTrackingWhitelist} width="20px" height="20px" viewBox="0 0 20 20">
+				<svg className="cliqz-tracker-scrub" onClick={handleCliqzTrackerWhitelist} width="20px" height="20px" viewBox="0 0 20 20">
 					<g transform="translate(1 1)" fill="none" fillRule="evenodd">
 						<path className="border" stroke="#00AEF0" d="M-.5-.5h18.3v18.217H-.5z" />
 						<path className="background" stroke="#FFF" fill="#00AEF0" d="M.5.5h16.3v16.217H.5z" />

app/scss/partials/_blocking_tracker.scss

@@ -144,26 +144,26 @@
 		justify-content: space-between;
 
 		&:not(.whitelisted) {
-			.anti-track-trust {
+			.cliqz-tracker-trust {
 				visibility: hidden;
 				cursor: pointer;
 				.border { stroke: #d8d8d8; }
 				.background { fill: #f7f7f7; }
 				.trust-circle { stroke: #9B9B9B; }
 			}
 
-			.anti-track-scrub {
+			.cliqz-tracker-scrub {
 				pointer-events: none;
 			}
 		}
 
 		&.whitelisted {
 			flex-direction: row-reverse;
 
-			.anti-track-trust {
+			.cliqz-tracker-trust {
 				pointer-events: none;
 			}
-			.anti-track-scrub {
+			.cliqz-tracker-scrub {
 				visibility: hidden;
 				pointer-events: auto;
 				cursor: pointer;
@@ -174,13 +174,13 @@
 		}
 
 		&:hover {
-			.anti-track-trust {
+			.cliqz-tracker-trust {
 				visibility: visible;
 			}
 		}
 
 		&.whitelisted:hover {
-			.anti-track-scrub {
+			.cliqz-tracker-scrub {
 				visibility: visible;
 			}
 		}