Merge pull request #3252 from bettyblocks/fix/properly-display-error-…

…message-data-table-PFR-727 fix: properly display error msg in data table header PFR-727
bettyblocks · Nov 16, 2023 · 6c0d0e6 · 6c0d0e6
2 parents 0f2ca78 + 5f2e7a7
commit 6c0d0e6
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/components/dataTable.js b/src/components/dataTable.js
@@ -498,15 +498,22 @@
     };
 
     const renderTableHead = () => {
-      if ((loading && !loadOnScroll) || error) {
+      if (loading && !loadOnScroll) {
         return Array.from(Array(children.length).keys()).map((colIdx) => (
           <TableCell key={colIdx}>
-            <div className={classes.skeleton}>
-              {error && displayError && error.message}
-            </div>
+            <div className={classes.skeleton} />
           </TableCell>
         ));
       }
+
+      if (error) {
+        return (
+          <TableCell colSpan={children.length}>
+            {error && displayError && error.message}
+          </TableCell>
+        );
+      }
+
       return (
         <Children headerOnly handleSort={handleSort} orderBy={orderBy}>
           {children}