minor code clarity changes

kbase · Oct 30, 2023 · 976fb85 · 976fb85
1 parent e47c4d4
commit 976fb85
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/features/collections/data_products/Biolog.tsx b/src/features/collections/data_products/Biolog.tsx
@@ -16,7 +16,7 @@ import { Pagination } from '../../../common/components/Table';
 import { useAppDispatch, useBackoffPolling } from '../../../common/hooks';
 import { useAppParam } from '../../params/hooks';
 import { useSelectionId } from '../collectionsSlice';
-import { HeatMap } from './HeatMap';
+import { HeatMap, MAX_HEATMAP_PAGE } from './HeatMap';
 
 export const Biolog: FC<{
   collection_id: string;
@@ -65,7 +65,7 @@ export const Biolog: FC<{
             }
           }}
         />
-        <Pagination table={table} maxPage={10000} />
+        <Pagination table={table} maxPage={MAX_HEATMAP_PAGE} />
       </div>
     </div>
   );
@@ -174,11 +174,13 @@ const useBiolog = (collection_id: string | undefined) => {
       const normVal = (v: number): number =>
         !meta ? 0 : (v - meta.min_value) / (meta.max_value - meta.min_value);
       if (type === 'float') {
-        const v = typeof value === 'number' ? value : parseFloat('' + value);
+        const v =
+          typeof value === 'number' ? value : parseFloat(value.toString());
         return normVal(v);
       }
       if (type === 'int' || type === 'count') {
-        const v = typeof value === 'number' ? value : parseInt('' + value);
+        const v =
+          typeof value === 'number' ? value : parseInt(value.toString());
         return normVal(v);
       }
       return value ? 1 : 0;

diff --git a/src/features/collections/data_products/HeatMap.tsx b/src/features/collections/data_products/HeatMap.tsx
@@ -18,6 +18,8 @@ import { select } from 'd3-selection';
 import { Loader } from '../../../common/components/Loader';
 import { Tooltip, useHover } from '../../../common/components/Tooltip';
 
+export const MAX_HEATMAP_PAGE = 10000;
+
 /**
  * Generic Collections HeatMap viz, accepts a table with cell values of 0-1
  */

diff --git a/src/features/collections/data_products/Microtrait.tsx b/src/features/collections/data_products/Microtrait.tsx
@@ -16,7 +16,7 @@ import { Pagination } from '../../../common/components/Table';
 import { useAppDispatch, useBackoffPolling } from '../../../common/hooks';
 import { useAppParam } from '../../params/hooks';
 import { useSelectionId } from '../collectionsSlice';
-import { HeatMap } from './HeatMap';
+import { HeatMap, MAX_HEATMAP_PAGE } from './HeatMap';
 
 export const Microtrait: FC<{
   collection_id: string;
@@ -63,7 +63,7 @@ export const Microtrait: FC<{
             }
           }}
         />
-        <Pagination table={table} maxPage={10000} />
+        <Pagination table={table} maxPage={MAX_HEATMAP_PAGE} />
       </div>
     </div>
   );
@@ -176,11 +176,13 @@ const useMicrotrait = (collection_id: string | undefined) => {
       const normVal = (v: number): number =>
         !meta ? 0 : (v - meta.min_value) / (meta.max_value - meta.min_value);
       if (type === 'float') {
-        const v = typeof value === 'number' ? value : parseFloat('' + value);
+        const v =
+          typeof value === 'number' ? value : parseFloat(value.toString());
         return normVal(v);
       }
       if (type === 'int' || type === 'count') {
-        const v = typeof value === 'number' ? value : parseInt('' + value);
+        const v =
+          typeof value === 'number' ? value : parseInt(value.toString());
         return normVal(v);
       }
       return value ? 1 : 0;