Fix compilation errors in List

marmelab · Apr 9, 2024 · 75ee4b6 · 75ee4b6
1 parent e9b4b6c
commit 75ee4b6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/packages/ra-ui-materialui/src/list/Count.tsx b/packages/ra-ui-materialui/src/list/Count.tsx
@@ -40,6 +40,11 @@ export const Count = (props: CountProps) => {
         ...rest
     } = props;
     const resource = useResourceContext(props);
+    if (!resource) {
+        throw new Error(
+            'The Count component must be used inside a ResourceContext or must be passed a resource prop.'
+        );
+    }
     const oneSecondHasPassed = useTimeout(timeout);
     const createPath = useCreatePath();
 

diff --git a/packages/ra-ui-materialui/src/list/Empty.tsx b/packages/ra-ui-materialui/src/list/Empty.tsx
@@ -21,7 +21,7 @@ export const Empty = (props: EmptyProps) => {
     const getResourceLabel = useGetResourceLabel();
     const resourceName = translate(`resources.${resource}.forcedCaseName`, {
         smart_count: 0,
-        _: getResourceLabel(resource, 0),
+        _: resource ? getResourceLabel(resource, 0) : undefined,
     });
 
     const emptyMessage = translate('ra.page.empty', { name: resourceName });

diff --git a/packages/ra-ui-materialui/src/list/datagrid/DatagridLoading.tsx b/packages/ra-ui-materialui/src/list/datagrid/DatagridLoading.tsx
@@ -27,10 +27,10 @@ const DatagridLoading = ({
     nbChildren,
     nbFakeLines = 5,
     size,
-}: DatagridLoadingProps): JSX.Element => {
+}: DatagridLoadingProps) => {
     const oneSecondHasPassed = useTimeout(1000);
-
-    return oneSecondHasPassed ? (
+    if (!oneSecondHasPassed) return null;
+    return (
         <div className={DatagridClasses.root}>
             <Table
                 className={clsx(DatagridClasses.table, className)}
@@ -113,7 +113,7 @@ const DatagridLoading = ({
                 </TableBody>
             </Table>
         </div>
-    ) : null;
+    );
 };
 
 DatagridLoading.propTypes = {