Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed realtime activity sort. Closes #3330
Mike Cao48b6dfe72f04
diff --git a/src/app/(main)/console/ConsolePage.tsx b/src/app/(main)/console/ConsolePage.tsxdeleted file mode 100644index db1acbfe8..000000000--- a/src/app/(main)/console/ConsolePage.tsx+++ /dev/null@@ -1,6 +0,0 @@-'use client';-import TestConsole from './TestConsole';--export default function ConsolePage({ websiteId }) {- return <TestConsole websiteId={websiteId} />;-}diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsxindex 21b98df6d..8ed31fec6 100644--- a/src/app/(main)/console/TestConsole.tsx+++ b/src/app/(main)/console/TestConsole.tsx@@ -1,3 +1,4 @@+'use client';import { Button } from 'react-basics';import Link from 'next/link';import Script from 'next/script';@@ -9,7 +10,7 @@ import WebsiteChart from '../websites/[websiteId]/WebsiteChart';import { useApi, useNavigation } from '@/components/hooks';import styles from './TestConsole.module.css';-export function TestConsole({ websiteId }: { websiteId: string }) {+export function TestConsole({ websiteId }: { websiteId?: string }) {const { get, useQuery } = useApi();const { data, isLoading, error } = useQuery({queryKey: ['websites:me'],diff --git a/src/app/(main)/console/[[...websiteId]]/page.tsx b/src/app/(main)/console/[[...websiteId]]/page.tsxindex 93eafee47..6c504f1e6 100644--- a/src/app/(main)/console/[[...websiteId]]/page.tsx+++ b/src/app/(main)/console/[[...websiteId]]/page.tsx@@ -1,11 +1,11 @@import { Metadata } from 'next';-import ConsolePage from '../ConsolePage';+import TestConsole from '../TestConsole';async function getEnabled() {return !!process.env.ENABLE_TEST_CONSOLE;}-export default async function ({ params }: { params: { websiteId: string } }) {+export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;const enabled = await getEnabled();@@ -14,7 +14,7 @@ export default async function ({ params }: { params: { websiteId: string } }) {return null;}- return <ConsolePage websiteId={websiteId?.[0]} />;+ return <TestConsole websiteId={websiteId?.[0]} />;}export const metadata: Metadata = {diff --git a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsxindex 6edc28f97..e6d8d2ab8 100644--- a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx@@ -12,7 +12,7 @@ import RealtimeCountries from './RealtimeCountries';import WebsiteHeader from '../WebsiteHeader';import { percentFilter } from '@/lib/filters';-export function WebsiteRealtimePage({ websiteId }) {+export function WebsiteRealtimePage({ websiteId }: { websiteId: string }) {const { data, isLoading, error } = useRealtime(websiteId);if (isLoading || error) {diff --git a/src/app/(main)/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/websites/[websiteId]/realtime/page.tsxindex f205caddf..b376062be 100644--- a/src/app/(main)/websites/[websiteId]/realtime/page.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/page.tsx@@ -1,7 +1,7 @@import WebsiteRealtimePage from './WebsiteRealtimePage';import { Metadata } from 'next';-export default async function ({ params }: { params: { websiteId: string } }) {+export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {const { websiteId } = await params;return <WebsiteRealtimePage websiteId={websiteId} />;diff --git a/src/components/hooks/queries/useLogin.ts b/src/components/hooks/queries/useLogin.tsindex f88efbf0e..635c50006 100644--- a/src/components/hooks/queries/useLogin.ts+++ b/src/components/hooks/queries/useLogin.ts@@ -8,13 +8,13 @@ export function useLogin(): {user: any;setUser: (data: any) => void;} & UseQueryResult {- const { get, useQuery } = useApi();+ const { post, useQuery } = useApi();const user = useStore(selector);const query = useQuery({queryKey: ['login'],queryFn: async () => {- const data = await get('/auth/verify');+ const data = await post('/auth/verify');setUser(data);diff --git a/src/queries/sql/getRealtimeActivity.ts b/src/queries/sql/getRealtimeActivity.tsindex 108288853..c2f58ad81 100644--- a/src/queries/sql/getRealtimeActivity.ts+++ b/src/queries/sql/getRealtimeActivity.ts@@ -32,7 +32,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {where website_event.website_id = {{websiteId::uuid}}${filterQuery}${dateQuery}- order by website_event.created_at desc+ order by website_event.created_at asclimit 100`,params,