From 3004c37ccf88e7fadd59d04d5b079540979eee46 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Wed, 7 May 2025 12:33:53 -0700 Subject: [PATCH] Updated settings components. --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- src/app/(main)/settings/profile/LanguageSetting.tsx | 2 +- src/app/(main)/settings/profile/TimezoneSetting.tsx | 2 +- src/app/(main)/settings/users/UsersTable.tsx | 6 +++++- src/app/(main)/settings/websites/WebsitesTable.tsx | 5 ++++- src/components/input/DateFilter.tsx | 2 +- src/components/input/MenuButton.tsx | 4 ++-- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index dc4cbbb7..6da9c735 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@prisma/extension-read-replicas": "^0.4.1", "@react-spring/web": "^9.7.3", "@tanstack/react-query": "^5.74.11", - "@umami/react-zen": "^0.96.0", + "@umami/react-zen": "^0.97.0", "@umami/redis-client": "^0.27.0", "bcryptjs": "^2.4.3", "chalk": "^4.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 003ac2a9..44853a3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ importers: specifier: ^5.74.11 version: 5.74.11(react@19.1.0) '@umami/react-zen': - specifier: ^0.96.0 - version: 0.96.0(@babel/core@7.26.10)(@types/react@19.1.2)(immer@9.0.21)(use-sync-external-store@1.5.0(react@19.1.0)) + specifier: ^0.97.0 + version: 0.97.0(@babel/core@7.26.10)(@types/react@19.1.2)(immer@9.0.21)(use-sync-external-store@1.5.0(react@19.1.0)) '@umami/redis-client': specifier: ^0.27.0 version: 0.27.0 @@ -2992,8 +2992,8 @@ packages: resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==} engines: {node: ^16.0.0 || >=18.0.0} - '@umami/react-zen@0.96.0': - resolution: {integrity: sha512-ojY3sOehvGbYN29fHrPHyBlsrrjOFJdlftlYTsPQSbX/25SiD1Sk6/WqcY/YEJZS71gZyklc4yjd/EKSZgxJqw==} + '@umami/react-zen@0.97.0': + resolution: {integrity: sha512-+oGk/yKbeluWEfyUCLSffjoLGHx8JlgN5pbFdVKCSgXjKoPWpgiD7xqQHOIgw1KHrtdHEhbJkuoZ5frj3/0ZoQ==} '@umami/redis-client@0.27.0': resolution: {integrity: sha512-SbHTpxhgeZyTBUSp2zdZM+XUtpsaSL4Tad8QXIEhEtjWhvvfoornyT5kLuyYCVtzSAT4daALeGmOO1z6EE1KcA==} @@ -10784,7 +10784,7 @@ snapshots: '@typescript-eslint/types': 6.21.0 eslint-visitor-keys: 3.4.3 - '@umami/react-zen@0.96.0(@babel/core@7.26.10)(@types/react@19.1.2)(immer@9.0.21)(use-sync-external-store@1.5.0(react@19.1.0))': + '@umami/react-zen@0.97.0(@babel/core@7.26.10)(@types/react@19.1.2)(immer@9.0.21)(use-sync-external-store@1.5.0(react@19.1.0))': dependencies: '@fontsource/jetbrains-mono': 5.2.5 '@internationalized/date': 3.8.0 diff --git a/src/app/(main)/settings/profile/LanguageSetting.tsx b/src/app/(main)/settings/profile/LanguageSetting.tsx index 19c5d74e..4ec70d22 100644 --- a/src/app/(main)/settings/profile/LanguageSetting.tsx +++ b/src/app/(main)/settings/profile/LanguageSetting.tsx @@ -28,7 +28,7 @@ export function LanguageSetting() { return ( saveTimezone(value)} allowSearch={true} onSearch={setSearch} diff --git a/src/app/(main)/settings/users/UsersTable.tsx b/src/app/(main)/settings/users/UsersTable.tsx index 6b9b6a97..a4aeac6e 100644 --- a/src/app/(main)/settings/users/UsersTable.tsx +++ b/src/app/(main)/settings/users/UsersTable.tsx @@ -70,7 +70,11 @@ export function UsersTable({ - setDeleteUser(row)}> + setDeleteUser(row)} + data-test="link-button-delete" + > diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/settings/websites/WebsitesTable.tsx index 9328d0c5..9f18ec14 100644 --- a/src/app/(main)/settings/websites/WebsitesTable.tsx +++ b/src/app/(main)/settings/websites/WebsitesTable.tsx @@ -3,6 +3,7 @@ import { Row, Text, Icon, DataTable, DataColumn, MenuItem } from '@umami/react-z import { useMessages, useNavigation } from '@/components/hooks'; import { MenuButton } from '@/components/input/MenuButton'; import { Lucide } from '@/components/icons'; +import Link from 'next/link'; export interface WebsitesTableProps { data: any[]; @@ -29,7 +30,9 @@ export function WebsitesTable({ return ( - + + {(row: any) => {row.name}} + {showActions && ( diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx index a4ed510b..69f462d8 100644 --- a/src/components/input/DateFilter.tsx +++ b/src/components/input/DateFilter.tsx @@ -102,7 +102,7 @@ export function DateFilter({ return ( <>