watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-24 14:35:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

14
src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
View file

@ -1,6 +1,12 @@
import { Button, Modal, DialogTrigger, Dialog, Column } from '@umami/react-zen';
import { useRouter } from 'next/navigation';
import { useLogin, useMessages, useModified, useTeams, useTeamUrl } from '@/components/hooks';
import {
useLoginQuery,
useMessages,
useModified,
useTeamsQuery,
useNavigation,
} from '@/components/hooks';
import { WebsiteDeleteForm } from './WebsiteDeleteForm';
import { WebsiteResetForm } from './WebsiteResetForm';
import { WebsiteTransferForm } from './WebsiteTransferForm';
@ -9,11 +15,11 @@ import { ROLES } from '@/lib/constants';
export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) {
const { formatMessage, labels, messages } = useMessages();
const { user } = useLogin();
const { user } = useLoginQuery();
const { touch } = useModified();
const { teamId, renderTeamUrl } = useTeamUrl();
const { teamId, renderTeamUrl } = useNavigation();
const router = useRouter();
const { result } = useTeams(user.id);
const { result } = useTeamsQuery(user.id);
const canTransferWebsite =
(
!teamId &&

6
src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx
View file

@ -10,7 +10,7 @@ import {
ListItem,
Text,
} from '@umami/react-zen';
import { useApi, useLogin, useMessages, useTeams } from '@/components/hooks';
import { useApi, useLoginQuery, useMessages, useTeamsQuery } from '@/components/hooks';
import { WebsiteContext } from '@/app/(main)/websites/[websiteId]/WebsiteProvider';
import { ROLES } from '@/lib/constants';
@ -23,7 +23,7 @@ export function WebsiteTransferForm({
onSave?: () => void;
onClose?: () => void;
}) {
const { user } = useLogin();
const { user } = useLoginQuery();
const website = useContext(WebsiteContext);
const [teamId, setTeamId] = useState<string>(null);
const { formatMessage, labels, messages } = useMessages();
@ -31,7 +31,7 @@ export function WebsiteTransferForm({
const { mutate, error } = useMutation({
mutationFn: (data: any) => post(`/websites/${websiteId}/transfer`, data),
});
const { result, query } = useTeams(user.id);
const { result, query } = useTeamsQuery(user.id);
const isTeamWebsite = !!website?.teamId;
const items = result.data.filter(({ teamUser }) =>