Renamed query hooks. Fixed conversion bugs.

src/app/(main)/reports/[reportId]/BaseParameters.tsx

@@ -3,7 +3,7 @@ import { Column, Label } from '@umami/react-zen';
 import { parseDateRange } from '@/lib/date';
 import { DateFilter } from '@/components/input/DateFilter';
 import { WebsiteSelect } from '@/components/input/WebsiteSelect';
-import { useMessages, useTeamUrl, useWebsite } from '@/components/hooks';
+import { useMessages, useNavigation, useWebsiteQuery } from '@/components/hooks';
 import { ReportContext } from './Report';
 import styles from './BaseParameters.module.css';
 
@@ -22,11 +22,11 @@ export function BaseParameters({
 }: BaseParametersProps) {
   const { report, updateReport } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
-  const { teamId } = useTeamUrl();
+  const { teamId } = useNavigation();
   const { parameters } = report || {};
   const { websiteId, dateRange } = parameters || {};
   const { value, startDate, endDate } = dateRange || {};
-  const { data: website } = useWebsite(websiteId);
+  const { data: website } = useWebsiteQuery(websiteId);
   const { name } = website || {};
 
   const handleWebsiteSelect = (websiteId: string) => {

src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx

@@ -1,5 +1,5 @@
 import { useMemo, useState } from 'react';
-import { useFilters, useFormat, useMessages, useWebsiteValues } from '@/components/hooks';
+import { useFilters, useFormat, useMessages, useWebsiteValuesQuery } from '@/components/hooks';
 import { OPERATORS } from '@/lib/constants';
 import { isEqualsOperator } from '@/lib/params';
 import {
@@ -62,7 +62,7 @@ export function FieldFilterEditForm({
     data: values = [],
     isLoading,
     refetch,
-  } = useWebsiteValues({
+  } = useWebsiteValuesQuery({
     websiteId,
     type: name,
     startDate,

src/app/(main)/reports/[reportId]/Report.tsx

@@ -1,7 +1,7 @@
 import { createContext, ReactNode } from 'react';
 import { Loading } from '@umami/react-zen';
 import classNames from 'classnames';
-import { useReport } from '@/components/hooks';
+import { useReportQuery } from '@/components/hooks';
 import styles from './Report.module.css';
 
 export const ReportContext = createContext(null);
@@ -17,7 +17,7 @@ export function Report({
   children: ReactNode;
   className?: string;
 }) {
-  const report = useReport(reportId, defaultParameters);
+  const report = useReportQuery(reportId, defaultParameters);
 
   if (!report) {
     return reportId ? <Loading position="page" /> : null;

src/app/(main)/reports/[reportId]/ReportHeader.tsx

@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import { Icon, LoadingButton, InlineEditField, useToast } from '@umami/react-zen';
-import { useMessages, useApi, useNavigation, useTeamUrl } from '@/components/hooks';
+import { useMessages, useApi, useNavigation } from '@/components/hooks';
 import { ReportContext } from './Report';
 import styles from './ReportHeader.module.css';
 import { REPORT_TYPES } from '@/lib/constants';
@@ -10,8 +10,7 @@ export function ReportHeader({ icon }) {
   const { report, updateReport } = useContext(ReportContext);
   const { formatMessage, labels, messages } = useMessages();
   const { toast } = useToast();
-  const { router } = useNavigation();
-  const { renderTeamUrl } = useTeamUrl();
+  const { router, renderTeamUrl } = useNavigation();
 
   const { post, useMutation } = useApi();
   const { mutate: create, isPending: isCreating } = useMutation({

src/app/(main)/reports/[reportId]/ReportPage.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { useReport } from '@/components/hooks';
+import { useReportQuery } from '@/components/hooks';
 import { EventDataReport } from '../event-data/EventDataReport';
 import { FunnelReport } from '../funnel/FunnelReport';
 import { GoalsReport } from '../goals/GoalsReport';
@@ -21,7 +21,7 @@ const reports = {
 };
 
 export function ReportPage({ reportId }: { reportId: string }) {
-  const { report } = useReport(reportId);
+  const { report } = useReportQuery(reportId);
 
   if (!report) {
     return null;