Add includeTeams param for fetching websites.
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run

This commit is contained in:
Mike Cao 2025-09-12 10:15:13 -07:00
parent 433ce98719
commit 9ccafc390a
6 changed files with 34 additions and 36 deletions

View file

@ -18,6 +18,7 @@ import {
import { useMessages, useNavigation } from '@/components/hooks';
import { SideMenu } from '@/components/common/SideMenu';
import { WebsiteSelect } from '@/components/input/WebsiteSelect';
import { Text } from '@umami/react-zen';
export function WebsiteNav({ websiteId }: { websiteId: string }) {
const { formatMessage, labels } = useMessages();
@ -147,13 +148,27 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {
router.push(renderUrl(`/websites/${value}`));
};
const renderValue = (value: any) => {
return (
<Text truncate style={{ maxWidth: 160, lineHeight: 1 }}>
{value?.selectedItem?.name}
</Text>
);
};
const selectedKey = items
.flatMap(e => e.items)
.find(({ path }) => path && pathname.endsWith(path.split('?')[0]))?.id;
return (
<SideMenu items={items} selectedKey={selectedKey} allowMinimize={false} muteItems={false}>
<WebsiteSelect websiteId={websiteId} teamId={teamId} onChange={handleChange} />
<WebsiteSelect
websiteId={websiteId}
teamId={teamId}
onChange={handleChange}
renderValue={renderValue}
buttonProps={{ style: { outline: 'none' } }}
/>
</SideMenu>
);
}

View file

@ -7,6 +7,7 @@ import { parseRequest, getQueryFilters } from '@/lib/request';
export async function GET(request: Request) {
const schema = z.object({
...pagingParams,
includeTeams: z.string().optional(),
});
const { auth, query, error } = await parseRequest(request, schema);

View file

@ -1,6 +1,6 @@
import { z } from 'zod';
import { unauthorized, json } from '@/lib/response';
import { getUserWebsites } from '@/queries/prisma/website';
import { getAllUserWebsitesIncludingTeamOwner, getUserWebsites } from '@/queries/prisma/website';
import { pagingParams, searchParams } from '@/lib/schema';
import { getQueryFilters, parseRequest } from '@/lib/request';
@ -8,6 +8,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
const schema = z.object({
...pagingParams,
...searchParams,
includeTeams: z.string().optional(),
});
const { auth, query, error } = await parseRequest(request, schema);
@ -24,7 +25,9 @@ export async function GET(request: Request, { params }: { params: Promise<{ user
const filters = await getQueryFilters(query);
const websites = await getUserWebsites(userId, filters);
if (query.includeTeams) {
return json(await getAllUserWebsitesIncludingTeamOwner(auth.user.id, filters));
}
return json(websites);
return json(await getUserWebsites(userId, filters));
}