Session and event property filtering. Closes #2945. Closes #4008.

This commit is contained in:
Francis Cao committed 2026-07-23 11:50:35 -07:00
1 parent 78346795eb
commit d05d9c4f34
73 files changed
+1262 -161

No files matched your search

@@ -26,7 +26,7 @@ export function usePropertyFieldsQuery(
? `/websites/${websiteId}/event-data/fields`
: `/websites/${websiteId}/session-data/properties`,
{
...(source === 'event' ? { event: eventName } : {}),
...(source === 'event' && eventName ? { event: eventName } : {}),
startAt,
endAt,
unit,
@@ -34,7 +34,7 @@ export function usePropertyFieldsQuery(
...params,
},
),
enabled: !!(websiteId && (source === 'session' || eventName)),
enabled: !!websiteId,
...options,
});
}
@@ -40,7 +40,7 @@ export function usePropertyValuesQuery(
? `/websites/${websiteId}/event-data/values`
: `/websites/${websiteId}/session-data/values`,
{
...(source === 'event' ? { event: eventName } : {}),
...(source === 'event' && eventName ? { event: eventName } : {}),
startAt,
endAt,
unit,
@@ -51,7 +51,7 @@ export function usePropertyValuesQuery(
...params,
},
),
enabled: !!(websiteId && propertyName && (source === 'session' || eventName)),
enabled: !!(websiteId && propertyName),
...options,
});
}
+8 -3
View File
@@ -8,9 +8,10 @@ export function useFilterParameters({
}: {
includePagination?: boolean;
} = {}) {
const { query } = useNavigation();
const { pathname, query } = useNavigation();
const share = useShare();
const allowFilter = share?.parameters?.allowFilter !== false;
const isEventsPath = pathname.endsWith('/events');
return useMemo(() => {
const filterParams: Record<string, any> = {};
@@ -18,7 +19,11 @@ export function useFilterParameters({
if (allowFilter) {
for (const key of Object.keys(query)) {
const baseName = key.replace(/\d+$/, '');
if (FILTER_COLUMNS[baseName]) {
if (
FILTER_COLUMNS[baseName] ||
/^spf\d+$/.test(key) ||
(isEventsPath && /^epf\d+$/.test(key))
) {
filterParams[key] = query[key];
}
}
@@ -39,5 +44,5 @@ export function useFilterParameters({
}
return params;
}, [allowFilter, includePagination, query]);
}, [allowFilter, includePagination, isEventsPath, query]);
}
+15 -2
View File
@@ -1,4 +1,5 @@
import { FILTER_COLUMNS, OPERATORS } from '@/lib/constants';
import { parseSessionPropertyFilters, parseUniversalEventPropertyFilters } from '@/lib/params';
import { safeDecodeURIComponent } from '@/lib/url';
import { useShare } from './context/useShare';
import { useFields } from './useFields';
@@ -8,7 +9,7 @@ import { useOperatorLabels } from './useOperatorLabels';
export function useFilters() {
const { t, labels } = useMessages();
const { query } = useNavigation();
const { pathname, query } = useNavigation();
const { fields } = useFields();
const operatorLabels = useOperatorLabels();
const share = useShare();
@@ -85,6 +86,9 @@ export function useFilters() {
return arr;
}, [])
: [];
const eventPropertyFilters =
allowFilter && pathname.endsWith('/events') ? parseUniversalEventPropertyFilters(query) : [];
const sessionPropertyFilters = allowFilter ? parseSessionPropertyFilters(query) : [];
const getFilters = (type: string) => {
return (
@@ -96,5 +100,14 @@ export function useFilters() {
);
};
return { fields, operators, filters, operatorLabels, typeFilters, getFilters };
return {
fields,
operators,
filters,
eventPropertyFilters,
sessionPropertyFilters,
operatorLabels,
typeFilters,
getFilters,
};
}
@@ -11,6 +11,8 @@ export function useOperatorLabels(): Record<string, string> {
[OPERATORS.notSet]: t(labels.isNotSet),
[OPERATORS.contains]: t(labels.contains),
[OPERATORS.doesNotContain]: t(labels.doesNotContain),
[OPERATORS.regex]: t(labels.regexMatch),
[OPERATORS.notRegex]: t(labels.regexNotMatch),
[OPERATORS.true]: t(labels.true),
[OPERATORS.false]: t(labels.false),
[OPERATORS.greaterThan]: t(labels.greaterThan),
+16 -3
View File
@@ -81,9 +81,9 @@ export function FieldFilters({
return (
<Grid columns={{ base: '1fr', md: '180px 1fr' }} overflow="hidden" gapY="6">
<Row display={{ base: 'flex', md: 'none' }}>
<Row display={{ base: 'flex', md: 'none' }} alignItems="flex-start">
<MenuTrigger>
<Button>
<Button size="sm">
<Icon>
<Plus />
</Icon>
@@ -164,7 +164,20 @@ export function FieldFilters({
/>
);
})}
{!value.length && <Empty message={t(messages.nothingSelected)} />}
{!value.length &&
(isMobile ? (
<Row
color="muted"
justifyContent="center"
width="100%"
minHeight="70px"
style={{ paddingTop: '24px' }}
>
{t(messages.nothingSelected)}
</Row>
) : (
<Empty message={t(messages.nothingSelected)} />
))}
</Column>
</Grid>
);
+68 -5
View File
@@ -19,7 +19,11 @@ import {
useWebsiteSegmentQuery,
} from '@/components/hooks';
import { Bookmark, X } from '@/components/icons';
import { isSearchOperator } from '@/lib/params';
import {
isSearchOperator,
serializeSessionPropertyFilters,
serializeUniversalEventPropertyFilters,
} from '@/lib/params';
export function FilterBar({ websiteId }: { websiteId?: string }) {
const { t, labels } = useMessages();
@@ -30,12 +34,19 @@ export function FilterBar({ websiteId }: { websiteId?: string }) {
pathname,
updateParams,
replaceParams,
query: { segment, cohort },
query,
} = useNavigation();
const { filters, operatorLabels } = useFilters();
const { segment, cohort } = query;
const { filters, eventPropertyFilters, sessionPropertyFilters, operatorLabels } = useFilters();
const { data, isLoading } = useWebsiteSegmentQuery(websiteId, segment || cohort);
const canSaveSegment =
!!websiteId && filters.length > 0 && !segment && !cohort && !pathname.includes('/share');
!!websiteId &&
filters.length > 0 &&
eventPropertyFilters.length === 0 &&
sessionPropertyFilters.length === 0 &&
!segment &&
!cohort &&
!pathname.includes('/share');
const handleCloseFilter = (param: string) => {
router.push(updateParams({ [param]: undefined }));
@@ -45,11 +56,43 @@ export function FilterBar({ websiteId }: { websiteId?: string }) {
router.push(replaceParams());
};
const handleSessionPropertyFilterRemove = (index: number) => {
const clearedSessionPropertyFilters = Object.fromEntries(
Object.keys(query)
.filter(key => /^spf\d+$/.test(key))
.map(key => [key, undefined]),
);
const nextSessionPropertyFilters = sessionPropertyFilters.filter((_, i) => i !== index);
router.push(
updateParams({
...clearedSessionPropertyFilters,
...serializeSessionPropertyFilters(nextSessionPropertyFilters),
}),
);
};
const handleEventPropertyFilterRemove = (index: number) => {
const clearedEventPropertyFilters = Object.fromEntries(
Object.keys(query)
.filter(key => /^epf\d+$/.test(key))
.map(key => [key, undefined]),
);
const nextEventPropertyFilters = eventPropertyFilters.filter((_, i) => i !== index);
router.push(
updateParams({
...clearedEventPropertyFilters,
...serializeUniversalEventPropertyFilters(nextEventPropertyFilters),
}),
);
};
const handleSegmentRemove = (type: string) => {
router.push(updateParams({ [type]: undefined }));
};
if (!filters.length && !segment && !cohort) {
if (!filters.length && !eventPropertyFilters.length && !sessionPropertyFilters.length && !segment && !cohort) {
return null;
}
@@ -101,6 +144,26 @@ export function FilterBar({ websiteId }: { websiteId?: string }) {
/>
);
})}
{eventPropertyFilters.map((filter, index) => (
<FilterItem
key={`epf${index}`}
name={`epf${index}`}
label={`${t(labels.eventProperties)}: ${filter.propertyName}`}
operator={operatorLabels[filter.operator]}
value={filter.value}
onRemove={() => handleEventPropertyFilterRemove(index)}
/>
))}
{sessionPropertyFilters.map((filter, index) => (
<FilterItem
key={`spf${index}`}
name={`spf${index}`}
label={`${t(labels.sessionData)}: ${filter.propertyName}`}
operator={operatorLabels[filter.operator]}
value={filter.value}
onRemove={() => handleSessionPropertyFilterRemove(index)}
/>
))}
</Row>
<Row alignItems="center">
<DialogTrigger>
@@ -0,0 +1,64 @@
import { expect, test, vi } from 'vitest';
import { render, screen } from '@/test/render';
import { FilterEditForm } from './FilterEditForm';
const mockUseNavigation = vi.fn();
vi.mock('@/components/hooks', () => ({
useFilters: () => ({
filters: [],
eventPropertyFilters: [],
sessionPropertyFilters: [],
}),
useMessages: () => ({
t: (value: string) => value,
labels: {
fields: 'Fields',
segments: 'Segments',
cohorts: 'Cohorts',
eventProperties: 'Event Properties',
sessionData: 'Session Properties',
reset: 'Reset',
cancel: 'Cancel',
apply: 'Apply',
},
}),
useMobile: () => ({ isMobile: false }),
useNavigation: () => mockUseNavigation(),
}));
vi.mock('@/components/input/FieldFilters', () => ({
FieldFilters: () => <div>FieldFilters</div>,
}));
vi.mock('@/components/input/SegmentFilters', () => ({
SegmentFilters: () => <div>SegmentFilters</div>,
}));
vi.mock('@/components/property-data/PropertyFilters', () => ({
PropertyFilters: ({ source }: { source: string }) => <div>{`${source} PropertyFilters`}</div>,
}));
test('shows event and session property tabs on the events page', () => {
mockUseNavigation.mockReturnValue({
pathname: '/websites/test/events',
query: {},
});
render(<FilterEditForm websiteId="test-website" />);
expect(screen.getByRole('tab', { name: 'Event Properties' })).toBeInTheDocument();
expect(screen.getByRole('tab', { name: 'Session Properties' })).toBeInTheDocument();
});
test('hides the event property tab outside the events page', () => {
mockUseNavigation.mockReturnValue({
pathname: '/websites/test/sessions',
query: {},
});
render(<FilterEditForm websiteId="test-website" />);
expect(screen.queryByRole('tab', { name: 'Event Properties' })).not.toBeInTheDocument();
expect(screen.getByRole('tab', { name: 'Session Properties' })).toBeInTheDocument();
});
+82 -20
View File
@@ -2,12 +2,16 @@ import { Button, Column, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-
import { useState } from 'react';
import { useFilters, useMessages, useMobile, useNavigation } from '@/components/hooks';
import { FieldFilters } from '@/components/input/FieldFilters';
import { PropertyFilters } from '@/components/property-data/PropertyFilters';
import { SegmentFilters } from '@/components/input/SegmentFilters';
import type { EventPropertyFilter, SessionPropertyFilter } from '@/lib/types';
export interface FilterEditFormProps {
websiteId?: string;
onChange?: (params: {
filters: any[];
eventPropertyFilters: EventPropertyFilter[];
sessionPropertyFilters: SessionPropertyFilter[];
segment?: string;
cohort?: string;
match?: string;
@@ -20,14 +24,18 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
query: { segment, cohort, match },
pathname,
} = useNavigation();
const { filters } = useFilters();
const { filters, eventPropertyFilters, sessionPropertyFilters } = useFilters();
const { t, labels } = useMessages();
const [currentFilters, setCurrentFilters] = useState(filters);
const [currentEventPropertyFilters, setCurrentEventPropertyFilters] = useState(eventPropertyFilters);
const [currentSessionPropertyFilters, setCurrentSessionPropertyFilters] =
useState(sessionPropertyFilters);
const [currentSegment, setCurrentSegment] = useState(segment);
const [currentCohort, setCurrentCohort] = useState(cohort);
const [currentMatch, setCurrentMatch] = useState<string>(match || 'all');
const { isMobile } = useMobile();
const isPixelLink = !websiteId || pathname.includes('/pixels') || pathname.includes('/links');
const isEventsPath = pathname.endsWith('/events');
const excludeEvent =
!pathname.endsWith('/events') &&
!pathname.endsWith('/replays') &&
@@ -55,6 +63,8 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
const handleReset = () => {
setCurrentFilters([]);
setCurrentEventPropertyFilters([]);
setCurrentSessionPropertyFilters([]);
setCurrentSegment(undefined);
setCurrentCohort(undefined);
setCurrentMatch('all');
@@ -63,6 +73,8 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
const handleSave = () => {
onChange?.({
filters: currentFilters.filter(f => f.value),
eventPropertyFilters: currentEventPropertyFilters.filter(f => f.value),
sessionPropertyFilters: currentSessionPropertyFilters.filter(f => f.value),
segment: currentSegment,
cohort: currentCohort,
match: currentMatch !== 'all' ? currentMatch : undefined,
@@ -76,6 +88,16 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
};
const panelStyle = { overflowY: 'auto' as const, minHeight: 0 };
const mobileTabListStyle = isMobile
? ({
overflowX: 'auto',
overflowY: 'hidden',
flexWrap: 'nowrap',
scrollbarWidth: 'none',
WebkitOverflowScrolling: 'touch',
} as const)
: undefined;
const mobileTabStyle = isMobile ? ({ flex: '0 0 auto', whiteSpace: 'nowrap' } as const) : undefined;
return (
<Column width={isMobile ? 'auto' : '800px'} gap="6" style={{ flex: 1, minHeight: 0 }}>
@@ -87,12 +109,28 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
overflow: 'hidden',
}}
>
<TabList>
<Tab id="fields">{t(labels.fields)}</Tab>
<TabList style={mobileTabListStyle}>
<Tab id="fields" style={mobileTabStyle}>
{t(labels.fields)}
</Tab>
{!isPixelLink && (
<>
<Tab id="segments">{t(labels.segments)}</Tab>
<Tab id="cohorts">{t(labels.cohorts)}</Tab>
<Tab id="segments" style={mobileTabStyle}>
{t(labels.segments)}
</Tab>
<Tab id="cohorts" style={mobileTabStyle}>
{t(labels.cohorts)}
</Tab>
{websiteId && isEventsPath && (
<Tab id="event-properties" style={mobileTabStyle}>
{t(labels.eventProperties)}
</Tab>
)}
{websiteId && (
<Tab id="session-data" style={mobileTabStyle}>
{t(labels.sessionData)}
</Tab>
)}
</>
)}
</TabList>
@@ -106,21 +144,45 @@ export function FilterEditForm({ websiteId, onChange, onClose }: FilterEditFormP
exclude={excludedFields}
/>
</TabPanel>
<TabPanel id="segments" style={panelStyle}>
<SegmentFilters
websiteId={websiteId}
segmentId={currentSegment}
onChange={handleSegmentChange}
/>
</TabPanel>
<TabPanel id="cohorts" style={panelStyle}>
<SegmentFilters
type="cohort"
websiteId={websiteId}
segmentId={currentCohort}
onChange={handleSegmentChange}
/>
</TabPanel>
{!isPixelLink && websiteId && (
<TabPanel id="segments" style={panelStyle}>
<SegmentFilters
websiteId={websiteId}
segmentId={currentSegment}
onChange={handleSegmentChange}
/>
</TabPanel>
)}
{!isPixelLink && websiteId && (
<TabPanel id="cohorts" style={panelStyle}>
<SegmentFilters
type="cohort"
websiteId={websiteId}
segmentId={currentCohort}
onChange={handleSegmentChange}
/>
</TabPanel>
)}
{!isPixelLink && websiteId && isEventsPath && (
<TabPanel id="event-properties" style={panelStyle}>
<PropertyFilters
source="event"
websiteId={websiteId}
value={currentEventPropertyFilters}
onChange={setCurrentEventPropertyFilters}
/>
</TabPanel>
)}
{!isPixelLink && websiteId && (
<TabPanel id="session-data" style={panelStyle}>
<PropertyFilters
source="session"
websiteId={websiteId}
value={currentSessionPropertyFilters}
onChange={setCurrentSessionPropertyFilters}
/>
</TabPanel>
)}
</Tabs>
<Row
alignItems="center"
+32 -2
View File
@@ -4,7 +4,11 @@ import { useFilters, useMessages, useNavigation } from '@/components/hooks';
import { ListFilter } from '@/components/icons';
import { DialogButton } from '@/components/input/DialogButton';
import { FilterEditForm } from '@/components/input/FilterEditForm';
import { filtersArrayToObject } from '@/lib/params';
import {
filtersArrayToObject,
serializeSessionPropertyFilters,
serializeUniversalEventPropertyFilters,
} from '@/lib/params';
export function WebsiteFilterButton({
websiteId,
@@ -18,17 +22,43 @@ export function WebsiteFilterButton({
const { t, labels } = useMessages();
const { updateParams, pathname, router, query } = useNavigation();
const { filters: currentFilters } = useFilters();
const isEventsPath = pathname.endsWith('/events');
const [excludeBounce, setExcludeBounce] = useState(!!query.excludeBounce);
const isOverview =
/^\/teams\/[^/]+\/websites\/[^/]+$/.test(pathname) || /^\/share\/[^/]+$/.test(pathname);
const handleChange = ({ filters, segment, cohort, match }: any) => {
const handleChange = ({
filters,
eventPropertyFilters = [],
sessionPropertyFilters = [],
segment,
cohort,
match,
}: any) => {
const params = filtersArrayToObject(filters);
const cleared = Object.fromEntries(currentFilters.map(f => [f.name, undefined]));
const clearedEventPropertyFilters = Object.fromEntries(
Object.keys(query)
.filter(key => /^epf\d+$/.test(key))
.map(key => [key, undefined]),
);
const clearedSessionPropertyFilters = Object.fromEntries(
Object.keys(query)
.filter(key => /^spf\d+$/.test(key))
.map(key => [key, undefined]),
);
const eventPropertyParams = isEventsPath
? serializeUniversalEventPropertyFilters(eventPropertyFilters)
: {};
const sessionPropertyParams = serializeSessionPropertyFilters(sessionPropertyFilters);
const url = updateParams({
...cleared,
...clearedEventPropertyFilters,
...clearedSessionPropertyFilters,
...params,
...eventPropertyParams,
...sessionPropertyParams,
segment,
cohort,
match,
+1
View File
@@ -168,6 +168,7 @@ export const labels: Record<string, string> = {
regions: 'label.regions',
reports: 'label.reports',
eventData: 'label.event-data',
eventProperties: 'label.event-properties',
sessionData: 'label.session-data',
funnel: 'label.funnel',
funnels: 'label.funnels',
@@ -1,26 +1,10 @@
'use client';
import {
Button,
Column,
Grid,
Icon,
List,
ListItem,
Menu,
MenuItem,
MenuTrigger,
Popover,
Row,
} from '@umami/react-zen';
import { format } from 'date-fns';
import { Button, Column, Row } from '@umami/react-zen';
import { useState } from 'react';
import { Empty } from '@/components/common/Empty';
import { useMessages, useMobile, usePropertyFieldsQuery } from '@/components/hooks';
import { useMessages, useMobile } from '@/components/hooks';
import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';
import { Plus } from '@/components/icons';
import { DATA_TYPE, OPERATORS } from '@/lib/constants';
import type { PropertyFilter } from '@/lib/types';
import { PropertyFilterRecord } from './PropertyFilterRecord';
import { PropertyFilters } from './PropertyFilters';
export function PropertyFilterEditForm({
source,
@@ -39,96 +23,21 @@ export function PropertyFilterEditForm({
onApply: (filters: PropertyFilter[]) => void;
onClose: () => void;
}) {
const { t, labels, messages } = useMessages();
const { t, labels } = useMessages();
const { isMobile } = useMobile();
const [filters, setFilters] = useState<PropertyFilter[]>(value);
const { data: queriedFields = [] } = usePropertyFieldsQuery(source, websiteId, eventName, {
enabled: !providedFields,
});
const fields = providedFields ?? queriedFields;
const handleAdd = (propertyName: string) => {
const field = (fields as any[]).find(f => f.propertyName === propertyName);
const dataType: number = field?.dataType ?? DATA_TYPE.string;
setFilters(prev => [
...prev,
{
propertyName,
dataType,
operator:
dataType === DATA_TYPE.date
? OPERATORS.before
: dataType === DATA_TYPE.array
? OPERATORS.contains
: OPERATORS.equals,
value:
dataType === DATA_TYPE.boolean
? 'true'
: dataType === DATA_TYPE.date
? format(new Date(), 'yyyy-MM-dd')
: '',
},
]);
};
return (
<Column width={isMobile ? 'auto' : '800px'} gap="6">
<Column minHeight="400px">
<Grid columns={{ base: '1fr', md: '180px 1fr' }} overflow="hidden" gapY="6">
<Row display={{ base: 'flex', md: 'none' }}>
<MenuTrigger>
<Button>
<Icon>
<Plus />
</Icon>
</Button>
<Popover placement="bottom start" shouldFlip>
<Menu
onAction={key => handleAdd(key.toString())}
style={{ maxHeight: 'calc(100vh - 2rem)', overflowY: 'auto' }}
>
{(fields as any[]).map(field => (
<MenuItem
key={`${field.propertyName}:${field.dataType}`}
id={field.propertyName}
>
{field.propertyName}
</MenuItem>
))}
</Menu>
</Popover>
</MenuTrigger>
</Row>
<Column
display={{ base: 'none', md: 'flex' }}
border="right"
paddingRight="3"
marginRight="6"
>
<List onAction={key => handleAdd(key.toString())}>
{(fields as any[]).map(field => (
<ListItem key={`${field.propertyName}:${field.dataType}`} id={field.propertyName}>
{field.propertyName}
</ListItem>
))}
</List>
</Column>
<Column overflow="auto" gapY="4" style={{ contain: 'layout' }}>
{filters.map((filter, index) => (
<PropertyFilterRecord
key={`${filter.propertyName}-${index}`}
source={source}
websiteId={websiteId}
eventName={eventName}
filter={filter}
filters={filters}
onChange={f => setFilters(prev => prev.map((item, i) => (i === index ? f : item)))}
onRemove={() => setFilters(prev => prev.filter((_, i) => i !== index))}
/>
))}
{!filters.length && <Empty message={t(messages.nothingSelected)} />}
</Column>
</Grid>
<PropertyFilters
source={source}
websiteId={websiteId}
eventName={eventName}
fields={providedFields}
value={filters}
onChange={setFilters}
/>
</Column>
<Row alignItems="center" justifyContent="space-between" gap>
<Button onPress={() => setFilters([])}>{t(labels.reset)}</Button>
@@ -0,0 +1,162 @@
'use client';
import {
Button,
Column,
Grid,
Icon,
List,
ListItem,
Menu,
MenuItem,
MenuTrigger,
Popover,
Row,
} from '@umami/react-zen';
import { format } from 'date-fns';
import { Empty } from '@/components/common/Empty';
import { LoadingPanel } from '@/components/common/LoadingPanel';
import { useMessages, useMobile, usePropertyFieldsQuery } from '@/components/hooks';
import type { PropertyDataSource } from '@/components/hooks/queries/usePropertyFieldsQuery';
import { Plus } from '@/components/icons';
import { DATA_TYPE, OPERATORS } from '@/lib/constants';
import type { PropertyFilter } from '@/lib/types';
import { PropertyFilterRecord } from './PropertyFilterRecord';
export function PropertyFilters({
source,
websiteId,
eventName,
fields: providedFields,
value,
onChange,
}: {
source: PropertyDataSource;
websiteId: string;
eventName?: string;
fields?: Array<{ propertyName: string; dataType: number }>;
value: PropertyFilter[];
onChange: (filters: PropertyFilter[]) => void;
}) {
const { t, messages } = useMessages();
const { isMobile } = useMobile();
const { data: queriedFields, isLoading, isFetching } = usePropertyFieldsQuery(
source,
websiteId,
eventName,
{
enabled: !providedFields,
},
);
const fields = providedFields ?? queriedFields ?? [];
const handleAdd = (propertyName: string) => {
const field = (fields as any[]).find(f => f.propertyName === propertyName);
const dataType: number = field?.dataType ?? DATA_TYPE.string;
onChange([
...value,
{
propertyName,
dataType,
operator:
dataType === DATA_TYPE.date
? OPERATORS.before
: dataType === DATA_TYPE.array
? OPERATORS.contains
: OPERATORS.equals,
value:
dataType === DATA_TYPE.boolean
? 'true'
: dataType === DATA_TYPE.date
? format(new Date(), 'yyyy-MM-dd')
: '',
},
]);
};
return (
<LoadingPanel
data={fields}
isLoading={!providedFields && isLoading}
isFetching={!providedFields && isFetching}
isEmpty={!fields.length}
height={isMobile ? undefined : '100%'}
minHeight={isMobile ? '120px' : undefined}
loadingPlacement={isMobile ? 'center' : 'absolute'}
>
<Grid
columns={{ base: '1fr', md: '180px 1fr' }}
overflow="hidden"
gapY="6"
style={{ minHeight: isMobile ? undefined : '100%', alignContent: 'start' }}
>
<Row display={{ base: 'flex', md: 'none' }} alignItems="flex-start">
<MenuTrigger>
<Button size="sm">
<Icon>
<Plus />
</Icon>
</Button>
<Popover placement="bottom start" shouldFlip>
<Menu
onAction={key => handleAdd(key.toString())}
style={{ maxHeight: 'calc(100vh - 2rem)', overflowY: 'auto' }}
>
{(fields as any[]).map(field => (
<MenuItem key={`${field.propertyName}:${field.dataType}`} id={field.propertyName}>
{field.propertyName}
</MenuItem>
))}
</Menu>
</Popover>
</MenuTrigger>
</Row>
<Column
display={{ base: 'none', md: 'flex' }}
border="right"
paddingRight="3"
marginRight="6"
alignSelf="stretch"
>
<List onAction={key => handleAdd(key.toString())}>
{(fields as any[]).map(field => (
<ListItem key={`${field.propertyName}:${field.dataType}`} id={field.propertyName}>
{field.propertyName}
</ListItem>
))}
</List>
</Column>
<Column overflow="auto" gapY="4" style={{ contain: 'layout' }}>
{value.map((filter, index) => (
<PropertyFilterRecord
key={`${filter.propertyName}-${index}`}
source={source}
websiteId={websiteId}
eventName={eventName}
filter={filter}
filters={value}
onChange={nextFilter =>
onChange(value.map((item, i) => (i === index ? nextFilter : item)))
}
onRemove={() => onChange(value.filter((_, i) => i !== index))}
/>
))}
{!value.length &&
(isMobile ? (
<Row
color="muted"
justifyContent="center"
width="100%"
minHeight="70px"
style={{ paddingTop: '24px' }}
>
{t(messages.nothingSelected)}
</Row>
) : (
<Empty message={t(messages.nothingSelected)} />
))}
</Column>
</Grid>
</LoadingPanel>
);
}