Skip to content

Commit 325c366

Browse files
authored
show coherent state for limit sets When applicability is changed (#3392)
Signed-off-by: basseche <[email protected]>
1 parent 1b2273a commit 325c366

File tree

4 files changed

+30
-10
lines changed

4 files changed

+30
-10
lines changed

src/components/dialogs/limits/limits-pane-utils.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,11 @@ export const combineFormAndMapServerLimitsGroups = (
287287
return updatedOpLG;
288288
};
289289

290+
export const getOpLimitsGroupInfosFromBranchModification = (
291+
formBranchModification: LineModificationFormInfos
292+
): OperationalLimitsGroupFormInfos[] => {
293+
return formBranchModification?.limits?.operationalLimitsGroups ?? [];
294+
};
290295
export const addModificationTypeToTemporaryLimits = (
291296
formTemporaryLimits: TemporaryLimitFormInfos[]
292297
): TemporaryLimit[] => {

src/components/dialogs/limits/limits-pane.tsx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@ export function LimitsPane({
7171
return null;
7272
};
7373

74+
const getCurrentLimitsIgnoreApplicability = (
75+
equipmentToModify: any,
76+
operationalLimitsGroupName: string
77+
): CurrentLimits | null => {
78+
if (equipmentToModify?.currentLimits) {
79+
return equipmentToModify.currentLimits.find(
80+
(currentLimit: CurrentLimits) => currentLimit.id === operationalLimitsGroupName
81+
);
82+
}
83+
return null;
84+
};
7485
/**
7586
* returns an error message id if :
7687
* - there are more than 2 limit sets with the same name
@@ -202,7 +213,11 @@ export function LimitsPane({
202213
clearableFields={clearableFields}
203214
permanentCurrentLimitPreviousValue={
204215
getCurrentLimits(equipmentToModify, operationalLimitsGroup.id)
205-
?.permanentLimit
216+
?.permanentLimit ??
217+
getCurrentLimitsIgnoreApplicability(
218+
equipmentToModify,
219+
operationalLimitsGroup.name
220+
)?.permanentLimit
206221
}
207222
temporaryLimitsPreviousValues={
208223
getCurrentLimits(equipmentToModify, operationalLimitsGroup.id)

src/components/dialogs/network-modifications/line/modification/line-modification-dialog.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import {
6262
getAllLimitsFormData,
6363
getLimitsEmptyFormData,
6464
getLimitsValidationSchema,
65+
getOpLimitsGroupInfosFromBranchModification,
6566
} from '../../../limits/limits-pane-utils';
6667
import {
6768
getCharacteristicsEmptyFormData,
@@ -317,10 +318,9 @@ const LineModificationDialog = ({
317318
...{
318319
[LIMITS]: {
319320
[ENABLE_OLG_MODIFICATION]: formValues.limits[ENABLE_OLG_MODIFICATION],
320-
[OPERATIONAL_LIMITS_GROUPS]: combineFormAndMapServerLimitsGroups(
321-
formValues,
322-
line
323-
),
321+
[OPERATIONAL_LIMITS_GROUPS]: formValues.limits[ENABLE_OLG_MODIFICATION]
322+
? getOpLimitsGroupInfosFromBranchModification(formValues)
323+
: combineFormAndMapServerLimitsGroups(formValues, line),
324324
},
325325
},
326326
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(line, getValues),

src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,12 @@ import {
9191
import {
9292
addModificationTypeToOpLimitsGroups,
9393
addOperationTypeToSelectedOpLG,
94+
combineFormAndMapServerLimitsGroups,
9495
formatOpLimitGroupsToFormInfos,
9596
getAllLimitsFormData,
9697
getLimitsEmptyFormData,
9798
getLimitsValidationSchema,
98-
combineFormAndMapServerLimitsGroups,
99+
getOpLimitsGroupInfosFromBranchModification,
99100
} from '../../../limits/limits-pane-utils';
100101
import { useOpenShortWaitFetching } from 'components/dialogs/commons/handle-modification-form';
101102
import TwoWindingsTransformerModificationDialogHeader from './two-windings-transformer-modification-dialog-header';
@@ -659,10 +660,9 @@ const TwoWindingsTransformerModificationDialog = ({
659660
...{
660661
[LIMITS]: {
661662
[ENABLE_OLG_MODIFICATION]: formValues.limits[ENABLE_OLG_MODIFICATION],
662-
[OPERATIONAL_LIMITS_GROUPS]: combineFormAndMapServerLimitsGroups(
663-
formValues,
664-
twt
665-
),
663+
[OPERATIONAL_LIMITS_GROUPS]: formValues.limits[ENABLE_OLG_MODIFICATION]
664+
? getOpLimitsGroupInfosFromBranchModification(formValues)
665+
: combineFormAndMapServerLimitsGroups(formValues, twt),
666666
},
667667
},
668668
...getRatioTapChangerFormData({

0 commit comments

Comments
 (0)