Skip to content

[WIP] Add specific parameters management for shortcircuit #3443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[WIP] Add specific parameters management for shortcircuit #3443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97a096d
feat(Shortcircuit): specific params sc
sBouzols Nov 5, 2025
472a7ab
Merge branch 'main' into feat_shortcircuit_specific_parameters_2
sBouzols Nov 7, 2025
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
74 changes: 0 additions & 74 deletions src/components/dialogs/parameters/use-get-short-circuit-parameters.ts
View file
Open in desktop

This file was deleted.

26 changes: 22 additions & 4 deletions src/components/parameters-tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import DynamicSecurityAnalysisParameters from './dialogs/parameters/dynamic-security-analysis/dynamic-security-analysis-parameters';
import { stylesLayout, tabStyles } from './utils/tab-utils';
import { useParameterState } from './dialogs/parameters/use-parameters-state';
import { useGetShortCircuitParameters } from './dialogs/parameters/use-get-short-circuit-parameters';
import { cancelLeaveParametersTab, confirmLeaveParametersTab, setDirtyComputationParameters } from 'redux/actions';
import { StudyView, StudyViewType } from './utils/utils';
import {
Expand All @@ -61,6 +60,11 @@
} from '@gridsuite/commons-ui';
import { useParametersNotification } from './dialogs/parameters/use-parameters-notification';
import { useGetVoltageInitParameters } from './dialogs/parameters/use-get-voltage-init-parameters';
import {
getShortCircuitParameters,
getShortCircuitSpecificParametersDescription,
setShortCircuitParameters,
} from 'services/study/short-circuit-analysis';

enum TAB_VALUES {
lfParamsTabValue = 'LOAD_FLOW',
Expand Down Expand Up @@ -179,7 +183,21 @@
sensitivityAnalysisBackend
);

const shortCircuitParameters = useGetShortCircuitParameters();
const shortCircuitParametersBackend = useParametersBackend(
user,
studyUuid,
ComputingType.SHORT_CIRCUIT,
OptionalServicesStatus.Up,
null,

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

View workflow job for this annotation

GitHub Actions / build / build 

Argument of type 'null' is not assignable to parameter of type '() => Promise<string[]>'.
null,
null,
null,
getShortCircuitParameters,
setShortCircuitParameters,
getShortCircuitSpecificParametersDescription
);
useParametersNotification(ComputingType.SHORT_CIRCUIT, OptionalServicesStatus.Up, shortCircuitParametersBackend);

const voltageInitParameters = useGetVoltageInitParameters();
const useStateEstimationParameters = useGetStateEstimationParameters();

Expand Down Expand Up @@ -282,7 +300,7 @@
<ShortCircuitParametersInLine
studyUuid={studyUuid}
setHaveDirtyFields={setDirtyFields}
shortCircuitParameters={shortCircuitParameters}
parametersBackend={shortCircuitParametersBackend}

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

View workflow job for this annotation

GitHub Actions / build / build 

Type '{ studyUuid: `${string}-${string}-${string}-${string}-${string}` | null; setHaveDirtyFields: (isDirty: boolean) => void; parametersBackend: UseParametersBackendReturnProps<ComputingType.SHORT_CIRCUIT>; enableDeveloperMode: boolean; }' is not assignable to type 'IntrinsicAttributes & Readonly<{ studyUuid: `${string}-${string}-${string}-${string}-${string}` | null; setHaveDirtyFields: (isDirty: boolean) => void; shortCircuitParameters: ShortCircuitParametersInfos | null; enableDeveloperMode: boolean; }>'.
enableDeveloperMode={enableDeveloperMode}
/>
);
Expand Down Expand Up @@ -327,7 +345,7 @@
currentNodeUuid,
currentRootNetworkUuid,
sensitivityAnalysisBackend,
shortCircuitParameters,
shortCircuitParametersBackend,
user,
voltageInitParameters,
useStateEstimationParameters,
Expand Down
36 changes: 35 additions & 1 deletion src/services/study/short-circuit-analysis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { getStudyUrlWithNodeUuidAndRootNetworkUuid } from './index';
import { getStudyUrl, getStudyUrlWithNodeUuidAndRootNetworkUuid } from './index';
import {
getShortCircuitAnalysisTypeFromEnum,
ShortCircuitAnalysisType,
Expand All @@ -15,6 +15,12 @@ import type { UUID } from 'node:crypto';
import { GlobalFilters } from '../../components/results/common/global-filter/global-filter-types';
import { Selector } from 'components/results/common/utils';

const PREFIX_SHORTCIRCUIT_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/shortcircuit';

export function getShortCircuitUrl() {
return `${PREFIX_SHORTCIRCUIT_SERVER_QUERIES}/v1/`;
}

interface ShortCircuitAnalysisResult {
studyUuid: UUID | null;
currentNodeUuid?: UUID;
Expand Down Expand Up @@ -207,3 +213,31 @@ export function downloadShortCircuitResultZippedCsv(
body: JSON.stringify({ headersCsv, enumValueTranslations, language }),
});
}

export function setShortCircuitParameters(studyUuid: UUID, newParams: any) {
console.info('set short circuit parameters');
const setShortCircuitParametersUrl = getStudyUrl(studyUuid) + '/short-circuit-analysis/parameters';
console.debug(setShortCircuitParametersUrl);
return backendFetch(setShortCircuitParametersUrl, {
method: 'POST',
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
body: newParams ? JSON.stringify(newParams) : null,
});
}

export function getShortCircuitParameters(studyUuid: UUID) {
console.info('get short circuit parameters');
const getScParams = getStudyUrl(studyUuid) + '/short-circuit-analysis/parameters';
console.debug(getScParams);
return backendFetchJson(getScParams);
}

export function getShortCircuitSpecificParametersDescription() {
console.info('get short circuit specific parameters description');
const getShortCircuitSpecificParametersUrl = getShortCircuitUrl() + 'parameters/specific-parameters';
console.debug(getShortCircuitSpecificParametersUrl);
return backendFetchJson(getShortCircuitSpecificParametersUrl);
}
Loading