From e163e7adb0640a6f71fd968597c1adf28ea37ad7 Mon Sep 17 00:00:00 2001
From: Kamil MARUT <kamil.marut@rte-france.com>
Date: Mon, 18 May 2026 11:04:42 +0200
Subject: [PATCH] feat: handle p and q measurement modification in battery
 modification dialog

Signed-off-by: Kamil MARUT <kamil.marut@rte-france.com>
---
 .../battery/battery-dialog.type.ts            | 10 +++++++++-
 .../modification/BatteryDialogTabsContent.tsx |  6 ++++++
 .../battery-modification-dialog.tsx           | 19 +++++++++++++++++++
 src/services/network-modification-types.ts    |  4 ++++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/components/dialogs/network-modifications/battery/battery-dialog.type.ts b/src/components/dialogs/network-modifications/battery/battery-dialog.type.ts
index 26d68660c9..dc30ab4758 100644
--- a/src/components/dialogs/network-modifications/battery/battery-dialog.type.ts
+++ b/src/components/dialogs/network-modifications/battery/battery-dialog.type.ts
@@ -9,6 +9,7 @@ import {
     ActivePowerControlInfos,
     ConnectablePositionFormInfos,
     FieldConstants,
+    MeasurementInfo,
     MinMaxReactiveLimitsFormInfos,
     Property,
     ReactiveCapabilityCurvePoints,
@@ -43,7 +44,12 @@ export type BatteryDialogSchemaBaseForm = {
     [FieldConstants.TRANSIENT_REACTANCE]?: number | null;
 };
 
-export type BatteryModificationDialogSchemaForm = Partial<BatteryDialogSchemaBaseForm>;
+export type BatteryModificationDialogSchemaForm = {
+    [FieldConstants.STATE_ESTIMATION]?: {
+        [FieldConstants.MEASUREMENT_P]?: MeasurementInfo;
+        [FieldConstants.MEASUREMENT_Q]?: MeasurementInfo;
+    };
+} & Partial<BatteryDialogSchemaBaseForm>;
 
 export interface BatteryFormInfos {
     id: string;
@@ -63,5 +69,7 @@ export interface BatteryFormInfos {
     connectionName?: string | null;
     connectionPosition: string | null;
     terminalConnected?: boolean | null;
+    measurementP: MeasurementInfo | undefined;
+    measurementQ: MeasurementInfo | undefined;
     properties: Record<string, string> | undefined;
 }
diff --git a/src/components/dialogs/network-modifications/battery/modification/BatteryDialogTabsContent.tsx b/src/components/dialogs/network-modifications/battery/modification/BatteryDialogTabsContent.tsx
index 9bc58e69ee..95acbf7f60 100644
--- a/src/components/dialogs/network-modifications/battery/modification/BatteryDialogTabsContent.tsx
+++ b/src/components/dialogs/network-modifications/battery/modification/BatteryDialogTabsContent.tsx
@@ -14,6 +14,7 @@ import {
     ConnectivityNetworkProps,
     FieldConstants,
     FloatInput,
+    PowerMeasurementsForm,
     PropertiesForm,
     ReactiveLimitsForm,
     ReactivePowerAdornment,
@@ -131,6 +132,11 @@ export function BatteryDialogTabsContent({
             <Box hidden={tabIndex !== BatteryDialogTab.SPECIFIC_TAB}>
                 <GridSection title="ShortCircuit" />
                 <ShortCircuitForm previousValues={batteryToModify?.batteryShortCircuit} />
+                <GridSection title="MeasurementsSection" />
+                <PowerMeasurementsForm
+                    activePowerMeasurement={batteryToModify?.measurementP}
+                    reactivePowerMeasurement={batteryToModify?.measurementQ}
+                />
             </Box>
 
             <Box hidden={tabIndex !== BatteryDialogTab.ADDITIONAL_INFORMATION_TAB}>
diff --git a/src/components/dialogs/network-modifications/battery/modification/battery-modification-dialog.tsx b/src/components/dialogs/network-modifications/battery/modification/battery-modification-dialog.tsx
index 117a40eb98..2ec7521a6c 100644
--- a/src/components/dialogs/network-modifications/battery/modification/battery-modification-dialog.tsx
+++ b/src/components/dialogs/network-modifications/battery/modification/battery-modification-dialog.tsx
@@ -35,6 +35,9 @@ import {
     getReactiveLimitsValidationSchema,
     getReactiveLimitsFormData,
     REMOVE,
+    getInjectionActiveReactivePowerEmptyFormData,
+    getInjectionActiveReactivePowerValidationSchemaProperties,
+    getInjectionActiveReactivePowerEditData,
 } from '@gridsuite/commons-ui';
 import { yupResolver } from '@hookform/resolvers/yup';
 import yup from 'components/utils/yup-config';
@@ -67,6 +70,7 @@ const emptyFormData = {
     ...getActivePowerControlEmptyFormData(true),
     ...emptyProperties,
     ...getShortCircuitEmptyFormData(),
+    ...getInjectionActiveReactivePowerEmptyFormData(FieldConstants.STATE_ESTIMATION),
 };
 
 const formSchema = yup
@@ -87,6 +91,7 @@ const formSchema = yup
             }),
         [FieldConstants.CONNECTIVITY]: getConnectivityWithPositionSchema(true),
         [FieldConstants.REACTIVE_LIMITS]: getReactiveLimitsValidationSchema(true),
+        [FieldConstants.STATE_ESTIMATION]: getInjectionActiveReactivePowerValidationSchemaProperties(),
         ...getSetPointsSchema(true),
         ...getActivePowerControlSchema(true),
         ...getShortCircuitFormSchema(true),
@@ -166,6 +171,7 @@ export default function BatteryModificationDialog({
                     directTransX: editData?.directTransX?.value ?? null,
                     stepUpTransformerX: editData?.stepUpTransformerX?.value ?? null,
                 }),
+                ...getInjectionActiveReactivePowerEditData(FieldConstants.STATE_ESTIMATION, editData),
             });
         },
         [reset]
