Merge branch 'dev' into 3802-team-to-user-switch

src/components/input/ActionSelect.tsx

@@ -1,4 +1,4 @@
-import { Select, ListItem } from '@umami/react-zen';
+import { ListItem, Select } from '@umami/react-zen';
 import { useMessages } from '@/components/hooks';
 
 export interface ActionSelectProps {

src/components/input/CurrencySelect.tsx

@@ -1,7 +1,7 @@
-import { CURRENCIES } from '@/lib/constants';
 import { ListItem, Select } from '@umami/react-zen';
 import { useState } from 'react';
 import { useMessages } from '@/components/hooks';
+import { CURRENCIES } from '@/lib/constants';
 
 export function CurrencySelect({ value, onChange }) {
   const { formatMessage, labels } = useMessages();

src/components/input/DateFilter.tsx

@@ -1,9 +1,9 @@
-import { useState, Key, Fragment } from 'react';
-import { Modal, Select, ListItem, ListSeparator, Dialog, SelectProps } from '@umami/react-zen';
+import { Dialog, ListItem, ListSeparator, Modal, Select, type SelectProps } from '@umami/react-zen';
 import { endOfYear } from 'date-fns';
-import { DatePickerForm } from '@/components/metrics/DatePickerForm';
-import { useMessages, useMobile } from '@/components/hooks';
+import { Fragment, type Key, useState } from 'react';
 import { DateDisplay } from '@/components/common/DateDisplay';
+import { useMessages, useMobile } from '@/components/hooks';
+import { DatePickerForm } from '@/components/metrics/DatePickerForm';
 import { parseDateRange } from '@/lib/date';
 
 export interface DateFilterProps extends SelectProps {

src/components/input/DialogButton.tsx

@@ -1,13 +1,13 @@
-import { CSSProperties, ReactNode } from 'react';
 import {
   Button,
-  ButtonProps,
-  Modal,
+  type ButtonProps,
   Dialog,
+  type DialogProps,
   DialogTrigger,
-  DialogProps,
   IconLabel,
+  Modal,
 } from '@umami/react-zen';
+import type { CSSProperties, ReactNode } from 'react';
 import { useMobile } from '@/components/hooks';
 
 export interface DialogButtonProps extends Omit<ButtonProps, 'children'> {

src/components/input/DownloadButton.tsx

@@ -1,7 +1,7 @@
+import { Button, Icon, Tooltip, TooltipTrigger } from '@umami/react-zen';
 import Papa from 'papaparse';
-import { Button, Icon, TooltipTrigger, Tooltip } from '@umami/react-zen';
-import { Download } from '@/components/icons';
 import { useMessages } from '@/components/hooks';
+import { Download } from '@/components/icons';
 
 export function DownloadButton({
   filename = 'data',

src/components/input/ExportButton.tsx

@@ -1,10 +1,10 @@
-import { useState } from 'react';
-import { Icon, Tooltip, TooltipTrigger, LoadingButton } from '@umami/react-zen';
-import { Download } from '@/components/icons';
-import { useMessages, useApi } from '@/components/hooks';
+import { Icon, LoadingButton, Tooltip, TooltipTrigger } from '@umami/react-zen';
 import { useSearchParams } from 'next/navigation';
+import { useState } from 'react';
+import { useApi, useMessages } from '@/components/hooks';
 import { useDateParameters } from '@/components/hooks/useDateParameters';
 import { useFilterParameters } from '@/components/hooks/useFilterParameters';
+import { Download } from '@/components/icons';
 
 export function ExportButton({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();

src/components/input/FieldFilters.tsx

@@ -1,22 +1,22 @@
-import { Key } from 'react';
-import { subMonths, endOfDay } from 'date-fns';
 import {
-  Grid,
+  Button,
   Column,
+  Grid,
+  Icon,
   List,
   ListItem,
-  Row,
-  Button,
-  Popover,
-  MenuTrigger,
   Menu,
   MenuItem,
-  Icon,
+  MenuTrigger,
+  Popover,
+  Row,
 } from '@umami/react-zen';
+import { endOfDay, subMonths } from 'date-fns';
+import type { Key } from 'react';
+import { Empty } from '@/components/common/Empty';
+import { FilterRecord } from '@/components/common/FilterRecord';
 import { useFields, useMessages, useMobile } from '@/components/hooks';
 import { Plus } from '@/components/icons';
-import { FilterRecord } from '@/components/common/FilterRecord';
-import { Empty } from '@/components/common/Empty';
 
 export interface FieldFiltersProps {
   websiteId: string;

src/components/input/FilterBar.tsx

@@ -1,24 +1,24 @@
 import {
   Button,
-  Icon,
-  Text,
-  Row,
-  TooltipTrigger,
-  Tooltip,
-  Modal,
   Dialog,
   DialogTrigger,
+  Icon,
+  Modal,
+  Row,
+  Text,
+  Tooltip,
+  TooltipTrigger,
 } from '@umami/react-zen';
+import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';
 import {
-  useNavigation,
-  useMessages,
-  useFormat,
   useFilters,
+  useFormat,
+  useMessages,
+  useNavigation,
   useWebsiteSegmentQuery,
 } from '@/components/hooks';
-import { X, Bookmark } from '@/components/icons';
+import { Bookmark, X } from '@/components/icons';
 import { isSearchOperator } from '@/lib/params';
-import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';
 
 export function FilterBar({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();

src/components/input/FilterButtons.tsx

@@ -1,5 +1,5 @@
+import { Box, ToggleGroup, ToggleGroupItem } from '@umami/react-zen';
 import { useState } from 'react';
-import { ToggleGroup, ToggleGroupItem, Box } from '@umami/react-zen';
 
 export interface FilterButtonsProps {
   items: { id: string; label: string }[];

src/components/input/FilterEditForm.tsx

@@ -1,8 +1,8 @@
+import { Button, Column, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';
+import { useState } from 'react';
 import { useFilters, useMessages, useMobile, useNavigation } from '@/components/hooks';
 import { FieldFilters } from '@/components/input/FieldFilters';
 import { SegmentFilters } from '@/components/input/SegmentFilters';
-import { Button, Column, Row, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';
-import { useState } from 'react';
 
 export interface FilterEditFormProps {
   websiteId?: string;

src/components/input/LanguageButton.tsx

@@ -1,7 +1,7 @@
-import { Icon, Button, MenuTrigger, Popover, Grid, Text, Dialog } from '@umami/react-zen';
-import { languages } from '@/lib/lang';
-import { useLocale } from '@/components/hooks';
+import { Button, Dialog, Grid, Icon, MenuTrigger, Popover, Text } from '@umami/react-zen';
 import { Globe } from 'lucide-react';
+import { useLocale } from '@/components/hooks';
+import { languages } from '@/lib/lang';
 
 export function LanguageButton() {
   const { locale, saveLocale } = useLocale();

src/components/input/LookupField.tsx

@@ -1,6 +1,6 @@
-import { SetStateAction, useMemo, useState } from 'react';
+import { ComboBox, type ComboBoxProps, ListItem, Loading, useDebounce } from '@umami/react-zen';
 import { endOfDay, subMonths } from 'date-fns';
-import { ComboBox, ListItem, Loading, useDebounce, ComboBoxProps } from '@umami/react-zen';
+import { type SetStateAction, useMemo, useState } from 'react';
 import { Empty } from '@/components/common/Empty';
 import { useMessages, useWebsiteValuesQuery } from '@/components/hooks';
 

src/components/input/MenuButton.tsx

@@ -1,5 +1,5 @@
-import { ReactNode, Key } from 'react';
-import { DialogTrigger, Button, Menu, Popover, Icon } from '@umami/react-zen';
+import { Button, DialogTrigger, Icon, Menu, Popover } from '@umami/react-zen';
+import type { Key, ReactNode } from 'react';
 import { Ellipsis } from '@/components/icons';
 
 export function MenuButton({

src/components/input/MobileMenuButton.tsx

@@ -1,4 +1,4 @@
-import { Dialog, DialogTrigger, Button, Icon, Modal, DialogProps } from '@umami/react-zen';
+import { Button, Dialog, type DialogProps, DialogTrigger, Icon, Modal } from '@umami/react-zen';
 import { Menu } from '@/components/icons';
 
 export function MobileMenuButton(props: DialogProps) {

src/components/input/MonthSelect.tsx

@@ -1,4 +1,4 @@
-import { Row, Select, ListItem } from '@umami/react-zen';
+import { ListItem, Row, Select } from '@umami/react-zen';
 import { useLocale } from '@/components/hooks';
 import { formatDate } from '@/lib/date';
 

src/components/input/NavButton.tsx

@@ -1,18 +1,19 @@
 import {
-  Text,
+  Column,
   Icon,
+  IconLabel,
   Menu,
   MenuItem,
-  MenuTrigger,
   MenuSection,
   MenuSeparator,
-  SubmenuTrigger,
+  MenuTrigger,
   Popover,
-  Row,
-  Column,
   Pressable,
-  IconLabel,
+  Row,
+  SubmenuTrigger,
+  Text,
 } from '@umami/react-zen';
+import { ArrowRight } from 'lucide-react';
 import {
   useConfig,
   useLoginQuery,
@@ -33,7 +34,6 @@ import {
 } from '@/components/icons';
 import { Switch } from '@/components/svg';
 import { DOCS_URL } from '@/lib/constants';
-import { ArrowRight } from 'lucide-react';
 
 export interface TeamsButtonProps {
   showText?: boolean;

src/components/input/PanelButton.tsx

@@ -1,6 +1,6 @@
-import { Button, Icon, ButtonProps } from '@umami/react-zen';
-import { PanelLeft } from '@/components/icons';
+import { Button, type ButtonProps, Icon } from '@umami/react-zen';
 import { useGlobalState } from '@/components/hooks';
+import { PanelLeft } from '@/components/icons';
 
 export function PanelButton(props: ButtonProps) {
   const [isCollapsed, setIsCollapsed] = useGlobalState('sidenav-collapsed');

src/components/input/PreferencesButton.tsx

@@ -1,9 +1,9 @@
-import { Button, Icon, DialogTrigger, Popover, Column, Label } from '@umami/react-zen';
-import { TimezoneSetting } from '@/app/(main)/settings/preferences/TimezoneSetting';
+import { Button, Column, DialogTrigger, Icon, Label, Popover } from '@umami/react-zen';
 import { DateRangeSetting } from '@/app/(main)/settings/preferences/DateRangeSetting';
-import { Settings } from '@/components/icons';
-import { useMessages } from '@/components/hooks';
+import { TimezoneSetting } from '@/app/(main)/settings/preferences/TimezoneSetting';
 import { Panel } from '@/components/common/Panel';
+import { useMessages } from '@/components/hooks';
+import { Settings } from '@/components/icons';
 
 export function PreferencesButton() {
   const { formatMessage, labels } = useMessages();

src/components/input/ProfileButton.tsx

@@ -1,18 +1,18 @@
-import { Fragment } from 'react';
 import {
-  Icon,
   Button,
-  MenuTrigger,
-  Popover,
+  Icon,
   Menu,
   MenuItem,
-  MenuSeparator,
   MenuSection,
-  Text,
+  MenuSeparator,
+  MenuTrigger,
+  Popover,
   Row,
+  Text,
 } from '@umami/react-zen';
-import { useMessages, useLoginQuery, useNavigation } from '@/components/hooks';
-import { LogOut, UserCircle, LockKeyhole } from '@/components/icons';
+import { Fragment } from 'react';
+import { useLoginQuery, useMessages, useNavigation } from '@/components/hooks';
+import { LockKeyhole, LogOut, UserCircle } from '@/components/icons';
 
 export function ProfileButton() {
   const { formatMessage, labels } = useMessages();

src/components/input/RefreshButton.tsx

@@ -1,8 +1,7 @@
-import { LoadingButton, Icon, Tooltip, TooltipTrigger } from '@umami/react-zen';
-import { setWebsiteDateRange } from '@/store/websites';
-import { useDateRange } from '@/components/hooks';
+import { Icon, LoadingButton, Tooltip, TooltipTrigger } from '@umami/react-zen';
+import { useDateRange, useMessages } from '@/components/hooks';
 import { RefreshCw } from '@/components/icons';
-import { useMessages } from '@/components/hooks';
+import { setWebsiteDateRange } from '@/store/websites';
 
 export function RefreshButton({
   websiteId,

src/components/input/ReportEditButton.tsx

@@ -1,6 +1,3 @@
-import { ReactNode, useState } from 'react';
-import { useMessages } from '@/components/hooks';
-import { useDeleteQuery } from '@/components/hooks/queries/useDeleteQuery';
 import {
   AlertDialog,
   Button,
@@ -10,9 +7,12 @@ import {
   MenuTrigger,
   Modal,
   Popover,
-  Text,
   Row,
+  Text,
 } from '@umami/react-zen';
+import { type ReactNode, useState } from 'react';
+import { useMessages } from '@/components/hooks';
+import { useDeleteQuery } from '@/components/hooks/queries/useDeleteQuery';
 import { Edit, MoreHorizontal, Trash } from '@/components/icons';
 
 export function ReportEditButton({

src/components/input/SegmentFilters.tsx

@@ -1,7 +1,7 @@
 import { IconLabel, List, ListItem } from '@umami/react-zen';
-import { useWebsiteSegmentsQuery } from '@/components/hooks';
-import { LoadingPanel } from '@/components/common/LoadingPanel';
 import { Empty } from '@/components/common/Empty';
+import { LoadingPanel } from '@/components/common/LoadingPanel';
+import { useWebsiteSegmentsQuery } from '@/components/hooks';
 import { ChartPie, UserPlus } from '@/components/icons';
 
 export interface SegmentFiltersProps {

src/components/input/SegmentSaveButton.tsx

@@ -1,7 +1,7 @@
-import { Button, DialogTrigger, Modal, Text, Icon, Dialog } from '@umami/react-zen';
+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';
+import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';
 import { useMessages } from '@/components/hooks';
 import { Plus } from '@/components/icons';
-import { SegmentEditForm } from '@/app/(main)/websites/[websiteId]/segments/SegmentEditForm';
 
 export function SegmentSaveButton({ websiteId }: { websiteId: string }) {
   const { formatMessage, labels } = useMessages();

src/components/input/SettingsButton.tsx

@@ -1,23 +1,23 @@
-import { Key } from 'react';
 import {
-  Icon,
   Button,
-  MenuTrigger,
-  Popover,
+  Icon,
   Menu,
   MenuItem,
-  MenuSeparator,
   MenuSection,
+  MenuSeparator,
+  MenuTrigger,
+  Popover,
 } from '@umami/react-zen';
-import { useMessages, useLoginQuery, useNavigation, useConfig } from '@/components/hooks';
+import type { Key } from 'react';
+import { useConfig, useLoginQuery, useMessages, useNavigation } from '@/components/hooks';
 import {
-  LogOut,
-  LockKeyhole,
-  Settings,
-  UserCircle,
-  LifeBuoy,
   BookText,
   ExternalLink,
+  LifeBuoy,
+  LockKeyhole,
+  LogOut,
+  Settings,
+  UserCircle,
 } from '@/components/icons';
 import { DOCS_URL } from '@/lib/constants';
 

src/components/input/WebsiteDateFilter.tsx

@@ -1,8 +1,8 @@
-import { useCallback, useMemo } from 'react';
-import { Button, Icon, Row, Text, Select, ListItem } from '@umami/react-zen';
+import { Button, Icon, ListItem, Row, Select, Text } from '@umami/react-zen';
 import { isAfter } from 'date-fns';
-import { ChevronRight } from '@/components/icons';
+import { useCallback, useMemo } from 'react';
 import { useDateRange, useDateRangeQuery, useMessages, useNavigation } from '@/components/hooks';
+import { ChevronRight } from '@/components/icons';
 import { getDateRangeValue } from '@/lib/date';
 import { DateFilter } from './DateFilter';
 

src/components/input/WebsiteFilterButton.tsx

@@ -1,7 +1,7 @@
-import { ListFilter } from '@/components/icons';
-import { FilterEditForm } from '@/components/input/FilterEditForm';
-import { DialogButton } from '@/components/input/DialogButton';
 import { 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';
 
 export function WebsiteFilterButton({

src/components/input/WebsiteSelect.tsx

@@ -1,12 +1,12 @@
+import { ListItem, Row, Select, type SelectProps, Text } from '@umami/react-zen';
 import { useState } from 'react';
-import { Select, SelectProps, ListItem, Text, Row } from '@umami/react-zen';
+import { Empty } from '@/components/common/Empty';
 import {
-  useUserWebsitesQuery,
-  useMessages,
   useLoginQuery,
+  useMessages,
+  useUserWebsitesQuery,
   useWebsiteQuery,
 } from '@/components/hooks';
-import { Empty } from '@/components/common/Empty';
 
 export function WebsiteSelect({
   websiteId,
@@ -28,7 +28,7 @@ export function WebsiteSelect({
     { userId: user?.id, teamId },
     { search, pageSize: 10, includeTeams },
   );
-  const listItems: { id: string; name: string }[] = data?.['data'] || [];
+  const listItems: { id: string; name: string }[] = data?.data || [];
 
   const handleSearch = (value: string) => {
     setSearch(value);