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

fix export report route

Browse source
This commit is contained in:
Francis Cao 2025-07-22 11:10:37 -07:00
parent 7670ec4136
commit 6d124e7bb0
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/(main)/reports/[reportId]/ReportBody.tsx
View file

@ -12,7 +12,9 @@ export function ReportBody({ children }) {
return ( return (
<div className={styles.body}> <div className={styles.body}>
<DownloadButton filename={report.name} data={report.data} /> {report.type !== 'revenue' && report.type !== 'attribution' && (
<DownloadButton filename={report.name} data={report.data} />
)}
{children} {children}
</div> </div>
); );

20
src/app/api/websites/[websiteId]/export/route.ts
View file

@ -5,7 +5,7 @@ import { getRequestFilters, parseRequest } from '@/lib/request';
import { unauthorized, json } from '@/lib/response'; import { unauthorized, json } from '@/lib/response';
import { canViewWebsite } from '@/lib/auth'; import { canViewWebsite } from '@/lib/auth';
import { pagingParams } from '@/lib/schema'; import { pagingParams } from '@/lib/schema';
import { getEventMetrics, getWebsiteEvents } from '@/queries'; import { getEventMetrics, getPageviewMetrics, getSessionMetrics } from '@/queries';
export async function GET( export async function GET(
request: Request, request: Request,
@ -32,8 +32,6 @@ export async function GET(
const startDate = new Date(+startAt); const startDate = new Date(+startAt);
const endDate = new Date(+endAt); const endDate = new Date(+endAt);
const limit = 10;
const offset = 0;
const filters = { const filters = {
...(await getRequestFilters(query)), ...(await getRequestFilters(query)),
@ -42,13 +40,13 @@ export async function GET(
}; };
const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([ const [events, pages, referrers, browsers, os, devices, countries] = await Promise.all([
getWebsiteEvents(websiteId, { startDate, endDate }, query), getEventMetrics(websiteId, 'event', filters),
getEventMetrics(websiteId, 'url', filters, limit, offset), getPageviewMetrics(websiteId, 'url', filters),
getEventMetrics(websiteId, 'referrer', filters, limit, offset), getPageviewMetrics(websiteId, 'referrer', filters),
getEventMetrics(websiteId, 'browser', filters, limit, offset), getSessionMetrics(websiteId, 'browser', filters),
getEventMetrics(websiteId, 'os', filters, limit, offset), getSessionMetrics(websiteId, 'os', filters),
getEventMetrics(websiteId, 'device', filters, limit, offset), getSessionMetrics(websiteId, 'device', filters),
getEventMetrics(websiteId, 'country', filters, limit, offset), getSessionMetrics(websiteId, 'country', filters),
]); ]);
const zip = new JSZip(); const zip = new JSZip();
@ -60,7 +58,7 @@ export async function GET(
}); });
}; };
zip.file('events.csv', parse(events?.data)); zip.file('events.csv', parse(events));
zip.file('pages.csv', parse(pages)); zip.file('pages.csv', parse(pages));
zip.file('referrers.csv', parse(referrers)); zip.file('referrers.csv', parse(referrers));
zip.file('browsers.csv', parse(browsers)); zip.file('browsers.csv', parse(browsers));