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

Added report context. Removed report store.

Browse source
This commit is contained in:
Mike Cao 2023-05-28 21:37:34 -07:00
parent bc37f5124e
commit bfb52eb678
31 changed files with 372 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

45
pages/api/reports/[id].ts
View file

@ -1,59 +1,68 @@
import { canUpdateUserReport, canViewUserReport } from 'lib/auth';
import { canUpdateReport, canViewReport } from 'lib/auth';
import { useAuth, useCors } from 'lib/middleware';
import { NextApiRequestQueryBody } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getUserReportById, updateUserReport } from 'queries';
import { getReportById, updateReport } from 'queries';
export interface UserReportRequestQuery {
export interface ReportRequestQuery {
id: string;
}
export interface UserReportRequestBody {
export interface ReportRequestBody {
websiteId: string;
reportName: string;
templateName: string;
type: string;
name: string;
description: string;
parameters: string;
}
export default async (
req: NextApiRequestQueryBody<UserReportRequestQuery, UserReportRequestBody>,
req: NextApiRequestQueryBody<ReportRequestQuery, ReportRequestBody>,
res: NextApiResponse,
) => {
await useCors(req, res);
await useAuth(req, res);
if (req.method === 'GET') {
const { id: userReportId } = req.query;
const { id: reportId } = req.query;
const data = await getUserReportById(userReportId);
const data = await getReportById(reportId);
if (!(await canViewUserReport(req.auth, data))) {
if (!(await canViewReport(req.auth, data))) {
return unauthorized(res);
}
data.parameters = JSON.parse(data.parameters);
return ok(res, data);
}
if (req.method === 'POST') {
const { id: userReportId } = req.query;
const { id: reportId } = req.query;
const data = await getUserReportById(userReportId);
const { websiteId, type, name, description, parameters } = req.body;
if (!(await canUpdateUserReport(req.auth, data))) {
const data = await getReportById(reportId);
if (!(await canUpdateReport(req.auth, data))) {
return unauthorized(res);
}
const updated = await updateUserReport(
const result = await updateReport(
{
...req.body,
},
websiteId,
type,
name,
description,
parameters: JSON.stringify(parameters),
} as any,
{
id: userReportId,
id: reportId,
},
);
return ok(res, updated);
return ok(res, result);
}
return methodNotAllowed(res);

32
pages/api/reports/index.ts
View file

@ -3,17 +3,21 @@ import { useAuth, useCors } from 'lib/middleware';
import { NextApiRequestQueryBody } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok } from 'next-basics';
import { createUserReport, getUserReports } from 'queries';
import { createReport, getReports } from 'queries';
export interface UserReportRequestBody {
export interface ReportRequestBody {
websiteId: string;
reportName: string;
templateName: string;
parameters: string;
name: string;
type: string;
description: string;
parameters: {
window: string;
urls: string[];
};
}
export default async (
req: NextApiRequestQueryBody<any, UserReportRequestBody>,
req: NextApiRequestQueryBody<any, ReportRequestBody>,
res: NextApiResponse,
) => {
await useCors(req, res);
@ -24,19 +28,25 @@ export default async (
} = req.auth;
if (req.method === 'GET') {
const data = await getUserReports(userId);
const data = await getReports(userId);
return ok(res, data);
}
if (req.method === 'POST') {
const data = await createUserReport({
const { websiteId, type, name, description, parameters } = req.body;
const result = await createReport({
id: uuid(),
userId,
...req.body,
});
websiteId,
type,
name,
description,
parameters: JSON.stringify(parameters),
} as any);
return ok(res, data);
return ok(res, result);
}
return methodNotAllowed(res);