Fix UI whitelist update bug and update variable names

app/panel/actions/BlockingActions.js

@@ -15,11 +15,11 @@ import {
 	UPDATE_BLOCKING_DATA,
 	UPDATE_BLOCK_ALL_TRACKERS,
 	UPDATE_CATEGORIES,
-	UPDATE_ANTI_TRACKING_HIDE,
+	UPDATE_UNKNOWN_CATEGORY_HIDE,
 	UPDATE_CATEGORY_BLOCKED,
 	UPDATE_TRACKER_BLOCKED,
 	UPDATE_TRACKER_TRUST_RESTRICT,
-	UPDATE_ANTI_TRACKING_WHITELIST,
+	UPDATE_CLIQZ_MODULE_WHITELIST,
 	TOGGLE_EXPAND_ALL
 } from '../constants/constants';
 
@@ -64,9 +64,9 @@ export function updateCategories(data) {
  * @param  {Object} data
  * @return {Object}
  */
-export function updateAntiTrackingHide(data) {
+export function updateUnknownCategoryHide(data) {
 	return {
-		type: UPDATE_ANTI_TRACKING_HIDE,
+		type: UPDATE_UNKNOWN_CATEGORY_HIDE,
 		data,
 	};
 }
@@ -123,12 +123,12 @@ export function updateTrackerTrustRestrict(data) {
  * @param  {Object} data
  * @return {Object} dispatch
  */
-export function updateAntiTrackingWhitelist(unknownTracker) {
+export function updateCliqzModuleWhitelist(unknownTracker) {
 	return function(dispatch, getState) {
 		// use redux-thunk to get pageHost from summary
 		const { pageHost } = getState().summary;
 		dispatch({
-			type: UPDATE_ANTI_TRACKING_WHITELIST,
+			type: UPDATE_CLIQZ_MODULE_WHITELIST,
 			data: { unknownTracker, pageHost },
 		});
 	};

app/panel/components/Blocking.jsx

@@ -93,7 +93,7 @@ class Blocking extends React.Component {
 	*/
 	setShow(filterName) {
 		const updated_categories = JSON.parse(JSON.stringify(this.props.categories)); // deep clone
-		const updatedAntiTracking = JSON.parse(JSON.stringify(this.props.unknownCategory)); // deep clone
+		const updatedUnknownCategory = JSON.parse(JSON.stringify(this.props.unknownCategory)); // deep clone
 
 		updated_categories.forEach((category) => {
 			let count = 0;
@@ -112,9 +112,9 @@ class Blocking extends React.Component {
 			category.num_shown = (show) ? count : 0;
 		});
 
-		updatedAntiTracking.hide = !(filterName === 'all' || filterName === 'unknown');
+		updatedUnknownCategory.hide = !(filterName === 'all' || filterName === 'unknown');
 		this.props.actions.updateCategories(updated_categories);
-		this.props.actions.updateAntiTrackingHide(updatedAntiTracking);
+		this.props.actions.updateUnknownCategoryHide(updatedUnknownCategory);
 	}
 
 	/**

app/panel/components/Blocking/Tracker.jsx

@@ -220,7 +220,7 @@ class Tracker extends React.Component {
 	handleAntiTrackingWhitelist() {
 		const { tracker } = this.props;
 
-		this.props.actions.updateAntiTrackingWhitelist(tracker);
+		this.props.actions.updateCliqzModuleWhitelist(tracker);
 		this.props.actions.showNotification({
 			updated: `${tracker.name}-whitelisting-status-changed`,
 			reload: true,

app/panel/constants/constants.js

@@ -39,11 +39,11 @@ export const SEND_SIGNAL = 'SEND_SIGNAL';
 // blocking
 export const UPDATE_BLOCKING_DATA = 'UPDATE_BLOCKING_DATA';
 export const UPDATE_CATEGORIES = 'UPDATE_CATEGORIES';
-export const UPDATE_ANTI_TRACKING_HIDE = 'UPDATE_ANTI_TRACKING_HIDE';
+export const UPDATE_UNKNOWN_CATEGORY_HIDE = 'UPDATE_UNKNOWN_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';
-export const UPDATE_ANTI_TRACKING_WHITELIST = 'UPDATE_ANTI_TRACKING_WHITELIST';
+export const UPDATE_CLIQZ_MODULE_WHITELIST = 'UPDATE_CLIQZ_MODULE_WHITELIST';
 export const UPDATE_BLOCK_ALL_TRACKERS = 'UPDATE_BLOCK_ALL_TRACKERS';
 export const TOGGLE_EXPAND_ALL = 'TOGGLE_EXPAND_ALL';
 

app/panel/reducers/blocking.js

@@ -17,11 +17,11 @@ import {
 	FILTER_TRACKERS,
 	UPDATE_BLOCK_ALL_TRACKERS,
 	UPDATE_CATEGORIES,
-	UPDATE_ANTI_TRACKING_HIDE,
+	UPDATE_UNKNOWN_CATEGORY_HIDE,
 	UPDATE_CATEGORY_BLOCKED,
 	UPDATE_TRACKER_BLOCKED,
 	UPDATE_TRACKER_TRUST_RESTRICT,
-	UPDATE_ANTI_TRACKING_WHITELIST,
+	UPDATE_CLIQZ_MODULE_WHITELIST,
 	TOGGLE_EXPAND_ALL,
 	UPDATE_CLIQZ_MODULE_DATA,
 	UPDATE_SUMMARY_DATA
@@ -42,13 +42,13 @@ const initialState = {
 	site_specific_unblocks: {},
 	site_specific_blocks: {},
 	unknownCategory: {
-		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
-		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
+		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)
 		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 Anti-Tracking blocking category
+		hide: false, // Whether or not to display the Unknown category
 	}
 };
 
@@ -79,8 +79,8 @@ export default (state = initialState, action) => {
 		case UPDATE_CATEGORIES: {
 			return Object.assign({}, state, { categories: action.data });
 		}
-		case UPDATE_ANTI_TRACKING_HIDE: {
-			return Object.assign({}, state, { antiTracking: action.data });
+		case UPDATE_UNKNOWN_CATEGORY_HIDE: {
+			return Object.assign({}, state, { unknownCategory: action.data });
 		}
 		case UPDATE_CATEGORY_BLOCKED: {
 			const updated = updateCategoryBlocked(state, action);
@@ -98,9 +98,9 @@ export default (state = initialState, action) => {
 			const updated = _updateTrackerTrustRestrict(state, action);
 			return Object.assign({}, state, updated);
 		}
-		case UPDATE_ANTI_TRACKING_WHITELIST: {
-			const antiTracking = _updateCliqzModuleWhitelist(state, action);
-			return Object.assign({}, state, { antiTracking });
+		case UPDATE_CLIQZ_MODULE_WHITELIST: {
+			const unknownCategory = _updateCliqzModuleWhitelist(state, action);
+			return Object.assign({}, state, { unknownCategory });
 		}
 		case UPDATE_CLIQZ_MODULE_DATA:
 		case UPDATE_SUMMARY_DATA: {