📈 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 improvements
Blue Mouse1b3d0a3fbc0c
diff --git a/src/api/ai.js b/src/api/ai.jsindex 8939888ec..21a34acdb 100644--- a/src/api/ai.js+++ b/src/api/ai.js@@ -19,7 +19,7 @@ const api = axios.create({*/export const getChartPrediction = (chart, periodToForecast, frequency) =>api- .post('', {+ .post('/', {...chart,period_to_forecast: periodToForecast,frequency,diff --git a/src/modals/Forecast.jsx b/src/modals/Forecast.jsxindex 5e08248de..1184c8533 100644--- a/src/modals/Forecast.jsx+++ b/src/modals/Forecast.jsx@@ -35,7 +35,7 @@ const Forecast = ({return}- onSubmit(period)+ onSubmit(processedPeriod)}const _onClose = () => {diff --git a/src/pages/Project/View/ViewProject.helpers.jsx b/src/pages/Project/View/ViewProject.helpers.jsxindex 1801f0472..1168b4ca2 100644--- a/src/pages/Project/View/ViewProject.helpers.jsx+++ b/src/pages/Project/View/ViewProject.helpers.jsx@@ -16,6 +16,7 @@ import _size from 'lodash/size'import _round from 'lodash/round'import _fill from 'lodash/fill'import _reduce from 'lodash/reduce'+import _tail from 'lodash/tail'import JSZip from 'jszip'import { TimeFormat, tbsFormatMapper, tbsFormatMapper24h } from 'redux/constants'@@ -31,6 +32,32 @@ const getSum = (arr) => {return _reduce(arr, (acc, c) => acc + c, 0)}+const transformAIChartData = (data) => {+ const transformedData = {+ x: [],+ sdur: [],+ uniques: [],+ visits: [],+ }++ _forEach(data, (d) => {+ if (d.x) {+ transformedData.x = d.x+ }+ if (d.sdur) {+ transformedData.sdur = d.sdur+ }+ if (d.uniques) {+ transformedData.uniques = d.uniques+ }+ if (d.visits) {+ transformedData.visits = d.visits+ }+ })++ return transformedData+}+const trendline = (data) => {const xData = _map(_fill(new Array(_size(data)), 0), (_, i) => i + 1)const yData = data@@ -236,10 +263,28 @@ const getColumnsPerf = (chart, activeChartMetrics) => {const noRegionPeriods = ['custom', 'yesterday']// function to get the settings and data for the chart(main diagram)-const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFormat) => {+const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFormat, forecasedChartData) => {const xAxisSize = _size(chart.x)+ const lines = []+ const modifiedChart = { ...chart }let regions+ // console.log(chart, forecasedChartData)++ if (!_isEmpty(forecasedChartData)) {+ lines.push({+ // value: _tail(chart?.x),+ value: _size(chart?.x),+ text: 'Forecast',+ })+ modifiedChart.x = [...modifiedChart.x, ...forecasedChartData.x]+ modifiedChart.uniques = [...modifiedChart.uniques, ...forecasedChartData.uniques]+ modifiedChart.visits = [...modifiedChart.visits, ...forecasedChartData.visits]+ modifiedChart.sdur = [...modifiedChart.sdur, ...forecasedChartData.sdur]+ }++ console.log(lines)+if (applyRegions) {let regionStart@@ -288,7 +333,7 @@ const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeForeturn {data: {x: 'x',- columns: getColumns(chart, activeChartMetrics),+ columns: getColumns(modifiedChart, activeChartMetrics),types: {unique: area(),total: area(),@@ -313,6 +358,11 @@ const getSettings = (chart, timeBucket, activeChartMetrics, applyRegions, timeFosessionDuration: 'y2',},},+ grid: {+ x: {+ lines,+ },+ },axis: {x: {tick: {@@ -513,5 +563,8 @@ const getFormatDate = (date) => {}export {- iconClassName, getFormatDate, panelIconMapping, typeNameMapping, validFilters, validPeriods, validTimeBacket, paidPeriods, noRegionPeriods, getSettings, getExportFilename, getColumns, onCSVExportClick, CHART_METRICS_MAPPING, CHART_METRICS_MAPPING_PERF, getColumnsPerf, getSettingsPerf,+ iconClassName, getFormatDate, panelIconMapping, typeNameMapping, validFilters,+ validPeriods, validTimeBacket, paidPeriods, noRegionPeriods, getSettings,+ getExportFilename, getColumns, onCSVExportClick, CHART_METRICS_MAPPING,+ CHART_METRICS_MAPPING_PERF, getColumnsPerf, getSettingsPerf, transformAIChartData,}diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex 264a63a88..e3f0e8229 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -48,12 +48,14 @@ import routes from 'routes'import {getProjectData, getProject, getOverallStats, getLiveVisitors, getPerfData,} from 'api'+import { getChartPrediction } from 'api/ai'import {Panel, Overview, CustomEvents,} from './Panels'import {onCSVExportClick, getFormatDate, panelIconMapping, typeNameMapping, validFilters, validPeriods,- validTimeBacket, paidPeriods, noRegionPeriods, getSettings, getColumns, CHART_METRICS_MAPPING, CHART_METRICS_MAPPING_PERF, getSettingsPerf,+ validTimeBacket, paidPeriods, noRegionPeriods, getSettings, getColumns, CHART_METRICS_MAPPING,+ CHART_METRICS_MAPPING_PERF, getSettingsPerf, transformAIChartData,} from './ViewProject.helpers'import CCRow from './components/CCRow'import RefRow from './components/RefRow'@@ -130,6 +132,10 @@ const ViewProject = ({return projectTab || PROJECT_TABS.traffic})+ // TODO: THIS SHOULD BE MOVED TO REDUCERS WITH CACHE FUNCTIONALITY+ // I PUT IT HERE JUST TO SEE IF IT WORKS WELL+ const [forecasedChartData, setForecasedChartData] = useState({})+const [chartDataPerf, setChartDataPerf] = useState({})const [isPanelsDataEmptyPerf, setIsPanelsDataEmptyPerf] = useState(false)const [panelsDataPerf, setPanelsDataPerf] = useState({})@@ -337,7 +343,7 @@ const ViewProject = ({setIsPanelsDataEmpty(true)} else {const applyRegions = !_includes(noRegionPeriods, activePeriod.period)- const bbSettings = getSettings(chart, timeBucket, activeChartMetrics, applyRegions, timeFormat)+ const bbSettings = getSettings(chart, timeBucket, activeChartMetrics, applyRegions, timeFormat, forecasedChartData)setChartData(chart)setPanelsData({@@ -609,12 +615,25 @@ const ViewProject = ({setIsForecastOpened(true)}- const onForecastSubmit = () => {- // todo-+ const onForecastSubmit = async (periodToForecast) => {setIsForecastOpened(false)+ setDataLoading(true)++ try {+ const result = await getChartPrediction(chartData, periodToForecast, timeBucket)+ const transformed = transformAIChartData(result)+ setForecasedChartData(transformed)+ } catch (e) {+ console.error(`[onForecastSubmit] Error: ${e}`)+ }++ setDataLoading(false)}+ useEffect(() => {+ loadAnalytics()+ }, [forecasedChartData])+useEffect(() => {const url = new URL(window.location)url.searchParams.delete('tab')@@ -1252,7 +1271,11 @@ const ViewProject = ({<ArrowPathIcon className='w-5 h-5 text-gray-700 dark:text-gray-50' /></button></div>- <div className='md:border-r border-gray-200 dark:border-gray-600 md:pr-3 mr-3'>+ <div+ className={cx('md:border-r border-gray-200 dark:border-gray-600 md:pr-3 mr-3', {+ hidden: activeTab !== PROJECT_TABS.traffic,+ })}+ ><buttontype='button'onClick={onForecastOpen}diff --git a/src/redux/sagas/ui/load_forecast.js b/src/redux/sagas/ui/load_forecast.jsnew file mode 100644index 000000000..e69de29bbdiff --git a/src/ui/icons/Robot.jsx b/src/ui/icons/Robot.jsxindex 92a2cf9e1..abb2fdb6a 100644--- a/src/ui/icons/Robot.jsx+++ b/src/ui/icons/Robot.jsx@@ -2,10 +2,12 @@ import React from 'react'import cx from 'clsx'import PropTypes from 'prop-types'-const Robot = ({ theme, className, containerClassName }) => {+const Robot = ({+ className, containerClassName, // theme,+}) => {const cn = cx(className, {- 'fill-white': theme === 'dark',- 'fill-slate-800': theme === 'light',+ // 'fill-white': theme === 'dark',+ // 'fill-slate-800': theme === 'light',})return (@@ -21,7 +23,7 @@ const Robot = ({ theme, className, containerClassName }) => {Robot.propTypes = {className: PropTypes.string,- theme: PropTypes.string.isRequired,+ // theme: PropTypes.string.isRequired,}Robot.defaultProps = {