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
6 changes: 1 addition & 5 deletions src/components/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
} from '@gridsuite/commons-ui';
import PageNotFound from './page-not-found';
import { FormattedMessage } from 'react-intl';
import { APP_NAME, PARAM_FAVORITE_CONTINGENCY_LISTS, PARAM_USE_NAME } from '../utils/config-params';
import { APP_NAME, PARAM_USE_NAME } from '../utils/config-params';
import AppTopBar from './app-top-bar';
import { StudyContainer } from './study-container';
import { fetchDefaultParametersValues, fetchIdpSettings } from '../services/utils';
Expand All @@ -42,7 +42,6 @@ import {
renameTableDefinition,
saveSpreadsheetGlobalFilters,
selectComputedLanguage,
selectFavoriteContingencyLists,
selectIsDeveloperMode,
selectLanguage,
selectTheme,
Expand Down Expand Up @@ -129,9 +128,6 @@ const App = () => {
case PARAM_USE_NAME:
dispatch(selectUseName(param.value === 'true'));
break;
case PARAM_FAVORITE_CONTINGENCY_LISTS:
dispatch(selectFavoriteContingencyLists(param.value.split(',').filter((list) => list)));
break;
case LAST_SELECTED_DIRECTORY:
localStorage.setItem(LAST_SELECTED_DIRECTORY, param.value);
break;
Expand Down
231 changes: 0 additions & 231 deletions src/components/dialogs/contingency-list-selector.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import { useSelector } from 'react-redux';
import { AppState } from '../../../../redux/reducer';
import IconButton from '@mui/material/IconButton';
import type { UUID } from 'node:crypto';
import { setModificationMetadata } from '../../../../services/study/network-modifications';

const styles = {
Expand All @@ -44,17 +43,17 @@
const empty = !description;

const updateModification = useCallback(
async (uuid: UUID, descriptionRecord: Record<string, string>) => {
async (descriptionRecord: Record<string, string>) => {
setIsLoading(true);

return setModificationMetadata(studyUuid, currentNode?.id, uuid, {
return setModificationMetadata(studyUuid, currentNode?.id, modificationUuid, {
description: descriptionRecord.description,
type: data?.type,
}).finally(() => {
setIsLoading(false);
});
},
[studyUuid, currentNode?.id, data?.type]
[studyUuid, currentNode?.id, modificationUuid, data?.type]
);

const handleDescDialogClose = useCallback(() => {
Expand All @@ -72,9 +71,8 @@
<DescriptionModificationDialog
open
description={description ?? ''}
elementUuid={modificationUuid}
onClose={handleDescDialogClose}
updateElement={updateModification}

Check failure on line 75 in src/components/graph/menus/network-modifications/DescriptionRenderer.tsx

View workflow job for this annotation

GitHub Actions / build / build

Type '(descriptionRecord: Record<string, string>) => Promise<Response>' is not assignable to type '(uuid: `${string}-${string}-${string}-${string}-${string}`, data: Record<string, string>) => Promise<Response>'.
/>
)}
<Tooltip title={description} arrow placement="right">
Expand Down
4 changes: 4 additions & 0 deletions src/components/parameters-tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
} from 'services/study/short-circuit-analysis';
import { useGetPccMinParameters } from './dialogs/parameters/use-get-pcc-min-parameters';
import { useWorkspacePanelActions } from './workspace/hooks/use-workspace-panel-actions';
import { fetchContingencyCount } from '../services/study';

enum TAB_VALUES {
lfParamsTabValue = 'LOAD_FLOW',
Expand Down Expand Up @@ -295,6 +296,9 @@
<SecurityAnalysisParametersInline
studyUuid={studyUuid}
parametersBackend={securityAnalysisParametersBackend}
fetchContingencyCount={(contingencyLists: UUID[] | null) =>

Check failure on line 299 in src/components/parameters-tabs.tsx

View workflow job for this annotation

GitHub Actions / build / build

Type '{ studyUuid: `${string}-${string}-${string}-${string}-${string}` | null; parametersBackend: UseParametersBackendReturnProps<ComputingType.SECURITY_ANALYSIS>; fetchContingencyCount: (contingencyLists: `${string}-${string}-${string}-${string}-${string}`[] | null) => Promise<...>; setHaveDirtyFields: (isDirty: boolean)...' is not assignable to type 'IntrinsicAttributes & Readonly<{ studyUuid: `${string}-${string}-${string}-${string}-${string}` | null; parametersBackend: UseParametersBackendReturnProps<ComputingType.SECURITY_ANALYSIS>; setHaveDirtyFields: (isDirty: boolean) => void; isDeveloperMode: boolean; }>'.
fetchContingencyCount(studyUuid, currentNodeUuid, currentRootNetworkUuid, contingencyLists)
}
setHaveDirtyFields={setDirtyFields}
isDeveloperMode={isDeveloperMode}
/>
Expand Down
20 changes: 5 additions & 15 deletions src/components/run-button-container.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {
} from '@gridsuite/commons-ui';
import RunButton from './run-button';
import { DynamicSimulationParametersSelector } from './dialogs/dynamicsimulation/dynamic-simulation-parameters-selector';
import { ContingencyListSelector } from './dialogs/contingency-list-selector';
import { startSensitivityAnalysis, stopSensitivityAnalysis } from '../services/study/sensitivity-analysis';
import {
fetchDynamicSimulationParameters,
Expand Down Expand Up @@ -101,8 +100,6 @@ export function RunButtonContainer({ studyUuid, currentNode, currentRootNetworkU
const stateEstimationStatus = useSelector((state) => state.computingStatus[ComputingType.STATE_ESTIMATION]);
const pccMinStatus = useSelector((state) => state.computingStatus[ComputingType.PCC_MIN]);

const [showContingencyListSelector, setShowContingencyListSelector] = useState(false);

const [showDynamicSimulationParametersSelector, setShowDynamicSimulationParametersSelector] = useState(false);

// a transient state which is used only for a run with popup dialog
Expand Down Expand Up @@ -219,16 +216,16 @@ export function RunButtonContainer({ studyUuid, currentNode, currentRootNetworkU
[currentNode, snackError]
);

const handleStartSecurityAnalysis = (contingencyListNames) => {
const handleStartSecurityAnalysis = useCallback(() => {
startComputationAsync(
ComputingType.SECURITY_ANALYSIS,
null,
() => startSecurityAnalysis(studyUuid, currentNode?.id, currentRootNetworkUuid, contingencyListNames),
() => startSecurityAnalysis(studyUuid, currentNode?.id, currentRootNetworkUuid),
() => {},
null,
null
);
};
}, [studyUuid, currentNode?.id, currentRootNetworkUuid, startComputationAsync]);

const handleStartDynamicSimulation = (dynamicSimulationConfiguration, debug) => {
startComputationAsync(
Expand Down Expand Up @@ -310,7 +307,7 @@ export function RunButtonContainer({ studyUuid, currentNode, currentRootNetworkU
[ComputingType.SECURITY_ANALYSIS]: {
messageId: 'SecurityAnalysis',
startComputation() {
setShowContingencyListSelector(true);
handleStartSecurityAnalysis();
},
actionOnRunnable() {
actionOnRunnables(ComputingType.SECURITY_ANALYSIS, () =>
Expand Down Expand Up @@ -508,6 +505,7 @@ export function RunButtonContainer({ studyUuid, currentNode, currentRootNetworkU
checkForbiddenProvider,
studyUuid,
handleStartLoadFlow,
handleStartSecurityAnalysis,
currentNode?.id,
currentRootNetworkUuid,
startComputationAsync,
Expand Down Expand Up @@ -600,14 +598,6 @@ export function RunButtonContainer({ studyUuid, currentNode, currentRootNetworkU
computationStopped={computationStopped}
disabled={isModificationsInProgress || disabled}
/>
<ContingencyListSelector
open={showContingencyListSelector}
onClose={() => setShowContingencyListSelector(false)}
onStart={(params) => {
handleStartSecurityAnalysis(params);
setShowContingencyListSelector(false);
}}
/>
{!disabled && showDynamicSimulationParametersSelector && (
<DynamicSimulationParametersSelector
open={showDynamicSimulationParametersSelector}
Expand Down
Loading
Loading