enable using same filters

This commit is contained in:
Francis Cao committed 2026-02-21 14:56:29 -08:00
1 parent b4b3ba5552
commit 79c06787cd
9 files changed
+125 -145

No files matched your search

+19 -82
View File
@@ -1,91 +1,28 @@
import { useMemo } from 'react';
import { FILTER_COLUMNS } from '@/lib/constants';
import { useNavigation } from './useNavigation';
export function useFilterParameters() {
const {
query: {
path,
referrer,
title,
query,
host,
os,
browser,
device,
country,
region,
city,
event,
tag,
hostname,
distinctId,
utmSource,
utmMedium,
utmCampaign,
utmContent,
utmTerm,
page,
pageSize,
search,
segment,
cohort,
excludeBounce,
},
} = useNavigation();
const { query } = useNavigation();
return useMemo(() => {
const filterParams: Record<string, any> = {};
for (const key of Object.keys(query)) {
const baseName = key.replace(/\d+$/, '');
if (FILTER_COLUMNS[baseName]) {
filterParams[key] = query[key];
}
}
return {
path,
referrer,
title,
query,
host,
os,
browser,
device,
country,
region,
city,
event,
tag,
hostname,
distinctId,
utmSource,
utmMedium,
utmCampaign,
utmContent,
utmTerm,
search,
segment,
cohort,
excludeBounce,
...filterParams,
search: query.search,
segment: query.segment,
cohort: query.cohort,
excludeBounce: query.excludeBounce,
page: query.page,
pageSize: query.pageSize,
};
}, [
path,
referrer,
title,
query,
host,
os,
browser,
device,
country,
region,
city,
event,
tag,
hostname,
distinctId,
utmSource,
utmMedium,
utmCampaign,
utmContent,
utmTerm,
page,
pageSize,
search,
segment,
cohort,
excludeBounce,
]);
}, [query]);
}
+4 -2
View File
@@ -74,10 +74,11 @@ export function useFilters() {
};
const filters = Object.keys(query).reduce((arr, key) => {
if (FILTER_COLUMNS[key]) {
const baseName = key.replace(/\d+$/, '');
if (FILTER_COLUMNS[baseName]) {
let operator = 'eq';
let value = safeDecodeURIComponent(query[key]);
const label = fields.find(({ name }) => name === key)?.label;
const label = fields.find(({ name }) => name === baseName)?.label;
const match = value.match(/^([a-z]+)\.(.*)/);
@@ -88,6 +89,7 @@ export function useFilters() {
return arr.concat({
name: key,
type: baseName,
operator,
value,
label,
+15 -17
View File
@@ -48,24 +48,24 @@ export function FieldFilters({ websiteId, value, exclude = [], onChange }: Field
{} as Record<FieldGroup, typeof fields>,
);
const updateFilter = (name: string, props: Record<string, any>) => {
onChange(value.map(filter => (filter.name === name ? { ...filter, ...props } : filter)));
const updateFilter = (index: number, props: Record<string, any>) => {
onChange(value.map((filter, i) => (i === index ? { ...filter, ...props } : filter)));
};
const handleAdd = (name: Key) => {
onChange(value.concat({ name: name.toString(), operator: 'eq', value: '' }));
};
const handleChange = (name: string, value: Key) => {
updateFilter(name, { value });
const handleChange = (index: number, val: Key) => {
updateFilter(index, { value: val });
};
const handleSelect = (name: string, operator: Key) => {
updateFilter(name, { operator });
const handleSelect = (index: number, operator: Key) => {
updateFilter(index, { operator });
};
const handleRemove = (name: string) => {
onChange(value.filter(filter => filter.name !== name));
const handleRemove = (index: number) => {
onChange(value.filter((_, i) => i !== index));
};
return (
@@ -87,9 +87,8 @@ export function FieldFilters({ websiteId, value, exclude = [], onChange }: Field
return (
<MenuSection key={groupKey} title={label}>
{groupFields.map(field => {
const isDisabled = !!value.find(({ name }) => name === field.name);
return (
<MenuItem key={field.name} id={field.name} isDisabled={isDisabled}>
<MenuItem key={field.name} id={field.name}>
{field.filterLabel}
</MenuItem>
);
@@ -115,9 +114,8 @@ export function FieldFilters({ websiteId, value, exclude = [], onChange }: Field
return (
<ListSection key={groupKey} title={label}>
{groupFields.map(field => {
const isDisabled = !!value.find(({ name }) => name === field.name);
return (
<ListItem key={field.name} id={field.name} isDisabled={isDisabled}>
<ListItem key={field.name} id={field.name}>
{field.filterLabel}
</ListItem>
);
@@ -128,18 +126,18 @@ export function FieldFilters({ websiteId, value, exclude = [], onChange }: Field
</List>
</Column>
<Column overflow="auto" gapY="4" style={{ contain: 'layout' }}>
{value.map(filter => {
{value.map((filter, index) => {
return (
<FilterRecord
key={filter.name}
key={`${filter.name}-${index}`}
websiteId={websiteId}
type={filter.name}
startDate={startDate}
endDate={endDate}
{...filter}
onSelect={handleSelect}
onRemove={handleRemove}
onChange={handleChange}
onSelect={(_name, operator) => handleSelect(index, operator)}
onRemove={() => handleRemove(index)}
onChange={(_name, val) => handleChange(index, val)}
/>
);
})}
+2 -2
View File
@@ -78,12 +78,12 @@ export function FilterBar({ websiteId }: { websiteId: string }) {
/>
)}
{filters.map(filter => {
const { name, label, operator, value } = filter;
const { name, type, label, operator, value } = filter;
const paramValue = isSearchOperator(operator)
? value
: String(value)
.split(',')
.map(v => formatValue(v, name))
.map(v => formatValue(v, type || name))
.join(', ');
return (