fix(react): support rendering unknown columns

niledatabase · Aug 18, 2022 · 6a2ec0b · 6a2ec0b
1 parent 0d484de
commit 6a2ec0b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/packages/react/src/components/InstanceTable/InstanceTable.tsx b/packages/react/src/components/InstanceTable/InstanceTable.tsx
@@ -80,6 +80,19 @@ const InstanceTable = React.memo(function InstanceTable(props: Props) {
       }
       return baseArr;
     }
+    if (columns) {
+      return columns.map((header: string | GridColDef): GridColDef => {
+        if (typeof header === 'object') {
+          return header;
+        }
+        return {
+          minWidth: 200,
+          field: header,
+          headerName: header,
+          flex: 1,
+        };
+      });
+    }
     return [];
   }, [additionalColumns, columns, entityData, processColumns]);
 
@@ -92,6 +105,7 @@ const InstanceTable = React.memo(function InstanceTable(props: Props) {
     }
     return `No ${entity} found`;
   }
+
   return (
     <TableSkeleton isFetching={isFetching} numberOfRows={flatInstances.length}>
       {flatInstances.length === 0 ? (

diff --git a/packages/react/src/components/InstanceTable/InstanceTableDataFetcher.tsx b/packages/react/src/components/InstanceTable/InstanceTableDataFetcher.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { useQuery } from '@tanstack/react-query';
 
 import { useNile } from '../../context';
-import Queries from '../../lib/queries';
+import Queries, { useQuery } from '../../lib/queries';
 
 import InstanceTable from './InstanceTable';
 import { InstanceTableProps } from './types';
@@ -34,9 +33,7 @@ export default function InstanceTableDataFetcher(
 
   const { data: entityData, isFetching: isEntityFetching } = useQueryHook(
     Queries.GetEntity(entity),
-    () => {
-      return nile.entities.getEntity({ type: String(entity) });
-    }
+    () => nile.entities.getEntity({ type: String(entity) })
   );
 
   const { data: instances, isFetching: isInstancesFetching } = useQueryHook(
@@ -47,7 +44,6 @@ export default function InstanceTableDataFetcher(
         org: String(org),
       })
   );
-
   return (
     <InstanceTable
       instances={instances}