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.

fix mobile view for admin screens and nav. update equals and not equals filter to be multiselect.

Francis Cao67626652f96f
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 (
- <NavMenu
- items={items}
- title={t(labels.admin)}
- selectedKey={selectedKey}
- allowMinimize={false}
- onItemClick={onItemClick}
- />
+ <Column gap="2">
+ <Link href={renderUrl('/boards', false)} role="button" onClick={onItemClick}>
+ <TooltipTrigger delay={0}>
+ <Focusable>
+ <Row
+ alignItems="center"
+ hover={{ backgroundColor: 'surface-sunken' }}
+ borderRadius
+ minHeight="40px"
+ >
+ <IconLabel icon={<ArrowLeft />} label={t(labels.back)} padding />
+ </Row>
+ </Focusable>
+ <Tooltip placement="right">{t(labels.back)}</Tooltip>
+ </TooltipTrigger>
+ </Link>
+ <NavMenu
+ items={items}
+ title={t(labels.admin)}
+ selectedKey={selectedKey}
+ allowMinimize={false}
+ onItemClick={onItemClick}
+ />
+ </Column>
);
}
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 (
<>
- <DataTable data={data}>
+ <DataTable data={data} {...props}>
<DataColumn id="name" label={t(labels.name)} width="1fr">
{(row: any) => <Link href={`/admin/teams/${row.id}`}>{row.name}</Link>}
</DataColumn>
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 (
<>
- <DataTable data={data}>
+ <DataTable data={data} {...props}>
<DataColumn id="username" label={t(labels.username)} width="2fr">
{(row: any) => <Link href={`/admin/users/${row.id}`}>{row.username}</Link>}
</DataColumn>
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 (
<>
- <DataTable data={data}>
+ <DataTable data={data} {...props}>
<DataColumn id="name" label={t(labels.name)}>
{(row: any) => (
<Text truncate>
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() {
<Logo />
</Icon>
<Heading>umami</Heading>
- <Form onSubmit={handleSubmit} error={getErrorMessage(error)}>
+ <Form onSubmit={handleSubmit} error={getErrorMessage(error)} style={{ minWidth: 300 }}>
<FormField
label={t(labels.username)}
data-test="input-username"
diff --git a/src/components/common/FilterRecord.tsx b/src/components/common/FilterRecord.tsx
index 26299eb83..e255cd7e9 100644
--- a/src/components/common/FilterRecord.tsx
+++ b/src/components/common/FilterRecord.tsx
@@ -1,6 +1,17 @@
-import { Button, Column, Grid, Icon, Label, ListItem, Select, TextField } from '@umami/react-zen';
+import {
+ Button,
+ Column,
+ Grid,
+ Icon,
+ Label,
+ ListItem,
+ Loading,
+ Select,
+ TextField,
+} from '@umami/react-zen';
import { useState } from 'react';
import { Empty } from '@/components/common/Empty';
+import { MultiSelect } from '@/components/common/MultiSelect';
import { useFilters, useFormat, useWebsiteValuesQuery } from '@/components/hooks';
import { X } from '@/components/icons';
import { isSearchOperator } from '@/lib/params';
@@ -12,7 +23,7 @@ export interface FilterRecordProps {
endDate: Date;
name: string;
operator: string;
- value: string;
+ value: string | string[];
onSelect?: (name: string, value: any) => 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<string[]>(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 (
<Column>
<Label>{fields.find(f => f.name === name)?.label}</Label>
@@ -72,26 +89,30 @@ export function FilterRecord({
))}
</Select>
{isSearch && (
- <TextField value={selected} defaultValue={selected} onChange={handleSelectValue} />
+ <TextField
+ value={selected[0] || ''}
+ defaultValue={selected[0] || ''}
+ onChange={handleSelectValue}
+ />
)}
{!isSearch && (
- <Select
+ <MultiSelect
value={selected}
- onChange={handleSelectValue}
+ onChange={handleMultiSelectValue}
searchValue={search}
onSearch={handleSearch}
- isLoading={isLoading}
- listProps={{ renderEmptyState: () => <Empty /> }}
+ renderValue={values =>
+ values.length > 0 ? values.map(v => formatValue(v, type)).join(', ') : undefined
+ }
+ renderEmptyState={() => (isLoading ? <Loading icon="dots" /> : <Empty />)}
allowSearch
>
- {items?.map(({ value }) => {
- return (
- <ListItem key={value} id={value}>
- {formatValue(value, type)}
- </ListItem>
- );
- })}
- </Select>
+ {items.map(({ value }) => (
+ <ListItem key={value} id={value}>
+ {formatValue(value, type)}
+ </ListItem>
+ ))}
+ </MultiSelect>
)}
</Grid>
<Column justifyContent="flex-start">
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 (
+ <MenuTrigger>
+ <Button
+ variant="outline"
+ className="w-full justify-between"
+ style={{ maxWidth: '100%', overflow: 'hidden' }}
+ >
+ <span style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
+ {displayValue ?? placeholder}
+ </span>
+ <Icon rotate={90} size="sm" aria-hidden="true">
+ <ChevronRight />
+ </Icon>
+ </Button>
+ <Popover style={{ minWidth: 'var(--trigger-width)', maxWidth: 'var(--trigger-width)' }}>
+ <Column
+ gap="2"
+ padding="2"
+ border
+ borderRadius="md"
+ shadow="lg"
+ className="bg-surface-overlay"
+ >
+ {allowSearch && <SearchField value={searchValue} onSearch={onSearch} autoFocus />}
+ <List
+ selectionMode="multiple"
+ value={value}
+ onChange={onChange}
+ showCheckmark
+ renderEmptyState={renderEmptyState}
+ >
+ {children}
+ </List>
+ </Column>
+ </Popover>
+ </MenuTrigger>
+ );
+}
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 (
<FilterItem
diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
index 77357f8ba..29118a6ba 100644
--- a/src/lib/clickhouse.ts
+++ b/src/lib/clickhouse.ts
@@ -75,9 +75,9 @@ function mapFilter(column: string, operator: string, name: string, type: string
switch (operator) {
case OPERATORS.equals:
- return `${column} = ${value}`;
+ return `${column} IN {${name}:Array(${type})}`;
case OPERATORS.notEquals:
- return `${column} != ${value}`;
+ return `${column} NOT IN {${name}:Array(${type})}`;
case OPERATORS.contains:
return `positionCaseInsensitive(${column}, ${value}) > 0`;
case OPERATORS.doesNotContain:
@@ -173,10 +173,14 @@ function getDateQuery(filters: Record<string, any>) {
function getQueryParams(filters: Record<string, any>) {
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 };
+ }
+
+ if (Array.isArray(param)) {
+ return { operator: OPERATORS.equals, value: 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<string, any>) {
function getQueryParams(filters: Record<string, any>) {
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;