From 7dc4609a838608044801daf684d8e85971df3db9 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 24 Jun 2021 11:16:38 +0200
Subject: [PATCH] add getFirstCompletedRemoteData, remove force redownload of
 owningcollection

---
 .../item-move/item-move.component.ts            | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index c22f5f3ff8..0f6ce23793 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -7,7 +7,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { Observable, of as observableOf } from 'rxjs';
@@ -103,7 +106,7 @@ export class ItemMoveComponent implements OnInit {
   moveToCollection() {
     this.processing = true;
     const move$ = this.itemDataService.moveToCollection(this.item.id, this.selectedCollection)
-                                      .pipe(getFirstCompletedRemoteData());
+      .pipe(getFirstCompletedRemoteData());
 
     move$.subscribe((response: RemoteData<any>) => {
       if (response.hasSucceeded) {
@@ -114,8 +117,14 @@ export class ItemMoveComponent implements OnInit {
     });
 
     move$.pipe(
-      switchMap(() => this.itemDataService.findById(
-        this.item.id, false, true, followLink('owningCollection', undefined, true, false)))
+      switchMap(() =>
+        this.itemDataService.findById(
+          this.item.id,
+          false,
+          true,
+          followLink('owningCollection')
+      )),
+      getFirstCompletedRemoteData()
     ).subscribe(() => {
       this.processing = false;
       this.router.navigate([getItemEditRoute(this.item)]);