Refactored useQuery functions.

src/app/(main)/console/TestConsole.js

@@ -14,7 +14,10 @@ import styles from './TestConsole.module.css';
 
 export function TestConsole({ websiteId }) {
   const { get, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(['websites:me'], () => get('/me/websites'));
+  const { data, isLoading, error } = useQuery({
+    queryKey: ['websites:me'],
+    queryFn: () => get('/me/websites'),
+  });
   const { router } = useNavigation();
 
   function handleChange(value) {

src/app/(main)/dashboard/Dashboard.js

@@ -20,9 +20,10 @@ export function Dashboard() {
   const { get, useQuery } = useApi();
   const { page, handlePageChange } = useApiFilter();
   const pageSize = 10;
-  const { data: result, isLoading } = useQuery(['websites', page, pageSize], () =>
-    get('/websites', { includeTeams: 1, page, pageSize }),
-  );
+  const { data: result, isLoading } = useQuery({
+    queryKey: ['websites', page, pageSize],
+    queryFn: () => get('/websites', { includeTeams: 1, page, pageSize }),
+  });
   const { data, count } = result || {};
   const hasData = data && data?.length !== 0;
 

src/app/(main)/dashboard/DashboardEdit.js

@@ -17,7 +17,10 @@ export function DashboardEdit() {
   const { formatMessage, labels } = useMessages();
   const [order, setOrder] = useState(websiteOrder || []);
   const { get, useQuery } = useApi();
-  const { data: result } = useQuery(['websites'], () => get('/websites', { includeTeams: 1 }));
+  const { data: result } = useQuery({
+    queryKey: ['websites'],
+    queryFn: () => get('/websites', { includeTeams: 1 }),
+  });
   const { data: websites } = result || {};
 
   const ordered = useMemo(() => {

src/app/(main)/reports/ReportsDataTable.tsx

@@ -8,9 +8,11 @@ import useCache from 'store/cache';
 export default function ReportsDataTable({ websiteId }: { websiteId?: string }) {
   const { get } = useApi();
   const modified = useCache(state => (state as any)?.reports);
-  const queryResult = useFilterQuery(['reports', { websiteId, modified }], params =>
-    get(websiteId ? `/websites/${websiteId}/reports` : `/reports`, params),
-  );
+  const queryResult = useFilterQuery({
+    queryKey: ['reports', { websiteId, modified }],
+    queryFn: (params: any) =>
+      get(websiteId ? `/websites/${websiteId}/reports` : `/reports`, params),
+  });
 
   return (
     <DataTable queryResult={queryResult}>

src/app/(main)/reports/[id]/FilterSelectForm.js

@@ -8,16 +8,16 @@ import { useApi } from 'components/hooks';
 function useValues(websiteId, type) {
   const now = Date.now();
   const { get, useQuery } = useApi();
-  const { data, error, isLoading } = useQuery(
-    ['websites:values', websiteId, type],
-    () =>
+  const { data, error, isLoading } = useQuery({
+    queryKey: ['websites:values', websiteId, type],
+    queryFn: () =>
       get(`/websites/${websiteId}/values`, {
         type,
         startAt: +subDays(now, 90),
         endAt: now,
       }),
-    { enabled: !!(websiteId && type) },
-  );
+    enabled: !!(websiteId && type),
+  });
 
   return { data, error, isLoading };
 }

src/app/(main)/reports/[id]/ReportDetails.js

@@ -14,7 +14,10 @@ const reports = {
 
 export default function ReportDetails({ reportId }) {
   const { get, useQuery } = useApi();
-  const { data: report } = useQuery(['reports', reportId], () => get(`/reports/${reportId}`));
+  const { data: report } = useQuery({
+    queryKey: ['reports', reportId],
+    queryFn: () => get(`/reports/${reportId}`),
+  });
 
   if (!report) {
     return null;

src/app/(main)/reports/event-data/EventDataParameters.js

@@ -12,16 +12,16 @@ import styles from './EventDataParameters.module.css';
 
 function useFields(websiteId, startDate, endDate) {
   const { get, useQuery } = useApi();
-  const { data, error, isLoading } = useQuery(
-    ['fields', websiteId, startDate, endDate],
-    () =>
+  const { data, error, isLoading } = useQuery({
+    queryKey: ['fields', websiteId, startDate, endDate],
+    queryFn: () =>
       get('/reports/event-data', {
         websiteId,
         startAt: +startDate,
         endAt: +endDate,
       }),
-    { enabled: !!(websiteId && startDate && endDate) },
-  );
+    enabled: !!(websiteId && startDate && endDate),
+  });
 
   return { data, error, isLoading };
 }

src/app/(main)/settings/teams/TeamsDataTable.js

@@ -8,10 +8,13 @@ import useCache from 'store/cache';
 export function TeamsDataTable() {
   const { get } = useApi();
   const modified = useCache(state => state?.teams);
-  const queryResult = useFilterQuery(['teams', { modified }], params => {
-    return get(`/teams`, {
-      ...params,
-    });
+  const queryResult = useFilterQuery({
+    queryKey: ['teams', { modified }],
+    queryFn: params => {
+      return get(`/teams`, {
+        ...params,
+      });
+    },
   });
 
   return (

src/app/(main)/settings/teams/[id]/TeamMembers.js

@@ -7,15 +7,15 @@ import useCache from 'store/cache';
 export function TeamMembers({ teamId, readOnly }) {
   const { get } = useApi();
   const modified = useCache(state => state?.['team:members']);
-  const queryResult = useFilterQuery(
-    ['team:members', { teamId, modified }],
-    params => {
+  const queryResult = useFilterQuery({
+    queryKey: ['team:members', { teamId, modified }],
+    queryFn: params => {
       return get(`/teams/${teamId}/users`, {
         ...params,
       });
     },
-    { enabled: !!teamId },
-  );
+    enabled: !!teamId,
+  });
 
   return (
     <>

src/app/(main)/settings/teams/[id]/TeamSettings.js

@@ -17,15 +17,15 @@ export function TeamSettings({ teamId }) {
   const [tab, setTab] = useState('details');
   const { get, useQuery } = useApi();
   const { showToast } = useToasts();
-  const { data, isLoading } = useQuery(
-    ['team', teamId],
-    () => {
+  const { data, isLoading } = useQuery({
+    queryKey: ['team', teamId],
+    queryFn: () => {
       if (teamId) {
         return get(`/teams/${teamId}`);
       }
     },
-    { cacheTime: 0 },
-  );
+    cacheTime: 0,
+  });
   const canEdit = data?.teamUser?.find(
     ({ userId, role }) => role === ROLES.teamOwner && userId === user.id,
   );

src/app/(main)/settings/teams/[id]/TeamWebsiteAddForm.js

@@ -12,7 +12,10 @@ export function TeamWebsiteAddForm({ teamId, onSave, onClose }) {
   const { formatMessage, labels } = useMessages();
   const { get, post, useQuery, useMutation } = useApi();
   const { mutate, error } = useMutation(data => post(`/teams/${teamId}/websites`, data));
-  const { data: websites, isLoading } = useQuery(['websites'], () => get('/websites'));
+  const { data: websites, isLoading } = useQuery({
+    queryKey: ['websites'],
+    queryFn: () => get('/websites'),
+  });
   const [selected, setSelected] = useState([]);
   const hasData = websites && websites.data.length > 0;
 

src/app/(main)/settings/teams/[id]/TeamWebsites.js

@@ -13,15 +13,15 @@ export function TeamWebsites({ teamId }) {
   const { user } = useUser();
   const { get } = useApi();
   const modified = useCache(state => state?.['team:websites']);
-  const queryResult = useFilterQuery(
-    ['team:websites', { teamId, modified }],
-    params => {
+  const queryResult = useFilterQuery({
+    queryKey: ['team:websites', { teamId, modified }],
+    queryFn: params => {
       return get(`/teams/${teamId}/websites`, {
         ...params,
       });
     },
-    { enabled: !!user },
-  );
+    enabled: !!user,
+  });
 
   const handleChange = () => {
     queryResult.refetch();

src/app/(main)/settings/users/UserWebsites.js

@@ -7,15 +7,15 @@ export function UserWebsites({ userId }) {
   const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
     useApiFilter();
   const { get, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(
-    ['user:websites', userId, filter, page, pageSize],
-    () =>
+  const { data, isLoading, error } = useQuery({
+    queryKey: ['user:websites', userId, filter, page, pageSize],
+    queryFn: () =>
       get(`/users/${userId}/websites`, {
         filter,
         page,
         pageSize,
       }),
-  );
+  });
   const hasData = data && data.length !== 0;
 
   return (

src/app/(main)/settings/users/UsersDataTable.js

@@ -9,10 +9,9 @@ import useCache from 'store/cache';
 export function UsersDataTable() {
   const { get } = useApi();
   const modified = useCache(state => state?.users);
-  const queryResult = useFilterQuery(['users', { modified }], params => {
-    return get(`/users`, {
-      ...params,
-    });
+  const queryResult = useFilterQuery({
+    queryKey: ['users', { modified }],
+    queryFn: params => get(`/users`, params),
   });
 
   return (

src/app/(main)/settings/users/[id]/UserSettings.js

@@ -14,15 +14,15 @@ export function UserSettings({ userId }) {
   const [tab, setTab] = useState('details');
   const { get, useQuery } = useApi();
   const { showToast } = useToasts();
-  const { data, isLoading } = useQuery(
-    ['user', userId],
-    () => {
+  const { data, isLoading } = useQuery({
+    queryKey: ['user', userId],
+    queryFn: () => {
       if (userId) {
         return get(`/users/${userId}`);
       }
     },
-    { cacheTime: 0 },
-  );
+    cacheTime: 0,
+  });
 
   const handleSave = data => {
     showToast({ message: formatMessage(messages.saved), variant: 'success' });

src/app/(main)/settings/websites/WebsiteSettings.js

@@ -1,6 +1,6 @@
 'use client';
 import { useEffect, useState } from 'react';
-import { Item, Tabs, useToasts, Button, Text, Icon, Icons } from 'react-basics';
+import { Item, Tabs, useToasts, Button, Text, Icon, Icons, Loading } from 'react-basics';
 import { useRouter } from 'next/navigation';
 import Link from 'next/link';
 import PageHeader from 'components/layout/PageHeader';
@@ -16,7 +16,9 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl
   const { formatMessage, labels, messages } = useMessages();
   const { get, useQuery } = useApi();
   const { showToast } = useToasts();
-  const { data } = useQuery(['website', websiteId], () => get(`/websites/${websiteId}`), {
+  const { data, isLoading } = useQuery({
+    queryKey: ['website', websiteId],
+    queryFn: () => get(`/websites/${websiteId}`),
     enabled: !!websiteId,
     cacheTime: 0,
   });
@@ -46,6 +48,10 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl
     }
   }, [data]);
 
+  if (isLoading || !values) {
+    return <Loading />;
+  }
+
   return (
     <>
       <PageHeader title={values?.name}>

src/app/(main)/settings/websites/WebsitesDataTable.tsx

@@ -21,17 +21,17 @@ function useWebsites(userId: string, { includeTeams, onlyTeams }) {
   const { get } = useApi();
   const modified = useCache((state: any) => state?.websites);
 
-  return useFilterQuery(
-    ['websites', { includeTeams, onlyTeams, modified }],
-    (params: any) => {
+  return useFilterQuery({
+    queryKey: ['websites', { includeTeams, onlyTeams, modified }],
+    queryFn: (params: any) => {
       return get(`/users/${userId}/websites`, {
         includeTeams,
         onlyTeams,
         ...params,
       });
     },
-    { enabled: !!userId },
-  );
+    enabled: !!userId,
+  });
 }
 
 export function WebsitesDataTable({

src/app/(main)/websites/[id]/WebsiteChart.js

@@ -12,12 +12,12 @@ export function WebsiteChart({ websiteId }) {
   } = useNavigation();
   const { get, useQuery } = useApi();
 
-  const { data, isLoading } = useQuery(
-    [
+  const { data, isLoading } = useQuery({
+    queryKey: [
       'websites:pageviews',
       { websiteId, modified, url, referrer, os, browser, device, country, region, city, title },
     ],
-    () =>
+    queryFn: () =>
       get(`/websites/${websiteId}/pageviews`, {
         startAt: +startDate,
         endAt: +endDate,
@@ -33,7 +33,7 @@ export function WebsiteChart({ websiteId }) {
         city,
         title,
       }),
-  );
+  });
 
   const chartData = useMemo(() => {
     if (data) {

src/app/(main)/websites/[id]/WebsiteMetricsBar.js

@@ -17,12 +17,12 @@ export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) {
     query: { url, referrer, title, os, browser, device, country, region, city },
   } = useNavigation();
 
-  const { data, error, isLoading, isFetched } = useQuery(
-    [
+  const { data, error, isLoading, isFetched } = useQuery({
+    queryKey: [
       'websites:stats',
       { websiteId, modified, url, referrer, title, os, browser, device, country, region, city },
     ],
-    () =>
+    queryFn: () =>
       get(`/websites/${websiteId}/stats`, {
         startAt: +startDate,
         endAt: +endDate,
@@ -36,7 +36,7 @@ export function WebsiteMetricsBar({ websiteId, showFilter = true, sticky }) {
         region,
         city,
       }),
-  );
+  });
 
   const { pageviews, uniques, bounces, totaltime } = data || {};
   const num = Math.min(data && uniques.value, data && bounces.value);

src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.js

@@ -11,15 +11,15 @@ export function EventDataMetricsBar({ websiteId }) {
   const [dateRange] = useDateRange(websiteId);
   const { startDate, endDate, modified } = dateRange;
 
-  const { data, error, isLoading, isFetched } = useQuery(
-    ['event-data:stats', { websiteId, startDate, endDate, modified }],
-    () =>
+  const { data, error, isLoading, isFetched } = useQuery({
+    queryKey: ['event-data:stats', { websiteId, startDate, endDate, modified }],
+    queryFn: () =>
       get(`/event-data/stats`, {
         websiteId,
         startAt: +startDate,
         endAt: +endDate,
       }),
-  );
+  });
 
   return (
     <div className={styles.container}>

src/app/(main)/websites/[id]/event-data/WebsiteEventData.js

@@ -10,17 +10,17 @@ function useData(websiteId, event) {
   const [dateRange] = useDateRange(websiteId);
   const { startDate, endDate } = dateRange;
   const { get, useQuery } = useApi();
-  const { data, error, isLoading } = useQuery(
-    ['event-data:events', { websiteId, startDate, endDate, event }],
-    () =>
+  const { data, error, isLoading } = useQuery({
+    queryKey: ['event-data:events', { websiteId, startDate, endDate, event }],
+    queryFn: () =>
       get('/event-data/events', {
         websiteId,
         startAt: +startDate,
         endAt: +endDate,
         event,
       }),
-    { enabled: !!(websiteId && startDate && endDate) },
-  );
+    enabled: !!(websiteId && startDate && endDate),
+  });
 
   return { data, error, isLoading };
 }

src/app/(main)/websites/[id]/realtime/Realtime.js

@@ -28,15 +28,13 @@ export function Realtime({ websiteId }) {
   const [currentData, setCurrentData] = useState();
   const { get, useQuery } = useApi();
   const { data: website } = useWebsite(websiteId);
-  const { data, isLoading, error } = useQuery(
-    ['realtime', websiteId],
-    () => get(`/realtime/${websiteId}`, { startAt: currentData?.timestamp || 0 }),
-    {
-      enabled: !!(websiteId && website),
-      refetchInterval: REALTIME_INTERVAL,
-      cache: false,
-    },
-  );
+  const { data, isLoading, error } = useQuery({
+    queryKey: ['realtime', websiteId],
+    queryFn: () => get(`/realtime/${websiteId}`, { startAt: currentData?.timestamp || 0 }),
+    enabled: !!(websiteId && website),
+    refetchInterval: REALTIME_INTERVAL,
+    cache: false,
+  });
 
   useEffect(() => {
     if (data) {

src/app/(main)/websites/[id]/realtime/RealtimeHome.js

@@ -10,7 +10,10 @@ export function RealtimeHome() {
   const { formatMessage, labels, messages } = useMessages();
   const { get, useQuery } = useApi();
   const router = useRouter();
-  const { data, isLoading, error } = useQuery(['websites:me'], () => get('/me/websites'));
+  const { data, isLoading, error } = useQuery({
+    queryKey: ['websites:me'],
+    queryFn: () => get('/me/websites'),
+  });
 
   useEffect(() => {
     if (data?.length) {