Skip to content

Commit bdda66c

Browse files
ayolabayolab
authored
Fix dialogs validate button when switching nodes in sync mode (#3242)
Signed-off-by: Ayoub LABIDI <[email protected]>
1 parent a0fbbcb commit bdda66c

File tree

12 files changed

+144
-107
lines changed

12 files changed

+144
-107
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ export const updateOpLimitsGroups = (
248248
});
249249

250250
// adds all the operational limits groups from mapServerBranch THAT ARE NOT DELETED by the netmod
251-
mapServerBranch.currentLimits.forEach((currentLimit: CurrentLimits) => {
251+
mapServerBranch.currentLimits?.forEach((currentLimit: CurrentLimits) => {
252252
const equivalentFromNetMod = updatedOpLG.find(
253253
(opLG: OperationalLimitsGroup) =>
254254
currentLimit.id === opLG.name && currentLimit.applicability === opLG.applicability

‎src/components/dialogs/network-modifications/battery/modification/battery-modification-dialog.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,13 @@ export default function BatteryModificationDialog({
234234
...value,
235235
reactiveCapabilityCurvePoints: previousReactiveCapabilityCurveTable,
236236
});
237-
reset((formValues) => ({
238-
...formValues,
239-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(value, getValues),
240-
}));
237+
reset(
238+
(formValues) => ({
239+
...formValues,
240+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(value, getValues),
241+
}),
242+
{ keepDirty: true }
243+
);
241244
}
242245
setDataFetchStatus(FetchStatus.SUCCEED);
243246
})

‎src/components/dialogs/network-modifications/generator/modification/generator-modification-dialog.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,13 @@ export default function GeneratorModificationDialog({
293293
...value,
294294
reactiveCapabilityCurvePoints: previousReactiveCapabilityCurveTable,
295295
});
296-
reset((formValues) => ({
297-
...formValues,
298-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(value, getValues),
299-
}));
296+
reset(
297+
(formValues) => ({
298+
...formValues,
299+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(value, getValues),
300+
}),
301+
{ keepDirty: true }
302+
);
300303
}
301304
setDataFetchStatus(FetchStatus.SUCCEED);
302305
})

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

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -202,27 +202,34 @@ export const LccModificationDialog = ({
202202
.then((value: LccFormInfos | null) => {
203203
if (value) {
204204
setLccToModify({ ...value });
205-
reset((formValues) => ({
206-
...formValues,
207-
[HVDC_LINE_TAB]: {
205+
reset(
206+
(formValues) => ({
208207
...formValues,
209-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(value, getValues, HVDC_LINE_TAB),
210-
},
211-
[CONVERTER_STATION_1]: {
212-
...formValues,
213-
[FILTERS_SHUNT_COMPENSATOR_TABLE]: getConcatenatedShuntCompensatorOnSideInfos(
214-
editData?.converterStation1.shuntCompensatorsOnSide,
215-
value.lccConverterStation1.shuntCompensatorsOnSide
216-
),
217-
},
218-
[CONVERTER_STATION_2]: {
219-
...formValues,
220-
[FILTERS_SHUNT_COMPENSATOR_TABLE]: getConcatenatedShuntCompensatorOnSideInfos(
221-
editData?.converterStation2.shuntCompensatorsOnSide,
222-
value.lccConverterStation2.shuntCompensatorsOnSide
223-
),
224-
},
225-
}));
208+
[HVDC_LINE_TAB]: {
209+
...formValues,
210+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(
211+
value,
212+
getValues,
213+
HVDC_LINE_TAB
214+
),
215+
},
216+
[CONVERTER_STATION_1]: {
217+
...formValues,
218+
[FILTERS_SHUNT_COMPENSATOR_TABLE]: getConcatenatedShuntCompensatorOnSideInfos(
219+
editData?.converterStation1.shuntCompensatorsOnSide,
220+
value.lccConverterStation1.shuntCompensatorsOnSide
221+
),
222+
},
223+
[CONVERTER_STATION_2]: {
224+
...formValues,
225+
[FILTERS_SHUNT_COMPENSATOR_TABLE]: getConcatenatedShuntCompensatorOnSideInfos(
226+
editData?.converterStation2.shuntCompensatorsOnSide,
227+
value.lccConverterStation2.shuntCompensatorsOnSide
228+
),
229+
},
230+
}),
231+
{ keepDirty: true }
232+
);
226233
}
227234
setDataFetchStatus(FetchStatus.SUCCEED);
228235
})

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,15 @@ const VscModificationDialog: React.FC<any> = ({
216216
reactiveCapabilityCurveTable: previousReactiveCapabilityCurveTable2,
217217
},
218218
});
219-
reset((formValues) => ({
220-
...formValues,
221-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(value, getValues),
222-
}));
219+
reset(
220+
(formValues) => ({
221+
...formValues,
222+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(value, getValues),
223+
}),
224+
{
225+
keepDirty: true,
226+
}
227+
);
223228
}
224229
setDataFetchStatus(FetchStatus.SUCCEED);
225230
})

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -308,15 +308,18 @@ const LineModificationDialog = ({
308308
.then((line: BranchInfos) => {
309309
if (line) {
310310
setLineToModify(line);
311-
reset((formValues: LineModificationEditData) => ({
312-
...formValues,
313-
...{
314-
[LIMITS]: {
315-
[OPERATIONAL_LIMITS_GROUPS]: updateOpLimitsGroups(formValues, line),
311+
reset(
312+
(formValues: LineModificationEditData) => ({
313+
...formValues,
314+
...{
315+
[LIMITS]: {
316+
[OPERATIONAL_LIMITS_GROUPS]: updateOpLimitsGroups(formValues, line),
317+
},
316318
},
317-
},
318-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(line, getValues),
319-
}));
319+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(line, getValues),
320+
}),
321+
{ keepDirty: true }
322+
);
320323
}
321324
setDataFetchStatus(FetchStatus.SUCCEED);
322325
})

‎src/components/dialogs/network-modifications/load/modification/load-modification-dialog.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,13 @@ export default function LoadModificationDialog({
169169
.then((load: LoadFormInfos) => {
170170
if (load) {
171171
setLoadToModify(load);
172-
reset((formValues) => ({
173-
...formValues,
174-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(load, getValues),
175-
}));
172+
reset(
173+
(formValues) => ({
174+
...formValues,
175+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(load, getValues),
176+
}),
177+
{ keepDirty: true }
178+
);
176179
}
177180
setDataFetchStatus(FetchStatus.SUCCEED);
178181
})

‎src/components/dialogs/network-modifications/shunt-compensator/modification/shunt-compensator-modification-dialog.jsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,13 @@ const ShuntCompensatorModificationDialog = ({
181181
} else {
182182
setShuntCompensatorInfos(shuntCompensator);
183183
setDataFetchStatus(FetchStatus.SUCCEED);
184-
reset((formValues) => ({
185-
...formValues,
186-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(shuntCompensator, getValues),
187-
}));
184+
reset(
185+
(formValues) => ({
186+
...formValues,
187+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(shuntCompensator, getValues),
188+
}),
189+
{ keepDirty: true }
190+
);
188191
}
189192
}
190193
setLoading(false);

‎src/components/dialogs/network-modifications/substation/modification/substation-modification-dialog.jsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,13 @@ const SubstationModificationDialog = ({
112112
.then((substation) => {
113113
if (substation) {
114114
setSubstationToModify(substation);
115-
reset((formValues) => ({
116-
...formValues,
117-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(substation, getValues),
118-
}));
115+
reset(
116+
(formValues) => ({
117+
...formValues,
118+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(substation, getValues),
119+
}),
120+
{ keepDirty: true }
121+
);
119122
}
120123
setDataFetchStatus(FetchStatus.SUCCEED);
121124
})

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

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -655,56 +655,59 @@ const TwoWindingsTransformerModificationDialog = ({
655655
.then((twt) => {
656656
if (twt) {
657657
setTwtToModify(twt);
658-
reset((formValues) => ({
659-
...formValues,
660-
...{
661-
[LIMITS]: {
662-
[OPERATIONAL_LIMITS_GROUPS]: updateOpLimitsGroups(formValues, twt),
658+
reset(
659+
(formValues) => ({
660+
...formValues,
661+
...{
662+
[LIMITS]: {
663+
[OPERATIONAL_LIMITS_GROUPS]: updateOpLimitsGroups(formValues, twt),
664+
},
663665
},
664-
},
665-
...getRatioTapChangerFormData({
666-
enabled: isRatioTapChangerEnabled(twt),
667-
hasLoadTapChangingCapabilities: getValues(
668-
`${RATIO_TAP_CHANGER}.${LOAD_TAP_CHANGING_CAPABILITIES}`
669-
),
670-
regulationMode:
671-
getValues(`${RATIO_TAP_CHANGER}.${REGULATING}`) === false
672-
? PHASE_REGULATION_MODES.OFF.id
673-
: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_MODE}`),
674-
regulationType: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_TYPE}`),
675-
regulationSide: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_SIDE}`),
676-
targetV: getValues(`${RATIO_TAP_CHANGER}.${TARGET_V}`),
677-
targetDeadband: getValues(`${RATIO_TAP_CHANGER}.${TARGET_DEADBAND}`),
678-
lowTapPosition: getValues(`${RATIO_TAP_CHANGER}.${LOW_TAP_POSITION}`),
679-
highTapPosition: getValues(`${RATIO_TAP_CHANGER}.${HIGH_TAP_POSITION}`),
680-
tapPosition: getValues(`${RATIO_TAP_CHANGER}.${TAP_POSITION}`),
681-
steps: addSelectedFieldToRows(getRatioTapChangerSteps(twt)),
682-
equipmentId: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${ID}`),
683-
equipmentType: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${TYPE}`),
684-
voltageLevelId: getValues(`${RATIO_TAP_CHANGER}.${VOLTAGE_LEVEL}.${ID}`),
685-
}),
686-
...getPhaseTapChangerFormData({
687-
enabled: isPhaseTapChangerEnabled(twt),
688-
regulationMode: getValues(`${PHASE_TAP_CHANGER}.${REGULATION_MODE}`),
689-
regulationType: getValues(`${PHASE_TAP_CHANGER}.${REGULATION_TYPE}`),
690-
regulationSide: getValues(`${PHASE_TAP_CHANGER}.${REGULATION_SIDE}`),
691-
currentLimiterRegulatingValue: getValues(
692-
`${PHASE_TAP_CHANGER}.${CURRENT_LIMITER_REGULATING_VALUE}`
693-
),
694-
flowSetpointRegulatingValue: getValues(
695-
`${PHASE_TAP_CHANGER}.${FLOW_SET_POINT_REGULATING_VALUE}`
696-
),
697-
targetDeadband: getValues(`${PHASE_TAP_CHANGER}.${TARGET_DEADBAND}`),
698-
lowTapPosition: getValues(`${PHASE_TAP_CHANGER}.${LOW_TAP_POSITION}`),
699-
highTapPosition: getValues(`${PHASE_TAP_CHANGER}.${HIGH_TAP_POSITION}`),
700-
tapPosition: getValues(`${PHASE_TAP_CHANGER}.${TAP_POSITION}`),
701-
steps: addSelectedFieldToRows(getPhaseTapChangerSteps(twt)),
702-
equipmentId: getValues(`${PHASE_TAP_CHANGER}.${EQUIPMENT}.${ID}`),
703-
equipmentType: getValues(`${PHASE_TAP_CHANGER}.${EQUIPMENT}.${TYPE}`),
704-
voltageLevelId: getValues(`${PHASE_TAP_CHANGER}.${VOLTAGE_LEVEL}.${ID}`),
666+
...getRatioTapChangerFormData({
667+
enabled: isRatioTapChangerEnabled(twt),
668+
hasLoadTapChangingCapabilities: getValues(
669+
`${RATIO_TAP_CHANGER}.${LOAD_TAP_CHANGING_CAPABILITIES}`
670+
),
671+
regulationMode:
672+
getValues(`${RATIO_TAP_CHANGER}.${REGULATING}`) === false
673+
? PHASE_REGULATION_MODES.OFF.id
674+
: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_MODE}`),
675+
regulationType: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_TYPE}`),
676+
regulationSide: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_SIDE}`),
677+
targetV: getValues(`${RATIO_TAP_CHANGER}.${TARGET_V}`),
678+
targetDeadband: getValues(`${RATIO_TAP_CHANGER}.${TARGET_DEADBAND}`),
679+
lowTapPosition: getValues(`${RATIO_TAP_CHANGER}.${LOW_TAP_POSITION}`),
680+
highTapPosition: getValues(`${RATIO_TAP_CHANGER}.${HIGH_TAP_POSITION}`),
681+
tapPosition: getValues(`${RATIO_TAP_CHANGER}.${TAP_POSITION}`),
682+
steps: addSelectedFieldToRows(getRatioTapChangerSteps(twt)),
683+
equipmentId: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${ID}`),
684+
equipmentType: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${TYPE}`),
685+
voltageLevelId: getValues(`${RATIO_TAP_CHANGER}.${VOLTAGE_LEVEL}.${ID}`),
686+
}),
687+
...getPhaseTapChangerFormData({
688+
enabled: isPhaseTapChangerEnabled(twt),
689+
regulationMode: getValues(`${PHASE_TAP_CHANGER}.${REGULATION_MODE}`),
690+
regulationType: getValues(`${PHASE_TAP_CHANGER}.${REGULATION_TYPE}`),
691+
regulationSide: getValues(`${PHASE_TAP_CHANGER}.${REGULATION_SIDE}`),
692+
currentLimiterRegulatingValue: getValues(
693+
`${PHASE_TAP_CHANGER}.${CURRENT_LIMITER_REGULATING_VALUE}`
694+
),
695+
flowSetpointRegulatingValue: getValues(
696+
`${PHASE_TAP_CHANGER}.${FLOW_SET_POINT_REGULATING_VALUE}`
697+
),
698+
targetDeadband: getValues(`${PHASE_TAP_CHANGER}.${TARGET_DEADBAND}`),
699+
lowTapPosition: getValues(`${PHASE_TAP_CHANGER}.${LOW_TAP_POSITION}`),
700+
highTapPosition: getValues(`${PHASE_TAP_CHANGER}.${HIGH_TAP_POSITION}`),
701+
tapPosition: getValues(`${PHASE_TAP_CHANGER}.${TAP_POSITION}`),
702+
steps: addSelectedFieldToRows(getPhaseTapChangerSteps(twt)),
703+
equipmentId: getValues(`${PHASE_TAP_CHANGER}.${EQUIPMENT}.${ID}`),
704+
equipmentType: getValues(`${PHASE_TAP_CHANGER}.${EQUIPMENT}.${TYPE}`),
705+
voltageLevelId: getValues(`${PHASE_TAP_CHANGER}.${VOLTAGE_LEVEL}.${ID}`),
706+
}),
707+
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(twt, getValues),
705708
}),
706-
[ADDITIONAL_PROPERTIES]: getConcatenatedProperties(twt, getValues),
707-
}));
709+
{ keepDirty: true }
710+
);
708711
}
709712
setDataFetchStatus(FetchStatus.SUCCEED);
710713
})

0 commit comments

Comments
 (0)