📈 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
(fix) Errors / sessions flickering (#426)
Andrii Romasiun671fe7443eb6
diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsxindex 83d55ba27..78abb5414 100644--- a/app/pages/Project/View/ViewProject.tsx+++ b/app/pages/Project/View/ViewProject.tsx@@ -191,6 +191,7 @@ import { ErrorDetails } from './components/ErrorDetails'import { IError } from './interfaces/error'import NoErrorDetails from './components/NoErrorDetails'import WaitingForAnError from './components/WaitingForAnError'+import NoSessionDetails from './components/NoSessionDetails'const SwetrixSDK = require('@swetrix/sdk')const CUSTOM_EV_DROPDOWN_MAX_VISIBLE_LENGTH = 32@@ -444,6 +445,7 @@ const ViewProject = ({const [sessionsLoading, setSessionsLoading] = useState<boolean | null>(null) // null - not loaded, true - loading, false - loadedconst [activeSession, setActiveSession] = useState<any>(null)const [sessionLoading, setSessionLoading] = useState<boolean>(false)+ const [activePSID, setActivePSID] = useState<string | null>(null)// errorsconst [errorsSkip, setErrorsSkip] = useState<number>(0)@@ -1519,23 +1521,28 @@ const ViewProject = ({setSessionLoading(false)}+ useEffect(() => {+ const url = new URL(window.location.toString())+ const { searchParams } = url+ const tab = searchParams.get('tab') as string++ if (PROJECT_TABS[tab]) {+ setActiveTab(tab)+ }+ }, [])+useEffect(() => {if (authLoading) {return}- // @ts-ignore- const url = new URL(window.location)+ const url = new URL(window.location.toString())const { searchParams } = urlconst psid = searchParams.get('psid') as stringconst tab = searchParams.get('tab') as stringif (psid && tab === PROJECT_TABS.sessions) {- loadSession(psid)- }-- if (PROJECT_TABS[tab]) {- setActiveTab(tab)+ setActivePSID(psid)}// eslint-disable-next-line react-hooks/exhaustive-deps}, [authLoading])@@ -1552,12 +1559,20 @@ const ViewProject = ({const tab = searchParams.get('tab') as stringif (eid && tab === PROJECT_TABS.errors) {- // loadError(eid)setActiveEID(eid)}// eslint-disable-next-line react-hooks/exhaustive-deps}, [authLoading])+ useEffect(() => {+ if (!activePSID) {+ return+ }++ loadSession(activePSID)+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [period, dateRange, timeBucket, activePSID])+useEffect(() => {if (!activeEID) {return@@ -1626,7 +1641,7 @@ const ViewProject = ({setCanLoadMoreSessions(true)}} catch (e) {- console.error('[ERROR](loadAnalytics) Loading analytics data failed')+ console.error('[ERROR](loadSessions) Loading sessions data failed')console.error(e)} finally {setSessionsLoading(false)@@ -2386,6 +2401,11 @@ const ViewProject = ({}if (activeTab === PROJECT_TABS.sessions) {+ if (activePSID) {+ await loadSession(activePSID)+ return+ }+resetSessions()loadSessions(0)return@@ -3073,6 +3093,10 @@ const ViewProject = ({// updatePeriod using for update period and timeBucket also update urlconst updatePeriod = (newPeriod: { period: string; label?: string }) => {+ if (period === newPeriod.period) {+ return+ }+const newPeriodFull = _find(periodPairs, (el) => el.period === newPeriod.period)let tb = timeBucket// @ts-ignore@@ -3524,7 +3548,7 @@ const ViewProject = ({{/* Tabs selector */}<TabsSelector />{activeTab !== PROJECT_TABS.alerts &&- (activeTab !== PROJECT_TABS.sessions || !activeSession) &&+ (activeTab !== PROJECT_TABS.sessions || !activePSID) &&(activeFunnel || activeTab !== PROJECT_TABS.funnels) && (<><div className='mt-2 flex flex-col items-center justify-between lg:flex-row lg:items-start'>@@ -4055,7 +4079,7 @@ const ViewProject = ({)}</div>)}- {activeTab === PROJECT_TABS.sessions && !activeSession && (+ {activeTab === PROJECT_TABS.sessions && !activePSID && (<><Filtersfilters={filtersSessions}@@ -4063,9 +4087,17 @@ const ViewProject = ({onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}/>- {sessionsLoading && _isEmpty(sessions) && <Loader />}- {!sessionsLoading && _isEmpty(sessions) && <NoEvents filters={filters} resetFilters={resetFilters} />}- <Sessions sessions={sessions} onClick={loadSession} timeFormat={timeFormat} />+ {(sessionsLoading === null || sessionsLoading) && _isEmpty(sessions) && <Loader />}+ {typeof sessionsLoading === 'boolean' && !sessionsLoading && _isEmpty(sessions) && (+ <NoEvents filters={filters} resetFilters={resetFilters} />+ )}+ <Sessions+ sessions={sessions}+ onClick={(psid) => {+ setActivePSID(psid)+ }}+ timeFormat={timeFormat}+ />{canLoadMoreSessions && (<buttontype='button'@@ -4074,7 +4106,7 @@ const ViewProject = ({className={cx('relative mx-auto mt-2 flex items-center rounded-md bg-gray-50 p-2 text-sm font-medium text-gray-700 hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:text-gray-50 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',{- 'cursor-not-allowed opacity-50': sessionsLoading,+ 'cursor-not-allowed opacity-50': sessionsLoading || sessionsLoading === null,hidden: sessionsLoading && _isEmpty(sessions),},)}@@ -4085,11 +4117,12 @@ const ViewProject = ({)}</>)}- {activeTab === PROJECT_TABS.sessions && activeSession && (+ {activeTab === PROJECT_TABS.sessions && activePSID && (<><buttononClick={() => {setActiveSession(null)+ setActivePSID(null)const url = new URL(window.location.href)url.searchParams.delete('psid')window.history.pushState({}, '', url.toString())@@ -4100,15 +4133,21 @@ const ViewProject = ({{t('project.backToSessions')}</button>{activeSession?.details && <SessionDetails details={activeSession?.details} />}- <SessionChart- chart={activeSession?.chart}- timeBucket={activeSession?.timeBucket}- timeFormat={timeFormat}- rotateXAxis={rotateXAxis}- chartType={chartType}- dataNames={dataNames}- />+ {!_isEmpty(activeSession?.chart) && (+ <SessionChart+ chart={activeSession?.chart}+ timeBucket={activeSession?.timeBucket}+ timeFormat={timeFormat}+ rotateXAxis={rotateXAxis}+ chartType={chartType}+ dataNames={dataNames}+ />+ )}<Pageflow pages={activeSession?.pages} timeFormat={timeFormat} />+ {_isEmpty(activeSession) && sessionLoading && <Loader />}+ {_isEmpty(activeSession?.chart) && _isEmpty(activeSession?.pages) && !sessionLoading && (+ <NoSessionDetails />+ )}</>)}{activeTab === PROJECT_TABS.errors && !activeEID && (@@ -4119,7 +4158,8 @@ const ViewProject = ({onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}/>- {!errorsLoading && _isEmpty(errors) && (+ {(errorsLoading === null || errorsLoading) && _isEmpty(errors) && <Loader />}+ {typeof errorsLoading === 'boolean' && !errorsLoading && _isEmpty(errors) && (<NoEvents filters={filtersErrors} resetFilters={resetFilters} />)}<Errors@@ -4146,7 +4186,6 @@ const ViewProject = ({{t('project.loadMore')}</button>)}- {_isEmpty(errors) && errorsLoading && <Loader />}</>)}{activeTab === PROJECT_TABS.errors && activeEID && (diff --git a/app/pages/Project/View/components/NoSessionDetails.tsx b/app/pages/Project/View/components/NoSessionDetails.tsxnew file mode 100644index 000000000..01fceb2ac--- /dev/null+++ b/app/pages/Project/View/components/NoSessionDetails.tsx@@ -0,0 +1,28 @@+import { FaceFrownIcon } from '@heroicons/react/24/outline'+import { useTranslation } from 'react-i18next'++const NoSessionDetails = () => {+ const { t } = useTranslation('common')++ return (+ <div className='px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8'>+ <div className='mx-auto max-w-max'>+ <main className='sm:flex'>+ <FaceFrownIcon type='giant' className='-ml-1.5 mb-2 h-12 w-12 sm:m-0 sm:h-20 sm:w-20' />+ <div className='sm:ml-6'>+ <div className='sm:border-l sm:border-gray-200 sm:pl-6'>+ <h1 className='text-4xl font-extrabold tracking-tight text-gray-900 dark:text-gray-50 sm:text-5xl'>+ {t('project.noSessionDetails')}+ </h1>+ <p className='mt-1 max-w-prose whitespace-pre-line text-base text-gray-700 dark:text-gray-300'>+ {t('project.noSessionDesc')}+ </p>+ </div>+ </div>+ </main>+ </div>+ </div>+ )+}++export default NoSessionDetailsdiff --git a/public/locales/en.json b/public/locales/en.jsonindex 82479c218..ea83c6889 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -655,6 +655,8 @@"noEvTitle": "No events yet","noErrorDetails": "No error details","noErrorDesc": "This error does not exist or has not occurred within the specified time frame.",+ "noSessionDetails": "No session details",+ "noSessionDesc": "We could not find a session with the specified session ID.","showAll": "Show all views","trendlineUnique": "Unique visitors trendline","backToFunnels": "Back to funnels list",