watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Renamed query hooks. Fixed conversion bugs.

Browse source
This commit is contained in:
Mike Cao 2025-03-22 03:48:18 -07:00
parent adca3c36d0
commit 7886c3f393
110 changed files with 423 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/input/ProfileButton.tsx
View file

@ -12,11 +12,11 @@ import {
} from '@umami/react-zen';
import { useRouter } from 'next/navigation';
import { User, LogOut, CircleUserRound } from 'lucide-react';
import { useMessages, useLogin } from '@/components/hooks';
import { useMessages, useLoginQuery } from '@/components/hooks';
export function ProfileButton() {
const { formatMessage, labels } = useMessages();
const { user } = useLogin();
const { user } = useLoginQuery();
const router = useRouter();
const cloudMode = !!process.env.cloudMode;

9
src/components/input/RefreshButton.tsx
View file

@ -1,4 +1,4 @@
import { LoadingButton, Icon, TooltipPopup } from '@umami/react-zen';
import { LoadingButton, Icon, Tooltip, TooltipTrigger } from '@umami/react-zen';
import { setWebsiteDateRange } from '@/store/websites';
import { useDateRange } from '@/components/hooks';
import { Icons } from '@/components/icons';
@ -21,12 +21,13 @@ export function RefreshButton({
}
return (
<TooltipPopup label={formatMessage(labels.refresh)}>
<LoadingButton isLoading={isLoading} onClick={handleClick}>
<TooltipTrigger>
<LoadingButton isLoading={isLoading} onPress={handleClick}>
<Icon>
<Icons.Refresh />
</Icon>
</LoadingButton>
</TooltipPopup>
<Tooltip>{formatMessage(labels.refresh)}</Tooltip>
</TooltipTrigger>
);
}

8
src/components/input/TeamsButton.tsx
View file

@ -15,7 +15,7 @@ import {
Icons,
} from '@umami/react-zen';
import { User, Users } from 'lucide-react';
import { useLogin, useMessages, useTeams, useTeamUrl } from '@/components/hooks';
import { useLoginQuery, useMessages, useTeamsQuery, useNavigation } from '@/components/hooks';
export function TeamsButton({
className,
@ -24,10 +24,10 @@ export function TeamsButton({
className?: string;
showText?: boolean;
}) {
const { user } = useLogin();
const { user } = useLoginQuery();
const { formatMessage, labels } = useMessages();
const { result } = useTeams(user.id);
const { teamId } = useTeamUrl();
const { result } = useTeamsQuery(user.id);
const { teamId } = useNavigation();
const router = useRouter();
const team = result?.data?.find(({ id }) => id === teamId);
const [selectedKeys, setSelectedKeys] = useState<any>(new Set([teamId || user.id]));