📈 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
some update
kruzhambusfec4faab4942
diff --git a/src/api/index.ts b/src/api/index.tsindex 5af44b425..2a0d2e29c 100644--- a/src/api/index.ts+++ b/src/api/index.ts@@ -761,7 +761,7 @@ export const getProjectDataCustomEvents = () =>api.get(- `log/custom-events?pid=${pid}&timeBucket=${tb}&period=${period}&filters=${JSON.stringify(filters)}&from=${from}&to=${to}&timezone=${timezone}`,+ `log/custom-events?pid=${pid}&timeBucket=${tb}&period=${period}&filters=${JSON.stringify(filters)}&from=${from}&to=${to}&timezone=${timezone}&customEvents=${JSON.stringify(customEvents)}`,).then((response) => response.data).catch((error) => {diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsxindex ef477a787..c4efb24e1 100644--- a/src/pages/Project/View/ViewProject.tsx+++ b/src/pages/Project/View/ViewProject.tsx@@ -55,7 +55,7 @@ import PaidFeature from 'modals/PaidFeature'import Forecast from 'modals/Forecast'import routes from 'routes'import {- getProjectData, getProject, getOverallStats, getLiveVisitors, getPerfData,+ getProjectData, getProject, getOverallStats, getLiveVisitors, getPerfData, getProjectDataCustomEvents,} from 'api'import { getChartPrediction } from 'api/ai'import {@@ -543,6 +543,91 @@ 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 newFilters