📈 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
custom events to chart
kruzhambus31d6d8abd616
diff --git a/src/pages/MainPage/index.tsx b/src/pages/MainPage/index.tsxindex 04d786ee0..083c04cd4 100644--- a/src/pages/MainPage/index.tsx+++ b/src/pages/MainPage/index.tsx@@ -37,7 +37,7 @@ import Pricing from './Pricing'import './styles.css'-const LIVE_DEMO_URL = '/projects/STEzHcB1rALV'+const LIVE_DEMO_URL = '/projects/FxKL4SGgp4PZ'const COMPETITORS_LIST = ['Google Analytics', 'Fathom', 'Plausible', 'Simple Analytics']const SWETRIX_AND_COMPETITORS_LIST = ['Swetrix', ...COMPETITORS_LIST]diff --git a/src/pages/Project/View/ViewProject.helpers.tsx b/src/pages/Project/View/ViewProject.helpers.tsxindex 9cd2e923a..65159af0f 100644--- a/src/pages/Project/View/ViewProject.helpers.tsx+++ b/src/pages/Project/View/ViewProject.helpers.tsx@@ -298,11 +298,18 @@ const getSettings = (},rotateXAxias: boolean,chartType: string,+ customEvents?: {+ [key: string]: string[],+ },) => {const xAxisSize = _size(chart.x)const lines = []const modifiedChart = { ...chart }let regions+ const columns = getColumns(chart, activeChartMetrics)+ const customEventsToArray = customEvents ? _map(_keys(customEvents), (el) => {+ return [el, ...customEvents[el]]+ }) : []if (!_isEmpty(forecasedChartData)) {lines.push({@@ -363,7 +370,7 @@ const getSettings = (return {data: {x: 'x',- columns: getColumns(modifiedChart, activeChartMetrics),+ columns: [...columns, ...customEventsToArray],types: {unique: chartType === chartTypes.line ? area() : bar(),total: chartType === chartTypes.line ? area() : bar(),diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsxindex c4efb24e1..ae3457458 100644--- a/src/pages/Project/View/ViewProject.tsx+++ b/src/pages/Project/View/ViewProject.tsx@@ -314,6 +314,13 @@ const ViewProject = ({return []}, [panelsData, activeChartMetricsCustomEvents])+ const dataNamesCustomEvents = useMemo(() => {+ if (!_isEmpty(panelsData.customs)) {+ return { ..._keys(panelsData.customs) }+ }+ return {}+ }, [panelsData])+const dataNames = useMemo(() => {return {unique: t('project.unique'),@@ -323,8 +330,9 @@ const ViewProject = ({trendlineTotal: t('project.trendlineTotal'),trendlineUnique: t('project.trendlineUnique'),sessionDuration: t('dashboard.sessionDuration'),+ ...dataNamesCustomEvents,}- }, [t])+ }, [t, dataNamesCustomEvents])const dataNamesPerf = useMemo(() => {return {@@ -356,6 +364,57 @@ const ViewProject = ({history.push(routes.dashboard)}+ const loadCustomEvents = async () => {+ if (_isEmpty(panelsData.customs)) {+ return+ }++ let data+ let from+ let to++ try {+ setDataLoading(true)++ if (dateRange) {+ from = getFormatDate(dateRange[0])+ to = getFormatDate(dateRange[1])+ }++ if (period === 'custom' && dateRange) {+ data = await getProjectDataCustomEvents(id, timeBucket, '', filters, from, to, timezone, activeChartMetricsCustomEvents)+ } else {+ data = await getProjectDataCustomEvents(id, timeBucket, period, filters, '', '', timezone, activeChartMetricsCustomEvents)+ }++ const { chart } = data++ const applyRegions = !_includes(noRegionPeriods, activePeriod?.period)+ const bbSettings = getSettings(chartData, timeBucket, activeChartMetrics, applyRegions, timeFormat, forecasedChartData, rotateXAxias, chartType, chart.events)++ if (!_isEmpty(mainChart)) {+ mainChart.destroy()+ }++ setMainChart(() => {+ // @ts-ignore+ const generete = bb.generate(bbSettings)+ generete.data.names(dataNames)+ return generete+ })+ } catch (e) {+ console.log('FAILED TO LOAD CUSTOM EVENTS', e)+ } finally {+ setDataLoading(false)+ }+ }++ useEffect(() => {+ if (activeTab === PROJECT_TABS.traffic) {+ loadCustomEvents()+ }+ }, [activeTab, activeChartMetricsCustomEvents])+// this function is used for requesting the data from the APIconst loadAnalytics = async (forced = false, newFilters: any[] | null = null) => {if (!forced && (isLoading || _isEmpty(project) || dataLoading)) {@@ -543,91 +602,6 @@ const ViewProject = ({}}- const loadAnalyticsCustomEvents = async (forced = false, newFilters: any[] | null = null) => {- if (!forced && (isLoading || _isEmpty(project) || dataLoading)) {- return- }-- setDataLoading(true)- try {- let dataPerf- let key- let from- let to-- if (dateRange) {- from = getFormatDate(dateRange[0])- to = getFormatDate(dateRange[1])- key = getProjectCacheCustomKey(from, to, timeBucket)- } else {- key = getProjectCacheKey(period, timeBucket)- }-- if (!forced && !_isEmpty(cachePerf[id]) && !_isEmpty(cachePerf[id][key])) {- dataPerf = cachePerf[id][key]- } else {- if (period === 'custom' && dateRange) {- dataPerf = await getProjectDataCustomEvents(id, timeBucket, '', newFilters || filtersPerf, from, to, timezone, activeChartMetricsCustomEvents)- } else {- dataPerf = await getProjectDataCustomEvents(id, timeBucket, period, newFilters || filtersPerf, '', '', timezone, activeChartMetricsCustomEvents)- }-- setProjectCachePerf(id, dataPerf || {}, key)- }-- const {- appliedFilters,- } = dataPerf-- if (!_isEmpty(appliedFilters)) {- setFilters(appliedFilters)- }-- if (_isEmpty(dataPerf)) {- setIsPanelsDataEmptyPerf(true)- setDataLoading(false)- setAnalyticsLoading(false)- return- }-- if (_isEmpty(dataPerf.params)) {- setIsPanelsDataEmptyPerf(true)- } else {- const { chart: chartPerf } = dataPerf- const bbSettings = getSettingsPerf(chartPerf, timeBucket, activeChartMetricsPerf, rotateXAxias, chartType)- setChartDataPerf(chartPerf)-- setPanelsDataPerf({- types: _keys(dataPerf.params),- data: dataPerf.params,- })-- if (activeTab === PROJECT_TABS.performance) {- if (!_isEmpty(mainChart)) {- mainChart.destroy()- }-- setMainChart(() => {- // @ts-ignore- const generete = bb.generate(bbSettings)- generete.data.names(dataNamesPerf)- return generete- })- }-- setIsPanelsDataEmptyPerf(false)- }-- setAnalyticsLoading(false)- setDataLoading(false)- } catch (e) {- setAnalyticsLoading(false)- setDataLoading(false)- console.error('[ERROR](loadAnalytics) Loading analytics data failed')- console.error(e)- }- }-// this funtion is used for requesting the data from the API when the filter is changedconst filterHandler = (column: string, filter: any, isExclusive = false) => {let newFiltersdiff --git a/src/utils/analytics.ts b/src/utils/analytics.tsindex 37e684621..d60641668 100644--- a/src/utils/analytics.ts+++ b/src/utils/analytics.ts@@ -1,7 +1,7 @@import * as Swetrix from 'swetrix'import { isSelfhosted } from 'redux/constants'-const SWETRIX_PID = 'STEzHcB1rALV'+const SWETRIX_PID = 'FxKL4SGgp4PZ'Swetrix.init(SWETRIX_PID)