Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed websites paging.
Mike Caod709f4eb80d2
diff --git a/src/app/(main)/settings/teams/TeamsPage.tsx b/src/app/(main)/settings/teams/TeamsSettingsPage.tsxsimilarity index 79%rename from src/app/(main)/settings/teams/TeamsPage.tsxrename to src/app/(main)/settings/teams/TeamsSettingsPage.tsxindex 33ddda3df..9b45845bc 100644--- a/src/app/(main)/settings/teams/TeamsPage.tsx+++ b/src/app/(main)/settings/teams/TeamsSettingsPage.tsx@@ -2,7 +2,7 @@import TeamsDataTable from './TeamsDataTable';import TeamsHeader from './TeamsHeader';-export default function TeamsPage() {+export default function TeamsSettingsPage() {return (<><TeamsHeader />diff --git a/src/app/(main)/settings/teams/page.tsx b/src/app/(main)/settings/teams/page.tsxindex 93be83a20..4342b607f 100644--- a/src/app/(main)/settings/teams/page.tsx+++ b/src/app/(main)/settings/teams/page.tsx@@ -1,8 +1,8 @@import { Metadata } from 'next';-import TeamsPage from './TeamsPage';+import TeamsSettingsPage from './TeamsSettingsPage';export default function () {- return <TeamsPage />;+ return <TeamsSettingsPage />;}export const metadata: Metadata = {diff --git a/src/app/(main)/settings/users/UsersPage.tsx b/src/app/(main)/settings/users/UsersSettingsPage.tsxsimilarity index 79%rename from src/app/(main)/settings/users/UsersPage.tsxrename to src/app/(main)/settings/users/UsersSettingsPage.tsxindex 348c5a334..664f58d1b 100644--- a/src/app/(main)/settings/users/UsersPage.tsx+++ b/src/app/(main)/settings/users/UsersSettingsPage.tsx@@ -2,7 +2,7 @@import UsersDataTable from './UsersDataTable';import UsersHeader from './UsersHeader';-export default function UsersPage() {+export default function UsersSettingsPage() {return (<><UsersHeader />diff --git a/src/app/(main)/settings/users/page.tsx b/src/app/(main)/settings/users/page.tsxindex a3209ab3c..01d5156f2 100644--- a/src/app/(main)/settings/users/page.tsx+++ b/src/app/(main)/settings/users/page.tsx@@ -1,8 +1,8 @@import { Metadata } from 'next';-import UsersPage from './UsersPage';+import UsersSettingsPage from './UsersSettingsPage';export default function () {- return <UsersPage />;+ return <UsersSettingsPage />;}export const metadata: Metadata = {title: 'Users',diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsxindex a9d99f9af..6ffe6fd01 100644--- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx@@ -4,21 +4,19 @@ import DataTable from 'components/common/DataTable';import { useWebsites } from 'components/hooks';export function WebsitesDataTable({- userId,teamId,allowEdit = true,allowView = true,showActions = true,children,}: {- userId?: string;teamId?: string;allowEdit?: boolean;allowView?: boolean;showActions?: boolean;children?: ReactNode;}) {- const queryResult = useWebsites({ userId, teamId });+ const queryResult = useWebsites({ teamId });return (<DataTable queryResult={queryResult}>diff --git a/src/app/(main)/settings/websites/WebsitesPage.tsx b/src/app/(main)/settings/websites/WebsitesPage.tsxdeleted file mode 100644index 4de8f1051..000000000--- a/src/app/(main)/settings/websites/WebsitesPage.tsx+++ /dev/null@@ -1,15 +0,0 @@-'use client';-import { useLogin } from 'components/hooks';-import WebsitesDataTable from './WebsitesDataTable';-import WebsitesHeader from './WebsitesHeader';--export default function WebsitesPage({ teamId }: { teamId: string }) {- const { user } = useLogin();-- return (- <>- <WebsitesHeader teamId={teamId} allowCreate={user.role !== 'view-only'} />- <WebsitesDataTable teamId={teamId} userId={user.id} allowEdit={true} />- </>- );-}diff --git a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsxnew file mode 100644index 000000000..14411da10--- /dev/null+++ b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx@@ -0,0 +1,12 @@+'use client';+import WebsitesDataTable from './WebsitesDataTable';+import WebsitesHeader from './WebsitesHeader';++export default function WebsitesSettingsPage({ teamId }: { teamId: string }) {+ return (+ <>+ <WebsitesHeader teamId={teamId} />+ <WebsitesDataTable teamId={teamId} />+ </>+ );+}diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsitePage.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsxsimilarity index 76%rename from src/app/(main)/settings/websites/[websiteId]/WebsitePage.tsxrename to src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsxindex 752fd33ca..001476298 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsitePage.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx@@ -2,7 +2,7 @@import WebsiteProvider from 'app/(main)/websites/[websiteId]/WebsiteProvider';import WebsiteSettings from './WebsiteSettings';-export default function WebsitePage({ websiteId }: { websiteId: string }) {+export default function WebsiteSettingsPage({ websiteId }: { websiteId: string }) {return (<WebsiteProvider websiteId={websiteId}><WebsiteSettings websiteId={websiteId} />diff --git a/src/app/(main)/settings/websites/[websiteId]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsxindex 33caff5ac..f3d87c788 100644--- a/src/app/(main)/settings/websites/[websiteId]/page.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/page.tsx@@ -1,8 +1,8 @@-import WebsitePage from './WebsitePage';+import WebsiteSettingsPage from './WebsiteSettingsPage';import { Metadata } from 'next';export default async function ({ params: { websiteId } }) {- return <WebsitePage websiteId={websiteId} />;+ return <WebsiteSettingsPage websiteId={websiteId} />;}export const metadata: Metadata = {diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsxindex 8d305e6b7..d073b32b5 100644--- a/src/app/(main)/settings/websites/page.tsx+++ b/src/app/(main)/settings/websites/page.tsx@@ -1,8 +1,8 @@import { Metadata } from 'next';-import WebsitesPage from './WebsitesPage';+import WebsitesSettingsPage from './WebsitesSettingsPage';export default function ({ params: { teamId } }: { params: { teamId: string } }) {- return <WebsitesPage teamId={teamId} />;+ return <WebsitesSettingsPage teamId={teamId} />;}export const metadata: Metadata = {diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsxindex fa2e9f71a..75776c4cf 100644--- a/src/app/(main)/websites/WebsitesPage.tsx+++ b/src/app/(main)/websites/WebsitesPage.tsx@@ -1,12 +1,15 @@'use client';import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader';import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable';+import { useLogin } from 'components/hooks';++export default function WebsitesPage({ teamId }: { teamId: string; userId: string }) {+ const { user } = useLogin();-export default function WebsitesPage({ teamId, userId }: { teamId: string; userId: string }) {return (<>- <WebsitesHeader teamId={teamId} />- <WebsitesDataTable teamId={teamId} userId={userId} allowEdit={false} />+ <WebsitesHeader teamId={teamId} allowCreate={user.role !== 'view-only'} />+ <WebsitesDataTable teamId={teamId} allowEdit={false} /></>);}diff --git a/src/components/common/Pager.tsx b/src/components/common/Pager.tsxindex 82292156a..3e0a8033e 100644--- a/src/components/common/Pager.tsx+++ b/src/components/common/Pager.tsx@@ -23,6 +23,7 @@ export function Pager({ page, pageSize, count, onPageChange, className }: PagerPconst handlePageChange = (value: number) => {const nextPage = page + value;+if (nextPage > 0 && nextPage <= maxPage) {onPageChange(nextPage);}diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.tsindex 8bfad3334..941989750 100644--- a/src/components/hooks/queries/useWebsites.ts+++ b/src/components/hooks/queries/useWebsites.ts@@ -13,8 +13,9 @@ export function useWebsites(return useFilterQuery({queryKey: ['websites', { userId, teamId, modified, ...params }],- queryFn: () => {+ queryFn: (data: any) => {return get(teamId ? `/teams/${teamId}/websites` : `/users/${userId || user.id}/websites`, {+ ...data,...params,});},diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsxindex 1ea8d3928..0540ed383 100644--- a/src/components/input/WebsiteSelect.tsx+++ b/src/components/input/WebsiteSelect.tsx@@ -7,12 +7,10 @@ import styles from './WebsiteSelect.module.css';export function WebsiteSelect({websiteId,teamId,- userId,onSelect,}: {websiteId?: string;teamId?: string;- userId?: string;onSelect?: (key: any) => void;}) {const { formatMessage, labels, messages } = useMessages();@@ -21,7 +19,7 @@ export function WebsiteSelect({const { data: website } = useWebsite(selectedId as string);- const queryResult = useWebsites({ teamId, userId }, { query, pageSize: 5 });+ const queryResult = useWebsites({ teamId }, { query, pageSize: 5 });const renderValue = () => {return website?.name;