Skip to content

fix missing element in move feeder #3582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
EtienneLt wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix missing element in move feeder #3582

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec9db2
fix missing element in move feeder
EtienneLt Dec 15, 2025
8245545
Merge branch 'main' into fix-missing-element-in-move-feeder
EtienneLt Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...rk-modifications/voltage-level/move-feeder-bays/move-voltage-level-feeder-bays-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ export default function MoveVoltageLevelFeederBaysDialog({
editData?.feederBays &&
editData?.feederBays?.length > 0
) {
// when an equipment is not present in feederBaysInfos but is in editData.feederBays it is moved to the end of editData.feederBays to make rowId correspond
editData.feederBays = moveNotFoundItemToEnd(editData.feederBays, feederBaysInfos);
mergedRowData = editData.feederBays.filter(Boolean).map((bay, index) => ({
equipmentId: bay.equipmentId,
busbarSectionId: bay.busbarSectionId,
Expand All @@ -218,6 +220,16 @@ export default function MoveVoltageLevelFeederBaysDialog({
[editData, isNodeBuiltValue]
);

const moveNotFoundItemToEnd = (listToMove: MoveFeederBayInfos[], listToCheck: FeederBays) => {
return listToMove
.filter((feederDataRow) => listToCheck.some((element) => element.equipmentId === feederDataRow.equipmentId))
.concat(
listToMove.filter(
(feederDataRow) => !listToCheck.some((element) => element.equipmentId === feederDataRow.equipmentId)
)
);
};

const handleVoltageLevelDataFetch = useCallback(
(feederBaysInfos: FeederBaysInfos, busesOrbusbarSections: Identifiable[]) => {
const busbarSectionIds = busesOrbusbarSections?.map((b) => b.id) ?? null;
Expand All @@ -233,6 +245,7 @@ export default function MoveVoltageLevelFeederBaysDialog({
rowId: `${item.equipmentId}-${index}`,
}));
setFeederBaysPreviousValues(feederBaysWithRowIds);
console.log('feederBaysWithRowIds', feederBaysWithRowIds);
// merge row data between actual values in network and user's modification infos
const mergedRowDataWithKeys = mergeRowData(feederBaysWithRowIds, busbarSectionIds);
// reset default values for RHF state
Expand Down
Loading