From 4541788a34500b7d23fed6d1016172eb63c5a8fe Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Thu, 9 May 2024 14:55:37 +0200
Subject: [PATCH] fix issue where relationship lists wouldn't update
 automatically from the second submit onwards

---
 src/app/core/data/relationship-data.service.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 8d8f62b14e..b002d4c9ce 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -309,13 +309,19 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     } else {
       findListOptions.searchParams = searchParams;
     }
-    const result$ = this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+
+    // always set reRequestOnStale to false here, so it doesn't happen automatically in BaseDataService
+    const result$ = this.searchBy('byLabel', findListOptions, useCachedVersionIfAvailable, false, ...linksToFollow);
 
     // add this result as a dependency of the item, meaning that if the item is invalided, this
     // result will be as well
-    this.addDependency(result$, item.self);
+    this.addDependency(result$, item._links.self.href);
 
-    return result$;
+    // do the reRequestOnStale call here, to ensure any re-requests also get added as dependencies
+    return result$.pipe(
+      this.reRequestStaleRemoteData(reRequestOnStale, () =>
+        this.getItemRelationshipsByLabel(item, label, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
+    );
   }
 
   /**