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!

Merge branch 'main' into feature/compare

Maksim Mrugc685ecd7d364
diff --cc src/pages/Project/View/ViewProject.helpers.tsx
index 9957aa214,0eb267aff..4e2c53270
--- a/src/pages/Project/View/ViewProject.helpers.tsx
+++ b/src/pages/Project/View/ViewProject.helpers.tsx
@@@ -491,94 -464,24 +491,101 @@@ const getSettings =
},
},
tooltip: {
+ contents: (item: any, _: any, __: any, color: any) => {
+ const typesOptionsToTypesCompare: {
+ [key: string]: string,
+ } = {
+ unique: 'uniques',
+ total: 'visits',
+ sessionDuration: 'sdur',
+ }
+
+ if (_isEmpty(compareChart)) {
+ return `<ul class='bg-gray-100 dark:text-gray-50 dark:bg-slate-800 rounded-md shadow-md px-3 py-1'>
+ <li class='font-semibold'>${d3.timeFormat(tbsFormatMapper[timeBucket])(item[0].x)}</li>
+ <hr class='border-gray-200 dark:border-gray-600' />
+ ${_map(item, (el: {
+ id: string,
+ index: number,
+ name: string,
+ value: string,
+ x: Date,
+ }) => {
+ return `
+ <li class='flex justify-between'>
+ <div class='flex justify-items-start'>
+ <div class='w-3 h-3 rounded-sm mt-1.5 mr-2' style=background-color:${color(el.id)}></div>
+ <span>${el.name}</span>
+ </div>
+ <span class='pl-4'>${el.value}</span>
+ </li>
+ `
+ }).join('')}`
+ }
+
+ return `
+ <ul class='bg-gray-100 dark:text-gray-50 dark:bg-slate-800 rounded-md shadow-md px-3 py-1'>
+ ${_map(item, (el: {
+ id: string,
+ index: number,
+ name: string,
+ value: string,
+ x: Date,
+ }) => {
+ const {
+ id, index, name, value, x,
+ } = el
+
+ if (id === 'uniqueCompare' || id === 'totalCompare' || id === 'bounceCompare' || id === 'sessionDurationCompare') {
+ return '<span></span>'
+ }
+
+ if (id === 'sessionDuration') {
+ return `
+ <div class='flex justify-between'>
+ <div class='flex justify-items-start'>
+ <div class='w-3 h-3 rounded-sm mt-1.5 mr-2' style=background-color:${color(id)}></div>
+ <span>${name}</span>
+ </div>
+ </div>
+ format: {
+ title: timeFormat === TimeFormat['24-hour'] ? (x: string) => d3.timeFormat(tbsFormatMapperTooltip24h[timeBucket])(x) : (x: string) => d3.timeFormat(tbsFormatMapperTooltip[timeBucket])(x),
+ },
+ contents: {
+ template: `
+ <ul class='bg-gray-100 dark:text-gray-50 dark:bg-slate-800 rounded-md shadow-md px-3 py-1'>
+ <li class='font-semibold'>{=TITLE}</li>
<hr class='border-gray-200 dark:border-gray-600' />
- {{
- <li class='flex justify-between'>
- <div class='flex justify-items-start'>
- <div class='w-3 h-3 rounded-sm mt-1.5 mr-2' style=background-color:{=COLOR}></div>
- <span>{=NAME}</span>
- </div>
- <span class='pl-4'>{=VALUE}</span>
- </li>
- }}
- </ul>`,
+ <li class='mt-1 ml-2'>
+ <p>
+ <span>${d3.timeFormat(tbsFormatMapper[timeBucket])(x)}</span> - <span>${getStringFromTime(getTimeFromSeconds(value))}</span>
+ </p>
+ <p>
+ <span>${d3.timeFormat(tbsFormatMapper[timeBucket])(dayjs(compareChart?.x[index]).toDate())}</span> - <span>${getStringFromTime(getTimeFromSeconds(compareChart[typesOptionsToTypesCompare[id]][index]))}</span>
+ </p>
+ </li>
+ `
+ }
+
+ return `
+ <div class='flex justify-between'>
+ <div class='flex justify-items-start'>
+ <div class='w-3 h-3 rounded-sm mt-1.5 mr-2' style=background-color:${color(id)}></div>
+ <span>${name}</span>
+ </div>
+ </div>
+ <hr class='border-gray-200 dark:border-gray-600' />
+ <li class='mt-1 ml-2'>
+ <p>
+ <span>${d3.timeFormat(tbsFormatMapper[timeBucket])(x)}</span> - <span>${value}</span>
+ </p>
+ <p>
+ <span>${d3.timeFormat(tbsFormatMapper[timeBucket])(dayjs(compareChart?.x[index]).toDate())}</span> - <span>${compareChart[typesOptionsToTypesCompare[id]][index]}</span>
+ </p>
+ </li>
+ `
+ }).join('')}
+ </ul>`
},
},
point: {
diff --cc src/pages/Project/View/ViewProject.tsx
index 52084bf48,32515b7fb..627a60a71
--- a/src/pages/Project/View/ViewProject.tsx
+++ b/src/pages/Project/View/ViewProject.tsx
@@@ -941,12 -853,8 +928,8 @@@ 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()
- }
-
setMainChart(() => {
// @ts-ignore
const generete = bb.generate(bbSettings)