m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-01 12:29:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix getReports for website, user, team

Browse Source
This commit is contained in:
Francis Cao 2024-06-03 12:26:03 -07:00
parent 111c93be20
commit d40807e672
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/(main)/reports/ReportsPage.tsx
View File

@ -2,8 +2,11 @@
import { Metadata } from 'next';
import ReportsHeader from './ReportsHeader';
import ReportsDataTable from './ReportsDataTable';
import { useTeamUrl } from 'components/hooks';
export default function ReportsPage() {
const { teamId } = useTeamUrl();
export default function ReportsPage({ teamId }: { teamId: string }) {
return (
<>
<ReportsHeader />

4
src/app/(main)/reports/page.tsx
View File

@ -1,8 +1,8 @@
import ReportsPage from './ReportsPage';
import { Metadata } from 'next';
export default function ({ params: { teamId } }: { params: { teamId: string } }) {
return <ReportsPage teamId={teamId} />;
export default function () {
return <ReportsPage />;
}
export const metadata: Metadata = {

22
src/pages/api/reports/index.ts
View File

@ -66,12 +66,30 @@ export default async (
const data = await getReports(
{
where: {
userId: !teamId && !websiteId ? userId : undefined,
websiteId,
OR: [
...(websiteId ? [{ websiteId }] : []),
...(teamId
? [
{
website: {
deletedAt: null,
teamId,
},
},
]
: []),
...(userId
? [
{
website: {
deletedAt: null,
userId,
},
},
]
: []),
],
},
include: {
website: {
select: {