Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some review fixes #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions src/components/ControlPanel/ControlPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';
import { camelCase } from 'lodash';
import {
Actions,
Expand All @@ -8,7 +8,7 @@ import {
Title,
} from './ControlPanelStyles';

import Selector, { Option } from 'components/Selector';
import Selector from 'components/Selector';

interface ControlPanelProps {
dataSources: Array<string>;
Expand All @@ -30,22 +30,19 @@ const ControlPanel = ({
onDataSourcesChanged,
}: ControlPanelProps) => {
const [applied, setApplied] = useState(true);
const [campaignsOptions, setCampaignsOptions] = useState<Array<Option>>([]);
const [dataSourcesOptions, setDataSourcesOptions] = useState<Array<Option>>(
[]
);
const [selectedCampaigns, setSelectedCampaigns] = useState<Array<string>>([]);
const [selectedDataSources, setSelectedDataSources] = useState<Array<string>>(
[]
);

useEffect(() => {
setDataSourcesOptions(prepareSelectData(dataSources));
}, [dataSources]);

useEffect(() => {
setCampaignsOptions(prepareSelectData(campaigns));
}, [campaigns]);
const campaignsOptions = React.useMemo(
() => prepareSelectData(campaigns),
[campaigns]
);
const dataSourcesOptions = React.useMemo(
() => prepareSelectData(dataSources),
[dataSources]
);

const handleDataSourcesChanged = (selectedDataSources: Array<string>) => {
setSelectedDataSources(selectedDataSources);
Expand Down
10 changes: 3 additions & 7 deletions src/components/Dashboard/Dashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';
import { groupBy, mapValues, get, uniq } from 'lodash';

import ControlPanel from 'components/ControlPanel';
Expand All @@ -16,18 +16,14 @@ interface DashboardProps {
}

const Dashboard = ({ data }: DashboardProps) => {
const [groupedData, setGroupedData] = useState({});
const [selectedCampaigns, setSelectedCampaigns] = useState<Array<string>>([]);
const [selectedDataSources, setSelectedDataSources] = useState<Array<string>>(
[]
);

useEffect(() => {
const groupedData = React.useMemo(() => {
const groupedByDataSource = groupBy(data, 'Datasource');
const groupedByDataSourceAndCampaign = mapValues(groupedByDataSource, val =>
groupBy(val, 'Campaign')
);
setGroupedData(groupedByDataSourceAndCampaign);
return mapValues(groupedByDataSource, val => groupBy(val, 'Campaign'));
}, [data]);

const allDataSources = React.useMemo(
Expand Down
13 changes: 5 additions & 8 deletions src/components/Dashboard/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { get, groupBy } from 'lodash';
import { get, groupBy, sumBy } from 'lodash';

import { ChartData } from 'components/Chart';

Expand Down Expand Up @@ -70,13 +70,10 @@ export const prepareChartData = (
(memo, date) => {
memo.push({
date,
clicks: filteredDataGroupedByDate[date].reduce(
(sum, value) => sum + value.Clicks,
0
),
impressions: filteredDataGroupedByDate[date].reduce(
(sum, value) => sum + value.Impressions,
0
clicks: sumBy(filteredDataGroupedByDate[date], item => item.Clicks),
impressions: sumBy(
filteredDataGroupedByDate[date],
item => item.Impressions
),
});

Expand Down