watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Mike Cao 2025-08-21 01:33:43 -07:00
commit 3a332b5947
40 changed files with 354 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/boards/BoardsPage.tsx
View file

@ -7,7 +7,7 @@ import { BoardAddButton } from './BoardAddButton';
export function BoardsPage() {
return (
<PageBody>
<Column>
<Column margin="2">
<PageHeader title="My Boards">
<BoardAddButton />
</PageHeader>

2
src/app/(main)/links/LinksPage.tsx
View file

@ -13,7 +13,7 @@ export function LinksPage() {
return (
<PageBody>
<Column gap="6">
<Column gap="6" margin="2">
<PageHeader title={formatMessage(labels.links)}>
<LinkAddButton teamId={teamId} />
</PageHeader>

2
src/app/(main)/pixels/PixelsPage.tsx
View file

@ -13,7 +13,7 @@ export function PixelsPage() {
return (
<PageBody>
<Column gap="6">
<Column gap="6" margin="2">
<PageHeader title={formatMessage(labels.pixels)}>
<PixelAddButton teamId={teamId} />
</PageHeader>

2
src/app/(main)/websites/WebsitesPage.tsx
View file

@ -13,7 +13,7 @@ export function WebsitesPage() {
return (
<PageBody>
<Column gap="6">
<Column gap="6" margin="2">
<PageHeader title={formatMessage(labels.websites)}>
<WebsiteAddButton teamId={teamId} />
</PageHeader>

2
src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
View file

@ -11,7 +11,7 @@ export function RevenuePage({ websiteId }: { websiteId: string }) {
return (
<Column gap>
<WebsiteControls websiteId={websiteId} allowFilter={false} />
<WebsiteControls websiteId={websiteId} />
<Revenue websiteId={websiteId} startDate={startDate} endDate={endDate} />
</Column>
);

2
src/app/(main)/websites/[websiteId]/cohorts/CohortDeleteButton.tsx
View file

@ -19,7 +19,7 @@ export function CohortDeleteButton({
const { formatMessage, labels } = useMessages();
const { del, useMutation } = useApi();
const { mutate, isPending, error } = useMutation({
mutationFn: () => del(`/websites/${websiteId}/cohorts/${cohortId}`),
mutationFn: () => del(`/websites/${websiteId}/segments/${cohortId}`),
});
const { touch } = useModified();

6
src/app/api/websites/[websiteId]/segments/route.ts
View file

@ -1,6 +1,6 @@
import { canUpdateWebsite, canViewWebsite } from '@/validations';
import { uuid } from '@/lib/crypto';
import { parseRequest } from '@/lib/request';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { json, unauthorized } from '@/lib/response';
import { segmentTypeParam, searchParams } from '@/lib/schema';
import { createSegment, getWebsiteSegments } from '@/queries';
@ -28,7 +28,9 @@ export async function GET(
return unauthorized();
}
const segments = await getWebsiteSegments(websiteId, type);
const filters = await getQueryFilters(query);
const segments = await getWebsiteSegments(websiteId, type, filters);
return json(segments);
}