From 6de7326cc582b96a794457ead5b889343d60aa38 Mon Sep 17 00:00:00 2001 From: basseche Date: Fri, 19 Dec 2025 13:16:42 +0100 Subject: [PATCH 1/2] Add control to two windings transformers modification on tap changer position Signed-off-by: basseche --- .../two-windings-transformer-modification-dialog.jsx | 6 +++--- .../ratio-tap-changer-pane/ratio-tap-changer-pane-utils.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx b/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx index 9ce0ad792b..537729352f 100644 --- a/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx +++ b/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx @@ -686,9 +686,9 @@ const TwoWindingsTransformerModificationDialog = ({ regulationSide: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_SIDE}`), targetV: getValues(`${RATIO_TAP_CHANGER}.${TARGET_V}`), targetDeadband: getValues(`${RATIO_TAP_CHANGER}.${TARGET_DEADBAND}`), - lowTapPosition: getValues(`${RATIO_TAP_CHANGER}.${LOW_TAP_POSITION}`), - highTapPosition: getValues(`${RATIO_TAP_CHANGER}.${HIGH_TAP_POSITION}`), - tapPosition: getValues(`${RATIO_TAP_CHANGER}.${TAP_POSITION}`), + lowTapPosition: twt?.ratioTapChanger?.lowTapPosition, + highTapPosition: twt?.ratioTapChanger?.highTapPosition, + tapPosition: twt?.ratioTapChanger?.tapPosition, steps: addSelectedFieldToRows(getRatioTapChangerSteps(twt)), equipmentId: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${ID}`), equipmentType: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${TYPE}`), diff --git a/src/components/dialogs/network-modifications/two-windings-transformer/tap-changer-pane/ratio-tap-changer-pane/ratio-tap-changer-pane-utils.js b/src/components/dialogs/network-modifications/two-windings-transformer/tap-changer-pane/ratio-tap-changer-pane/ratio-tap-changer-pane-utils.js index cf9f4b11b1..b53813ce74 100644 --- a/src/components/dialogs/network-modifications/two-windings-transformer/tap-changer-pane/ratio-tap-changer-pane/ratio-tap-changer-pane-utils.js +++ b/src/components/dialogs/network-modifications/two-windings-transformer/tap-changer-pane/ratio-tap-changer-pane/ratio-tap-changer-pane-utils.js @@ -135,21 +135,21 @@ const ratioTapChangerValidationSchema = (isModification, id) => ({ .number() .nullable() .when(ENABLED, { - is: (enabled) => enabled && !isModification, + is: (enabled) => enabled, then: (schema) => schema.required(), }), [HIGH_TAP_POSITION]: yup .number() .nullable() .when(ENABLED, { - is: (enabled) => enabled && !isModification, + is: (enabled) => enabled, then: (schema) => schema.required(), }), [TAP_POSITION]: yup .number() .nullable() .when(ENABLED, { - is: (enabled) => enabled && !isModification, + is: (enabled) => enabled, then: (schema) => schema .required() From 670abe37131596b4906879126afed58ac82adb16 Mon Sep 17 00:00:00 2001 From: basseche Date: Mon, 5 Jan 2026 11:34:02 +0100 Subject: [PATCH 2/2] fix control Signed-off-by: basseche --- .../two-windings-transformer-modification-dialog.jsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx b/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx index 537729352f..05d4cec599 100644 --- a/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx +++ b/src/components/dialogs/network-modifications/two-windings-transformer/modification/two-windings-transformer-modification-dialog.jsx @@ -686,9 +686,15 @@ const TwoWindingsTransformerModificationDialog = ({ regulationSide: getValues(`${RATIO_TAP_CHANGER}.${REGULATION_SIDE}`), targetV: getValues(`${RATIO_TAP_CHANGER}.${TARGET_V}`), targetDeadband: getValues(`${RATIO_TAP_CHANGER}.${TARGET_DEADBAND}`), - lowTapPosition: twt?.ratioTapChanger?.lowTapPosition, - highTapPosition: twt?.ratioTapChanger?.highTapPosition, - tapPosition: twt?.ratioTapChanger?.tapPosition, + lowTapPosition: + getValues(`${RATIO_TAP_CHANGER}.${LOW_TAP_POSITION}`) ?? + twt?.ratioTapChanger?.lowTapPosition, + highTapPosition: + getValues(`${RATIO_TAP_CHANGER}.${HIGH_TAP_POSITION}`) ?? + twt?.ratioTapChanger?.highTapPosition, + tapPosition: + getValues(`${RATIO_TAP_CHANGER}.${TAP_POSITION}`) ?? + twt?.ratioTapChanger?.tapPosition, steps: addSelectedFieldToRows(getRatioTapChangerSteps(twt)), equipmentId: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${ID}`), equipmentType: getValues(`${RATIO_TAP_CHANGER}.${EQUIPMENT}.${TYPE}`),