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 DataTable rendering.

Mike Caoef9f8ed81641
diff --git a/src/app/(main)/settings/layout.module.css b/src/app/(main)/settings/layout.module.css
index b87f75d00..c56ec8bbd 100644
--- a/src/app/(main)/settings/layout.module.css
+++ b/src/app/(main)/settings/layout.module.css
@@ -6,7 +6,7 @@
.menu {
width: 240px;
- padding-top: 40px;
+ padding-top: 34px;
padding-right: 20px;
}
diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx
index 3efee0248..ad76f18b9 100644
--- a/src/components/common/DataTable.tsx
+++ b/src/components/common/DataTable.tsx
@@ -25,16 +25,16 @@ export interface DataTableProps {
error: unknown;
};
searchDelay?: number;
- showSearch?: boolean;
- showPaging?: boolean;
+ allowSearch?: boolean;
+ allowPaging?: boolean;
children: ReactNode | ((data: any) => ReactNode);
}
export function DataTable({
queryResult,
searchDelay = 600,
- showSearch = true,
- showPaging = true,
+ allowSearch = true,
+ allowPaging = true,
children,
}: DataTableProps) {
const { formatMessage, labels, messages } = useMessages();
@@ -58,7 +58,7 @@ export function DataTable({
return (
<>
- {(hasData || query || isLoading) && showSearch && (
+ {allowSearch && (hasData || query) && (
<SearchField
className={styles.search}
value={query}
@@ -73,12 +73,10 @@ export function DataTable({
>
{hasData ? (typeof children === 'function' ? children(result) : children) : null}
{isLoading && <Loading icon="dots" />}
- {!isLoading && !hasData && !query && (
- <Empty message={formatMessage(messages.noDataAvailable)} />
- )}
+ {!isLoading && !hasData && !query && <Empty />}
{noResults && <Empty message={formatMessage(messages.noResultsFound)} />}
</div>
- {showPaging && (
+ {allowPaging && hasData && (
<Pager
className={styles.pager}
page={page}