Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

hide legend

kruzhambusacc08a3de75e
diff --git a/src/pages/Project/View/ViewProject.helpers.tsx b/src/pages/Project/View/ViewProject.helpers.tsx
index 021a076e4..1e8b458ca 100644
--- a/src/pages/Project/View/ViewProject.helpers.tsx
+++ b/src/pages/Project/View/ViewProject.helpers.tsx
@@ -9,7 +9,7 @@ import {
import * as d3 from 'd3'
import dayjs from 'dayjs'
import {
- area, areaSpline, spline, bar,
+ area, areaSpline, spline, bar, line,
} from 'billboard.js'
import _forEach from 'lodash/forEach'
import _map from 'lodash/map'
@@ -115,14 +115,14 @@ const convertToCSV = (array: any[]) => {
let str = 'name,value,perc\r\n'
for (let i = 0; i < _size(array); ++i) {
- let line = ''
+ let lines = ''
_forEach(array[i], (index) => {
- if (line !== '') line += ','
- line += index
+ if (lines !== '') lines += ','
+ lines += index
})
- str += `${line}\r\n`
+ str += `${lines}\r\n`
}
return str
@@ -219,7 +219,7 @@ const getColumns = (chart: {
columns.push(['trendlineTotal', ...trendline(chart.visits)])
}
- if (compareChart?.views) {
+ if (compareChart?.visits) {
columns.push(['totalCompare', ...compareChart.visits])
}
}
@@ -255,7 +255,7 @@ const getColumns = (chart: {
if (sessionDuration) {
columns.push(['sessionDuration', ...chart.sdur])
- if (compareChart?.sessionDuration) {
+ if (compareChart?.sdur) {
columns.push(['sessionDurationCompare', ...compareChart.sdur])
}
}
@@ -441,29 +441,29 @@ const getSettings = (
columns: [...columns, ...customEventsToArray],
types: {
unique: chartType === chartTypes.line ? area() : bar(),
- uniqueCompare: chartType === chartTypes.line ? area() : bar(),
+ uniqueCompare: chartType === chartTypes.line ? line() : bar(),
total: chartType === chartTypes.line ? area() : bar(),
- totalCompare: chartType === chartTypes.line ? area() : bar(),
+ totalCompare: chartType === chartTypes.line ? line() : bar(),
bounce: chartType === chartTypes.line ? spline() : bar(),
bounceCompare: chartType === chartTypes.line ? spline() : bar(),
viewsPerUnique: chartType === chartTypes.line ? spline() : bar(),
trendlineUnique: spline(),
trendlineTotal: spline(),
sessionDuration: chartType === chartTypes.line ? spline() : bar(),
- sessionDurationCompare: chartType === chartTypes.line ? spline() : bar(),
+ sessionDurationCompare: chartType === chartTypes.line ? line() : bar(),
},
colors: {
unique: '#2563EB',
- uniqueCompare: 'rgba(37, 99, 235, 0.5)',
+ uniqueCompare: 'rgba(37, 99, 235, 0.4)',
total: '#D97706',
- totalCompare: 'rgba(217, 119, 6, 0.5)',
+ totalCompare: 'rgba(217, 119, 6, 0.4)',
bounce: '#2AC4B3',
- bounceCompare: 'rgba(42, 196, 179, 0.5)',
+ bounceCompare: 'rgba(42, 196, 179, 0.4)',
viewsPerUnique: '#F87171',
trendlineUnique: '#436abf',
trendlineTotal: '#eba14b',
sessionDuration: '#c945ed',
- sessionDurationCompare: 'rgba(201, 69, 237, 0.5)',
+ sessionDurationCompare: 'rgba(201, 69, 237, 0.4)',
...customEventsColors,
},
regions,
@@ -535,6 +535,7 @@ const getSettings = (
width: 10,
},
},
+ hide: ['uniqueCompare', 'totalCompare', 'bounceCompare', 'sessionDurationCompare'],
},
area: {
linearGradient: true,
diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsx
index afb1cbffc..0bbafbb1a 100644
--- a/src/pages/Project/View/ViewProject.tsx
+++ b/src/pages/Project/View/ViewProject.tsx
@@ -219,6 +219,7 @@ const ViewProject = ({
const [activePeriodCompare, setActivePeriodCompare] = useState<string>(periodPairsCompare[0].period)
const activeDropdownLabelCompare = useMemo(() => _find(periodPairsCompare, p => p.period === activePeriodCompare)?.label, [periodPairsCompare, activePeriodCompare])
const [dateRangeCompare, setDateRangeCompare] = useState<null | Date[]>(null)
+ const [dataChartCompare, setDataChartCompare] = useState<any>({})
const tabs: {
id: string
@@ -509,7 +510,7 @@ const ViewProject = ({
if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {
data = cache[id][key]
} else {
- if ((period === 'custom' && dateRange) || isActiveCompare) {
+ if (period === 'custom' && dateRange) {
data = await getProjectData(id, timeBucket, '', newFilters || filters, from, to, timezone)
customEventsChart = await getProjectDataCustomEvents(id, timeBucket, '', filters, from, to, timezone, activeChartMetricsCustomEvents)
} else {
@@ -554,11 +555,14 @@ const ViewProject = ({
setFilters(appliedFilters)
}
+ if (!_isEmpty(dataCompare) && !_isEmpty(dataCompare?.chart)) {
+ setDataChartCompare(dataCompare.chart)
+ }
+
if (_isEmpty(params)) {
setIsPanelsDataEmpty(true)
} else {
const applyRegions = !_includes(noRegionPeriods, activePeriod?.period)
- console.log(dataCompare?.chart)
const bbSettings = getSettings(chart, timeBucket, activeChartMetrics, applyRegions, timeFormat, forecasedChartData, rotateXAxias, chartType, customEventsChart, dataCompare?.chart)
setChartData(chart)
@@ -909,7 +913,7 @@ const ViewProject = ({
if (activeChartMetrics.bounce || activeChartMetrics.sessionDuration || activeChartMetrics.views || activeChartMetrics.unique || !activeChartMetrics.bounce || !activeChartMetrics.sessionDuration) {
const applyRegions = !_includes(noRegionPeriods, activePeriod?.period)
- const bbSettings = getSettings(chartData, timeBucket, activeChartMetrics, applyRegions, timeFormat, forecasedChartData, rotateXAxias, chartType, customEventsChartData)
+ const bbSettings = getSettings(chartData, timeBucket, activeChartMetrics, applyRegions, timeFormat, forecasedChartData, rotateXAxias, chartType, customEventsChartData, dataChartCompare)
if (!_isEmpty(mainChart)) {
mainChart.destroy()