-
{{'item.edit.move.head' | translate: { id: (itemRD$ | async)?.payload?.handle} }}
+
{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}
{{'item.edit.move.description' | translate}}
+
-
{{'item.edit.move.move' | translate}}
+
+ {{'item.edit.move.move' | translate}}
+
-
+
{{'item.edit.move.cancel' | translate}}
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index 3d947fdabe..e73b4b6f9a 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -103,20 +103,8 @@ describe('ItemMoveComponent', () => {
});
it('should load suggestions', () => {
const expected = [
- {
- displayValue: 'Test collection 1',
- value: {
- name: 'Test collection 1',
- object: collection1,
- }
- },
- {
- displayValue: 'Test collection 2',
- value: {
- name: 'Test collection 2',
- object: collection2,
- }
- }
+ collection1,
+ collection2
];
comp.collectionSearchResults.subscribe((value) => {
@@ -128,20 +116,18 @@ describe('ItemMoveComponent', () => {
expect(comp.getCurrentUrl()).toEqual('fake-url/fake-id/edit');
});
it('should on click select the correct collection name and id', () => {
- const data = {
- name: 'Test collection 1',
- object: collection1,
- };
+ const data = collection1;
+
comp.onClick(data);
- expect(comp.selectedCollection).toEqual('Test collection 1');
- expect(comp.selectedCollectionObject).toEqual(collection1);
+ expect(comp.selectedCollectionName).toEqual('Test collection 1');
+ expect(comp.selectedCollection).toEqual(collection1);
});
describe('moveCollection', () => {
it('should call itemDataService.moveToCollection', () => {
comp.itemId = 'item-id';
- comp.selectedCollection = 'selected-collection-id';
- comp.selectedCollectionObject = collection1;
+ comp.selectedCollectionName = 'selected-collection-id';
+ comp.selectedCollection = collection1;
comp.moveCollection();
expect(mockItemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
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 4cca0cd3a4..d964c940f7 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
@@ -1,23 +1,23 @@
-import {Component, OnInit} from '@angular/core';
-import {SearchService} from '../../../+search-page/search-service/search.service';
-import {first, map} from 'rxjs/operators';
-import {DSpaceObjectType} from '../../../core/shared/dspace-object-type.model';
-import {SearchOptions} from '../../../+search-page/search-options.model';
-import {RemoteData} from '../../../core/data/remote-data';
-import {DSpaceObject} from '../../../core/shared/dspace-object.model';
-import {PaginatedList} from '../../../core/data/paginated-list';
-import {SearchResult} from '../../../+search-page/search-result.model';
-import {Item} from '../../../core/shared/item.model';
-import {ActivatedRoute, Router} from '@angular/router';
-import {NotificationsService} from '../../../shared/notifications/notifications.service';
-import {TranslateService} from '@ngx-translate/core';
-import {getSucceededRemoteData} from '../../../core/shared/operators';
-import {ItemDataService} from '../../../core/data/item-data.service';
-import {getItemEditPath} from '../../item-page-routing.module';
-import {Observable} from 'rxjs';
-import {of as observableOf} from 'rxjs';
+import { Component, OnInit } from '@angular/core';
+import { SearchService } from '../../../+search-page/search-service/search.service';
+import { first, map } from 'rxjs/operators';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { SearchOptions } from '../../../+search-page/search-options.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { SearchResult } from '../../../+search-page/search-result.model';
+import { Item } from '../../../core/shared/item.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { getItemEditPath } from '../../item-page-routing.module';
+import { Observable, of as observableOf } from 'rxjs';
import { RestResponse } from '../../../core/cache/response.models';
import { Collection } from '../../../core/shared/collection.model';
+import { tap } from 'rxjs/internal/operators/tap';
@Component({
selector: 'ds-item-move',
@@ -31,13 +31,18 @@ export class ItemMoveComponent implements OnInit {
* TODO: There is currently no backend support to change the owningCollection and inherit policies,
* TODO: when this is added, the inherit policies option should be used.
*/
+
+ selectorType = DSpaceObjectType.COLLECTION;
+
inheritPolicies = false;
itemRD$: Observable
>;
collectionSearchResults: Observable = observableOf([]);
- selectedCollection: string;
- selectedCollectionObject: Collection;
+ selectedCollectionName: string;
+ selectedCollection: Collection;
+ canSubmit = false;
itemId: string;
+ processing = false;
constructor(private route: ActivatedRoute,
private router: Router,
@@ -48,7 +53,7 @@ export class ItemMoveComponent implements OnInit {
}
ngOnInit(): void {
- this.itemRD$ = this.route.data.pipe(map((data) => data.item),getSucceededRemoteData()) as Observable>;
+ this.itemRD$ = this.route.data.pipe(map((data) => data.item), getSucceededRemoteData()) as Observable>;
this.itemRD$.subscribe((rd) => {
this.itemId = rd.payload.id;
}
@@ -76,12 +81,9 @@ export class ItemMoveComponent implements OnInit {
first(),
map((rd: RemoteData>>) => {
return rd.payload.page.map((searchResult) => {
- return {
- displayValue: searchResult.indexableObject.name,
- value: {name: searchResult.indexableObject.name, object: searchResult.indexableObject}
- };
- });
- })
+ return searchResult.indexableObject
+ })
+ }) ,
);
}
@@ -91,8 +93,9 @@ export class ItemMoveComponent implements OnInit {
* @param data - obtained from the ds-input-suggestions component
*/
onClick(data: any): void {
- this.selectedCollection = data.name;
- this.selectedCollectionObject = data.object;
+ this.selectedCollection = data;
+ this.selectedCollectionName = data.name;
+ this.canSubmit = true;
}
/**
@@ -106,7 +109,8 @@ export class ItemMoveComponent implements OnInit {
* Moves the item to a new collection based on the selected collection
*/
moveCollection() {
- this.itemDataService.moveToCollection(this.itemId, this.selectedCollectionObject).pipe(first()).subscribe(
+ this.processing = true;
+ this.itemDataService.moveToCollection(this.itemId, this.selectedCollection).pipe(first()).subscribe(
(response: RestResponse) => {
this.router.navigate([getItemEditPath(this.itemId)]);
if (response.isSuccessful) {
@@ -114,8 +118,16 @@ export class ItemMoveComponent implements OnInit {
} else {
this.notificationsService.error(this.translateService.get('item.edit.move.error'));
}
+ this.processing = false;
}
);
+ }
+ /**
+ * Resets the can submit when the user changes the content of the input field
+ * @param data
+ */
+ resetCollection(data: any) {
+ this.canSubmit = false;
}
}
diff --git a/src/app/+item-page/edit-item-page/item-operation/item-operation.component.html b/src/app/+item-page/edit-item-page/item-operation/item-operation.component.html
index 4623195437..3a52fd0d12 100644
--- a/src/app/+item-page/edit-item-page/item-operation/item-operation.component.html
+++ b/src/app/+item-page/edit-item-page/item-operation/item-operation.component.html
@@ -4,7 +4,7 @@