include team-manager in includeTeams option
This commit is contained in:
@@ -2,7 +2,7 @@ import { z } from 'zod';
|
||||
import { getQueryFilters, parseRequest } from '@/lib/request';
|
||||
import { json } from '@/lib/response';
|
||||
import { pagingParams } from '@/lib/schema';
|
||||
import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma';
|
||||
import { getAllUserWebsitesIncludingTeamAccess, getUserWebsites } from '@/queries/prisma';
|
||||
|
||||
export async function GET(request: Request) {
|
||||
const schema = z.object({
|
||||
@@ -19,7 +19,7 @@ export async function GET(request: Request) {
|
||||
const filters = await getQueryFilters(query);
|
||||
|
||||
if (query.includeTeams) {
|
||||
return json(await getAllUserWebsitesIncludingTeamOwner(auth.user.id, filters));
|
||||
return json(await getAllUserWebsitesIncludingTeamAccess(auth.user.id, filters));
|
||||
}
|
||||
|
||||
return json(await getUserWebsites(auth.user.id, filters));
|
||||
|
||||
@@ -2,7 +2,7 @@ import { z } from 'zod';
|
||||
import { getQueryFilters, parseRequest } from '@/lib/request';
|
||||
import { json, unauthorized } from '@/lib/response';
|
||||
import { pagingParams, searchParams } from '@/lib/schema';
|
||||
import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';
|
||||
import { getAllUserWebsitesIncludingTeamAccess, getUserWebsites } from '@/queries/prisma/website';
|
||||
|
||||
export async function GET(request: Request, { params }: { params: Promise<{ userId: string }> }) {
|
||||
const schema = z.object({
|
||||
@@ -26,7 +26,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
|
||||
const filters = await getQueryFilters(query);
|
||||
|
||||
if (query.includeTeams) {
|
||||
return json(await getAllUserWebsitesIncludingTeamOwner(userId, filters));
|
||||
return json(await getAllUserWebsitesIncludingTeamAccess(userId, filters));
|
||||
}
|
||||
|
||||
return json(await getUserWebsites(userId, filters));
|
||||
|
||||
@@ -7,7 +7,7 @@ import { json, unauthorized } from '@/lib/response';
|
||||
import { pagingParams, searchParams } from '@/lib/schema';
|
||||
import { canCreateTeamWebsite, canCreateWebsite } from '@/permissions';
|
||||
import { createShare, createWebsite, getWebsiteCount } from '@/queries/prisma';
|
||||
import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';
|
||||
import { getAllUserWebsitesIncludingTeamAccess, getUserWebsites } from '@/queries/prisma/website';
|
||||
|
||||
const CLOUD_WEBSITE_LIMIT = 3;
|
||||
|
||||
@@ -29,7 +29,7 @@ export async function GET(request: Request) {
|
||||
const filters = await getQueryFilters(query);
|
||||
|
||||
if (query.includeTeams) {
|
||||
return json(await getAllUserWebsitesIncludingTeamOwner(userId, filters));
|
||||
return json(await getAllUserWebsitesIncludingTeamAccess(userId, filters));
|
||||
}
|
||||
|
||||
return json(await getUserWebsites(userId, filters));
|
||||
|
||||
@@ -42,7 +42,7 @@ export async function getWebsites(criteria: Prisma.WebsiteFindManyArgs, filters:
|
||||
return attachShareIdToWebsites(websites);
|
||||
}
|
||||
|
||||
export async function getAllUserWebsitesIncludingTeamOwner(userId: string, filters?: QueryFilters) {
|
||||
export async function getAllUserWebsitesIncludingTeamAccess(userId: string, filters?: QueryFilters) {
|
||||
return getWebsites(
|
||||
{
|
||||
where: {
|
||||
@@ -53,7 +53,7 @@ export async function getAllUserWebsitesIncludingTeamOwner(userId: string, filte
|
||||
deletedAt: null,
|
||||
members: {
|
||||
some: {
|
||||
role: ROLES.teamOwner,
|
||||
role: { in: [ROLES.teamOwner, ROLES.teamManager] },
|
||||
userId,
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user