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
Add team reports.
Brian Cao69389ebcd5e7
diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.tsindex db83e6edc..762f297c7 100644--- a/pages/api/reports/index.ts+++ b/pages/api/reports/index.ts@@ -37,6 +37,7 @@ export default async (page,filter,pageSize: +pageSize || null,+ includeTeams: true,});return ok(res, data);diff --git a/queries/admin/report.ts b/queries/admin/report.tsindex 22f3c62bc..a053ba92d 100644--- a/queries/admin/report.ts+++ b/queries/admin/report.ts@@ -1,7 +1,7 @@import { Prisma, Report } from '@prisma/client';import { REPORT_FILTER_TYPES } from 'lib/constants';import prisma from 'lib/prisma';-import { FilterResult, ReportSearchFilter, ReportSearchFilterType, SearchFilter } from 'lib/types';+import { FilterResult, ReportSearchFilter } from 'lib/types';export async function createReport(data: Prisma.ReportUncheckedCreateInput): Promise<Report> {return prisma.client.report.create({ data });@@ -155,7 +155,7 @@ export async function getReports(export async function getReportsByUserId(userId: string,- filter: SearchFilter<ReportSearchFilterType>,+ filter: ReportSearchFilter,): Promise<FilterResult<Report[]>> {return getReports({ userId, ...filter },@@ -174,7 +174,7 @@ export async function getReportsByUserId(export async function getReportsByWebsiteId(websiteId: string,- filter: SearchFilter<ReportSearchFilterType>,+ filter: ReportSearchFilter,): Promise<FilterResult<Report[]>> {return getReports({ websiteId, ...filter });}diff --git a/queries/admin/team.ts b/queries/admin/team.tsindex 79735fc77..284b218e2 100644--- a/queries/admin/team.ts+++ b/queries/admin/team.ts@@ -1,8 +1,8 @@import { Prisma, Team } from '@prisma/client';-import prisma from 'lib/prisma';import { ROLES, TEAM_FILTER_TYPES } from 'lib/constants';import { uuid } from 'lib/crypto';-import { FilterResult, TeamSearchFilter, TeamSearchFilterType, SearchFilter } from 'lib/types';+import prisma from 'lib/prisma';+import { FilterResult, TeamSearchFilter } from 'lib/types';export interface GetTeamOptions {includeTeamUser?: boolean;@@ -142,7 +142,7 @@ export async function getTeams(export async function getTeamsByUserId(userId: string,- filter?: SearchFilter<TeamSearchFilterType>,+ filter?: TeamSearchFilter,): Promise<FilterResult<Team[]>> {return getTeams({ userId, ...filter },