From 7f067772376bb5df8a7ec37aae90ca2fdb8d5d67 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 18 Sep 2024 15:09:17 +0300
Subject: [PATCH] B: Fix constituenta tooltip

---
 .../src/components/info/BadgeConstituenta.tsx        |  4 ++--
 .../src/components/select/PickSubstitutions.tsx      | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx b/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx
index 8d78b8e6..71320316 100644
--- a/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx
+++ b/rsconcept/frontend/src/components/info/BadgeConstituenta.tsx
@@ -16,7 +16,7 @@ interface BadgeConstituentaProps extends CProps.Styling {
 function BadgeConstituenta({ value, prefixID, className, style, theme }: BadgeConstituentaProps) {
   return (
     <div
-      id={`${prefixID}${value.alias}`}
+      id={`${prefixID}${value.id}`}
       className={clsx(
         'min-w-[3.1rem] max-w-[3.1rem]',
         'px-1',
@@ -33,7 +33,7 @@ function BadgeConstituenta({ value, prefixID, className, style, theme }: BadgeCo
       }}
     >
       {value.alias}
-      <TooltipConstituenta anchor={`#${prefixID}${value.alias}`} data={value} />
+      <TooltipConstituenta anchor={`#${prefixID}${value.id}`} data={value} />
     </div>
   );
 }
diff --git a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
index 8039896b..dccd93c0 100644
--- a/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
+++ b/rsconcept/frontend/src/components/select/PickSubstitutions.tsx
@@ -182,7 +182,11 @@ function PickSubstitutions({
         id: 'left_alias',
         size: 65,
         cell: props => (
-          <BadgeConstituenta theme={colors} value={props.row.original.substitution} prefixID={`${prefixID}_1_`} />
+          <BadgeConstituenta
+            theme={colors}
+            value={props.row.original.substitution}
+            prefixID={`${prefixID}_${props.row.index}_1_`}
+          />
         )
       }),
       columnHelper.display({
@@ -194,7 +198,11 @@ function PickSubstitutions({
         id: 'right_alias',
         size: 65,
         cell: props => (
-          <BadgeConstituenta theme={colors} value={props.row.original.original} prefixID={`${prefixID}_2_`} />
+          <BadgeConstituenta
+            theme={colors}
+            value={props.row.original.original}
+            prefixID={`${prefixID}_${props.row.index}_2_`}
+          />
         )
       }),
       columnHelper.accessor(item => item.original_source.alias, {