Updated DataTable rendering.

umami-software · Oct 8, 2023 · ef9f8ed · ef9f8ed
1 parent 8b48130
commit ef9f8ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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}