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.

Update admin/website search. Update param names.

Brian Cao4e2bfd748547
diff --git a/src/components/hooks/queries/useFilterQuery.ts b/src/components/hooks/queries/useFilterQuery.ts
index 1ac6564ba..5963d0997 100644
--- a/src/components/hooks/queries/useFilterQuery.ts
+++ b/src/components/hooks/queries/useFilterQuery.ts
@@ -1,14 +1,14 @@
import { UseQueryOptions } from '@tanstack/react-query';
import { useState } from 'react';
import { useApi } from './useApi';
-import { FilterResult, SearchFilter, FilterQueryResult } from 'lib/types';
+import { PageResult, PageParams, FilterQueryResult } from 'lib/types';
export function useFilterQuery<T = any>({
queryKey,
queryFn,
...options
}: Omit<UseQueryOptions, 'queryFn'> & { queryFn: (params?: object) => any }): FilterQueryResult<T> {
- const [params, setParams] = useState<T | SearchFilter>({
+ const [params, setParams] = useState<T | PageParams>({
query: '',
page: 1,
});
@@ -21,7 +21,7 @@ export function useFilterQuery<T = any>({
});
return {
- result: data as FilterResult<any>,
+ result: data as PageResult<any>,
query,
params,
setParams,
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index eb866899e..6250f2e54 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -5,7 +5,7 @@ import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
import { SESSION_COLUMNS, OPERATORS, DEFAULT_PAGE_SIZE } from './constants';
import { fetchWebsite } from './load';
import { maxDate } from './date';
-import { QueryFilters, QueryOptions, SearchFilter } from './types';
+import { QueryFilters, QueryOptions, PageParams } from './types';
import { filtersToArray } from './params';
const MYSQL_DATE_FORMATS = {
@@ -191,7 +191,7 @@ async function rawQuery(sql: string, data: object): Promise<any> {
return prisma.rawQuery(query, params);
}
-async function pagedQuery<T>(model: string, criteria: T, filters: SearchFilter) {
+async function pagedQuery<T>(model: string, criteria: T, filters: PageParams) {
const { page = 1, pageSize, orderBy, sortDescending = false } = filters || {};
const size = +pageSize || DEFAULT_PAGE_SIZE;
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 712a6aac3..95758b6f6 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -24,31 +24,7 @@ export type DynamicDataType = ObjectValues<typeof DATA_TYPE>;
export type KafkaTopic = ObjectValues<typeof KAFKA_TOPIC>;
export type ReportType = ObjectValues<typeof REPORT_TYPES>;
-export interface WebsiteSearchFilter extends SearchFilter {
- userId?: string;
- teamId?: string;
- includeTeams?: boolean;
- onlyTeams?: boolean;
-}
-
-export interface UserSearchFilter extends SearchFilter {
- teamId?: string;
-}
-
-export interface TeamSearchFilter extends SearchFilter {
- userId?: string;
-}
-
-export interface TeamUserSearchFilter extends SearchFilter {
- teamId?: string;
-}
-
-export interface ReportSearchFilter extends SearchFilter {
- userId?: string;
- websiteId?: string;
-}
-
-export interface SearchFilter {
+export interface PageParams {
query?: string;
page?: number;
pageSize?: number;
@@ -56,7 +32,7 @@ export interface SearchFilter {
sortDescending?: boolean;
}
-export interface FilterResult<T> {
+export interface PageResult<T> {
data: T;
count: number;
page: number;
@@ -66,10 +42,10 @@ export interface FilterResult<T> {
}
export interface FilterQueryResult<T> {
- result: FilterResult<T>;
+ result: PageResult<T>;
query: any;
- params: SearchFilter;
- setParams: Dispatch<SetStateAction<T | SearchFilter>>;
+ params: PageParams;
+ setParams: Dispatch<SetStateAction<T | PageParams>>;
}
export interface DynamicData {
diff --git a/src/pages/api/admin/users.ts b/src/pages/api/admin/users.ts
index 31b72ebf9..4f03ec9f8 100644
--- a/src/pages/api/admin/users.ts
+++ b/src/pages/api/admin/users.ts
@@ -1,13 +1,13 @@
import { canViewUsers } from 'lib/auth';
import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, Role, SearchFilter, User } from 'lib/types';
+import { NextApiRequestQueryBody, Role, PageParams, User } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getUsers } from 'queries';
import * as yup from 'yup';
-export interface UsersRequestQuery extends SearchFilter {}
+export interface UsersRequestQuery extends PageParams {}
export interface UsersRequestBody {
userId: string;
username: string;
diff --git a/src/pages/api/admin/websites.ts b/src/pages/api/admin/websites.ts
index 4fbcd5cc6..866921446 100644
--- a/src/pages/api/admin/websites.ts
+++ b/src/pages/api/admin/websites.ts
@@ -1,13 +1,17 @@
import { canViewAllWebsites } from 'lib/auth';
+import { ROLES } from 'lib/constants';
import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { pageInfo } from 'lib/schema';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getWebsites } from 'queries';
import * as yup from 'yup';
-import { pageInfo } from 'lib/schema';
-export interface WebsitesRequestQuery extends SearchFilter {}
+export interface WebsitesRequestQuery extends PageParams {
+ userId?: string;
+ includeTeams?: boolean;
+}
export interface WebsitesRequestBody {
name: string;
@@ -39,8 +43,29 @@ export default async (
return unauthorized(res);
}
+ const { userId, includeOwnedTeams } = req.query;
+
const websites = await getWebsites(
{
+ where: {
+ OR: [
+ ...(userId && [{ userId }]),
+ ...(userId &&
+ includeOwnedTeams && [
+ {
+ team: {
+ deletedAt: null,
+ teamUser: {
+ some: {
+ role: ROLES.teamOwner,
+ userId,
+ },
+ },
+ },
+ },
+ ]),
+ ],
+ },
include: {
user: {
select: {
@@ -48,6 +73,18 @@ export default async (
id: true,
},
},
+ team: {
+ where: {
+ deletedAt: null,
+ },
+ include: {
+ teamUser: {
+ where: {
+ role: ROLES.teamOwner,
+ },
+ },
+ },
+ },
},
},
req.query,
diff --git a/src/pages/api/teams/[teamId]/users/index.ts b/src/pages/api/teams/[teamId]/users/index.ts
index 3a03feaf4..ccbf423af 100644
--- a/src/pages/api/teams/[teamId]/users/index.ts
+++ b/src/pages/api/teams/[teamId]/users/index.ts
@@ -1,13 +1,13 @@
import { canAddUserToTeam, canViewTeam } from 'lib/auth';
import { useAuth, useValidate } from 'lib/middleware';
import { pageInfo } from 'lib/schema';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
import { NextApiResponse } from 'next';
import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createTeamUser, getTeamUser, getTeamUsers } from 'queries';
import * as yup from 'yup';
-export interface TeamUserRequestQuery extends SearchFilter {
+export interface TeamUserRequestQuery extends PageParams {
teamId: string;
}
diff --git a/src/pages/api/teams/[teamId]/websites/index.ts b/src/pages/api/teams/[teamId]/websites/index.ts
index fe2448570..75020fa44 100644
--- a/src/pages/api/teams/[teamId]/websites/index.ts
+++ b/src/pages/api/teams/[teamId]/websites/index.ts
@@ -1,13 +1,13 @@
import * as yup from 'yup';
import { canViewTeam } from 'lib/auth';
import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { ok, unauthorized } from 'next-basics';
import { getTeamWebsites } from 'queries';
-export interface TeamWebsiteRequestQuery extends SearchFilter {
+export interface TeamWebsiteRequestQuery extends PageParams {
teamId: string;
}
diff --git a/src/pages/api/teams/index.ts b/src/pages/api/teams/index.ts
index 08bf8f847..1e683469b 100644
--- a/src/pages/api/teams/index.ts
+++ b/src/pages/api/teams/index.ts
@@ -3,13 +3,13 @@ import { Team } from '@prisma/client';
import { canCreateTeam } from 'lib/auth';
import { uuid } from 'lib/crypto';
import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createTeam } from 'queries';
-export interface TeamsRequestQuery extends SearchFilter {}
+export interface TeamsRequestQuery extends PageParams {}
export interface TeamsRequestBody {
name: string;
}
diff --git a/src/pages/api/users/[userId]/teams.ts b/src/pages/api/users/[userId]/teams.ts
index ad4af6485..3f2af9e24 100644
--- a/src/pages/api/users/[userId]/teams.ts
+++ b/src/pages/api/users/[userId]/teams.ts
@@ -1,12 +1,12 @@
import * as yup from 'yup';
import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getUserTeams } from 'queries';
-export interface UserTeamsRequestQuery extends SearchFilter {
+export interface UserTeamsRequestQuery extends PageParams {
userId: string;
}
diff --git a/src/pages/api/users/index.ts b/src/pages/api/users/index.ts
index 7f8c91749..333670a98 100644
--- a/src/pages/api/users/index.ts
+++ b/src/pages/api/users/index.ts
@@ -2,14 +2,14 @@ import { canCreateUser } from 'lib/auth';
import { ROLES } from 'lib/constants';
import { uuid } from 'lib/crypto';
import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, Role, SearchFilter, User } from 'lib/types';
+import { NextApiRequestQueryBody, Role, PageParams, User } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createUser, getUserByUsername } from 'queries';
import * as yup from 'yup';
-export interface UsersRequestQuery extends SearchFilter {}
+export interface UsersRequestQuery extends PageParams {}
export interface UsersRequestBody {
username: string;
password: string;
diff --git a/src/pages/api/websites/[websiteId]/reports.ts b/src/pages/api/websites/[websiteId]/reports.ts
index 5bb1652bd..72e5b0f27 100644
--- a/src/pages/api/websites/[websiteId]/reports.ts
+++ b/src/pages/api/websites/[websiteId]/reports.ts
@@ -1,13 +1,13 @@
import * as yup from 'yup';
import { canViewWebsite } from 'lib/auth';
import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getWebsiteReports } from 'queries';
import { pageInfo } from 'lib/schema';
-export interface ReportsRequestQuery extends SearchFilter {
+export interface ReportsRequestQuery extends PageParams {
websiteId: string;
}
diff --git a/src/pages/api/websites/index.ts b/src/pages/api/websites/index.ts
index 0b7826ac3..c5eb72002 100644
--- a/src/pages/api/websites/index.ts
+++ b/src/pages/api/websites/index.ts
@@ -1,7 +1,7 @@
import { canCreateTeamWebsite, canCreateWebsite } from 'lib/auth';
import { uuid } from 'lib/crypto';
import { useAuth, useCors, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
+import { NextApiRequestQueryBody, PageParams } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createWebsite } from 'queries';
@@ -9,7 +9,7 @@ import userWebsitesRoute from 'pages/api/users/[userId]/websites';
import * as yup from 'yup';
import { pageInfo } from 'lib/schema';
-export interface WebsitesRequestQuery extends SearchFilter {}
+export interface WebsitesRequestQuery extends PageParams {}
export interface WebsitesRequestBody {
name: string;
diff --git a/src/queries/admin/report.ts b/src/queries/admin/report.ts
index d6b28cc4e..dc05a1d55 100644
--- a/src/queries/admin/report.ts
+++ b/src/queries/admin/report.ts
@@ -1,6 +1,6 @@
import { Prisma, Report } from '@prisma/client';
import prisma from 'lib/prisma';
-import { FilterResult, ReportSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
import ReportFindManyArgs = Prisma.ReportFindManyArgs;
async function findReport(criteria: Prisma.ReportFindUniqueArgs): Promise<Report> {
@@ -17,8 +17,8 @@ export async function getReport(reportId: string): Promise<Report> {
export async function getReports(
criteria: ReportFindManyArgs,
- filters: ReportSearchFilter = {},
-): Promise<FilterResult<Report[]>> {
+ filters: PageParams = {},
+): Promise<PageResult<Report[]>> {
const { query } = filters;
const where: Prisma.ReportWhereInput = {
@@ -50,8 +50,8 @@ export async function getReports(
export async function getUserReports(
userId: string,
- filters?: ReportSearchFilter,
-): Promise<FilterResult<Report[]>> {
+ filters?: PageParams,
+): Promise<PageResult<Report[]>> {
return getReports(
{
where: {
@@ -72,8 +72,8 @@ export async function getUserReports(
export async function getWebsiteReports(
websiteId: string,
- filters: ReportSearchFilter = {},
-): Promise<FilterResult<Report[]>> {
+ filters: PageParams = {},
+): Promise<PageResult<Report[]>> {
return getReports(
{
where: {
diff --git a/src/queries/admin/team.ts b/src/queries/admin/team.ts
index 74b877de1..e516c4463 100644
--- a/src/queries/admin/team.ts
+++ b/src/queries/admin/team.ts
@@ -2,7 +2,7 @@ import { Prisma, Team } from '@prisma/client';
import { ROLES } from 'lib/constants';
import { uuid } from 'lib/crypto';
import prisma from 'lib/prisma';
-import { FilterResult, TeamSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
import TeamFindManyArgs = Prisma.TeamFindManyArgs;
export async function findTeam(criteria: Prisma.TeamFindUniqueArgs): Promise<Team> {
@@ -22,8 +22,8 @@ export async function getTeam(teamId: string, options: { includeMembers?: boolea
export async function getTeams(
criteria: TeamFindManyArgs,
- filters: TeamSearchFilter = {},
-): Promise<FilterResult<Team[]>> {
+ filters: PageParams = {},
+): Promise<PageResult<Team[]>> {
const { getSearchParameters } = prisma;
const { query } = filters;
@@ -42,7 +42,7 @@ export async function getTeams(
);
}
-export async function getUserTeams(userId: string, filters: TeamSearchFilter = {}) {
+export async function getUserTeams(userId: string, filters: PageParams = {}) {
return getTeams(
{
where: {
diff --git a/src/queries/admin/teamUser.ts b/src/queries/admin/teamUser.ts
index 43785b787..d172dd5a1 100644
--- a/src/queries/admin/teamUser.ts
+++ b/src/queries/admin/teamUser.ts
@@ -1,7 +1,7 @@
import { Prisma, TeamUser } from '@prisma/client';
import { uuid } from 'lib/crypto';
import prisma from 'lib/prisma';
-import { FilterResult, TeamUserSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
import TeamUserFindManyArgs = Prisma.TeamUserFindManyArgs;
export async function findTeamUser(criteria: Prisma.TeamUserFindUniqueArgs): Promise<TeamUser> {
@@ -19,8 +19,8 @@ export async function getTeamUser(teamId: string, userId: string): Promise<TeamU
export async function getTeamUsers(
criteria: TeamUserFindManyArgs,
- filters?: TeamUserSearchFilter,
-): Promise<FilterResult<TeamUser[]>> {
+ filters?: PageParams,
+): Promise<PageResult<TeamUser[]>> {
const { query } = filters;
const where: Prisma.TeamUserWhereInput = {
diff --git a/src/queries/admin/user.ts b/src/queries/admin/user.ts
index 819f492d7..9e0851128 100644
--- a/src/queries/admin/user.ts
+++ b/src/queries/admin/user.ts
@@ -1,7 +1,7 @@
import { Prisma } from '@prisma/client';
import { ROLES } from 'lib/constants';
import prisma from 'lib/prisma';
-import { FilterResult, Role, User, UserSearchFilter } from 'lib/types';
+import { PageResult, Role, User, PageParams } from 'lib/types';
import { getRandomChars } from 'next-basics';
import UserFindManyArgs = Prisma.UserFindManyArgs;
@@ -49,8 +49,8 @@ export async function getUserByUsername(username: string, options: GetUserOption
export async function getUsers(
criteria: UserFindManyArgs,
- filters?: UserSearchFilter,
-): Promise<FilterResult<User[]>> {
+ filters?: PageParams,
+): Promise<PageResult<User[]>> {
const { query } = filters;
const where: Prisma.UserWhereInput = {
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 949efb715..1f513bd4f 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -1,6 +1,6 @@
import { Prisma, Website } from '@prisma/client';
import prisma from 'lib/prisma';
-import { FilterResult, WebsiteSearchFilter } from 'lib/types';
+import { PageResult, PageParams } from 'lib/types';
import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {
@@ -25,8 +25,8 @@ export async function getSharedWebsite(shareId: string) {
export async function getWebsites(
criteria: WebsiteFindManyArgs,
- filters: WebsiteSearchFilter,
-): Promise<FilterResult<Website[]>> {
+ filters: PageParams,
+): Promise<PageResult<Website[]>> {
const { query } = filters;
const where: Prisma.WebsiteWhereInput = {
@@ -53,8 +53,8 @@ export async function getAllWebsites(userId: string) {
export async function getUserWebsites(
userId: string,
- filters?: WebsiteSearchFilter,
-): Promise<FilterResult<Website[]>> {
+ filters?: PageParams,
+): Promise<PageResult<Website[]>> {
return getWebsites(
{
where: {
@@ -78,8 +78,8 @@ export async function getUserWebsites(
export async function getTeamWebsites(
teamId: string,
- filters?: WebsiteSearchFilter,
-): Promise<FilterResult<Website[]>> {
+ filters?: PageParams,
+): Promise<PageResult<Website[]>> {
return getWebsites(
{
where: {