📈 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
trendline
kruzhambus20b74ef7e083
diff --git a/src/pages/Project/View/ViewProject.helpers.jsx b/src/pages/Project/View/ViewProject.helpers.jsxindex f42a9d932..10ca6f0fd 100644--- a/src/pages/Project/View/ViewProject.helpers.jsx+++ b/src/pages/Project/View/ViewProject.helpers.jsx@@ -14,12 +14,58 @@ import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _size from 'lodash/size'import _round from 'lodash/round'+import _reduce from 'lodash/reduce'import JSZip from 'jszip'import { tbsFormatMapper } from 'redux/constants'import countries from 'utils/isoCountries'+const getAvg = (arr) => {+ const total = _reduce(arr, (acc, c) => acc + c, 0)+ return total / arr.length+}++const getSum = (arr) => {+ return _reduce(arr, (acc, c) => acc + c, 0)+}++const trendline = (data) => {+ const xData = new Array(data.length).fill(0).map((_, i) => i + 1)+ const yData = data++ const xMean = getAvg(xData)+ const yMean = getAvg(yData)++ const xMinusxMean = _map(xData, (val) => val - xMean)+ const yMinusyMean = _map(yData, (val) => val - yMean)++ const xMinusxMeanSq = _map(xMinusxMean, (val) => val ** 2)++ const xy = []+ for (let x = 0; x < data.length; x++) {+ xy.push(xMinusxMean[x] * yMinusyMean[x])+ }++ const xySum = getSum(xy)++ const b1 = xySum / getSum(xMinusxMeanSq)++ const b0 = yMean - b1 * xMean++ const trendData = []+ for (let x = 0; x < data.length; x++) {+ const y = _round(b0 + b1 * x, 2)+ if (y < 0) {+ trendData.push(0)+ } else {+ trendData.push(y)+ }+ }++ return trendData+}+const getExportFilename = (prefix) => {// turn something like 2022-03-02T19:31:00.100Z into 2022-03-02const date = _split(_replace(_split(new Date().toISOString(), '.')[0], /:/g, '-'), 'T')[0]@@ -83,12 +129,13 @@ const CHART_METRICS_MAPPING = {views: 'views',bounce: 'bounce',viewsPerUnique: 'viewsPerUnique',+ trendlines: 'trendlines',}// function to filter the data for the chartconst getColumns = (chart, activeChartMetrics) => {const {- views, bounce, viewsPerUnique, unique,+ views, bounce, viewsPerUnique, unique, trendlines,} = activeChartMetricsconst columns = [@@ -97,10 +144,16 @@ const getColumns = (chart, activeChartMetrics) => {if (unique) {columns.push(['unique', ...chart.uniques])+ if (trendlines) {+ columns.push(['trendlineUnique', ...trendline(chart.uniques)])+ }}if (views) {columns.push(['total', ...chart.visits])+ if (trendlines) {+ columns.push(['trendlineTotal', ...trendline(chart.visits)])+ }}if (bounce) {@@ -187,12 +240,16 @@ const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions) => {total: area(),bounce: spline(),viewsPerUnique: spline(),+ trendlineUnique: spline(),+ trendlineTotal: spline(),},colors: {unique: '#2563EB',total: '#D97706',bounce: '#2AC4B3',viewsPerUnique: '#F87171',+ trendlineUnique: '#436abf',+ trendlineTotal: '#eba14b',},regions,axes: {diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex 285cd1b1d..05d1a1f64 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -93,6 +93,7 @@ const ViewProject = ({[CHART_METRICS_MAPPING.views]: false,[CHART_METRICS_MAPPING.bounce]: false,[CHART_METRICS_MAPPING.viewsPerUnique]: false,+ [CHART_METRICS_MAPPING.trendlines]: false,})const checkIfAllMetricsAreDisabled = useMemo(() => !_some(activeChartMetrics, (value) => value), [activeChartMetrics])const [filters, setFilters] = useState([])@@ -131,12 +132,17 @@ const ViewProject = ({label: t('dashboard.viewsPerUnique'),active: activeChartMetrics[CHART_METRICS_MAPPING.viewsPerUnique],},+ {+ id: CHART_METRICS_MAPPING.trendlines,+ label: t('dashboard.trendlines'),+ active: activeChartMetrics[CHART_METRICS_MAPPING.trendlines],+ },]}, [t, activeChartMetrics])const dataNames = useMemo(() => {return {- unique: t('project.unique'), total: t('project.total'), bounce: `${t('dashboard.bounceRate')} (%)`, viewsPerUnique: t('dashboard.viewsPerUnique'),+ unique: t('project.unique'), total: t('project.total'), bounce: `${t('dashboard.bounceRate')} (%)`, viewsPerUnique: t('dashboard.viewsPerUnique'), trendlineTotal: t('project.trendlineTotal'), trendlineUnique: t('project.trendlineUnique'),}}, [t])@@ -344,7 +350,7 @@ const ViewProject = ({if (!isLoading && !_isEmpty(chartData) && !_isEmpty(mainChart)) {mainChart.data.names(dataNames)- if (activeChartMetrics.views || activeChartMetrics.unique || activeChartMetrics.viewsPerUnique) {+ if (activeChartMetrics.views || activeChartMetrics.unique || activeChartMetrics.viewsPerUnique || activeChartMetrics.trendlines) {mainChart.load({columns: getColumns(chartData, activeChartMetrics),})