watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 21:57:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Display correct date for events/sessions.

Browse source
This commit is contained in:
Mike Cao 2024-08-12 23:54:21 -07:00
parent 78728b8706
commit b11b2e3524
6 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/app/(main)/websites/[websiteId]/events/EventsTable.tsx
View file

@ -1,13 +1,14 @@
import { GridTable, GridColumn, Icon } from 'react-basics';
import { useLocale, useMessages, useTeamUrl } from 'components/hooks';
import { useLocale, useMessages, useTeamUrl, useTimezone } from 'components/hooks';
import Empty from 'components/common/Empty';
import Avatar from 'components/common/Avatar';
import Link from 'next/link';
import Icons from 'components/icons';
import { formatDate } from 'lib/date';
import { formatInTimeZone } from 'date-fns-tz';
export function EventsTable({ data = [] }) {
const { locale } = useLocale();
const { dateLocale } = useLocale();
const { timezone } = useTimezone();
const { formatMessage, labels } = useMessages();
const { renderTeamUrl } = useTeamUrl();
@ -36,7 +37,11 @@ export function EventsTable({ data = [] }) {
}}
</GridColumn>
<GridColumn name="created" label={formatMessage(labels.created)} width={'300px'}>
{row => formatDate(new Date(row.createdAt), 'PPPpp', locale)}
{row =>
formatInTimeZone(new Date(row.createdAt.split(' ').join('T') + 'Z'), timezone, 'PPPpp', {
locale: dateLocale,
})
}
</GridColumn>
</GridTable>
);

13
src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
View file

@ -1,13 +1,14 @@
import Link from 'next/link';
import { GridColumn, GridTable } from 'react-basics';
import { useFormat, useLocale, useMessages } from 'components/hooks';
import { useFormat, useLocale, useMessages, useTimezone } from 'components/hooks';
import Avatar from 'components/common/Avatar';
import styles from './SessionsTable.module.css';
import { formatDate } from 'lib/date';
import TypeIcon from 'components/common/TypeIcon';
import { formatInTimeZone } from 'date-fns-tz';
export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
const { locale } = useLocale();
const { dateLocale } = useLocale();
const { timezone } = useTimezone();
const { formatMessage, labels } = useMessages();
const { formatValue } = useFormat();
@ -52,7 +53,11 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
)}
</GridColumn>
<GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
{row => formatDate(new Date(row.lastAt), 'PPPpp', locale)}
{row =>
formatInTimeZone(new Date(row.createdAt.split(' ').join('T') + 'Z'), timezone, 'PPPpp', {
locale: dateLocale,
})
}
</GridColumn>
</GridTable>
);