File tree Expand file tree Collapse file tree 4 files changed +30
-10
lines changed
two-windings-transformer/modification Expand file tree Collapse file tree 4 files changed +30
-10
lines changed Original file line number Diff line number Diff 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+ } ;
290295export const addModificationTypeToTemporaryLimits = (
291296 formTemporaryLimits : TemporaryLimitFormInfos [ ]
292297) : TemporaryLimit [ ] => {
Original file line number Diff line number Diff 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 )
Original file line number Diff line number Diff line change @@ -62,6 +62,7 @@ import {
6262 getAllLimitsFormData ,
6363 getLimitsEmptyFormData ,
6464 getLimitsValidationSchema ,
65+ getOpLimitsGroupInfosFromBranchModification ,
6566} from '../../../limits/limits-pane-utils' ;
6667import {
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 ) ,
Original file line number Diff line number Diff line change @@ -91,11 +91,12 @@ import {
9191import {
9292 addModificationTypeToOpLimitsGroups ,
9393 addOperationTypeToSelectedOpLG ,
94+ combineFormAndMapServerLimitsGroups ,
9495 formatOpLimitGroupsToFormInfos ,
9596 getAllLimitsFormData ,
9697 getLimitsEmptyFormData ,
9798 getLimitsValidationSchema ,
98- combineFormAndMapServerLimitsGroups ,
99+ getOpLimitsGroupInfosFromBranchModification ,
99100} from '../../../limits/limits-pane-utils' ;
100101import { useOpenShortWaitFetching } from 'components/dialogs/commons/handle-modification-form' ;
101102import 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 ( {
You can’t perform that action at this time.
0 commit comments