Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Updated data table render check.

Mike Cao90bd72cf9847
diff --git a/src/app/(main)/reports/ReportsDataTable.tsx b/src/app/(main)/reports/ReportsDataTable.tsx
index cf5953e85..7c99fb25f 100644
--- a/src/app/(main)/reports/ReportsDataTable.tsx
+++ b/src/app/(main)/reports/ReportsDataTable.tsx
@@ -1,16 +1,23 @@
import { useReports } from 'components/hooks';
import ReportsTable from './ReportsTable';
import DataTable from 'components/common/DataTable';
+import { ReactNode } from 'react';
export default function ReportsDataTable({
websiteId,
teamId,
+ children,
}: {
websiteId?: string;
teamId?: string;
+ children?: ReactNode;
}) {
const queryResult = useReports({ websiteId, teamId });
+ if (queryResult?.result?.data?.length === 0) {
+ return children;
+ }
+
return (
<DataTable queryResult={queryResult}>
{({ data }) => <ReportsTable data={data} showDomain={!websiteId} />}
diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsx
index fe92b6a05..6baeba331 100644
--- a/src/app/(main)/settings/teams/TeamsDataTable.tsx
+++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx
@@ -1,17 +1,24 @@
import DataTable from 'components/common/DataTable';
import TeamsTable from 'app/(main)/settings/teams/TeamsTable';
import { useLogin, useTeams } from 'components/hooks';
+import { ReactNode } from 'react';
export function TeamsDataTable({
allowEdit,
showActions,
+ children,
}: {
allowEdit?: boolean;
showActions?: boolean;
+ children?: ReactNode;
}) {
const { user } = useLogin();
const queryResult = useTeams(user.id);
+ if (queryResult?.result?.data?.length === 0) {
+ return children;
+ }
+
return (
<DataTable queryResult={queryResult}>
{({ data }) => {
diff --git a/src/app/(main)/settings/users/UsersDataTable.tsx b/src/app/(main)/settings/users/UsersDataTable.tsx
index cfff4e71c..681b4dc2d 100644
--- a/src/app/(main)/settings/users/UsersDataTable.tsx
+++ b/src/app/(main)/settings/users/UsersDataTable.tsx
@@ -1,10 +1,21 @@
import DataTable from 'components/common/DataTable';
import { useUsers } from 'components/hooks';
import UsersTable from './UsersTable';
+import { ReactNode } from 'react';
-export function UsersDataTable({ showActions }: { showActions?: boolean }) {
+export function UsersDataTable({
+ showActions,
+ children,
+}: {
+ showActions?: boolean;
+ children?: ReactNode;
+}) {
const queryResult = useUsers();
+ if (queryResult?.result?.data?.length === 0) {
+ return children;
+ }
+
return (
<DataTable queryResult={queryResult}>
{({ data }) => <UsersTable data={data} showActions={showActions} />}
diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
index b3472942b..1780dfb4a 100644
--- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx
+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx
@@ -18,7 +18,7 @@ export function WebsitesDataTable({
}) {
const queryResult = useWebsites({ teamId });
- if (!queryResult?.result?.data?.length) {
+ if (queryResult?.result?.data?.length === 0) {
return children;
}