Merge branch 'dev' of https://github.com/umami-software/umami into dev

# Conflicts:
#	src/components/metrics/ReferrersTable.tsx

src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx

@@ -6,6 +6,7 @@ import { WebsiteShareForm } from './WebsiteShareForm';
 import { WebsiteTrackingCode } from './WebsiteTrackingCode';
 import { WebsiteData } from './WebsiteData';
 import { WebsiteEditForm } from './WebsiteEditForm';
+import { SegmentsDataTable } from '@/app/(main)/websites/[websiteId]/segments/SegmentsDataTable';
 
 export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal?: boolean }) {
   const website = useContext(WebsiteContext);
@@ -17,6 +18,7 @@ export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal
         <Tab id="details">{formatMessage(labels.details)}</Tab>
         <Tab id="tracking">{formatMessage(labels.trackingCode)}</Tab>
         <Tab id="share"> {formatMessage(labels.shareUrl)}</Tab>
+        <Tab id="segments"> {formatMessage(labels.segments)}</Tab>
         <Tab id="manage">{formatMessage(labels.manage)}</Tab>
       </TabList>
       <TabPanel id="details" style={{ width: 500 }}>
@@ -28,6 +30,9 @@ export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal
       <TabPanel id="share" style={{ width: 500 }}>
         <WebsiteShareForm websiteId={websiteId} shareId={website.shareId} />
       </TabPanel>
+      <TabPanel id="segments">
+        <SegmentsDataTable websiteId={websiteId} />
+      </TabPanel>
       <TabPanel id="manage">
         <WebsiteData websiteId={websiteId} />
       </TabPanel>

src/app/(main)/websites/[websiteId]/(reports)/breakdown/FieldSelectForm.tsx

@@ -25,7 +25,7 @@ export function FieldSelectForm({
   };
 
   return (
-    <Column width="300px" gap="6">
+    <Column gap="6">
       <List value={selected} onChange={handleChange} selectionMode="multiple">
         {fields.map(({ name, label }) => {
           return (

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

@@ -11,8 +11,6 @@ import {
   Tag,
   Money,
   Network,
-  UserPlus,
-  ChartPie,
 } from '@/components/icons';
 import { useMessages, useNavigation } from '@/components/hooks';
 import { SideMenu } from '@/components/common/SideMenu';
@@ -89,23 +87,6 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {
         },
       ],
     },
-    {
-      label: formatMessage(labels.segments),
-      items: [
-        {
-          id: 'segments',
-          label: formatMessage(labels.segments),
-          icon: <ChartPie />,
-          path: renderPath('/segments'),
-        },
-        {
-          id: 'cohorts',
-          label: formatMessage(labels.cohorts),
-          icon: <UserPlus />,
-          path: renderPath('/cohorts'),
-        },
-      ],
-    },
     {
       label: formatMessage(labels.growth),
       items: [

src/app/api/reports/utm/route.ts

@@ -17,8 +17,8 @@ export async function POST(request: Request) {
     return unauthorized();
   }
 
-  const parameters = await setWebsiteDate(websiteId, body.parameters);
   const filters = await getQueryFilters(body.filters, websiteId);
+  const parameters = await setWebsiteDate(websiteId, body.parameters);
 
   const data = await getUTM(websiteId, parameters as UTMParameters, filters);
 

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

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { getQueryFilters, parseRequest } from '@/lib/request';
 import { unauthorized, json } from '@/lib/response';
 import { canViewWebsite } from '@/lib/auth';
-import { dateRangeParams, filterParams, pagingParams } from '@/lib/schema';
+import { dateRangeParams, filterParams, pagingParams, searchParams } from '@/lib/schema';
 import { getWebsiteSessions } from '@/queries';
 
 export async function GET(
@@ -13,6 +13,7 @@ export async function GET(
     ...dateRangeParams,
     ...filterParams,
     ...pagingParams,
+    ...searchParams,
   });
 
   const { auth, query, error } = await parseRequest(request, schema);