@@ -272,6 +278,7 @@ export default function BatteryModificationDialog({
             const reactiveLimits = battery[FieldConstants.REACTIVE_LIMITS];
             const isReactiveCapabilityCurveOn =
                 reactiveLimits?.[FieldConstants.REACTIVE_CAPABILITY_CURVE_CHOICE] === 'CURVE';
+            const stateEstimationData = battery[FieldConstants.STATE_ESTIMATION];
             const batteryModificationInfos = {
                 type: MODIFICATION_TYPES.BATTERY_MODIFICATION.type,
                 uuid: editData?.uuid ?? null,
@@ -311,6 +318,18 @@ export default function BatteryModificationDialog({
                 reactiveCapabilityCurvePoints: isReactiveCapabilityCurveOn
                     ? (reactiveLimits[FieldConstants.REACTIVE_CAPABILITY_CURVE_TABLE] ?? null)
                     : null,
+                pMeasurementValue: toModificationOperation(
+                    stateEstimationData?.[FieldConstants.MEASUREMENT_P]?.[FieldConstants.VALUE]
+                ),
+                pMeasurementValidity: toModificationOperation(
+                    stateEstimationData?.[FieldConstants.MEASUREMENT_P]?.[FieldConstants.VALIDITY]
+                ),
+                qMeasurementValue: toModificationOperation(
+                    stateEstimationData?.[FieldConstants.MEASUREMENT_Q]?.[FieldConstants.VALUE]
+                ),
+                qMeasurementValidity: toModificationOperation(
+                    stateEstimationData?.[FieldConstants.MEASUREMENT_Q]?.[FieldConstants.VALIDITY]
+                ),
                 properties: toModificationProperties(battery) ?? null,
                 directTransX: toModificationOperation(battery[FieldConstants.TRANSIENT_REACTANCE]),
                 stepUpTransformerX: toModificationOperation(battery[FieldConstants.TRANSFORMER_REACTANCE]),
diff --git a/src/services/network-modification-types.ts b/src/services/network-modification-types.ts
index e17d45973e..38e12504ea 100644
--- a/src/services/network-modification-types.ts
+++ b/src/services/network-modification-types.ts
@@ -83,6 +83,10 @@ export interface BatteryModificationInfos {
     connectionName: AttributeModification<string> | null;
     connectionPosition: AttributeModification<number> | null;
     terminalConnected: AttributeModification<boolean> | null;
+    pMeasurementValue: AttributeModification<number> | null;
+    pMeasurementValidity: AttributeModification<boolean> | null;
+    qMeasurementValue: AttributeModification<number> | null;
+    qMeasurementValidity: AttributeModification<boolean> | null;
     properties: Property[] | null;
     directTransX: AttributeModification<number> | null;
     stepUpTransformerX: AttributeModification<number> | null;