Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
import { AGGRID_LOCALES } from '../../../../translations/not-intl/aggrid-locales';
import { useSelector } from 'react-redux';
import { AppState } from '../../../../redux/reducer';
import { STUDY_VIEWS, StudyView } from 'components/utils/utils';
import { UUID } from 'crypto';
import { CurrentTreeNode } from 'components/graph/tree-node.type';

const styles = {
container: {
Expand Down Expand Up @@ -164,6 +167,9 @@
}

interface VoltageInitModificationProps {
currentNode: CurrentTreeNode;
studyUuid: UUID;
currentRootNetworkUuid: UUID;
editData: EditData;
onClose: () => void;
onPreviewModeSubmit?: () => void;
Expand All @@ -172,6 +178,9 @@
}

const VoltageInitModificationDialog: FunctionComponent<VoltageInitModificationProps> = ({
studyUuid,
currentNode,
currentRootNetworkUuid,
editData,
onClose,
onPreviewModeSubmit,
Expand All @@ -184,6 +193,11 @@
const [tabIndex, setTabIndex] = useState(EquipmentTypeTabs.GENERATOR_TAB);

const language = useSelector((state: AppState) => state.computedLanguage);
const appTabIndex = useSelector((state: AppState) => state.appTabIndex);

const isExportCSVButtonDisabled = useMemo(() => {
return STUDY_VIEWS[appTabIndex] !== StudyView.RESULTS;
}, [appTabIndex]);

const handleTabChange = useCallback((newValue: number) => {
setTabIndex(newValue);
Expand Down Expand Up @@ -505,10 +519,17 @@
<Box sx={styles.csvExport}>
<Box style={{ flexGrow: 1 }}></Box>
<CsvExport
studyUuid={studyUuid}

Check failure on line 522 in src/components/dialogs/network-modifications/voltage-init-modification/voltage-init-modification-dialog.tsx

View workflow job for this annotation

GitHub Actions / build / build

Type '{ studyUuid: `${string}-${string}-${string}-${string}-${string}`; nodeUuid: `${string}-${string}-${string}-${string}-${string}`; rootNetworkUuid: `${string}-${string}-${string}-${string}-${string}`; columns: any[]; tableName: string; tableNamePrefix: string; disabled: boolean; language: GsLangUser; exportDataAsCsv: ...' is not assignable to type 'IntrinsicAttributes & CsvDownloadProps & { disabled: boolean; }'.
nodeUuid={currentNode.id}
rootNetworkUuid={currentRootNetworkUuid}
columns={columnDefs}
tableName={tableName}
tableNamePrefix="VoltageInit_"
disabled={rowData.length === 0 || editDataFetchStatus === FetchStatus.RUNNING}
disabled={
isExportCSVButtonDisabled ||
rowData.length === 0 ||
editDataFetchStatus === FetchStatus.RUNNING
}
language={language}
exportDataAsCsv={(params) => gridRef.current?.api?.exportDataAsCsv(params)}
/>
Expand All @@ -529,14 +550,18 @@
},
[
editData,
studyUuid,
currentNode.id,
currentRootNetworkUuid,
isExportCSVButtonDisabled,
editDataFetchStatus,
language,
generatorsColumnDefs,
transformersColumnDefs,
staticVarCompensatorsColumnDefs,
vscConverterStationsColumnDefs,
shuntCompensatorsColumnDefs,
busColumnDefs,
language,
]
);

Expand Down
6 changes: 6 additions & 0 deletions src/components/results/loadflow/limit-violation-result.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ import { ComputingType } from '@gridsuite/commons-ui';
import { AppState } from 'redux/reducer';

export const LimitViolationResult: FunctionComponent<LimitViolationResultProps> = ({
studyUuid,
nodeUuid,
currentRootNetworkUuid,
result,
isLoadingResult,
columnDefs,
Expand Down Expand Up @@ -95,6 +98,9 @@ export const LimitViolationResult: FunctionComponent<LimitViolationResultProps>
<>
<Box sx={{ height: '4px' }}>{openLoaderTab && <LinearProgress />}</Box>
<RenderTableAndExportCsv
studyUuid={studyUuid}
nodeUuid={nodeUuid}
rootNetworkUuid={currentRootNetworkUuid}
gridRef={gridRef}
columns={columnDefs}
defaultColDef={defaultColDef}
Expand Down
9 changes: 9 additions & 0 deletions src/components/results/loadflow/load-flow-result-tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ export const LoadFlowResultTab: FunctionComponent<LoadFlowTabProps> = ({
{tabIndex === 0 && (
<GlassPane active={isLoadingResult}>
<LimitViolationResult
studyUuid={studyUuid}
nodeUuid={nodeUuid}
currentRootNetworkUuid={currentRootNetworkUuid}
result={result}
isLoadingResult={isLoadingResult || filterEnumsLoading}
columnDefs={loadFlowLimitViolationsColumns}
Expand All @@ -249,6 +252,9 @@ export const LoadFlowResultTab: FunctionComponent<LoadFlowTabProps> = ({
{tabIndex === 1 && (
<GlassPane active={isLoadingResult}>
<LimitViolationResult
studyUuid={studyUuid}
nodeUuid={nodeUuid}
currentRootNetworkUuid={currentRootNetworkUuid}
result={result}
isLoadingResult={isLoadingResult || filterEnumsLoading}
columnDefs={loadFlowLimitViolationsColumns}
Expand All @@ -260,6 +266,9 @@ export const LoadFlowResultTab: FunctionComponent<LoadFlowTabProps> = ({
)}
{tabIndex === 2 && (
<LoadFlowResult
studyUuid={studyUuid}
nodeUuid={nodeUuid}
currentRootNetworkUuid={currentRootNetworkUuid}
result={result}
isLoadingResult={isLoadingResult || filterEnumsLoading}
columnDefs={loadFlowLimitViolationsColumns}
Expand Down
12 changes: 11 additions & 1 deletion src/components/results/loadflow/load-flow-result.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ import { AgGridReact } from 'ag-grid-react';
import { ComputingType } from '@gridsuite/commons-ui';
import { AppState } from 'redux/reducer';

export const LoadFlowResult: FunctionComponent<LoadflowResultProps> = ({ result, isLoadingResult, columnDefs }) => {
export const LoadFlowResult: FunctionComponent<LoadflowResultProps> = ({
studyUuid,
nodeUuid,
currentRootNetworkUuid,
result,
isLoadingResult,
columnDefs,
}) => {
const theme = useTheme();
const intl = useIntl();

Expand Down Expand Up @@ -90,6 +97,9 @@ export const LoadFlowResult: FunctionComponent<LoadflowResultProps> = ({ result,
<>
<Box sx={{ height: '4px' }}>{openLoaderStatusTab && <LinearProgress />}</Box>
<RenderTableAndExportCsv
studyUuid={studyUuid}
nodeUuid={nodeUuid}
rootNetworkUuid={currentRootNetworkUuid}
gridRef={gridRef}
columns={columnDefs}
defaultColDef={defaultColDef}
Expand Down
4 changes: 2 additions & 2 deletions src/components/results/loadflow/load-flow-result.type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ export interface LoadflowResultTap {
tableName: string;
}

export interface LoadflowResultProps extends LoadflowResultTap {
export interface LoadflowResultProps extends LoadflowResultTap, LoadFlowTabProps {
result: LoadFlowResult;
}

export interface LimitViolationResultProps extends LoadflowResultTap {
export interface LimitViolationResultProps extends LoadflowResultTap, LoadFlowTabProps {
result: OverloadedEquipment[];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { FunctionComponent, SyntheticEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useSelector } from 'react-redux';
import { FormattedMessage } from 'react-intl';
import { FormattedMessage, useIntl } from 'react-intl';
import { AppState } from '../../../redux/reducer';
import { Box, LinearProgress, MenuItem, Select, Tab, Tabs } from '@mui/material';
import { fetchSecurityAnalysisResult } from '../../../services/study/security-analysis';
Expand Down Expand Up @@ -36,7 +36,6 @@ import { SelectChangeEvent } from '@mui/material/Select/SelectInput';
import { SecurityAnalysisExportButton } from './security-analysis-export-button';
import { useSecurityAnalysisColumnsDefs } from './use-security-analysis-column-defs';
import { SECURITY_ANALYSIS_RESULT_SORT_STORE } from 'utils/store-sort-filter-fields';
import { useIntl } from 'react-intl/lib';
import { PARAM_DEVELOPER_MODE } from 'utils/config-params';
import { useFilterSelector } from '../../../hooks/use-filter-selector';
import { mapFieldsToColumnsFilter } from '../../../utils/aggrid-headers-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ import { AgGridReact } from 'ag-grid-react';
import { StateEstimationResultProps } from './state-estimation-result.type';

export const StateEstimationQualityResult: FunctionComponent<StateEstimationResultProps> = ({
studyUuid,
nodeUuid,
currentRootNetworkUuid,
result,
isLoadingResult,
columnDefs,
Expand Down Expand Up @@ -106,6 +109,9 @@ export const StateEstimationQualityResult: FunctionComponent<StateEstimationResu
<>
<Box sx={{ height: '4px' }}>{openLoaderTab && <LinearProgress />}</Box>
<RenderTableAndExportCsv
studyUuid={studyUuid}
nodeUuid={nodeUuid}
rootNetworkUuid={currentRootNetworkUuid}
gridRef={gridRef}
columns={columnDefs}
defaultColDef={defaultColDef}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ export const StateEstimationResultTab: FunctionComponent<StateEstimationTabProps
{tabIndex === 1 && (
<GlassPane active={isLoadingResult}>
<StateEstimationQualityResult
studyUuid={studyUuid}
nodeUuid={nodeUuid}
currentRootNetworkUuid={currentRootNetworkUuid}
result={result}
isLoadingResult={isLoadingResult}
columnDefs={stateEstimationQualityColumns}
Expand All @@ -137,6 +140,9 @@ export const StateEstimationResultTab: FunctionComponent<StateEstimationTabProps
{tabIndex === 2 && (
<GlassPane active={isLoadingResult}>
<StateEstimationQualityResult
studyUuid={studyUuid}
nodeUuid={nodeUuid}
currentRootNetworkUuid={currentRootNetworkUuid}
result={result}
isLoadingResult={isLoadingResult}
columnDefs={stateEstimationQualityColumns}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@ export interface StateEstimationResultStatusProps {
result: StateEstimationResult;
}

export interface StateEstimationResultProps extends StateEstimationResultTableProps, StateEstimationResultStatusProps {}
export interface StateEstimationResultProps
extends StateEstimationTabProps,
StateEstimationResultTableProps,
StateEstimationResultStatusProps {}
20 changes: 17 additions & 3 deletions src/components/utils/renderTable-ExportCsv.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { FunctionComponent, RefObject } from 'react';
import { FunctionComponent, RefObject, useMemo } from 'react';
import { ColDef, GridReadyEvent, RowClassParams, RowDataUpdatedEvent, RowStyle } from 'ag-grid-community';
import { CustomAGGrid, CsvExport, type MuiStyles } from '@gridsuite/commons-ui';
import { AgGridReact } from 'ag-grid-react';
import { Box } from '@mui/material';
import { AGGRID_LOCALES } from '../../translations/not-intl/aggrid-locales';
import { useSelector } from 'react-redux';
import { AppState } from '../../redux/reducer';
import { UUID } from 'crypto';
import { STUDY_VIEWS, StudyView } from './utils';

const styles = {
gridContainer: {
Expand All @@ -31,6 +33,9 @@
} as const satisfies MuiStyles;

interface RenderTableAndExportCsvProps {
studyUuid: UUID;
nodeUuid: UUID;
rootNetworkUuid: UUID;
gridRef: RefObject<AgGridReact>;
columns: any[];
defaultColDef: ColDef;
Expand All @@ -44,6 +49,9 @@
}

export const RenderTableAndExportCsv: FunctionComponent<RenderTableAndExportCsvProps> = ({
studyUuid,
nodeUuid,
rootNetworkUuid,
gridRef,
columns,
defaultColDef,
Expand All @@ -55,17 +63,23 @@
overlayNoRowsTemplate,
skipColumnHeaders = false,
}) => {
const isRowsEmpty = !rows || rows.length === 0;
const language = useSelector((state: AppState) => state.computedLanguage);
const appTabIndex = useSelector((state: AppState) => state.appTabIndex);

const isExportCSVButtonDisabled = useMemo(() => {
return STUDY_VIEWS[appTabIndex] !== StudyView.RESULTS || !rows || rows.length === 0;
}, [appTabIndex, rows]);
return (
<Box sx={styles.gridContainer}>
<Box sx={styles.csvExport}>
<Box style={{ flexGrow: 1 }}></Box>
<CsvExport
studyUuid={studyUuid}

Check failure on line 77 in src/components/utils/renderTable-ExportCsv.tsx

View workflow job for this annotation

GitHub Actions / build / build

Type '{ studyUuid: `${string}-${string}-${string}-${string}-${string}`; nodeUuid: `${string}-${string}-${string}-${string}-${string}`; rootNetworkUuid: `${string}-${string}-${string}-${string}-${string}`; columns: any[]; tableName: string; disabled: boolean; skipColumnHeaders: boolean; language: GsLangUser; exportDataAsCs...' is not assignable to type 'IntrinsicAttributes & CsvDownloadProps & { disabled: boolean; }'.
nodeUuid={nodeUuid}
rootNetworkUuid={rootNetworkUuid}
columns={columns}
tableName={tableName}
disabled={isRowsEmpty}
disabled={isExportCSVButtonDisabled}
skipColumnHeaders={skipColumnHeaders}
language={language}
exportDataAsCsv={(params) => gridRef.current?.api?.exportDataAsCsv(params)}
Expand Down
3 changes: 3 additions & 0 deletions src/components/voltage-init-result-tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ export function VoltageInitResultTab({

return (
<VoltageInitResult
studyUuid={studyUuid}
nodeUuid={nodeUuid}
currentRootNetworkUuid={currentRootNetworkUuid}
result={voltageInitResultToShow}
status={voltageInitStatus}
handleGlobalFilterChange={handleGlobalFilterChange}
Expand Down
Loading
Loading