From dd358a27aa1ebe3d97f263aa049c1588be8913ba Mon Sep 17 00:00:00 2001 From: hdinia <33469289+hdinia@users.noreply.github.com> Date: Fri, 31 Jan 2025 16:58:52 +0100 Subject: [PATCH] fix wrong import --- .../LauncherHistory/JobStepper.tsx | 2 +- .../App/Singlestudy/explore/Results/index.tsx | 2 +- .../common/dialogs/DigestDialog.tsx | 78 ------------------- .../dialogs/DigestDialog/DigestMatrix.tsx | 10 +-- .../common/dialogs/DigestDialog/index.tsx | 2 +- .../common/dialogs/DigestDialog/types.ts | 10 +-- 6 files changed, 11 insertions(+), 93 deletions(-) delete mode 100644 webapp/src/components/common/dialogs/DigestDialog.tsx diff --git a/webapp/src/components/App/Singlestudy/HomeView/InformationView/LauncherHistory/JobStepper.tsx b/webapp/src/components/App/Singlestudy/HomeView/InformationView/LauncherHistory/JobStepper.tsx index 348f73b3c4..2c9025235f 100644 --- a/webapp/src/components/App/Singlestudy/HomeView/InformationView/LauncherHistory/JobStepper.tsx +++ b/webapp/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 index bd1742747e..753eabf762 100644 --- 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 deleted file mode 100644 index 0ce180fa8d..0000000000 --- a/webapp/src/components/common/dialogs/DigestDialog.tsx +++ /dev/null @@ -1,78 +0,0 @@ -/** - * Copyright (c) 2025, RTE (https://www.rte-france.com) - * - * See AUTHORS.txt - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * SPDX-License-Identifier: MPL-2.0 - * - * This file is part of the Antares project. - */ - -import { Skeleton } from "@mui/material"; -import OkDialog, { type OkDialogProps } from "./OkDialog"; -import UsePromiseCond from "../utils/UsePromiseCond"; -import type { LaunchJob } from "../../../common/types"; -import { getStudyData } from "../../../services/api/study"; -import usePromise from "../../../hooks/usePromise"; -import { useTranslation } from "react-i18next"; -import { AxiosError } from "axios"; -import EmptyView from "../page/EmptyView"; -import SearchOffIcon from "@mui/icons-material/SearchOff"; -import { generateDataColumns } from "../Matrix/shared/utils"; -import DataGridViewer from "../DataGridViewer"; - -export interface DigestDialogProps extends Pick { - studyId: LaunchJob["studyId"]; - outputId: LaunchJob["outputId"]; -} - -function DigestDialog({ studyId, outputId, ...dialogProps }: DigestDialogProps) { - const { t } = useTranslation(); - - const synthesisRes = usePromise( - () => getStudyData(studyId, `output/${outputId}/economy/mc-all/grid/digest`), - { - deps: [studyId, outputId], - }, - ); - - return ( - - } - ifRejected={(error) => { - if (error instanceof AxiosError && error.response?.status === 404) { - return ; - } - return ; - }} - ifFulfilled={(matrix) => - matrix && ( - - ) - } - /> - - ); -} - -export default DigestDialog; diff --git a/webapp/src/components/common/dialogs/DigestDialog/DigestMatrix.tsx b/webapp/src/components/common/dialogs/DigestDialog/DigestMatrix.tsx index 94ededeca8..d589c9eede 100644 --- 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 index 01bdeea9c3..b225740daf 100644 --- 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) } - ifFulfilled={(matrices) => matrices.data && } + ifFulfilled={(matrices) => } /> ); diff --git a/webapp/src/components/common/dialogs/DigestDialog/types.ts b/webapp/src/components/common/dialogs/DigestDialog/types.ts index e78e477707..0cf75eaa83 100644 --- 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; }