63469: Intermediate commit

src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts

@@ -140,10 +140,6 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
       this.notificationsService.error(this.getNotificationTitle('failed'), response.errorMessage);
     });
     if (successfulResponses.length > 0) {
-      // Remove the item's cache to make sure the lists are reloaded with the newest values
-      this.objectCache.remove(this.item.self);
-      this.requestService.removeByHrefSubstring(this.item.self);
-      // Send a notification that the removal was successful
       this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
     }
   }

src/app/core/data/relationship.service.ts

@@ -25,6 +25,7 @@ import {
   compareArraysUsingIds, filterRelationsByTypeLabel,
   relationsToItems
 } from '../../+item-page/simple/item-types/shared/item-relationships-utils';
+import { ObjectCacheService } from '../cache/object-cache.service';
 
 /**
  * The service handling all relationship requests
@@ -36,7 +37,8 @@ export class RelationshipService {
   constructor(protected requestService: RequestService,
               protected halService: HALEndpointService,
               protected rdbService: RemoteDataBuildService,
-              protected itemService: ItemDataService) {
+              protected itemService: ItemDataService,
+              protected objectCache: ObjectCacheService) {
   }
 
   /**
@@ -49,6 +51,11 @@ export class RelationshipService {
     );
   }
 
+  findById(uuid: string): Observable<RemoteData<Relationship>> {
+    const href$ = this.getRelationshipEndpoint(uuid);
+    return this.rdbService.buildSingle<Relationship>(href$);
+  }
+
   /**
    * Send a delete request for a relationship by ID
    * @param uuid
@@ -60,7 +67,8 @@ export class RelationshipService {
       map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)),
       configureRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
-      getResponseFromEntry()
+      getResponseFromEntry(),
+      tap(() => this.clearRelatedCache(uuid))
     );
   }
 
@@ -203,4 +211,17 @@ export class RelationshipService {
     );
   }
 
+  clearRelatedCache(uuid: string) {
+    this.findById(uuid).pipe(
+      getSucceededRemoteData(),
+      flatMap((rd: RemoteData<Relationship>) => observableCombineLatest(rd.payload.leftItem.pipe(getSucceededRemoteData()), rd.payload.rightItem.pipe(getSucceededRemoteData()))),
+      take(1)
+    ).subscribe(([leftItem, rightItem]) => {
+      this.objectCache.remove(leftItem.payload.self);
+      this.objectCache.remove(rightItem.payload.self);
+      this.requestService.removeByHrefSubstring(leftItem.payload.self);
+      this.requestService.removeByHrefSubstring(rightItem.payload.self);
+    });
+  }
+
 }