diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts index a076473b0f..8ffb471528 100644 --- a/src/app/core/data/base/delete-data.spec.ts +++ b/src/app/core/data/base/delete-data.spec.ts @@ -198,6 +198,11 @@ describe('DeleteDataImpl', () => { method: RestRequestMethod.DELETE, href: 'some-href?copyVirtualMetadata=a©VirtualMetadata=b©VirtualMetadata=c', })); + + const callback = (rdbService.buildFromRequestUUIDAndAwait as jasmine.Spy).calls.argsFor(0)[1]; + callback(); + expect(service.invalidateByHref).toHaveBeenCalledWith('some-href'); + done(); }); }); diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts index 807d9d838e..26f9d1cc53 100644 --- a/src/app/core/data/base/delete-data.ts +++ b/src/app/core/data/base/delete-data.ts @@ -68,15 +68,16 @@ export class DeleteDataImpl extends IdentifiableDataS deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable> { const requestId = this.requestService.generateRequestId(); + let deleteHref: string = href; if (copyVirtualMetadata) { copyVirtualMetadata.forEach((id) => - href += (href.includes('?') ? '&' : '?') + deleteHref += (deleteHref.includes('?') ? '&' : '?') + 'copyVirtualMetadata=' + id, ); } - const request = new DeleteRequest(requestId, href); + const request = new DeleteRequest(requestId, deleteHref); if (hasValue(this.responseMsToLive)) { request.responseMsToLive = this.responseMsToLive; } diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html index 5191e705d0..ed6ba3eabc 100644 --- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html +++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html @@ -6,30 +6,29 @@

{{descriptionMessage | translate}}

- +
{{'virtual-metadata.delete-item.info' | translate}} -
- -
+
-
+
-
- {{getRelationshipMessageKey(getLabel(type) | async) | translate}} +
+ {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
-
- + -
+
{{'virtual-metadata.delete-item.modal-head' | translate}} -
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts index 9012ebe7d7..0a512c8976 100644 --- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts +++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line max-classes-per-file import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { defaultIfEmpty, filter, map, switchMap, take } from 'rxjs/operators'; import { @@ -37,6 +38,34 @@ import { getItemEditRoute } from '../../item-page-routing-paths'; import { RemoteData } from '../../../core/data/remote-data'; import { NoContent } from '../../../core/shared/NoContent.model'; +/** + * Data Transfer Object used to prevent the HTML template to call function returning Observables + */ +class RelationshipTypeDTO { + + relationshipType: RelationshipType; + + isSelected$: Observable; + + label$: Observable; + + relationshipDTOs$: Observable; + +} + +/** + * Data Transfer Object used to prevent the HTML template to call function returning Observables + */ +class RelationshipDTO { + + relationship: Relationship; + + relatedItem$: Observable; + + virtualMetadata$: Observable; + +} + @Component({ selector: 'ds-item-delete', templateUrl: '../item-delete/item-delete.component.html' @@ -64,7 +93,7 @@ export class ItemDeleteComponent * A list of the relationship types for which this item has relations as an observable. * The list doesn't contain duplicates. */ - types$: BehaviorSubject = new BehaviorSubject([]); + typeDTOs$: BehaviorSubject = new BehaviorSubject([]); /** * A map which stores the relationships of this item for each type as observable lists @@ -93,6 +122,8 @@ export class ItemDeleteComponent */ private subs: Subscription[] = []; + public isDeleting$: BehaviorSubject = new BehaviorSubject(false); + constructor(protected route: ActivatedRoute, protected router: Router, protected notificationsService: NotificationsService, @@ -146,14 +177,25 @@ export class ItemDeleteComponent }, []) ), ); - }) - ).subscribe((types: RelationshipType[]) => this.types$.next(types))); + }), + ).subscribe((types: RelationshipType[]) => this.typeDTOs$.next(types.map((relationshipType: RelationshipType) => Object.assign(new RelationshipTypeDTO(), { + relationshipType: relationshipType, + isSelected$: this.isSelected(relationshipType), + label$: this.getLabel(relationshipType), + relationshipDTOs$: this.getRelationships(relationshipType).pipe( + map((relationships: Relationship[]) => relationships.map((relationship: Relationship) => Object.assign(new RelationshipDTO(), { + relationship: relationship, + relatedItem$: this.getRelatedItem(relationship), + virtualMetadata$: this.getVirtualMetadata(relationship), + } as RelationshipDTO))), + ), + }))))); } - this.subs.push(this.types$.pipe( + this.subs.push(this.typeDTOs$.pipe( take(1), - ).subscribe((types) => - this.objectUpdatesService.initialize(this.url, types, this.item.lastModified) + ).subscribe((types: RelationshipTypeDTO[]) => + this.objectUpdatesService.initialize(this.url, types.map((relationshipTypeDto: RelationshipTypeDTO) => relationshipTypeDto.relationshipType), this.item.lastModified), )); } @@ -326,34 +368,33 @@ export class ItemDeleteComponent * @param selected whether the type should be selected */ setSelected(type: RelationshipType, selected: boolean): void { - this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.item.uuid, type.uuid, selected); + if (this.isDeleting$.value === false) { + this.objectUpdatesService.setSelectedVirtualMetadata(this.url, this.item.uuid, type.uuid, selected); + } } /** * Perform the delete operation */ - performAction() { - - this.subs.push(this.types$.pipe( - switchMap((types) => + performAction(): void { + this.isDeleting$.next(true); + this.subs.push(this.typeDTOs$.pipe( + switchMap((types: RelationshipTypeDTO[]) => combineLatest( - types.map((type) => this.isSelected(type)) + types.map((type: RelationshipTypeDTO) => type.isSelected$), ).pipe( defaultIfEmpty([]), - map((selection) => types.filter( - (type, index) => selection[index] + map((selection: boolean[]) => types.filter( + (type: RelationshipTypeDTO, index: number) => selection[index], )), - map((selectedTypes) => selectedTypes.map((type) => type.id)), - ) + map((selectedDtoTypes: RelationshipTypeDTO[]) => selectedDtoTypes.map((typeDto: RelationshipTypeDTO) => typeDto.relationshipType.id)), + ), ), - switchMap((types) => - this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData()) - ) - ).subscribe( - (rd: RemoteData) => { - this.notify(rd.hasSucceeded); - } - )); + switchMap((types: string[]) => this.itemDataService.delete(this.item.id, types)), + getFirstCompletedRemoteData(), + ).subscribe((rd: RemoteData) => { + this.notify(rd.hasSucceeded); + })); } /** @@ -363,10 +404,10 @@ export class ItemDeleteComponent notify(succeeded: boolean) { if (succeeded) { this.notificationsService.success(this.translateService.get('item.edit.' + this.messageKey + '.success')); - this.router.navigate(['']); + void this.router.navigate(['']); } else { this.notificationsService.error(this.translateService.get('item.edit.' + this.messageKey + '.error')); - this.router.navigate([getItemEditRoute(this.item)]); + void this.router.navigate([getItemEditRoute(this.item)]); } } diff --git a/src/app/item-page/full/full-item-page.component.spec.ts b/src/app/item-page/full/full-item-page.component.spec.ts index 9fc078c2cd..ac82134f27 100644 --- a/src/app/item-page/full/full-item-page.component.spec.ts +++ b/src/app/item-page/full/full-item-page.component.spec.ts @@ -15,7 +15,6 @@ import { BehaviorSubject, of as observableOf } from 'rxjs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { AuthService } from '../../core/auth/auth.service'; import { createPaginatedList } from '../../shared/testing/utils.test'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec'; @@ -54,7 +53,6 @@ describe('FullItemPageComponent', () => { let comp: FullItemPageComponent; let fixture: ComponentFixture; - let authService: AuthService; let routeStub: ActivatedRouteStub; let routeData; let authorizationDataService: AuthorizationDataService; @@ -75,11 +73,6 @@ describe('FullItemPageComponent', () => { }; beforeEach(waitForAsync(() => { - authService = jasmine.createSpyObj('authService', { - isAuthenticated: observableOf(true), - setRedirectUrl: {} - }); - routeData = { dso: createSuccessfulRemoteDataObject(mockItem), }; @@ -117,7 +110,6 @@ describe('FullItemPageComponent', () => { { provide: ActivatedRoute, useValue: routeStub }, { provide: ItemDataService, useValue: {} }, { provide: MetadataService, useValue: metadataServiceStub }, - { provide: AuthService, useValue: authService }, { provide: AuthorizationDataService, useValue: authorizationDataService }, { provide: ServerResponseService, useValue: serverResponseService }, { provide: SignpostingDataService, useValue: signpostingDataService }, diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts index 31dd2c5fc2..c91ea8bfe6 100644 --- a/src/app/item-page/full/full-item-page.component.ts +++ b/src/app/item-page/full/full-item-page.component.ts @@ -13,7 +13,6 @@ import { Item } from '../../core/shared/item.model'; import { fadeInOut } from '../../shared/animations/fade'; import { hasValue } from '../../shared/empty.util'; -import { AuthService } from '../../core/auth/auth.service'; import { Location } from '@angular/common'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ServerResponseService } from '../../core/services/server-response.service'; @@ -49,7 +48,6 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit, protected route: ActivatedRoute, protected router: Router, protected items: ItemDataService, - protected authService: AuthService, protected authorizationService: AuthorizationDataService, protected _location: Location, protected responseService: ServerResponseService, @@ -57,7 +55,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit, protected linkHeadService: LinkHeadService, @Inject(PLATFORM_ID) protected platformId: string, ) { - super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, platformId); + super(route, router, items, authorizationService, responseService, signpostingDataService, linkHeadService, platformId); } /*** AoT inheritance fix, will hopefully be resolved in the near future **/ diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts index 533f97d0c0..f22eba5732 100644 --- a/src/app/item-page/item-page.resolver.spec.ts +++ b/src/app/item-page/item-page.resolver.spec.ts @@ -3,14 +3,15 @@ import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils'; import { DSpaceObject } from '../core/shared/dspace-object.model'; import { MetadataValueFilter } from '../core/shared/metadata.models'; import { first } from 'rxjs/operators'; -import { Router } from '@angular/router'; +import { Router, RouterModule } from '@angular/router'; import { TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; +import { AuthServiceStub } from '../shared/testing/auth-service.stub'; +import { AuthService } from '../core/auth/auth.service'; describe('ItemPageResolver', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [RouterTestingModule.withRoutes([{ + imports: [RouterModule.forRoot([{ path: 'entities/:entity-type/:id', component: {} as any }])] @@ -21,7 +22,8 @@ describe('ItemPageResolver', () => { let resolver: ItemPageResolver; let itemService: any; let store: any; - let router: any; + let router: Router; + let authService: AuthServiceStub; const uuid = '1234-65487-12354-1235'; let item: DSpaceObject; @@ -41,7 +43,8 @@ describe('ItemPageResolver', () => { store = jasmine.createSpyObj('store', { dispatch: {}, }); - resolver = new ItemPageResolver(itemService, store, router); + authService = new AuthServiceStub(); + resolver = new ItemPageResolver(itemService, store, router, authService as unknown as AuthService); }); it('should redirect to the correct route for the entity type', (done) => { diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts index e9b287406e..e3c1703e06 100644 --- a/src/app/item-page/item-page.resolver.ts +++ b/src/app/item-page/item-page.resolver.ts @@ -9,6 +9,8 @@ import { map } from 'rxjs/operators'; import { hasValue } from '../shared/empty.util'; import { getItemPageRoute } from './item-page-routing-paths'; import { ItemResolver } from './item.resolver'; +import { redirectOn4xx } from '../core/shared/authorized.operators'; +import { AuthService } from '../core/auth/auth.service'; /** * This class represents a resolver that requests a specific item before the route is activated and will redirect to the @@ -19,7 +21,8 @@ export class ItemPageResolver extends ItemResolver { constructor( protected itemService: ItemDataService, protected store: Store, - protected router: Router + protected router: Router, + protected authService: AuthService, ) { super(itemService, store, router); } @@ -33,6 +36,7 @@ export class ItemPageResolver extends ItemResolver { */ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> { return super.resolve(route, state).pipe( + redirectOn4xx(this.router, this.authService), map((rd: RemoteData) => { if (rd.hasSucceeded && hasValue(rd.payload)) { const thisRoute = state.url; diff --git a/src/app/item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts index b3202108f4..b1bc61a8f7 100644 --- a/src/app/item-page/simple/item-page.component.spec.ts +++ b/src/app/item-page/simple/item-page.component.spec.ts @@ -19,7 +19,6 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; -import { AuthService } from '../../core/auth/auth.service'; import { createPaginatedList } from '../../shared/testing/utils.test'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { ServerResponseService } from '../../core/services/server-response.service'; @@ -57,7 +56,6 @@ const mockSignpostingLinks: SignpostingLink[] = [mocklink, mocklink2]; describe('ItemPageComponent', () => { let comp: ItemPageComponent; let fixture: ComponentFixture; - let authService: AuthService; let authorizationDataService: AuthorizationDataService; let serverResponseService: jasmine.SpyObj; let signpostingDataService: jasmine.SpyObj; @@ -74,10 +72,6 @@ describe('ItemPageComponent', () => { }); beforeEach(waitForAsync(() => { - authService = jasmine.createSpyObj('authService', { - isAuthenticated: observableOf(true), - setRedirectUrl: {} - }); authorizationDataService = jasmine.createSpyObj('authorizationDataService', { isAuthorized: observableOf(false), }); @@ -107,7 +101,6 @@ describe('ItemPageComponent', () => { { provide: ItemDataService, useValue: {} }, { provide: MetadataService, useValue: mockMetadataService }, { provide: Router, useValue: {} }, - { provide: AuthService, useValue: authService }, { provide: AuthorizationDataService, useValue: authorizationDataService }, { provide: ServerResponseService, useValue: serverResponseService }, { provide: SignpostingDataService, useValue: signpostingDataService }, diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts index b9be6bebfb..3fd97d3261 100644 --- a/src/app/item-page/simple/item-page.component.ts +++ b/src/app/item-page/simple/item-page.component.ts @@ -11,9 +11,7 @@ import { Item } from '../../core/shared/item.model'; import { fadeInOut } from '../../shared/animations/fade'; import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators'; import { ViewMode } from '../../core/shared/view-mode.model'; -import { AuthService } from '../../core/auth/auth.service'; import { getItemPageRoute } from '../item-page-routing-paths'; -import { redirectOn4xx } from '../../core/shared/authorized.operators'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; import { FeatureID } from '../../core/data/feature-authorization/feature-id'; import { ServerResponseService } from '../../core/services/server-response.service'; @@ -72,7 +70,6 @@ export class ItemPageComponent implements OnInit, OnDestroy { protected route: ActivatedRoute, protected router: Router, protected items: ItemDataService, - protected authService: AuthService, protected authorizationService: AuthorizationDataService, protected responseService: ServerResponseService, protected signpostingDataService: SignpostingDataService, @@ -88,7 +85,6 @@ export class ItemPageComponent implements OnInit, OnDestroy { ngOnInit(): void { this.itemRD$ = this.route.data.pipe( map((data) => data.dso as RemoteData), - redirectOn4xx(this.router, this.authService) ); this.itemPageRoute$ = this.itemRD$.pipe( getAllSucceededRemoteDataPayload(),