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 WebsiteSelect behavior. Fixed date select.

Mike Cao8d5e8b072d47
diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts
index 4de13ae8f..0a82d5a3e 100644
--- a/src/components/hooks/useDateRange.ts
+++ b/src/components/hooks/useDateRange.ts
@@ -10,7 +10,6 @@ import { useNavigation } from './useNavigation';
export interface UseDateRangeOptions {
ignoreOffset?: boolean;
- useQueryParameter?: boolean;
}
export function useDateRange(websiteId?: string, options: UseDateRangeOptions = {}) {
@@ -21,11 +20,7 @@ export function useDateRange(websiteId?: string, options: UseDateRangeOptions =
} = useNavigation();
const websiteConfig = useWebsites(state => state[websiteId]?.dateRange);
const globalConfig = useApp(state => state.dateRangeValue);
- const dateValue =
- (options.useQueryParameter ? date : false) ||
- websiteConfig?.value ||
- globalConfig ||
- DEFAULT_DATE_RANGE_VALUE;
+ const dateValue = websiteConfig?.value || date || globalConfig || DEFAULT_DATE_RANGE_VALUE;
const dateRange = useMemo(() => {
const dateRangeObject = parseDateRange(dateValue, locale);
diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsx
index 917c7d218..0df4c1af8 100644
--- a/src/components/input/WebsiteSelect.tsx
+++ b/src/components/input/WebsiteSelect.tsx
@@ -1,6 +1,12 @@
import { useState } from 'react';
import { Select, SelectProps, ListItem, Text } from '@umami/react-zen';
-import { useUserWebsitesQuery, useWebsiteQuery, useNavigation } from '@/components/hooks';
+import {
+ useUserWebsitesQuery,
+ useWebsiteQuery,
+ useNavigation,
+ useMessages,
+} from '@/components/hooks';
+import { Empty } from '@/components/common/Empty';
export function WebsiteSelect({
websiteId,
@@ -10,6 +16,7 @@ export function WebsiteSelect({
websiteId?: string;
teamId?: string;
} & SelectProps) {
+ const { formatMessage, messages } = useMessages();
const { router, renderUrl } = useNavigation();
const [search, setSearch] = useState('');
const { data: website } = useWebsiteQuery(websiteId);
@@ -23,6 +30,10 @@ export function WebsiteSelect({
setSearch(value);
};
+ const handleOpenChange = () => {
+ setSearch('');
+ };
+
return (
<Select
{...props}
@@ -35,6 +46,10 @@ export function WebsiteSelect({
searchValue={search}
onSearch={handleSearch}
onChange={handleSelect}
+ onOpenChange={handleOpenChange}
+ listProps={{
+ renderEmptyState: () => <Empty message={formatMessage(messages.noResultsFound)} />,
+ }}
renderValue={() => (
<Text truncate weight="bold" style={{ maxWidth: 160, lineHeight: 1 }}>
{website?.name}
diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts
index 8f239e5f2..4ab4225e1 100644
--- a/src/lib/prisma.ts
+++ b/src/lib/prisma.ts
@@ -3,7 +3,7 @@ import { PrismaClient } from '@/generated/prisma/client';
import { PrismaPg } from '@prisma/adapter-pg';
import { readReplicas } from '@prisma/extension-read-replicas';
import { SESSION_COLUMNS, OPERATORS, DEFAULT_PAGE_SIZE, FILTER_COLUMNS } from './constants';
-import { QueryOptions, QueryFilters } from './types';
+import { QueryOptions, QueryFilters, Operator } from './types';
import { filtersObjectToArray } from './params';
const log = debug('umami:prisma');
@@ -143,7 +143,7 @@ function getQueryParams(filters: Record<string, any>) {
return {
...filters,
...filtersObjectToArray(filters).reduce((obj, { name, operator, value }) => {
- obj[name] = [OPERATORS.contains, OPERATORS.doesNotContain].includes(operator)
+ obj[name] = ([OPERATORS.contains, OPERATORS.doesNotContain] as Operator[]).includes(operator)
? `%${value}%`
: value;
diff --git a/src/lib/types.ts b/src/lib/types.ts
index cb0004066..c70490598 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -1,5 +1,5 @@
import { UseQueryOptions } from '@tanstack/react-query';
-import { DATA_TYPE, PERMISSIONS, ROLES } from './constants';
+import { DATA_TYPE, PERMISSIONS, ROLES, OPERATORS } from './constants';
import { TIME_UNIT } from './date';
export type ObjectValues<T> = T[keyof T];
@@ -10,6 +10,7 @@ export type TimeUnit = ObjectValues<typeof TIME_UNIT>;
export type Permission = ObjectValues<typeof PERMISSIONS>;
export type Role = ObjectValues<typeof ROLES>;
export type DynamicDataType = ObjectValues<typeof DATA_TYPE>;
+export type Operator = (typeof OPERATORS)[keyof typeof OPERATORS];
export interface Auth {
user?: {
@@ -26,10 +27,10 @@ export interface Auth {
export interface Filter {
name: string;
- operator: string;
+ operator: Operator;
value: string;
type?: string;
- columns?: string;
+ column?: string;
prefix?: string;
}