diff --git a/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-dialog.tsx b/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-dialog.tsx index 11ccf62808..e37ec8c87b 100644 --- a/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-dialog.tsx +++ b/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-dialog.tsx @@ -234,7 +234,6 @@ export default function MoveVoltageLevelFeederBaysDialog({ .filter((item, index, arr) => arr.findIndex((x) => x.equipmentId === item.equipmentId) === index); // merge row data between actual values in network and user's modification infos const mergedRowData = mergeRowData(feederBaysInfos, busBarSectionInfos); - // reset default values for RHF state reset( { @@ -337,7 +336,7 @@ export default function MoveVoltageLevelFeederBaysDialog({ onClear={clear} fullWidth onSave={onSubmit} - maxWidth={'md'} + maxWidth={'lg'} titleId="MOVE_VOLTAGE_LEVEL_FEEDER_BAYS" open={open} keepMounted={true} diff --git a/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-form.tsx b/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-form.tsx index 6b2e92b99c..3a6d4fe1c2 100644 --- a/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-form.tsx +++ b/src/components/dialogs/network-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-form.tsx @@ -19,6 +19,7 @@ import { CONNECTION_DIRECTION, CONNECTION_NAME, CONNECTION_POSITION, + EQUIPMENT_ID, IS_REMOVED, MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_TABLE, } from '../../../../utils/field-constants'; @@ -145,6 +146,36 @@ export function MoveVoltageLevelFeederBaysForm({ [intl, isNodeBuiltValue, shouldDisableTooltip] ); + const renderEquipmentIdCell = useCallback( + ({ data }: { data?: any }) => { + const watchTable: FeederBaysInfos = getValues(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_TABLE); + const formIndex = watchTable?.findIndex((item) => item.equipmentId === data.equipmentId); + + return ( + + ); + }, + [getValues] + ); + const renderConnectionNameCell = useCallback( ({ data }: { data?: any }) => { const watchTable: FeederBaysInfos = getValues(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_TABLE); @@ -166,6 +197,7 @@ export function MoveVoltageLevelFeederBaysForm({ }, }, }} + previousValue={watchTable[formIndex]?.connectablePositionInfos?.connectionName ?? ''} /> ); }, @@ -188,6 +220,7 @@ export function MoveVoltageLevelFeederBaysForm({ sx={{ padding: '1rem' }} disabled={data.isRemoved} disableClearable + previousValue={watchTable[formIndex]?.busbarSectionId} /> ); }, @@ -236,6 +269,17 @@ export function MoveVoltageLevelFeederBaysForm({ const columnDefs = useMemo( () => [ + { + field: EQUIPMENT_ID, + filter: true, + flex: 2, + cellRenderer: renderEquipmentIdCell, + headerComponent: HeaderWithTooltip, + headerComponentParams: { + displayName: intl.formatMessage({ id: 'equipmentID' }), + ...commonHeaderParams, + }, + }, { field: CONNECTION_NAME, filter: true, @@ -282,9 +326,10 @@ export function MoveVoltageLevelFeederBaysForm({ }, ], [ + renderEquipmentIdCell, intl, - commonHeaderParams, renderConnectionNameCell, + commonHeaderParams, renderBusbarSectionCell, renderConnectionDirectionCell, renderConnectionPositionCell, @@ -327,7 +372,7 @@ export function MoveVoltageLevelFeederBaysForm({ animateRows={false} domLayout="normal" headerHeight={48} - rowHeight={80} + rowHeight={85} rowStyle={{ border: 'none' }} suppressRowHoverHighlight={true} // group config diff --git a/src/translations/en.json b/src/translations/en.json index cd1264809c..b83900c85f 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1634,5 +1634,6 @@ "BOTTOM": "Bottom", "DuplicatedPositionsError": "Duplicated number", "MissingConnectionsInVoltageLevel": "Missing connections in voltage level (Connections removed from list on validation)", - "moveFeederBaysSections": "Feeder bay will be connected onto the selected busbar section" + "moveFeederBaysSections": "Feeder bay will be connected onto the selected busbar section", + "equipmentID": "Equipment ID" } diff --git a/src/translations/fr.json b/src/translations/fr.json index 99944f20a0..3663c524b4 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -1630,5 +1630,6 @@ "BOTTOM": "Bas", "DuplicatedPositionsError": "Numéro en doublon", "MissingConnectionsInVoltageLevel": "Départs absents du poste (Départs supprimés de la liste à la validation)", - "moveFeederBaysSections": "Les départs déplacés sont préparés sur la section de barre sélectionnée" + "moveFeederBaysSections": "Les départs déplacés sont préparés sur la section de barre sélectionnée", + "equipmentID": "ID de l'ouvrage" }