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!

some improvements

Blue Mouse6ba2a2186eca
diff --git a/src/api/index.js b/src/api/index.js
index 7096cd439..2f8a60948 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -260,6 +260,27 @@ export const getProjectData = (
: error.response.data.message
})
+export const getPerfData = (
+ pid,
+ tb = 'hour',
+ period = '3d',
+ filters = [],
+ from = '',
+ to = '',
+ timezone = '',
+) =>
+ api
+ .get(
+ `log/performance?pid=${pid}&timeBucket=${tb}&period=${period}&filters=${JSON.stringify(filters)}&from=${from}&to=${to}&timezone=${timezone}`,
+ )
+ .then((response) => response.data)
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message)
+ ? error.response.data
+ : error.response.data.message
+ })
+
export const getOverallStats = (pids) =>
api
.get(`log/birdseye?pids=[${_map(pids, (pid) => `"${pid}"`).join(',')}]`)
diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsx
index 2c3bbdc39..44bf4ea13 100644
--- a/src/pages/Project/View/ViewProject.jsx
+++ b/src/pages/Project/View/ViewProject.jsx
@@ -44,7 +44,7 @@ import FlatPicker from 'ui/Flatpicker'
import PaidFeature from 'modals/PaidFeature'
import routes from 'routes'
import {
- getProjectData, getProject, getOverallStats, getLiveVisitors,
+ getProjectData, getProject, getOverallStats, getLiveVisitors, getPerfData,
} from 'api'
import {
Panel, Overview, CustomEvents,
@@ -113,6 +113,8 @@ const ViewProject = ({
const [dateRange, setDateRange] = useState(localStorageDateRange ? [new Date(localStorageDateRange[0]), new Date(localStorageDateRange[1])] : null)
const [activeTab, setActiveTab] = useState(DEFAULT_TAB)
+ const [perfData, setPerfData] = useState({})
+
const tabs = useMemo(() => {
return [
{
@@ -297,6 +299,45 @@ const ViewProject = ({
}
}
+ // temp solution just to see if it works
+ useEffect(() => {
+ if (activeTab !== 'performance') {
+ setPerfData({})
+ return
+ }
+
+ const loadPerfData = async () => {
+ try {
+ let data
+ 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 (period === 'custom' && dateRange) {
+ data = await getPerfData(id, timeBucket, '', filters, from, to, timezone)
+ } else {
+ data = await getPerfData(id, timeBucket, period, filters, '', '', timezone)
+ }
+ setPerfData(data)
+ } catch (e) {
+ console.error('[ERROR](loadPerfData) Loading performance data failed')
+ console.error(e)
+ }
+ }
+
+ loadPerfData()
+ }, [activeTab, id, period, timeBucket, timezone, dateRange, filters])
+
+ console.log(perfData)
+
// this funtion is used for requesting the data from the API when the filter is changed
const filterHandler = (column, filter, isExclusive = false) => {
let newFilters
@@ -1042,64 +1083,98 @@ const ViewProject = ({
{isPanelsDataEmpty && (
<NoEvents filters={filters} resetFilters={resetFilters} pid={id} />
)}
- <div className={cx('pt-4 md:pt-0', { hidden: isPanelsDataEmpty || analyticsLoading })}>
- <div
- className={cx('h-80', {
- hidden: checkIfAllMetricsAreDisabled,
- })}
- >
- <div className='h-80' id='dataChart' />
- </div>
- <Filters
- filters={filters}
- onRemoveFilter={filterHandler}
- onChangeExclusive={onChangeExclusive}
- tnMapping={tnMapping}
- />
- {dataLoading && (
- <div className='loader bg-transparent static mt-4' id='loader'>
- <div className='loader-head'>
- <div className='first' />
- <div className='second' />
- </div>
+ {activeTab === 'traffic' && (
+ <div className={cx('pt-4 md:pt-0', { hidden: isPanelsDataEmpty || analyticsLoading })}>
+ <div
+ className={cx('h-80', {
+ hidden: checkIfAllMetricsAreDisabled,
+ })}
+ >
+ <div className='h-80' id='dataChart' />
</div>
- )}
- <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>
- {!_isEmpty(project.overall) && (
- <Overview
- t={t}
- overall={project.overall}
- chartData={chartData}
- activePeriod={activePeriod}
- sessionDurationAVG={sessionDurationAVG}
- live={project.live}
- projectId={id}
- />
+ <Filters
+ filters={filters}
+ onRemoveFilter={filterHandler}
+ onChangeExclusive={onChangeExclusive}
+ tnMapping={tnMapping}
+ />
+ {dataLoading && (
+ <div className='loader bg-transparent static mt-4' id='loader'>
+ <div className='loader-head'>
+ <div className='first' />
+ <div className='second' />
+ </div>
+ </div>
)}
- {_map(panelsData.types, (type) => {
- const panelName = tnMapping[type]
- const panelIcon = panelIconMapping[type]
- const customTabs = _filter(customPanelTabs, tab => tab.panelID === type)
+ <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>
+ {!_isEmpty(project.overall) && (
+ <Overview
+ t={t}
+ overall={project.overall}
+ chartData={chartData}
+ activePeriod={activePeriod}
+ sessionDurationAVG={sessionDurationAVG}
+ live={project.live}
+ projectId={id}
+ />
+ )}
+ {_map(panelsData.types, (type) => {
+ const panelName = tnMapping[type]
+ const panelIcon = panelIconMapping[type]
+ const customTabs = _filter(customPanelTabs, tab => tab.panelID === type)
- if (type === 'cc') {
- return (
- <Panel
- t={t}
- key={type}
- icon={panelIcon}
- id={type}
- onFilter={filterHandler}
- name={panelName}
- data={panelsData.data[type]}
- customTabs={customTabs}
- rowMapper={(rowName) => (
- <CCRow rowName={rowName} language={language} />
- )}
- />
- )
- }
+ if (type === 'cc') {
+ return (
+ <Panel
+ t={t}
+ key={type}
+ icon={panelIcon}
+ id={type}
+ onFilter={filterHandler}
+ name={panelName}
+ data={panelsData.data[type]}
+ customTabs={customTabs}
+ rowMapper={(rowName) => (
+ <CCRow rowName={rowName} language={language} />
+ )}
+ />
+ )
+ }
+
+ if (type === 'dv') {
+ return (
+ <Panel
+ t={t}
+ key={type}
+ icon={panelIcon}
+ id={type}
+ onFilter={filterHandler}
+ name={panelName}
+ data={panelsData.data[type]}
+ customTabs={customTabs}
+ capitalize
+ />
+ )
+ }
+
+ if (type === 'ref') {
+ return (
+ <Panel
+ t={t}
+ key={type}
+ icon={panelIcon}
+ id={type}
+ onFilter={filterHandler}
+ name={panelName}
+ data={panelsData.data[type]}
+ customTabs={customTabs}
+ rowMapper={(rowName) => (
+ <RefRow rowName={rowName} showIcons={showIcons} />
+ )}
+ />
+ )
+ }
- if (type === 'dv') {
return (
<Panel
t={t}
@@ -1110,12 +1185,111 @@ const ViewProject = ({
name={panelName}
data={panelsData.data[type]}
customTabs={customTabs}
- capitalize
/>
)
- }
+ })}
+ {!_isEmpty(panelsData.customs) && (
+ <CustomEvents
+ t={t}
+ customs={panelsData.customs}
+ chartData={chartData}
+ />
+ )}
+ </div>
+ </div>
+ )}
+ {activeTab === 'performance' && (
+ <div className={cx('pt-4 md:pt-0', { hidden: isPanelsDataEmpty || analyticsLoading })}>
+ <div
+ className={cx('h-80', {
+ hidden: checkIfAllMetricsAreDisabled,
+ })}
+ >
+ <div className='h-80' id='dataChart' />
+ </div>
+ <Filters
+ filters={filters}
+ onRemoveFilter={filterHandler}
+ onChangeExclusive={onChangeExclusive}
+ tnMapping={tnMapping}
+ />
+ {dataLoading && (
+ <div className='loader bg-transparent static mt-4' id='loader'>
+ <div className='loader-head'>
+ <div className='first' />
+ <div className='second' />
+ </div>
+ </div>
+ )}
+ <div className='mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3'>
+ {!_isEmpty(project.overall) && (
+ <Overview
+ t={t}
+ overall={project.overall}
+ chartData={chartData}
+ activePeriod={activePeriod}
+ sessionDurationAVG={sessionDurationAVG}
+ live={project.live}
+ projectId={id}
+ />
+ )}
+ {_map(panelsData.types, (type) => {
+ const panelName = tnMapping[type]
+ const panelIcon = panelIconMapping[type]
+ const customTabs = _filter(customPanelTabs, tab => tab.panelID === type)
+
+ if (type === 'cc') {
+ return (
+ <Panel
+ t={t}
+ key={type}
+ icon={panelIcon}
+ id={type}
+ onFilter={filterHandler}
+ name={panelName}
+ data={panelsData.data[type]}
+ customTabs={customTabs}
+ rowMapper={(rowName) => (
+ <CCRow rowName={rowName} language={language} />
+ )}
+ />
+ )
+ }
+
+ if (type === 'dv') {
+ return (
+ <Panel
+ t={t}
+ key={type}
+ icon={panelIcon}
+ id={type}
+ onFilter={filterHandler}
+ name={panelName}
+ data={panelsData.data[type]}
+ customTabs={customTabs}
+ capitalize
+ />
+ )
+ }
+
+ if (type === 'ref') {
+ return (
+ <Panel
+ t={t}
+ key={type}
+ icon={panelIcon}
+ id={type}
+ onFilter={filterHandler}
+ name={panelName}
+ data={panelsData.data[type]}
+ customTabs={customTabs}
+ rowMapper={(rowName) => (
+ <RefRow rowName={rowName} showIcons={showIcons} />
+ )}
+ />
+ )
+ }
- if (type === 'ref') {
return (
<Panel
t={t}
@@ -1126,35 +1300,19 @@ const ViewProject = ({
name={panelName}
data={panelsData.data[type]}
customTabs={customTabs}
- rowMapper={(rowName) => (
- <RefRow rowName={rowName} showIcons={showIcons} />
- )}
/>
)
- }
-
- return (
- <Panel
+ })}
+ {!_isEmpty(panelsData.customs) && (
+ <CustomEvents
t={t}
- key={type}
- icon={panelIcon}
- id={type}
- onFilter={filterHandler}
- name={panelName}
- data={panelsData.data[type]}
- customTabs={customTabs}
+ customs={panelsData.customs}
+ chartData={chartData}
/>
- )
- })}
- {!_isEmpty(panelsData.customs) && (
- <CustomEvents
- t={t}
- customs={panelsData.customs}
- chartData={chartData}
- />
- )}
+ )}
+ </div>
</div>
- </div>
+ )}
</div>
{!authenticated && (
<div className='bg-indigo-600'>