Merge branch 'bugfix/unsuccessfullResult-in-row-rendering' into q/1.0

scality · Jul 2, 2024 · 0e2fb8b · 0e2fb8b
2 parents fcc3d51 + 7b55cf9
commit 0e2fb8b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/src/lib/components/UnsuccessfulResult.component.tsx b/src/lib/components/UnsuccessfulResult.component.tsx
@@ -11,7 +11,7 @@ import { Text } from './text/Text.component';
 import { Box } from './box/Box';
 import { spacing } from '../spacing';
 
-const NoResult = styled(Box)<{ height: number | string }>`
+export const NoResult = styled(Box)<{ height: number | string }>`
   display: flex;
   justify-content: center;
   align-items: center;

diff --git a/src/lib/components/tablev2/TableCommon.tsx b/src/lib/components/tablev2/TableCommon.tsx
@@ -147,21 +147,30 @@ export function TableRows<
       />
     );
   }
-
   if (status === 'success' || status === undefined) {
     if (typeof children === 'function') {
-      return children(
-        <VirtualizedRows
-          rows={rows}
-          listRef={bodyRef}
-          itemKey={itemKey}
-          rowHeight={rowHeight}
-          setHasScrollbar={setHasScrollbar}
-          onBottom={onBottom}
-          onBottomOffset={onBottomOffset}
-          RenderRow={RenderRow}
-        />,
-      );
+      if (rows.length) {
+        return children(
+          <VirtualizedRows
+            rows={rows}
+            listRef={bodyRef}
+            itemKey={itemKey}
+            rowHeight={rowHeight}
+            setHasScrollbar={setHasScrollbar}
+            onBottom={onBottom}
+            onBottomOffset={onBottomOffset}
+            RenderRow={RenderRow}
+          />,
+        );
+      } else {
+        return children(
+          <UnsuccessfulResult
+            rowHeight={rowHeight}
+            name={entityName}
+            status="noResult"
+          />,
+        );
+      }
     } else if (rows.length) {
       return (
         <VirtualizedRows
@@ -176,7 +185,13 @@ export function TableRows<
         />
       );
     } else {
-      return <UnsuccessfulResult name={entityName} status="noResult" />;
+      return (
+        <UnsuccessfulResult
+          rowHeight={rowHeight}
+          name={entityName}
+          status="noResult"
+        />
+      );
     }
   }