Removed redundant wrappers and updated empty state text

Author: MillanWangGadget

packages/react/src/auto/shadcn/ShadcnAutoTable.tsx

@@ -1,6 +1,7 @@
 import { type FindManyFunction, type GadgetRecord } from "@gadgetinc/api-client-core";
+import pluralize from "pluralize";
 import * as React from "react";
-import { useCallback } from "react";
+import { useCallback, useMemo } from "react";
 import { useTable } from "../../useTable.js";
 import { type ColumnValueType, type OptionsType } from "../../utils.js";
 import { type AutoTableProps } from "../AutoTable.js";
@@ -50,7 +51,7 @@ export const makeAutoTable = (elements: ShadcnElements) => {
       error, // TODO - add an error state
       selection, // TODO - add record selection and bulk action system
       sort, // TODO - add column sorting
-
+      metadata,
       data: rawRecords, // TODO - use this to get direct record access in callbacks
     } = methods;
 
@@ -68,6 +69,15 @@ export const makeAutoTable = (elements: ShadcnElements) => {
       [onClick]
     );
 
+    const resourceName = useMemo(
+      () =>
+        props.resourceName ?? {
+          singular: metadata?.name ?? "",
+          plural: metadata ? pluralize(metadata.name) : "",
+        },
+      [props.resourceName, metadata]
+    );
+
     if (error) {
       return <Alert>Error</Alert>;
     }
@@ -105,7 +115,7 @@ export const makeAutoTable = (elements: ShadcnElements) => {
               ) : (
                 <TableRow>
                   <TableCell colSpan={columns.length} className="h-24 text-center">
-                    No results.
+                    {`No ${resourceName.plural} yet`}
                   </TableCell>
                 </TableRow>
               )}

packages/react/src/auto/shadcn/table/ShadcnAutoTablePagination.tsx

@@ -23,7 +23,5 @@ export const makeShadcnAutoTablePagination = (elements: ShadcnElements) => {
     );
   }
 
-  return (props: { page: PaginationResult }) => {
-    return <ShadcnAutoTablePagination {...props} />;
-  };
+  return ShadcnAutoTablePagination;
 };

packages/react/src/auto/shadcn/table/ShadcnAutoTableSearch.tsx

@@ -22,7 +22,5 @@ export const makeShadcnAutoTableSearch = (elements: ShadcnElements) => {
     );
   }
 
-  return (props: { search: SearchResult }) => {
-    return <ShadcnAutoTableSearch {...props} />;
-  };
+  return ShadcnAutoTableSearch;
 };

packages/react/src/auto/shadcn/table/cells/ShadcnAutoTableBooleanCell.tsx

@@ -16,9 +16,7 @@ export const makeShadcnAutoTableBooleanCell = (elements: Pick<ShadcnElements, "L
     );
   }
 
-  return (props: { value: any }) => {
-    return <ShadcnAutoTableBooleanCell {...props} />;
-  };
+  return ShadcnAutoTableBooleanCell;
 };
 
 const Checkmark = "✓";

packages/react/src/auto/shadcn/table/cells/ShadcnAutoTableCellRenderer.tsx

@@ -68,7 +68,5 @@ export const makeShadcnAutoTableCellRenderer = (elements: ShadcnElements) => {
     }
   }
 
-  return (props: { column: TableColumn; value: ColumnValueType }) => {
-    return <ShadcnAutoTableCellRenderer {...props} />;
-  };
+  return ShadcnAutoTableCellRenderer;
 };

packages/react/src/auto/shadcn/table/cells/ShadcnAutoTableDateTimeCell.tsx

@@ -11,7 +11,5 @@ export const makeShadcnAutoTableDateTimeCell = (elements: ShadcnAutoTableTextCel
     return value instanceof Date ? <ShadcnAutoTableTextCell value={formatLongDateTimeString(value, includeTime)} /> : null;
   }
 
-  return (props: { value: any; includeTime: boolean }) => {
-    return <ShadcnAutoTableDateTimeCell {...props} />;
-  };
+  return ShadcnAutoTableDateTimeCell;
 };

packages/react/src/auto/shadcn/table/cells/ShadcnAutoTableEncryptedStringCell.tsx

@@ -28,9 +28,7 @@ export const makeShadcnAutoTableEncryptedStringCell = (elements: Pick<ShadcnElem
     );
   }
 
-  return (props: { value: any }) => {
-    return <ShadcnAutoTableEncryptedStringCell {...props} />;
-  };
+  return ShadcnAutoTableEncryptedStringCell;
 };
 
 const showButtonContent = <Eye />;

packages/react/src/auto/shadcn/table/cells/ShadcnAutoTableFileCell.tsx

@@ -21,9 +21,8 @@ export const makeShadcnAutoTableFileCell = (elements: Pick<ShadcnElements, "Labe
       </div>
     );
   }
-  return (props: { value: FileValueType }) => {
-    return <ShadcnAutoTableFileCell {...props} />;
-  };
+
+  return ShadcnAutoTableFileCell;
 };
 
 const nonImageFileIndicator = <FileIcon />;

packages/react/src/auto/shadcn/table/cells/ShadcnAutoTableTagCell.tsx

@@ -46,7 +46,5 @@ export const makeShadcnAutoTableTagCell = (elements: ShadcnElements) => {
     );
   }
 
-  return (props: { value: any }) => {
-    return <ShadcnAutoTableTagCell {...props} />;
-  };
+  return ShadcnAutoTableTagCell;
 };

packages/react/src/auto/shadcn/table/cells/ShadcnAutoTableTextCell.tsx

@@ -33,7 +33,5 @@ export const makeShadcnAutoTableTextCell = (elements: ShadcnAutoTableTextCellEle
     );
   }
 
-  return (props: { value: any }) => {
-    return <ShadcnAutoTableTextCell {...props} />;
-  };
+  return ShadcnAutoTableTextCell;
 };