refactor(common-ui): change onNameClick argument in GroupedDataTable

AntaresSimulatorTeam · Mar 29, 2024 · 371510e · 371510e
1 parent cef2c05
commit 371510e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/index.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/index.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { createMRTColumnHelper, type MRT_Row } from "material-react-table";
+import { createMRTColumnHelper } from "material-react-table";
 import { Box } from "@mui/material";
 import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import { useTranslation } from "react-i18next";
@@ -127,8 +127,8 @@ function Renewables() {
     return deleteRenewableClusters(study.id, areaId, ids);
   };
 
-  const handleNameClick = (row: MRT_Row<RenewableClusterWithCapacity>) => {
-    navigate(`${location.pathname}/${row.original.id}`);
+  const handleNameClick = (row: RenewableClusterWithCapacity) => {
+    navigate(`${location.pathname}/${row.id}`);
   };
 
   ////////////////////////////////////////////////////////////////

diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/index.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/index.tsx
@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { createMRTColumnHelper, type MRT_Row } from "material-react-table";
+import { createMRTColumnHelper } from "material-react-table";
 import { Box, Tooltip } from "@mui/material";
 import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import { StudyMetadata } from "../../../../../../../common/types";
@@ -166,8 +166,8 @@ function Storages() {
     return deleteStorages(study.id, areaId, ids);
   };
 
-  const handleNameClick = (row: MRT_Row<Storage>) => {
-    navigate(`${location.pathname}/${row.original.id}`);
+  const handleNameClick = (row: Storage) => {
+    navigate(`${location.pathname}/${row.id}`);
   };
 
   ////////////////////////////////////////////////////////////////

diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/index.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/index.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { createMRTColumnHelper, type MRT_Row } from "material-react-table";
+import { createMRTColumnHelper } from "material-react-table";
 import { Box } from "@mui/material";
 import { useLocation, useNavigate, useOutletContext } from "react-router-dom";
 import { useTranslation } from "react-i18next";
@@ -134,8 +134,8 @@ function Thermal() {
     return deleteThermalClusters(study.id, areaId, ids);
   };
 
-  const handleNameClick = (row: MRT_Row<ThermalClusterWithCapacity>) => {
-    navigate(`${location.pathname}/${row.original.id}`);
+  const handleNameClick = (row: ThermalClusterWithCapacity) => {
+    navigate(`${location.pathname}/${row.id}`);
   };
 
   ////////////////////////////////////////////////////////////////

diff --git a/webapp/src/components/common/GroupedDataTable/index.tsx b/webapp/src/components/common/GroupedDataTable/index.tsx
@@ -11,7 +11,6 @@ import {
   useMaterialReactTable,
   type MRT_RowSelectionState,
   type MRT_ColumnDef,
-  type MRT_Row,
 } from "material-react-table";
 import { useTranslation } from "react-i18next";
 import { useMemo, useRef, useState } from "react";
@@ -42,7 +41,7 @@ export interface GroupedDataTableProps<
   onCreate?: (values: TRow<TGroups[number]>) => Promise<TData>;
   onDuplicate?: (row: TData, newName: string) => Promise<TData>;
   onDelete?: (rows: TData[]) => PromiseAny | void;
-  onNameClick?: (row: MRT_Row<TData>) => void;
+  onNameClick?: (row: TData) => void;
   isLoading?: boolean;
   deleteConfirmationMessage?: string | ((count: number) => string);
   fillPendingRow?: (
@@ -131,7 +130,7 @@ function GroupedDataTable<
                     textDecoration: "underline",
                   },
                 }}
-                onClick={() => callbacksRef.current.onNameClick?.(row)}
+                onClick={() => callbacksRef.current.onNameClick?.(row.original)}
               >
                 {renderedCellValue}
               </Box>