fix wrong import

AntaresSimulatorTeam · Feb 6, 2025 · dd358a2 · dd358a2
1 parent deb0118
commit dd358a2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 93 deletions.
diff --git a/...pp/src/components/App/Singlestudy/HomeView/InformationView/LauncherHistory/JobStepper.tsx b/...pp/src/components/App/Singlestudy/HomeView/InformationView/LauncherHistory/JobStepper.tsx
@@ -40,8 +40,8 @@ import {
 } from "./style";
 import ConfirmationDialog from "../../../../../common/dialogs/ConfirmationDialog";
 import LinearProgressWithLabel from "../../../../../common/LinearProgressWithLabel";
-import DigestDialog from "../../../../../common/dialogs/DigestDialog";
 import type { EmptyObject } from "../../../../../../utils/tsUtils";
+import DigestDialog from "@/components/common/dialogs/DigestDialog";
 
 export const ColorStatus = {
   running: "warning.main",

diff --git a/webapp/src/components/App/Singlestudy/explore/Results/index.tsx b/webapp/src/components/App/Singlestudy/explore/Results/index.tsx
@@ -55,7 +55,7 @@ import LaunchJobLogView from "../../../Tasks/LaunchJobLogView";
 import useEnqueueErrorSnackbar from "../../../../../hooks/useEnqueueErrorSnackbar";
 import ConfirmationDialog from "../../../../common/dialogs/ConfirmationDialog";
 import type { EmptyObject } from "../../../../../utils/tsUtils";
-import DigestDialog from "../../../../common/dialogs/DigestDialog";
+import DigestDialog from "@/components/common/dialogs/DigestDialog";
 
 interface OutputDetail {
   name: string;

diff --git a/webapp/src/components/common/dialogs/DigestDialog.tsx b/webapp/src/components/common/dialogs/DigestDialog.tsx
diff --git a/webapp/src/components/common/dialogs/DigestDialog/DigestMatrix.tsx b/webapp/src/components/common/dialogs/DigestDialog/DigestMatrix.tsx
@@ -18,7 +18,7 @@ import {
   groupResultColumns,
 } from "@/components/common/Matrix/shared/utils";
 import { Box } from "@mui/material";
-import type { DigestMatrixType } from "./types";
+import type { DigestMatrixData } from "./types";
 import { GridOff } from "@mui/icons-material";
 import { useTranslation } from "react-i18next";
 import EmptyView from "../../page/EmptyView";
@@ -28,12 +28,8 @@ const isGroupedColumns = (columns: string[] | string[][]): columns is string[][]
   return Array.isArray(columns[0]);
 };
 
-const isColumns = (columns: string[] | string[][]): columns is string[] => {
-  return !isGroupedColumns(columns);
-};
-
 interface DigestMatrixProps {
-  matrix: DigestMatrixType;
+  matrix: DigestMatrixData;
 }
 
 function DigestMatrix({ matrix }: DigestMatrixProps) {
@@ -49,7 +45,7 @@ function DigestMatrix({ matrix }: DigestMatrixProps) {
     : generateDataColumns({
         timeSeriesColumns: false,
         count: matrix.columns.length,
-        customColumns: isColumns(matrix.columns) ? matrix.columns : undefined,
+        customColumns: !isGroupedColumns(matrix.columns) ? matrix.columns : undefined,
       });
 
   ////////////////////////////////////////////////////////////////

diff --git a/webapp/src/components/common/dialogs/DigestDialog/index.tsx b/webapp/src/components/common/dialogs/DigestDialog/index.tsx
@@ -53,7 +53,7 @@ function DigestDialog({ studyId, outputId, ...dialogProps }: DigestDialogProps)
       <UsePromiseCond
         response={digestRes}
         ifPending={() => <Skeleton sx={{ height: 1, transform: "none" }} />}
-        ifFulfilled={(matrices) => matrices.data && <DigestTabs matrices={matrices.data} />}
+        ifFulfilled={(matrices) => <DigestTabs matrices={matrices.data} />}
       />
     </OkDialog>
   );

diff --git a/webapp/src/components/common/dialogs/DigestDialog/types.ts b/webapp/src/components/common/dialogs/DigestDialog/types.ts
@@ -12,15 +12,15 @@
  * This file is part of the Antares project.
  */
 
-export interface DigestMatrixType {
+export interface DigestMatrixData {
   columns: string[] | string[][];
   data: string[][];
   groupedColumns: boolean;
 }
 
 export interface DigestData {
-  area: DigestMatrixType;
-  districts: DigestMatrixType;
-  flowLinear: DigestMatrixType;
-  flowQuadratic: DigestMatrixType;
+  area: DigestMatrixData;
+  districts: DigestMatrixData;
+  flowLinear: DigestMatrixData;
+  flowQuadratic: DigestMatrixData;
 }