📈 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
Use timezone from user settings
Blue Mouse049b7efc8dce
diff --git a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx b/web/app/pages/Project/tabs/Sessions/Pageflow.tsxindex 96cba77c1..b89825b3c 100644--- a/web/app/pages/Project/tabs/Sessions/Pageflow.tsx+++ b/web/app/pages/Project/tabs/Sessions/Pageflow.tsx@@ -1,3 +1,5 @@+import dayjs from 'dayjs'+import utc from 'dayjs/plugin/utc'import { TFunction } from 'i18next'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'@@ -18,9 +20,12 @@ import {import React, { useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'+import { useViewProjectContext } from '~/pages/Project/View/ViewProject'import { Text } from '~/ui/Text'import { cn, getStringFromTime, getTimeFromSeconds } from '~/utils/generic'+dayjs.extend(utc)+interface Metadata {key: stringvalue: string@@ -80,6 +85,38 @@ const formatDuration = (seconds: number): string => {return getStringFromTime(getTimeFromSeconds(seconds))}+const parseDateTime = (value: string | null | undefined) => {+ if (!value) return null++ const date = dayjs.utc(value)+ if (!date.isValid()) return null++ return date+}++const getTimestamp = (value: string | null | undefined) =>+ parseDateTime(value)?.valueOf() ?? Number.NaN++const formatDateTime = (+ value: string,+ language: string,+ timeFormat: '12-hour' | '24-hour',+ timezone: string,+) => {+ const date = parseDateTime(value)+ if (!date) return ''++ return date.toDate().toLocaleDateString(language, {+ day: 'numeric',+ month: 'short',+ hour: 'numeric',+ minute: 'numeric',+ second: 'numeric',+ hourCycle: timeFormat === '12-hour' ? 'h12' : 'h23',+ timeZone: timezone,+ })+}+const StepNumber = ({ number }: { number: number }) => (<Textsize='xs'@@ -404,13 +441,14 @@ export const Pageflow = ({t,i18n: { language },} = useTranslation('common')+ const { timezone } = useViewProjectContext()const filteredPages = useMemo(() => {if (!pages) return []if (!zoomedTimeRange) return pagesreturn pages.filter((page) => {- const pageTime = new Date(page.created).getTime()+ const pageTime = getTimestamp(page.created)return (pageTime >= zoomedTimeRange[0].getTime() &&pageTime <= zoomedTimeRange[1].getTime()@@ -422,8 +460,12 @@ export const Pageflow = ({if (filteredPages.length < 2) return []const times: number[] = []for (let i = 0; i < filteredPages.length - 1; i++) {- const currentTime = new Date(filteredPages[i].created).getTime()- const nextTime = new Date(filteredPages[i + 1].created).getTime()+ const currentTime = getTimestamp(filteredPages[i].created)+ const nextTime = getTimestamp(filteredPages[i + 1].created)+ if (!Number.isFinite(currentTime) || !Number.isFinite(nextTime)) {+ times.push(0)+ continue+ }times.push(Math.round((nextTime - currentTime) / 1000))}return times@@ -431,10 +473,13 @@ export const Pageflow = ({const timeAfterLastEvent = useMemo(() => {if (sdur <= 0 || filteredPages.length === 0) return 0- const firstEventTime = new Date(filteredPages[0].created).getTime()- const lastEventTime = new Date(+ const firstEventTime = getTimestamp(filteredPages[0].created)+ const lastEventTime = getTimestamp(filteredPages[filteredPages.length - 1].created,- ).getTime()+ )+ if (!Number.isFinite(firstEventTime) || !Number.isFinite(lastEventTime)) {+ return 0+ }const remaining = sdur - Math.round((lastEventTime - firstEventTime) / 1000)return remaining > 0 ? remaining : 0}, [filteredPages, sdur])@@ -462,16 +507,11 @@ export const Pageflow = ({{_map(filteredPages,({ value, created, type, metadata, amount, currency }, index) => {- const displayCreated = new Date(created).toLocaleDateString(+ const displayCreated = formatDateTime(+ created,language,- {- day: 'numeric',- month: 'short',- hour: 'numeric',- minute: 'numeric',- second: 'numeric',- hourCycle: timeFormat === '12-hour' ? 'h12' : 'h23',- },+ timeFormat,+ timezone,)const isLastEvent = index === filteredPages.length - 1diff --git a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsxindex 89c1e3328..d6dd0f0c0 100644--- a/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx+++ b/web/app/pages/Project/tabs/Sessions/SessionDetailView.tsx@@ -1,4 +1,5 @@import dayjs from 'dayjs'+import utc from 'dayjs/plugin/utc'import _isEmpty from 'lodash/isEmpty'import _size from 'lodash/size'import _truncate from 'lodash/truncate'@@ -16,6 +17,7 @@ import { Link } from '~/ui/Link'import { BrowserIcon, OSIcon } from '../SharedIcons'import { PROJECT_TABS } from '~/lib/constants'import { SessionDetails as SessionDetailsType } from '~/lib/models/Project'+import { useViewProjectContext } from '~/pages/Project/View/ViewProject'import { useCurrentProject } from '~/providers/CurrentProjectProvider'import { useTheme } from '~/providers/ThemeProvider'import PulsatingCircle from '~/ui/icons/PulsatingCircle'@@ -36,6 +38,8 @@ import NoSessionDetails from './NoSessionDetails'import { Pageflow } from './Pageflow'import { SessionChart } from './SessionChart'+dayjs.extend(utc)+interface PageflowItem {type: 'pageview' | 'event' | 'error' | 'sale' | 'refund'value: string@@ -148,15 +152,23 @@ const formatCompactElapsed = (seconds: number) => {return `${Math.floor(safeSeconds / year)}y`}+const parseDateTime = (value: string | null | undefined) => {+ if (!value) return null++ const date = dayjs.utc(value)+ if (!date.isValid()) return null++ return date+}+const formatDateTime = (value: string | null | undefined,language: string,timeFormat: '12-hour' | '24-hour',+ timezone: string,) => {- if (!value) return null-- const date = dayjs(value)- if (!date.isValid()) return null+ const date = parseDateTime(value)+ if (!date) return nullreturn date.toDate().toLocaleDateString(language, {day: 'numeric',@@ -166,6 +178,7 @@ const formatDateTime = (minute: 'numeric',second: 'numeric',hourCycle: timeFormat === '12-hour' ? 'h12' : 'h23',+ timeZone: timezone,})}@@ -194,6 +207,7 @@ export const SessionDetailView = ({i18n: { language },} = useTranslation('common')const { id: projectId } = useCurrentProject()+ const { timezone } = useViewProjectContext()const { theme } = useTheme()const [zoomedTimeRange, setZoomedTimeRange] = useState<[Date, Date] | null>(null,@@ -224,10 +238,12 @@ export const SessionDetailView = ({if (pageviews.length >= 1) {const firstPageview = pageviews[0]const lastPageview = pageviews[pageviews.length - 1]- const diffSeconds = dayjs(lastPageview.created).diff(- dayjs(firstPageview.created),- 'seconds',- )+ const firstPageviewDate = parseDateTime(firstPageview.created)+ const lastPageviewDate = parseDateTime(lastPageview.created)+ const diffSeconds =+ firstPageviewDate && lastPageviewDate+ ? lastPageviewDate.diff(firstPageviewDate, 'seconds')+ : 0if (diffSeconds > 0) {return diffSeconds}@@ -309,23 +325,35 @@ export const SessionDetailView = ({const sessionStartAt = activeSession.sessionStart || firstEventAtconst lastActivityAt =activeSession.lastActivity || lastEventAt || sessionStartAt || null- const secondsSinceLastActivity = lastActivityAt- ? Math.max(0, dayjs().diff(dayjs(lastActivityAt), 'second'))+ const lastActivityDate = parseDateTime(lastActivityAt)+ const sessionStartDateTime = parseDateTime(sessionStartAt)+ const secondsSinceLastActivity = lastActivityDate+ ? Math.max(0, dayjs().diff(lastActivityDate, 'second')): nullconst lastSeenTime =secondsSinceLastActivity !== null? formatCompactElapsed(secondsSinceLastActivity): null- const sessionOnlineFor = sessionStartAt- ? formatCompactElapsed(dayjs().diff(dayjs(sessionStartAt), 'second'))+ const sessionOnlineFor = sessionStartDateTime+ ? formatCompactElapsed(dayjs().diff(sessionStartDateTime, 'second')): sessionDuration > 0? formatCompactElapsed(sessionDuration): null- const lastSeenDate = formatDateTime(lastActivityAt, language, timeFormat)- const sessionStartDate = formatDateTime(sessionStartAt, language, timeFormat)+ const lastSeenDate = formatDateTime(+ lastActivityAt,+ language,+ timeFormat,+ timezone,+ )+ const sessionStartDate = formatDateTime(+ sessionStartAt,+ language,+ timeFormat,+ timezone,+ )const sessionEndDate = details.isLive? null- : formatDateTime(lastActivityAt, language, timeFormat)+ : formatDateTime(lastActivityAt, language, timeFormat, timezone)const lastSeenLabel = lastSeenTime? lastSeenTime === 'now'? 'seen now'