fix(page loading): condition for more button

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.29
+
+- fix more button issue in page loading component
+
 ## 2.1.28
 
 - upgrade node-ip package (transitive dependency over @storybook/core-server) to remove CVE-2023-42282

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-shared-components",
-  "version": "2.1.28",
+  "version": "2.1.29",
   "description": "Catena-X Portal Shared Components",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",

src/components/basic/Table/PageLoadingTable.tsx

@@ -138,7 +138,7 @@ export const PageLoadingTable = function <Row, Args>({
         reload={refetch}
         {...props}
       />
-      {items.length > 0 && hasMore && (
+      {items.length > 0 && hasMore ? (
         <Box
           sx={{
             width: '100%',
@@ -150,6 +150,8 @@ export const PageLoadingTable = function <Row, Args>({
         >
           <LoadMoreButton label={loadLabel || 'load more'} onClick={nextPage} />
         </Box>
+      ) : (
+        <></>
       )}
     </>
   )

src/components/basic/Table/components/Helper/helper.ts

@@ -36,11 +36,10 @@ export interface PageDataRows {
 
 export const hasMorePages = (data: PageDataProps) => {
   return (
-    (data.page && data.totalPages && data?.page < data?.totalPages - 1) ??
-    (data?.meta && data.meta.page < data.meta.totalPages - 1)
+    data?.meta && data.meta.page < data.meta.totalPages - 1
   )
 }
 
 export const getMaxRows = (data: PageDataRows) => {
-  return data?.totalElements ?? data?.meta?.totalElements ?? 0
+  return data?.meta?.totalElements ?? 0
 }