Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Fixed test console.

Mike Cao9aa2830d2b9f
diff --git a/src/app/(main)/console/TestConsole.js b/src/app/(main)/console/TestConsole.js
index 1ae3eaf1a..b88bfd77d 100644
--- a/src/app/(main)/console/TestConsole.js
+++ b/src/app/(main)/console/TestConsole.js
@@ -7,19 +7,15 @@ import WebsiteChart from '../../(main)/websites/[id]/WebsiteChart';
import useApi from 'components/hooks/useApi';
import Head from 'next/head';
import Link from 'next/link';
-import { useRouter } from 'next/navigation';
+import useNavigation from 'components/hooks/useNavigation';
import Script from 'next/script';
import { Button } from 'react-basics';
import styles from './TestConsole.module.css';
-export function TestConsole() {
+export function TestConsole({ websiteId }) {
const { get, useQuery } = useApi();
const { data, isLoading, error } = useQuery(['websites:me'], () => get('/me/websites'));
- const router = useRouter();
- const {
- basePath,
- query: { id },
- } = router;
+ const { router } = useNavigation();
function handleChange(value) {
router.push(`/console/${value}`);
@@ -72,7 +68,6 @@ export function TestConsole() {
return null;
}
- const [websiteId] = id || [];
const website = data?.data.find(({ id }) => websiteId === id);
return (
@@ -87,8 +82,8 @@ export function TestConsole() {
<>
<Script
async
- data-website-id={website.id}
- src={`${basePath}/script.js`}
+ data-website-id={websiteId}
+ src={`${process.env.basePath}/script.js`}
data-cache="true"
/>
<div className={styles.test}>
diff --git a/src/app/(main)/console/[[...id]]/page.tsx b/src/app/(main)/console/[[...id]]/page.tsx
index d020ddf9f..f3d865f62 100644
--- a/src/app/(main)/console/[[...id]]/page.tsx
+++ b/src/app/(main)/console/[[...id]]/page.tsx
@@ -5,14 +5,14 @@ async function getEnabled() {
return !!process.env.ENABLE_TEST_CONSOLE;
}
-export default async function ConsolePage() {
+export default async function ({ params: { id } }) {
const enabled = await getEnabled();
if (!enabled) {
return null;
}
- return <TestConsole />;
+ return <TestConsole websiteId={id?.[0]} />;
}
export const metadata: Metadata = {