watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix compare screens
Some checks are pending
Create docker images / Build, push, and deploy (push) Waiting to run
Details
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Details

Browse source
This commit is contained in:
Francis Cao 2025-10-03 10:52:57 -07:00
parent f70f98fed0
commit 4d06b0ca5b
3 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/app/(main)/websites/[websiteId]/WebsiteChart.tsx
View file

@ -1,8 +1,8 @@
import { useMemo } from 'react';
import { LoadingPanel } from '@/components/common/LoadingPanel'; import { LoadingPanel } from '@/components/common/LoadingPanel';
import { PageviewsChart } from '@/components/metrics/PageviewsChart';
import { useWebsitePageviewsQuery } from '@/components/hooks/queries/useWebsitePageviewsQuery';
import { useDateRange } from '@/components/hooks'; import { useDateRange } from '@/components/hooks';
import { useWebsitePageviewsQuery } from '@/components/hooks/queries/useWebsitePageviewsQuery';
import { PageviewsChart } from '@/components/metrics/PageviewsChart';
import { useMemo } from 'react';
export function WebsiteChart({ export function WebsiteChart({
websiteId, websiteId,
@ -15,7 +15,7 @@ export function WebsiteChart({
const { startDate, endDate, unit, value } = dateRange; const { startDate, endDate, unit, value } = dateRange;
const { data, isLoading, isFetching, error } = useWebsitePageviewsQuery({ const { data, isLoading, isFetching, error } = useWebsitePageviewsQuery({
websiteId, websiteId,
compare: compareMode ? dateCompare?.['value'] : undefined, compare: compareMode ? dateCompare?.compare : undefined,
}); });
const { pageviews, sessions, compare } = (data || {}) as any; const { pageviews, sessions, compare } = (data || {}) as any;

17
src/app/(main)/websites/[websiteId]/compare/CompareTables.tsx
View file

@ -1,12 +1,11 @@
import { useState } from 'react';
import { Grid, Heading, Column, Row, Select, ListItem } from '@umami/react-zen';
import { useDateRange, useMessages, useNavigation } from '@/components/hooks';
import { MetricsTable } from '@/components/metrics/MetricsTable';
import { Panel } from '@/components/common/Panel';
import { DateDisplay } from '@/components/common/DateDisplay'; import { DateDisplay } from '@/components/common/DateDisplay';
import { Panel } from '@/components/common/Panel';
import { useDateRange, useMessages, useNavigation } from '@/components/hooks';
import { ChangeLabel } from '@/components/metrics/ChangeLabel'; import { ChangeLabel } from '@/components/metrics/ChangeLabel';
import { getCompareDate } from '@/lib/date'; import { MetricsTable } from '@/components/metrics/MetricsTable';
import { formatNumber } from '@/lib/format'; import { formatNumber } from '@/lib/format';
import { Column, Grid, Heading, ListItem, Row, Select } from '@umami/react-zen';
import { useState } from 'react';
export function CompareTables({ websiteId }: { websiteId: string }) { export function CompareTables({ websiteId }: { websiteId: string }) {
const [data, setData] = useState([]); const [data, setData] = useState([]);
@ -17,11 +16,7 @@ export function CompareTables({ websiteId }: { websiteId: string }) {
updateParams, updateParams,
query: { view = 'path' }, query: { view = 'path' },
} = useNavigation(); } = useNavigation();
const { startDate, endDate } = getCompareDate( const { startDate, endDate } = dateCompare;
dateCompare,
dateRange.startDate,
dateRange.endDate,
);
const params = { const params = {
startAt: startDate.getTime(), startAt: startDate.getTime(),

4
src/lib/date.ts
View file

@ -289,13 +289,13 @@ export function minDate(...args: any[]) {
export function getCompareDate(compare: string, startDate: Date, endDate: Date) { export function getCompareDate(compare: string, startDate: Date, endDate: Date) {
if (compare === 'yoy') { if (compare === 'yoy') {
return { startDate: subYears(startDate, 1), endDate: subYears(endDate, 1) }; return { compare, startDate: subYears(startDate, 1), endDate: subYears(endDate, 1) };
} }
if (compare === 'prev') { if (compare === 'prev') {
const diff = differenceInMinutes(endDate, startDate); const diff = differenceInMinutes(endDate, startDate);
return { startDate: subMinutes(startDate, diff), endDate: subMinutes(endDate, diff) }; return { compare, startDate: subMinutes(startDate, diff), endDate: subMinutes(endDate, diff) };
} }
return {}; return {};