From 78cfaf0ea75b1beb36c98a8834d807850dd4e578 Mon Sep 17 00:00:00 2001 From: Mathieu Deharbe <148252167+Mathieu-Deharbe@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:38:09 +0100 Subject: [PATCH] improves limit sets ihm (#2623) Signed-off-by: Mathieu DEHARBE --- .../limits/limits-groups-contextual-menu.tsx | 13 ++++++++----- .../limits/operational-limits-groups-tabs.tsx | 13 +++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/components/dialogs/limits/limits-groups-contextual-menu.tsx b/src/components/dialogs/limits/limits-groups-contextual-menu.tsx index da0c4a94ac..dee7c961ea 100644 --- a/src/components/dialogs/limits/limits-groups-contextual-menu.tsx +++ b/src/components/dialogs/limits/limits-groups-contextual-menu.tsx @@ -80,28 +80,31 @@ export function LimitsGroupsContextualMenu({ }; const handleDuplicateTab = () => { + let newName: string = ''; if (indexSelectedLimitSet1 !== null) { - const duplicatedLimits1 = getValues( + const duplicatedLimits1: OperationalLimitsGroup = getValues( `${parentFormName}.${OPERATIONAL_LIMITS_GROUPS_1}[${indexSelectedLimitSet1}]` ); + newName = duplicatedLimits1.id + '_COPY'; const newLimitsGroup1: OperationalLimitsGroup = { ...duplicatedLimits1, - [ID]: '', + [ID]: newName, }; appendToLimitsGroups1(newLimitsGroup1); } if (indexSelectedLimitSet2 !== null) { - const duplicatedLimits2 = getValues( + const duplicatedLimits2: OperationalLimitsGroup = getValues( `${parentFormName}.${OPERATIONAL_LIMITS_GROUPS_2}[${indexSelectedLimitSet2}]` ); + newName = duplicatedLimits2.id + '_COPY'; const newLimitsGroup2: OperationalLimitsGroup = { ...duplicatedLimits2, - [ID]: '', + [ID]: newName, }; appendToLimitsGroups2(newLimitsGroup2); } - startEditingLimitsGroup(getValues(`${parentFormName}.${OPERATIONAL_LIMITS_GROUPS_1}`).length - 1, ''); + startEditingLimitsGroup(getValues(`${parentFormName}.${OPERATIONAL_LIMITS_GROUPS_1}`).length - 1, newName); }; return ( diff --git a/src/components/dialogs/limits/operational-limits-groups-tabs.tsx b/src/components/dialogs/limits/operational-limits-groups-tabs.tsx index 72ad017837..7f6f566b26 100644 --- a/src/components/dialogs/limits/operational-limits-groups-tabs.tsx +++ b/src/components/dialogs/limits/operational-limits-groups-tabs.tsx @@ -306,7 +306,7 @@ export function OperationalLimitsGroupsTabs({ const newIndex: number = limitsGroups1.length; appendEmptyOperationalLimitsGroup(`${parentFormName}.${OPERATIONAL_LIMITS_GROUPS_1}`, ''); appendEmptyOperationalLimitsGroup(`${parentFormName}.${OPERATIONAL_LIMITS_GROUPS_2}`, ''); - startEditingLimitsGroup(newIndex, `LIMIT_SET`); + startEditingLimitsGroup(newIndex, `DEFAULT`); } }, [ editingTabIndex, @@ -356,10 +356,11 @@ export function OperationalLimitsGroupsTabs({ {(index === hoveredRowIndex || index === activatedByMenuTabIndex) && ( @@ -371,27 +372,31 @@ export function OperationalLimitsGroupsTabs({ /> ))} - + ) } + sx={limitsStyles.limitsBackground} />