Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Updated cohort processing.

Mike Caof9442001e4d2
diff --git a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx
index 76eba603d..bde75d483 100644
--- a/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/cohorts/CohortEditForm.tsx
@@ -90,7 +90,9 @@ export function CohortEditForm({
<Form
error={error}
onSubmit={handleSubmit}
- defaultValues={data || { parameters: { filters, dateRange: '30day' } }}
+ defaultValues={
+ data || { parameters: { filters, dateRange: '30day', action: { type: 'path' } } }
+ }
>
<FormField
name="name"
@@ -104,14 +106,19 @@ export function CohortEditForm({
<Label>{formatMessage(labels.action)}</Label>
<Grid columns="260px 1fr" gap>
<Column>
- <Select value={action} onChange={setAction}>
- <ListItem id="path">{formatMessage(labels.viewedPage)}</ListItem>
- <ListItem id="event">{formatMessage(labels.triggeredEvent)}</ListItem>
- </Select>
+ <FormField
+ name="parameters.action.type"
+ rules={{ required: formatMessage(labels.required) }}
+ >
+ <Select onSelectionChange={(value: any) => setAction(value)}>
+ <ListItem id="path">{formatMessage(labels.viewedPage)}</ListItem>
+ <ListItem id="event">{formatMessage(labels.triggeredEvent)}</ListItem>
+ </Select>
+ </FormField>
</Column>
<Column>
<FormField
- name="parameters.action"
+ name="parameters.action.value"
rules={{ required: formatMessage(labels.required) }}
>
{({ field }) => {
diff --git a/src/app/api/websites/[websiteId]/values/route.ts b/src/app/api/websites/[websiteId]/values/route.ts
index 12942f5cf..80f965099 100644
--- a/src/app/api/websites/[websiteId]/values/route.ts
+++ b/src/app/api/websites/[websiteId]/values/route.ts
@@ -1,5 +1,5 @@
import { canViewWebsite } from '@/validations';
-import { EVENT_COLUMNS, FILTER_COLUMNS, FILTER_GROUPS, SESSION_COLUMNS } from '@/lib/constants';
+import { EVENT_COLUMNS, FILTER_COLUMNS, SEGMENT_TYPES, SESSION_COLUMNS } from '@/lib/constants';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { badRequest, json, unauthorized } from '@/lib/response';
import { getWebsiteSegments, getValues } from '@/queries';
@@ -30,14 +30,16 @@ export async function GET(
const { type } = query;
- if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type) && !FILTER_GROUPS[type]) {
+ if (!SESSION_COLUMNS.includes(type) && !EVENT_COLUMNS.includes(type) && !SEGMENT_TYPES[type]) {
return badRequest();
}
- let values;
+ let values: any[];
- if (FILTER_GROUPS[type]) {
- values = (await getWebsiteSegments(websiteId, type)).map(segment => ({ value: segment.name }));
+ if (SEGMENT_TYPES[type]) {
+ values = (await getWebsiteSegments(websiteId, type))?.data?.map(segment => ({
+ value: segment.name,
+ }));
} else {
const filters = await getQueryFilters(query, websiteId);
values = await getValues(websiteId, FILTER_COLUMNS[type], filters);
diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsx
index ad115de41..52524c1ad 100644
--- a/src/components/input/FilterBar.tsx
+++ b/src/components/input/FilterBar.tsx
@@ -92,16 +92,9 @@ export function FilterBar({ websiteId }: { websiteId: string }) {
</TooltipTrigger>
)}
<Modal>
- <Dialog title={formatMessage(labels.segment)} style={{ width: 400 }}>
+ <Dialog title={formatMessage(labels.segment)} style={{ width: 800, minHeight: 300 }}>
{({ close }) => {
- return (
- <SegmentEditForm
- websiteId={websiteId}
- onClose={close}
- filters={filters}
- showFilters={false}
- />
- );
+ return <SegmentEditForm websiteId={websiteId} onClose={close} filters={filters} />;
}}
</Dialog>
</Modal>
diff --git a/src/components/input/FilterEditForm.tsx b/src/components/input/FilterEditForm.tsx
index d32f875cf..b21c5d550 100644
--- a/src/components/input/FilterEditForm.tsx
+++ b/src/components/input/FilterEditForm.tsx
@@ -1,6 +1,6 @@
import { useState } from 'react';
import { Column, Tabs, TabList, Tab, TabPanel, Row, Button } from '@umami/react-zen';
-import { useDateRange, useMessages } from '@/components/hooks';
+import { useMessages } from '@/components/hooks';
import { FieldFilters } from '@/components/input/FieldFilters';
import { SegmentFilters } from '@/components/input/SegmentFilters';
@@ -23,10 +23,6 @@ export function FilterEditForm({
const [currentFilters, setCurrentFilters] = useState(filters);
const [currentSegment, setCurrentSegment] = useState(segmentId);
- const {
- dateRange: { startDate, endDate },
- } = useDateRange(websiteId);
-
const handleReset = () => {
setCurrentFilters([]);
setCurrentSegment(null);
@@ -49,13 +45,7 @@ export function FilterEditForm({
<Tab id="segments">{formatMessage(labels.segments)}</Tab>
</TabList>
<TabPanel id="fields">
- <FieldFilters
- websiteId={websiteId}
- value={currentFilters}
- startDate={startDate}
- endDate={endDate}
- onSave={setCurrentFilters}
- />
+ <FieldFilters websiteId={websiteId} value={currentFilters} onChange={setCurrentFilters} />
</TabPanel>
<TabPanel id="segments" style={{ height: 400 }}>
<SegmentFilters
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index f2e9175c3..11d35aeeb 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -53,7 +53,7 @@ export const SESSION_COLUMNS = [
'region',
];
-export const FILTER_GROUPS = {
+export const SEGMENT_TYPES = {
segment: 'segment',
cohort: 'cohort',
};
diff --git a/src/lib/params.ts b/src/lib/params.ts
index f17f32c7e..71fd8cb22 100644
--- a/src/lib/params.ts
+++ b/src/lib/params.ts
@@ -18,7 +18,7 @@ export function isSearchOperator(operator: any) {
return [OPERATORS.contains, OPERATORS.doesNotContain].includes(operator);
}
-export function filtersObjectToArray(filters: QueryFilters, options: QueryOptions = {}) {
+export function filtersObjectToArray(filters: QueryFilters, options: QueryOptions = {}): Filter[] {
if (!filters) {
return [];
}
diff --git a/src/lib/request.ts b/src/lib/request.ts
index fc07ab8c4..b2881d820 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -6,6 +6,7 @@ import { badRequest, unauthorized } from '@/lib/response';
import { QueryFilters } from '@/lib/types';
import { getWebsiteSegment } from '@/queries';
import { z } from 'zod/v4';
+import { filtersArrayToObject } from '@/lib/params';
export async function parseRequest(
request: Request,
@@ -103,36 +104,31 @@ export async function getQueryFilters(
const segmentParams = (await getWebsiteSegment(websiteId, params.segment))
?.parameters as Record<string, any>;
- Object.assign(filters, segmentParams.filters);
+ Object.assign(filters, filtersArrayToObject(segmentParams.filters));
}
if (params.cohort) {
const cohortParams = (await getWebsiteSegment(websiteId, params.cohort))
?.parameters as Record<string, any>;
- // convert dateRange to startDate and endDate
- if (cohortParams.dateRange) {
- const { startDate, endDate } = parseDateRange(cohortParams.dateRange);
- cohortParams.startDate = startDate;
- cohortParams.endDate = endDate;
- delete cohortParams.dateRange;
- }
-
- if (cohortParams.filters) {
- Object.assign(cohortParams, cohortParams.filters);
- delete cohortParams.filters;
- }
-
- Object.assign(
- filters,
- Object.fromEntries(
- Object.entries(cohortParams || {}).map(([key, value]) =>
- key === 'startDate' || key === 'endDate'
- ? [`cohort_${key}`, new Date(value)]
- : [`cohort_${key}`, value],
- ),
- ),
- );
+ const { startDate, endDate } = parseDateRange(cohortParams.dateRange);
+
+ const cohortFilters = cohortParams.filters.map(({ name, ...props }) => ({
+ ...props,
+ name: `cohort_${name}`,
+ }));
+
+ cohortFilters.push({
+ name: cohortParams.action.type,
+ operator: 'eq',
+ value: cohortParams.action.value,
+ });
+
+ Object.assign(filters, {
+ ...filtersArrayToObject(cohortFilters),
+ cohort_startDate: startDate,
+ cohort_endDate: endDate,
+ });
}
}
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 6fdbfde73..cb0004066 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -29,6 +29,8 @@ export interface Filter {
operator: string;
value: string;
type?: string;
+ columns?: string;
+ prefix?: string;
}
export interface DateRange {