fix: count correctly the number of table headers that are rendered (#821

)
influxdata · Oct 6, 2022 · a88b2fb · a88b2fb
1 parent 909ac2c
commit a88b2fb
Show file tree

Hide file tree

Showing 5 changed files with 117 additions and 17 deletions.
diff --git a/giraffe/package.json b/giraffe/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@influxdata/giraffe",
-  "version": "2.37.0",
+  "version": "2.37.1",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "license": "MIT",

diff --git a/giraffe/src/components/SimpleTable/PagedTable.tsx b/giraffe/src/components/SimpleTable/PagedTable.tsx
@@ -23,6 +23,8 @@ interface ExtendedColumn {
   data: any[]
 }
 
+const TABLE_MARGIN = 10
+
 /*
  * @param result - the result of the query
  * @param paginationOffset - the start index of the first row of the current page
@@ -54,31 +56,28 @@ const getNumberOfRowsOnCurrentPage = (
   let lastSignature
   let signature
 
-  // rowHeight is now guaranteed to be greater than zero
-  const lastVisibleRowMinimumHeight = 0.2 * rowHeight
-
   while (rowIdx < result.table.length) {
     if (result.table.columns?.table?.data?.[rowIdx] !== currentTable) {
       signature = Object.values(result.table.columns)
-        .map(
-          c =>
-            `${c.name}::${c.fluxDataType}::${result.fluxGroupKeyUnion.includes(
-              c.name
-            )}`
-        )
+        .map(column => {
+          if (column.data[rowIdx] !== undefined) {
+            return `${column.name}::${
+              column.fluxDataType
+            }::${result.fluxGroupKeyUnion.includes(column.name)}`
+          }
+          return 'undefined'
+        })
         .join('|')
 
       if (signature !== lastSignature) {
         runningHeight += headerHeight
 
         if (currentTable !== undefined) {
-          runningHeight += 10
+          runningHeight += TABLE_MARGIN
         }
 
-        if (
-          runningHeight + lastVisibleRowMinimumHeight >=
-          totalAvailableHeight
-        ) {
+        // Stop counting if the new table cannot fit even 1 row
+        if (runningHeight + rowHeight >= totalAvailableHeight) {
           break
         }
 
@@ -92,7 +91,7 @@ const getNumberOfRowsOnCurrentPage = (
 
     runningHeight += rowHeight
 
-    if (runningHeight + lastVisibleRowMinimumHeight >= totalAvailableHeight) {
+    if (runningHeight >= totalAvailableHeight) {
       break
     }
 

diff --git a/stories/package.json b/stories/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@influxdata/giraffe-stories",
-  "version": "2.37.0",
+  "version": "2.37.1",
   "license": "MIT",
   "repository": {
     "type": "git",