Feature/counters

app/panel/actions/SummaryActions.js

@@ -12,7 +12,7 @@
  */
 
 import {
-	GET_SUMMARY_DATA,
+	GET_CLIQZ_MODULE_DATA,
 	UPDATE_TRACKER_COUNTS,
 	UPDATE_GHOSTERY_PAUSED,
 	UPDATE_SITE_POLICY,
@@ -21,18 +21,14 @@ import {
 import { sendMessageInPromise } from '../utils/msg';
 
 /**
- * Fetch summary data from background
- * @deprecated  in favor or PanelActions.getPanelData()
+ * Fetch Cliqz Modules data from background
  * @return {Object} dispatch
  */
-export function getSummaryData(tabId) {
+export function getCliqzModuleData() {
 	return function (dispatch) {
-		return sendMessageInPromise('getPanelData', {
-			tabId,
-			view: 'summary',
-		}).then((data) => {
+		return sendMessageInPromise('getCliqzModuleData').then((data) => {
 			dispatch({
-				type: GET_SUMMARY_DATA,
+				type: GET_CLIQZ_MODULE_DATA,
 				data,
 			});
 		});

app/panel/actions/__tests__/SummaryActions.js

@@ -16,7 +16,7 @@ import thunk from 'redux-thunk';
 import * as msg from '../../utils/msg';
 import * as summaryActions from '../SummaryActions';
 import {
-	GET_SUMMARY_DATA,
+	GET_CLIQZ_MODULE_DATA,
 	UPDATE_TRACKER_COUNTS,
 	UPDATE_GHOSTERY_PAUSED,
 	UPDATE_SITE_POLICY,
@@ -26,10 +26,10 @@ import {
 const middlewares = [thunk];
 const mockStore = configureStore(middlewares);
 
-const testData = { test: true };
+const testData = { adblock: {}, antitracking: {} };
 msg.sendMessageInPromise = jest.fn(messageType => new Promise((resolve, reject) => {
 	switch (messageType) {
-		case 'getPanelData':
+		case 'getCliqzModuleData':
 			resolve(testData);
 			break;
 		default:
@@ -38,14 +38,14 @@ msg.sendMessageInPromise = jest.fn(messageType => new Promise((resolve, reject)
 }));
 
 describe('app/panel/actions/SummaryActions.js', () => {
-	test('getSummaryData action should return correctly', () => {
+	test('getCliqzModuleData action should return correctly', () => {
 		const initialState = {};
 		const store = mockStore(initialState);
 
 		const data = testData;
-		const expectedPayload = { data, type: GET_SUMMARY_DATA };
+		const expectedPayload = { data, type: GET_CLIQZ_MODULE_DATA };
 
-		return store.dispatch(summaryActions.getSummaryData()).then(() => {
+		return store.dispatch(summaryActions.getCliqzModuleData()).then(() => {
 			const actions = store.getActions();
 			expect(actions).toEqual([expectedPayload]);
 		});

app/panel/components/Summary.jsx

@@ -67,6 +67,13 @@ class Summary extends React.Component {
 		this.updateSiteNotScanned(this.props);
 	}
 
+	/**
+	 * Lifecycle event
+	 */
+	componentDidMount() {
+		this.props.actions.getCliqzModuleData();
+	}
+
 	/**
 	 * Lifecycle event
 	 */

app/panel/constants/constants.js

@@ -13,6 +13,7 @@
 
 // panel
 export const GET_PANEL_DATA = 'GET_PANEL_DATA';
+export const GET_CLIQZ_MODULE_DATA = 'GET_CLIQZ_MODULE_DATA';
 export const SHOW_NOTIFICATION = 'SHOW_NOTIFICATION';
 export const TOGGLE_CLIQZ_FEATURE = 'TOGGLE_CLIQZ_FEATURE';
 export const CLOSE_NOTIFICATION = 'CLOSE_NOTIFICATION';

app/panel/reducers/__tests__/summary.js

@@ -15,6 +15,7 @@ import Immutable from 'seamless-immutable';
 import summaryReducer from '../summary';
 import {
 	GET_SUMMARY_DATA,
+	GET_CLIQZ_MODULE_DATA,
 	UPDATE_TRACKER_COUNTS,
 	UPDATE_GHOSTERY_PAUSED,
 	UPDATE_SITE_POLICY
@@ -49,6 +50,17 @@ describe('app/panel/reducers/summary.js', () => {
 		expect(summaryReducer(initState, action)).toEqual(data);
 	});
 
+	test('reducer correctly handles GET_CLIQZ_MODULE_DATA', () => {
+		const data = { adblock: {}, antitracking: {} };
+		const action = { data, type: GET_CLIQZ_MODULE_DATA };
+		const initState = Immutable({});
+
+		expect(summaryReducer(initState, action)).toEqual({
+			adBlock: {},
+			antiTracking: {},
+		});
+	});
+
 	test('reducer correctly handles UPDATE_GHOSTERY_PAUSED', () => {
 		const data = { time: null, ghosteryPaused: true };
 		const action = { data, type: UPDATE_GHOSTERY_PAUSED };

app/panel/reducers/summary.js

@@ -15,6 +15,7 @@
 
 import {
 	GET_SUMMARY_DATA,
+	GET_CLIQZ_MODULE_DATA,
 	UPDATE_GHOSTERY_PAUSED,
 	UPDATE_SITE_POLICY,
 	UPDATE_TRACKER_COUNTS
@@ -49,6 +50,9 @@ export default (state = initialState, action) => {
 		case GET_SUMMARY_DATA: {
 			return Object.assign({}, state, action.data);
 		}
+		case GET_CLIQZ_MODULE_DATA: {
+			return Object.assign({}, state, { adBlock: action.data.adblock, antiTracking: action.data.antitracking });
+		}
 		case UPDATE_GHOSTERY_PAUSED: {
 			return Object.assign({}, state, { paused_blocking: action.data.ghosteryPaused, paused_blocking_timeout: action.data.time });
 		}

app/scss/partials/_header.scss

@@ -123,6 +123,7 @@
 				vertical-align: top;
 				display: inline-block;
 				margin-left: 20px;
+				overflow-y: hidden;
 			}
 			a {
 				display: block;