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

src/app/(main)/boards/BoardsPage.tsx

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

src/app/(main)/links/LinksPage.tsx

@@ -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>

src/app/(main)/pixels/PixelsPage.tsx

@@ -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>

src/app/(main)/websites/WebsitesPage.tsx

@@ -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>

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

@@ -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>
   );

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

@@ -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();
 

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

@@ -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);
 }