Fixed some small bugs

Signed-off-by: Emil Balitzki <[email protected]>
amosproj · Jul 13, 2024 · df9d608 · df9d608
1 parent 7ba29cf
commit df9d608
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/frontend/src/components/DataView/DataRow.tsx b/frontend/src/components/DataView/DataRow.tsx
@@ -99,7 +99,7 @@ const DataRow: React.FC<RowProps> = ({ row, currentDatasets }) => {
   return (
     <Fragment>
       <TableRow className="data-row">
-        {row.subdata.length > 0 ? (
+        {row.subdata && row.subdata.length > 0 ? (
           <TableCell className="toggle-column" size="small">
             <IconButton
               aria-label="expand row"
@@ -155,14 +155,20 @@ const DataRow: React.FC<RowProps> = ({ row, currentDatasets }) => {
           <Collapse in={open} timeout="auto" unmountOnExit>
             <Table size="small" aria-label="subdata">
               <TableBody className="subdata-rows-container">
-                {row.subdata.map((subItem) => (
-                  <TableRow key={subItem.key}>
-                    <TableCell component="th" scope="row" size="small">
-                      {subItem.key}
-                    </TableCell>
-                    <TableCell size="small">{subItem.value}</TableCell>
-                  </TableRow>
-                ))}
+                {row.subdata ? (
+                  <div>
+                    {row.subdata.map((subItem) => (
+                      <TableRow key={subItem.key}>
+                        <TableCell component="th" scope="row" size="small">
+                          {subItem.key}
+                        </TableCell>
+                        <TableCell size="small">{subItem.value}</TableCell>
+                      </TableRow>
+                    ))}
+                  </div>
+                ) : (
+                  <div></div>
+                )}
               </TableBody>
             </Table>
           </Collapse>

diff --git a/frontend/src/components/DataView/DataView.tsx b/frontend/src/components/DataView/DataView.tsx
@@ -219,7 +219,7 @@ const DataView = () => {
                     <TableBody>
                       {filterData(data?.selectionData ?? []).map((row) => (
                         <DataRow
-                          key={row.datasetID}
+                          key={row.displayName + row.value + row.coordinate}
                           row={row}
                           currentDatasets={currentDatasets}
                         />
@@ -241,7 +241,7 @@ const DataView = () => {
                     <TableBody>
                       {filterData(data?.individualData ?? []).map((row) => (
                         <DataRow
-                          key={row.datasetID}
+                          key={row.displayName + row.value + row.coordinate}
                           row={row}
                           currentDatasets={currentDatasets}
                         />

diff --git a/frontend/src/types/LocationDataTypes.tsx b/frontend/src/types/LocationDataTypes.tsx
@@ -14,7 +14,7 @@ export interface DatasetItem {
   value: string | null;
   datasetID: string | null;
   coordinate: number[] | null;
-  subdata: SubdataItem[];
+  subdata: SubdataItem[] | null;
 }
 
 /**