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!

fix: session chart zoom -> exit to sessions -> open a new session results in a crash

Blue Mouse5f6dde41997c
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 6abf479ab..f49463427 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -3330,6 +3330,7 @@ const ViewProject = () => {
to={{
search: pureSearchParams,
}}
+ onClick={resetSessionChartZoom}
className='flex items-center text-sm text-gray-900 underline decoration-dashed hover:decoration-solid dark:text-gray-100'
>
<ChevronLeftIcon className='mr-1 size-3' />
@@ -3374,8 +3375,16 @@ const ViewProject = () => {
) : null}
</div>
) : null}
- <Pageflow pages={activeSession?.pages} timeFormat={timeFormat} zoomedTimeRange={zoomedTimeRange} />
- {_isEmpty(activeSession) && sessionLoading ? <Loader /> : null}
+
+ {_isEmpty(activeSession) && sessionLoading ? (
+ <Loader />
+ ) : (
+ <Pageflow
+ pages={activeSession?.pages}
+ timeFormat={timeFormat}
+ zoomedTimeRange={zoomedTimeRange}
+ />
+ )}
{activeSession !== null &&
_isEmpty(activeSession?.chart) &&
_isEmpty(activeSession?.pages) &&
diff --git a/web/app/pages/Project/View/components/Pageflow.tsx b/web/app/pages/Project/View/components/Pageflow.tsx
index 99b3ecd7d..0edb46936 100644
--- a/web/app/pages/Project/View/components/Pageflow.tsx
+++ b/web/app/pages/Project/View/components/Pageflow.tsx
@@ -2,7 +2,7 @@ import _isEmpty from 'lodash/isEmpty'
import _map from 'lodash/map'
import _toUpper from 'lodash/toUpper'
import { BugIcon, FileTextIcon, MousePointerClickIcon } from 'lucide-react'
-import React from 'react'
+import React, { useMemo } from 'react'
import { Trans, useTranslation } from 'react-i18next'
import { cn } from '~/utils/generic'
@@ -48,12 +48,20 @@ export const Pageflow = ({ pages, timeFormat, zoomedTimeRange }: PageflowProps)
i18n: { language },
} = useTranslation('common')
- const filteredPages = zoomedTimeRange
- ? pages.filter((page) => {
- const pageTime = new Date(page.created).getTime()
- return pageTime >= zoomedTimeRange[0].getTime() && pageTime <= zoomedTimeRange[1].getTime()
- })
- : pages
+ const filteredPages = useMemo(() => {
+ if (!pages) {
+ return []
+ }
+
+ if (!zoomedTimeRange) {
+ return pages
+ }
+
+ return pages.filter((page) => {
+ const pageTime = new Date(page.created).getTime()
+ return pageTime >= zoomedTimeRange[0].getTime() && pageTime <= zoomedTimeRange[1].getTime()
+ })
+ }, [pages, zoomedTimeRange])
if (zoomedTimeRange && _isEmpty(filteredPages)) {
return (