From 67626652f96f02af474662098a40988f4370b15b Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Fri, 20 Feb 2026 12:32:02 -0800 Subject: [PATCH] fix mobile view for admin screens and nav. update equals and not equals filter to be multiselect. --- src/app/(main)/admin/AdminNav.tsx | 38 +++++++--- .../(main)/admin/teams/AdminTeamsTable.tsx | 3 +- src/app/(main)/admin/users/UsersTable.tsx | 3 +- .../admin/websites/AdminWebsitesTable.tsx | 4 +- src/app/login/LoginForm.tsx | 2 +- src/components/common/FilterRecord.tsx | 55 +++++++++----- src/components/common/MultiSelect.tsx | 71 +++++++++++++++++++ src/components/input/FilterBar.tsx | 7 +- src/lib/clickhouse.ts | 16 +++-- src/lib/params.ts | 17 ++++- src/lib/prisma.ts | 18 +++-- src/lib/types.ts | 2 +- 12 files changed, 188 insertions(+), 48 deletions(-) create mode 100644 src/components/common/MultiSelect.tsx diff --git a/src/app/(main)/admin/AdminNav.tsx b/src/app/(main)/admin/AdminNav.tsx index aa1cbe884..edcfb4c62 100644 --- a/src/app/(main)/admin/AdminNav.tsx +++ b/src/app/(main)/admin/AdminNav.tsx @@ -1,10 +1,13 @@ +import { Column, Focusable, Row, Tooltip, TooltipTrigger } from '@umami/react-zen'; +import Link from 'next/link'; +import { IconLabel } from '@/components/common/IconLabel'; import { NavMenu } from '@/components/common/NavMenu'; import { useMessages, useNavigation } from '@/components/hooks'; -import { Globe, User, Users } from '@/components/icons'; +import { ArrowLeft, Globe, User, Users } from '@/components/icons'; export function AdminNav({ onItemClick }: { onItemClick?: () => void }) { const { t, labels } = useMessages(); - const { pathname } = useNavigation(); + const { pathname, renderUrl } = useNavigation(); const items = [ { @@ -37,12 +40,29 @@ export function AdminNav({ onItemClick }: { onItemClick?: () => void }) { ?.find(({ path }) => path && pathname.startsWith(path))?.id; return ( - + + + + + + } label={t(labels.back)} padding /> + + + {t(labels.back)} + + + + ); } diff --git a/src/app/(main)/admin/teams/AdminTeamsTable.tsx b/src/app/(main)/admin/teams/AdminTeamsTable.tsx index 2d5243b99..f948aba96 100644 --- a/src/app/(main)/admin/teams/AdminTeamsTable.tsx +++ b/src/app/(main)/admin/teams/AdminTeamsTable.tsx @@ -10,6 +10,7 @@ import { TeamDeleteForm } from '../../teams/[teamId]/TeamDeleteForm'; export function AdminTeamsTable({ data = [], showActions = true, + ...props }: { data: any[]; showActions?: boolean; @@ -19,7 +20,7 @@ export function AdminTeamsTable({ return ( <> - + {(row: any) => {row.name}} diff --git a/src/app/(main)/admin/users/UsersTable.tsx b/src/app/(main)/admin/users/UsersTable.tsx index 16a5b9084..f337cc85f 100644 --- a/src/app/(main)/admin/users/UsersTable.tsx +++ b/src/app/(main)/admin/users/UsersTable.tsx @@ -11,6 +11,7 @@ import { UserDeleteForm } from './UserDeleteForm'; export function UsersTable({ data = [], showActions = true, + ...props }: { data: any[]; showActions?: boolean; @@ -20,7 +21,7 @@ export function UsersTable({ return ( <> - + {(row: any) => {row.username}} diff --git a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx b/src/app/(main)/admin/websites/AdminWebsitesTable.tsx index def6dd9ff..062fe2774 100644 --- a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx +++ b/src/app/(main)/admin/websites/AdminWebsitesTable.tsx @@ -7,13 +7,13 @@ import { useMessages } from '@/components/hooks'; import { Edit, Trash, Users } from '@/components/icons'; import { MenuButton } from '@/components/input/MenuButton'; -export function AdminWebsitesTable({ data = [] }: { data: any[] }) { +export function AdminWebsitesTable({ data = [], ...props }: { data: any[] }) { const { t, labels } = useMessages(); const [deleteWebsite, setDeleteWebsite] = useState(null); return ( <> - + {(row: any) => ( diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsx index 936a30e77..23101b947 100644 --- a/src/app/login/LoginForm.tsx +++ b/src/app/login/LoginForm.tsx @@ -36,7 +36,7 @@ export function LoginForm() { umami -
+ void; onRemove?: (name: string) => void; onChange?: (name: string, value: string) => void; @@ -31,7 +42,8 @@ export function FilterRecord({ onChange, }: FilterRecordProps) { const { fields, operators } = useFilters(); - const [selected, setSelected] = useState(value); + const initValues = Array.isArray(value) ? value : value ? value.split(',') : []; + const [selected, setSelected] = useState(initValues); const [search, setSearch] = useState(''); const { formatValue } = useFormat(); const { data, isLoading } = useWebsiteValuesQuery({ @@ -53,10 +65,15 @@ export function FilterRecord({ }; const handleSelectValue = (value: string) => { - setSelected(value); + setSelected([value]); onChange?.(name, value); }; + const handleMultiSelectValue = (values: string[]) => { + setSelected(values); + onChange?.(name, values.join(',')); + }; + return ( @@ -72,26 +89,30 @@ export function FilterRecord({ ))} {isSearch && ( - + )} {!isSearch && ( - + {items.map(({ value }) => ( + + {formatValue(value, type)} + + ))} + )} diff --git a/src/components/common/MultiSelect.tsx b/src/components/common/MultiSelect.tsx new file mode 100644 index 000000000..21782d7ae --- /dev/null +++ b/src/components/common/MultiSelect.tsx @@ -0,0 +1,71 @@ +import { Button, Column, Icon, List, MenuTrigger, Popover, SearchField } from '@umami/react-zen'; +import type { ReactNode } from 'react'; +import { ChevronRight } from '@/components/icons'; + +interface MultiSelectProps { + value?: string[]; + onChange?: (values: string[]) => void; + searchValue?: string; + onSearch?: (value: string) => void; + placeholder?: string; + allowSearch?: boolean; + renderEmptyState?: () => ReactNode; + renderValue?: (values: string[]) => ReactNode; + children: ReactNode; +} + +export function MultiSelect({ + value = [], + onChange, + searchValue, + onSearch, + placeholder = 'Select an item', + allowSearch, + renderEmptyState, + renderValue, + children, +}: MultiSelectProps) { + const displayValue = renderValue + ? renderValue(value) + : value.length > 0 + ? value.join(', ') + : null; + + return ( + + + + + {allowSearch && } + + {children} + + + + + ); +} diff --git a/src/components/input/FilterBar.tsx b/src/components/input/FilterBar.tsx index d53c45676..0dca00b26 100644 --- a/src/components/input/FilterBar.tsx +++ b/src/components/input/FilterBar.tsx @@ -79,7 +79,12 @@ export function FilterBar({ websiteId }: { websiteId: string }) { )} {filters.map(filter => { const { name, label, operator, value } = filter; - const paramValue = isSearchOperator(operator) ? value : formatValue(value, name); + const paramValue = isSearchOperator(operator) + ? value + : String(value) + .split(',') + .map(v => formatValue(v, name)) + .join(', '); return ( 0`; case OPERATORS.doesNotContain: @@ -173,10 +173,14 @@ function getDateQuery(filters: Record) { function getQueryParams(filters: Record) { return { ...filters, - ...filtersObjectToArray(filters).reduce((obj, { name, value }) => { - if (name && value !== undefined) { - obj[name] = value; - } + ...filtersObjectToArray(filters).reduce((obj, { name, column, operator, value }) => { + if (!column || !name || value === undefined) return obj; + + obj[name] = ([OPERATORS.equals, OPERATORS.notEquals] as string[]).includes(operator) + ? Array.isArray(value) + ? value + : [value] + : value; return obj; }, {}), diff --git a/src/lib/params.ts b/src/lib/params.ts index ab2d58663..d7599216a 100644 --- a/src/lib/params.ts +++ b/src/lib/params.ts @@ -9,10 +9,21 @@ export function parseFilterValue(param: any) { const [, operator, value] = param.match(regex) || []; - return { operator: operator || OPERATORS.equals, value: value || param }; + const resolvedOperator = operator || OPERATORS.equals; + const resolvedValue = value ?? param; + + if (resolvedOperator === OPERATORS.equals || resolvedOperator === OPERATORS.notEquals) { + return { operator: resolvedOperator, value: resolvedValue.split(',') }; + } + + return { operator: resolvedOperator, value: resolvedValue }; } - return { operator: OPERATORS.equals, value: param }; + if (Array.isArray(param)) { + return { operator: OPERATORS.equals, value: param }; + } + + return { operator: OPERATORS.equals, value: [param] }; } export function isEqualsOperator(operator: any) { @@ -55,7 +66,7 @@ export function filtersArrayToObject(filters: Filter[]) { return filters.reduce((obj, filter: Filter) => { const { name, operator, value } = filter; - obj[name] = `${operator}.${value}`; + obj[name] = `${operator}.${Array.isArray(value) ? value.join(',') : value}`; return obj; }, {}); diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts index 41e42fbcc..1c9e9c703 100644 --- a/src/lib/prisma.ts +++ b/src/lib/prisma.ts @@ -82,9 +82,9 @@ function mapFilter(column: string, operator: string, name: string, type: string switch (operator) { case OPERATORS.equals: - return `${table}.${column} = ${value}`; + return `${table}.${column} = ANY(${value})`; case OPERATORS.notEquals: - return `${table}.${column} != ${value}`; + return `${table}.${column} != ALL(${value})`; case OPERATORS.contains: return `${table}.${column} ilike ${value}`; case OPERATORS.doesNotContain: @@ -177,10 +177,16 @@ function getDateQuery(filters: Record) { function getQueryParams(filters: Record) { return { ...filters, - ...filtersObjectToArray(filters).reduce((obj, { name, operator, value }) => { - obj[name] = ([OPERATORS.contains, OPERATORS.doesNotContain] as Operator[]).includes(operator) - ? `%${value}%` - : value; + ...filtersObjectToArray(filters).reduce((obj, { name, column, operator, value }) => { + if (!column) return obj; + + if (([OPERATORS.contains, OPERATORS.doesNotContain] as Operator[]).includes(operator)) { + obj[name] = `%${value}%`; + } else if (([OPERATORS.equals, OPERATORS.notEquals] as Operator[]).includes(operator)) { + obj[name] = Array.isArray(value) ? value : [value]; + } else { + obj[name] = value; + } return obj; }, {}), diff --git a/src/lib/types.ts b/src/lib/types.ts index fd8f1e42b..c089e2303 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -27,7 +27,7 @@ export interface Auth { export interface Filter { name: string; operator: Operator; - value: string; + value: string | string[]; type?: string; column?: string; prefix?: string;