From fe1c3417c76638c18626b93a97dbe9c34d3a4a20 Mon Sep 17 00:00:00 2001
From: Rezart Vata <rezart.vata@atis.al>
Date: Thu, 21 Oct 2021 17:09:11 +0200
Subject: [PATCH] [CST-4504] Bug fixing

---
 .../edit-relationship-list.component.ts             | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 15982da90a..b26faff517 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -230,17 +230,22 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
           modalComp.toRemove.splice(foundIndex,1);
         } else {
 
-          this.getIsRelatedItem(relatedItem)
-            .subscribe((isRelated: boolean) => {
-              if (!isRelated ) {
+          this.getRelationFromId(relatedItem)
+            .subscribe((relationship: Relationship) => {
+              if (!relationship ) {
                 modalComp.toAdd.push(searchResult);
+              } else {
+                const foundIndexRemove = modalComp.toRemove.findIndex( el => el.indexableObject.uuid === relatedItem.uuid);
+                if (foundIndexRemove !== -1) {
+                  modalComp.toRemove.splice(foundIndexRemove,1);
+                }
               }
 
               this.loading$.next(true);
               // emit the last page again to trigger a fieldupdates refresh
               this.relationshipsRd$.next(this.relationshipsRd$.getValue());
             });
-          }
+        }
       });
     };
     modalComp.deselect = (...selectableObjects: SearchResult<Item>[]) => {