From e1e6493decf8496a2116b3aaf18d61d37122ba6a Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sat, 8 Mar 2025 08:40:41 -0800 Subject: [PATCH] Lint fixes. --- package.json | 5 ++--- pnpm-lock.yaml | 9 +++------ .../reports/[reportId]/FieldParameters.tsx | 1 - .../reports/[reportId]/FilterParameters.tsx | 2 +- src/app/(main)/reports/goals/GoalsAddForm.tsx | 9 --------- .../reports/retention/RetentionParameters.tsx | 4 ---- src/app/(main)/settings/users/UserAddForm.tsx | 13 ++++++++---- src/app/(main)/settings/users/UsersTable.tsx | 3 +-- .../settings/users/[userId]/UserEditForm.tsx | 16 +++++++++++---- .../websites/[websiteId]/ShareUrl.tsx | 1 - .../[websiteId]/WebsiteExpandedView.tsx | 4 +--- .../[websiteId]/WebsiteFilterButton.tsx | 1 - src/components/common/FilterButtons.tsx | 6 ++++-- src/components/input/DateFilter.tsx | 20 ++++--------------- src/components/input/WebsiteDateFilter.tsx | 3 +-- src/components/input/WebsiteSelect.tsx | 11 ++-------- src/components/metrics/DatePickerForm.tsx | 4 +--- 17 files changed, 41 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 274444a8..354f7589 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@react-spring/web": "^9.7.5", "@tanstack/react-query": "^5.66.11", "@umami/prisma-client": "^0.14.0", - "@umami/react-zen": "link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen", + "@umami/react-zen": "link:../../../Library/pnpm/global/5/node_modules/@umami/react-zen", "@umami/redis-client": "^0.26.0", "bcryptjs": "^2.4.3", "chalk": "^4.1.2", @@ -120,7 +120,6 @@ "react-simple-maps": "^2.3.0", "react-use-measure": "^2.1.7", "react-window": "^1.8.11", - "react-zen": "link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen", "request-ip": "^3.3.0", "semver": "^7.7.1", "serialize-error": "^12.0.0", @@ -197,7 +196,7 @@ "sharp" ], "overrides": { - "react-zen": "link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen" + "@umami/react-zen": "link:../../../Library/pnpm/global/5/node_modules/@umami/react-zen" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 72ccf05c..12b92e2c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: - react-zen: link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen + '@umami/react-zen': link:../../../Library/pnpm/global/5/node_modules/@umami/react-zen importers: @@ -48,8 +48,8 @@ importers: specifier: ^0.14.0 version: 0.14.0(@prisma/client@6.4.1(prisma@6.4.1(typescript@5.8.2))(typescript@5.8.2))(@prisma/extension-read-replicas@0.4.0(@prisma/client@6.4.1(prisma@6.4.1(typescript@5.8.2))(typescript@5.8.2))) '@umami/react-zen': - specifier: link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen - version: link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen + specifier: link:../../../Library/pnpm/global/5/node_modules/@umami/react-zen + version: link:../../../Library/pnpm/global/5/node_modules/@umami/react-zen '@umami/redis-client': specifier: ^0.26.0 version: 0.26.0 @@ -176,9 +176,6 @@ importers: react-window: specifier: ^1.8.11 version: 1.8.11(react-dom@19.0.0(react@19.0.0))(react@19.0.0) - react-zen: - specifier: link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen - version: link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen request-ip: specifier: ^3.3.0 version: 3.3.0 diff --git a/src/app/(main)/reports/[reportId]/FieldParameters.tsx b/src/app/(main)/reports/[reportId]/FieldParameters.tsx index 024f8c65..45c6f16e 100644 --- a/src/app/(main)/reports/[reportId]/FieldParameters.tsx +++ b/src/app/(main)/reports/[reportId]/FieldParameters.tsx @@ -4,7 +4,6 @@ import { useContext } from 'react'; import { Button, Row, Label, Icon, Popover, MenuTrigger } from '@umami/react-zen'; import { FieldSelectForm } from '../[reportId]/FieldSelectForm'; import { ParameterList } from '../[reportId]/ParameterList'; -import { PopupForm } from '../[reportId]/PopupForm'; import { ReportContext } from './Report'; export function FieldParameters() { diff --git a/src/app/(main)/reports/[reportId]/FilterParameters.tsx b/src/app/(main)/reports/[reportId]/FilterParameters.tsx index 0c546c29..39481065 100644 --- a/src/app/(main)/reports/[reportId]/FilterParameters.tsx +++ b/src/app/(main)/reports/[reportId]/FilterParameters.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { useMessages, useFormat, useFilters, useFields } from '@/components/hooks'; import { Icons } from '@/components/icons'; -import { Button, Text, Row, Label, Icon, Popover, MenuTrigger } from '@umami/react-zen'; +import { Button, Row, Label, Icon, Popover, MenuTrigger } from '@umami/react-zen'; import { FilterSelectForm } from '../[reportId]/FilterSelectForm'; import { ParameterList } from '../[reportId]/ParameterList'; import { PopupForm } from '../[reportId]/PopupForm'; diff --git a/src/app/(main)/reports/goals/GoalsAddForm.tsx b/src/app/(main)/reports/goals/GoalsAddForm.tsx index 507e639e..78513be3 100644 --- a/src/app/(main)/reports/goals/GoalsAddForm.tsx +++ b/src/app/(main)/reports/goals/GoalsAddForm.tsx @@ -71,14 +71,6 @@ export function GoalsAddForm({ } }; - const renderTypeValue = (value: any) => { - return items.find(item => item.value === value)?.label; - }; - - const renderoperatorValue = (value: any) => { - return operators.find(item => item.value === value)?.label; - }; - return ( @@ -87,7 +79,6 @@ export function GoalsAddForm({ className={styles.dropdown} items={items} value={type} - renderValue={renderTypeValue} onChange={(value: any) => setType(value)} > {({ value, label }: any) => { diff --git a/src/app/(main)/reports/retention/RetentionParameters.tsx b/src/app/(main)/reports/retention/RetentionParameters.tsx index 0a534741..ce4cb9ea 100644 --- a/src/app/(main)/reports/retention/RetentionParameters.tsx +++ b/src/app/(main)/reports/retention/RetentionParameters.tsx @@ -22,10 +22,6 @@ export function RetentionParameters() { } }; - const handleDateChange = value => { - updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } }); - }; - return (
diff --git a/src/app/(main)/settings/users/UserAddForm.tsx b/src/app/(main)/settings/users/UserAddForm.tsx index 65353f9d..ed5cc0df 100644 --- a/src/app/(main)/settings/users/UserAddForm.tsx +++ b/src/app/(main)/settings/users/UserAddForm.tsx @@ -11,7 +11,6 @@ import { } from '@umami/react-zen'; import { useApi, useMessages } from '@/components/hooks'; import { ROLES } from '@/lib/constants'; -import { messages } from '@/components/messages'; export function UserAddForm({ onSave, onClose }) { const { post, useMutation } = useApi(); @@ -51,9 +50,15 @@ export function UserAddForm({ onSave, onClose }) { rules={{ required: formatMessage(labels.required) }} > diff --git a/src/app/(main)/settings/users/UsersTable.tsx b/src/app/(main)/settings/users/UsersTable.tsx index eeb74602..f064d30c 100644 --- a/src/app/(main)/settings/users/UsersTable.tsx +++ b/src/app/(main)/settings/users/UsersTable.tsx @@ -3,8 +3,7 @@ import Link from 'next/link'; import { formatDistance } from 'date-fns'; import { ROLES } from '@/lib/constants'; import { useMessages, useLocale } from '@/components/hooks'; -import UserDeleteButton from './UserDeleteButton'; -import LinkButton from '@/components/common/LinkButton'; +import { UserDeleteButton } from './UserDeleteButton'; export function UsersTable({ data = [], diff --git a/src/app/(main)/settings/users/[userId]/UserEditForm.tsx b/src/app/(main)/settings/users/[userId]/UserEditForm.tsx index fc30a3ae..05f8a077 100644 --- a/src/app/(main)/settings/users/[userId]/UserEditForm.tsx +++ b/src/app/(main)/settings/users/[userId]/UserEditForm.tsx @@ -66,14 +66,22 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () = rules={{ required: formatMessage(labels.required) }} > )} - {formatMessage(labels.save)} + + {formatMessage(labels.save)} + ); diff --git a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx index 95bfad8f..71e61327 100644 --- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx @@ -37,7 +37,6 @@ export function ShareUrl({ hostUrl, onSave }: { hostUrl?: string; onSave?: () => }; const handleSwitch = (checked: boolean) => { - console.log({ checked }); const data = { name: website.name, domain: website.domain, diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx index 0c6d8755..527b0062 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx @@ -1,4 +1,4 @@ -import { Select, Icon, Icons, ListItem, Text, Grid, Column } from '@umami/react-zen'; +import { Icon, Icons, Text, Grid, Column } from '@umami/react-zen'; import { LinkButton } from '@/components/common/LinkButton'; import { useMessages, useNavigation } from '@/components/hooks'; import { MenuNav } from '@/components/layout/MenuNav'; @@ -17,7 +17,6 @@ import { RegionsTable } from '@/components/metrics/RegionsTable'; import { ScreenTable } from '@/components/metrics/ScreenTable'; import { TagsTable } from '@/components/metrics/TagsTable'; import { ChannelsTable } from '@/components/metrics/ChannelsTable'; -import Link from 'next/link'; const views = { url: PagesTable, @@ -50,7 +49,6 @@ export function WebsiteExpandedView({ }) { const { formatMessage, labels } = useMessages(); const { - router, renderUrl, query: { view }, } = useNavigation(); diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx index 6331250e..83518148 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx @@ -1,5 +1,4 @@ import { Button, Icon, Icons, Box, MenuTrigger, Popover, Text } from '@umami/react-zen'; -import { PopupForm } from '@/app/(main)/reports/[reportId]/PopupForm'; import { FilterSelectForm } from '@/app/(main)/reports/[reportId]/FilterSelectForm'; import { useFields, useMessages, useNavigation, useDateRange } from '@/components/hooks'; import { OPERATOR_PREFIXES } from '@/lib/constants'; diff --git a/src/components/common/FilterButtons.tsx b/src/components/common/FilterButtons.tsx index a3b600a6..612b350f 100644 --- a/src/components/common/FilterButtons.tsx +++ b/src/components/common/FilterButtons.tsx @@ -1,5 +1,5 @@ import { Key } from 'react'; -import { Row, Button, Flexbox } from '@umami/react-zen'; +import { Text, Row, Button, Flexbox } from '@umami/react-zen'; export interface FilterButtonsProps { items: any[]; @@ -12,7 +12,9 @@ export function FilterButtons({ items, selectedKey, onSelect }: FilterButtonsPro {items.map(({ key, label }) => ( - + ))} diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx index d1484d01..6a555deb 100644 --- a/src/components/input/DateFilter.tsx +++ b/src/components/input/DateFilter.tsx @@ -1,20 +1,10 @@ import { useState, Key } from 'react'; -import { - Icon, - Modal, - Select, - Text, - Block, - Row, - ListItem, - ListSeparator, - Dialog, -} from '@umami/react-zen'; +import { Icon, Modal, Select, Text, Row, ListItem, ListSeparator, Dialog } from '@umami/react-zen'; import { endOfYear, isSameDay } from 'date-fns'; import { DatePickerForm } from '@/components/metrics/DatePickerForm'; import { useLocale, useMessages } from '@/components/hooks'; import { Icons } from '@/components/icons'; -import { formatDate, parseDateValue } from '@/lib/date'; +import { formatDate } from '@/lib/date'; import styles from './DateFilter.module.css'; import classNames from 'classnames'; @@ -41,7 +31,6 @@ export function DateFilter({ }: DateFilterProps) { const { formatMessage, labels } = useMessages(); const [showPicker, setShowPicker] = useState(false); - const { locale } = useLocale(); const options = [ { label: formatMessage(labels.today), value: '0day' }, @@ -108,6 +97,7 @@ export function DateFilter({ onChange(value.toString()); }; + /* const handleClose = () => setShowPicker(false); const renderValue = (value: string) => { @@ -133,9 +123,7 @@ export function DateFilter({ } return options.find(e => e.value === value)?.label; - }; - - console.log({ showPicker }); + };*/ return ( <> diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx index ac54b26e..3527bdfb 100644 --- a/src/components/input/WebsiteDateFilter.tsx +++ b/src/components/input/WebsiteDateFilter.tsx @@ -1,4 +1,4 @@ -import { useDateRange, useLocale } from '@/components/hooks'; +import { useDateRange } from '@/components/hooks'; import { isAfter } from 'date-fns'; import { getOffsetDateRange } from '@/lib/date'; import { Button, Icon, Icons } from '@umami/react-zen'; @@ -13,7 +13,6 @@ export function WebsiteDateFilter({ websiteId: string; showAllTime?: boolean; }) { - const { dir } = useLocale(); const { dateRange, saveDateRange } = useDateRange(websiteId); const { value, startDate, endDate, offset } = dateRange; const disableForward = diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsx index 31338fe3..58eae051 100644 --- a/src/components/input/WebsiteSelect.tsx +++ b/src/components/input/WebsiteSelect.tsx @@ -1,7 +1,6 @@ import { useState, Key } from 'react'; import { Select, ListItem } from '@umami/react-zen'; -import { useWebsite, useWebsites, useMessages } from '@/components/hooks'; -import { Empty } from '@/components/common/Empty'; +import { useWebsites, useMessages } from '@/components/hooks'; export function WebsiteSelect({ websiteId, @@ -12,18 +11,12 @@ export function WebsiteSelect({ teamId?: string; onSelect?: (key: any) => void; }) { - const { formatMessage, labels, messages } = useMessages(); + const { formatMessage, labels } = useMessages(); const [search, setSearch] = useState(''); const [selectedId, setSelectedId] = useState(websiteId); - const { data: website } = useWebsite(selectedId as string); - const queryResult = useWebsites({ teamId }, { search, pageSize: 5 }); - const renderEmpty = () => { - return ; - }; - const handleSelect = (value: any) => { setSelectedId(value); onSelect?.(value); diff --git a/src/components/metrics/DatePickerForm.tsx b/src/components/metrics/DatePickerForm.tsx index 2ed3a8ea..7fd127e5 100644 --- a/src/components/metrics/DatePickerForm.tsx +++ b/src/components/metrics/DatePickerForm.tsx @@ -19,7 +19,7 @@ export function DatePickerForm({ ); const [singleDate, setSingleDate] = useState(defaultStartDate || new Date()); const [startDate, setStartDate] = useState(defaultStartDate || new Date()); - const [endDate, setEndDate] = useState(defaultEndDate || new Date()); + const [endDate] = useState(defaultEndDate || new Date()); const { formatMessage, labels } = useMessages(); const disabled = @@ -35,8 +35,6 @@ export function DatePickerForm({ } }; - console.log({ minDate, maxDate, singleDate, startDate, endDate, disabled }); - return (