{{bitstreamRD?.payload?.name}} ({{bitstreamRD?.payl
[submitLabel]="'form.save'"
(submitForm)="onSubmit()"
(cancel)="onCancel()"
- (dfChange)="onChange($event)">
+ (dfChange)="onChange($event)">
+
+
[] = [
- followLink('parentCommunity', undefined, true, true, true,
+ followLink('parentCommunity', {},
followLink('parentCommunity')
),
followLink('logo')
diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
index 81ba60e51b6..4abb1494981 100644
--- a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
@@ -6,11 +6,12 @@ {{ 'collection.delete.head' | transla
{{ 'collection.delete.text' | translate:{ dso: dso.name } }}
-
diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.html b/src/app/+community-page/delete-community-page/delete-community-page.component.html
index 85aa8b1bce1..658f3da4366 100644
--- a/src/app/+community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/+community-page/delete-community-page/delete-community-page.component.html
@@ -6,11 +6,12 @@ {{ 'community.delete.head' | translat
{{ 'community.delete.text' | translate:{ dso: dso.name } }}
-
diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index fb193b24d4e..76597a135bb 100644
--- a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -4,10 +4,9 @@ import { ActivatedRoute } from '@angular/router';
import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
import { catchError, filter, first, map, mergeMap, take } from 'rxjs/operators';
-import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
import {
- getFirstSucceededRemoteDataPayload,
- getFirstSucceededRemoteDataWithNotEmptyPayload
+ getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataWithNotEmptyPayload,
} from '../../../core/shared/operators';
import { Item } from '../../../core/shared/item.model';
import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -15,7 +14,6 @@ import { LinkService } from '../../../core/cache/builders/link.service';
import { Bundle } from '../../../core/shared/bundle.model';
import { hasValue, isNotEmpty } from '../../../shared/empty.util';
import { Bitstream } from '../../../core/shared/bitstream.model';
-import { FindListOptions } from '../../../core/data/request.models';
/**
* Interface for a bundle's bitstream map entry
@@ -79,7 +77,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
getFirstSucceededRemoteDataWithNotEmptyPayload(),
map((item: Item) => this.linkService.resolveLink(
item,
- followLink('bundles', new FindListOptions(), true, true, true, followLink('bitstreams'))
+ followLink('bundles', {}, followLink('bitstreams'))
))
) as Observable- ;
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.html b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
index 74ca9aae4ea..f68cfb06853 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
@@ -5,19 +5,16 @@
{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle
{{'item.edit.move.description' | translate}}
-
-
-
+
+ {{'dso-selector.placeholder' | translate: { type: 'collection' } }}
+
+
+
+
+
+
@@ -33,16 +30,24 @@ {{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle
-
-
+
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 dd91c65e1e1..d200891629b 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
@@ -21,6 +21,8 @@ import {
createSuccessfulRemoteDataObject$
} from '../../../shared/remote-data.utils';
import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RequestService } from '../../../core/data/request.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
describe('ItemMoveComponent', () => {
let comp: ItemMoveComponent;
@@ -47,18 +49,25 @@ describe('ItemMoveComponent', () => {
name: 'Test collection 2'
});
- const mockItemDataService = jasmine.createSpyObj({
- moveToCollection: createSuccessfulRemoteDataObject$(collection1)
+ let itemDataService;
+
+ const mockItemDataServiceSuccess = jasmine.createSpyObj({
+ moveToCollection: createSuccessfulRemoteDataObject$(collection1),
+ findById: createSuccessfulRemoteDataObject$(mockItem),
});
const mockItemDataServiceFail = jasmine.createSpyObj({
- moveToCollection: createFailedRemoteDataObject$('Internal server error', 500)
+ moveToCollection: createFailedRemoteDataObject$('Internal server error', 500),
+ findById: createSuccessfulRemoteDataObject$(mockItem),
});
const routeStub = {
data: observableOf({
dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
- id: 'item1'
+ id: 'item1',
+ owningCollection: createSuccessfulRemoteDataObject$(Object.assign(new Collection(), {
+ id: 'originalOwningCollection',
+ }))
}))
})
};
@@ -79,43 +88,40 @@ describe('ItemMoveComponent', () => {
const notificationsServiceStub = new NotificationsServiceStub();
+ const init = (mockItemDataService) => {
+ itemDataService = mockItemDataService;
+
+ TestBed.configureTestingModule({
+ imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+ declarations: [ItemMoveComponent],
+ providers: [
+ { provide: ActivatedRoute, useValue: routeStub },
+ { provide: Router, useValue: routerStub },
+ { provide: ItemDataService, useValue: mockItemDataService },
+ { provide: NotificationsService, useValue: notificationsServiceStub },
+ { provide: SearchService, useValue: mockSearchService },
+ { provide: RequestService, useValue: getMockRequestService() },
+ ], schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
+ ]
+ }).compileComponents();
+ fixture = TestBed.createComponent(ItemMoveComponent);
+ comp = fixture.componentInstance;
+ fixture.detectChanges();
+ };
+
describe('ItemMoveComponent success', () => {
beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
- declarations: [ItemMoveComponent],
- providers: [
- { provide: ActivatedRoute, useValue: routeStub },
- { provide: Router, useValue: routerStub },
- { provide: ItemDataService, useValue: mockItemDataService },
- { provide: NotificationsService, useValue: notificationsServiceStub },
- { provide: SearchService, useValue: mockSearchService },
- ], schemas: [
- CUSTOM_ELEMENTS_SCHEMA
- ]
- }).compileComponents();
- fixture = TestBed.createComponent(ItemMoveComponent);
- comp = fixture.componentInstance;
- fixture.detectChanges();
- });
- it('should load suggestions', () => {
- const expected = [
- collection1,
- collection2
- ];
-
- comp.collectionSearchResults.subscribe((value) => {
- expect(value).toEqual(expected);
- }
- );
+ init(mockItemDataServiceSuccess);
});
+
it('should get current url ', () => {
expect(comp.getCurrentUrl()).toEqual('fake-url/fake-id/edit');
});
- it('should on click select the correct collection name and id', () => {
+ it('should select the correct collection name and id on click', () => {
const data = collection1;
- comp.onClick(data);
+ comp.selectDso(data);
expect(comp.selectedCollectionName).toEqual('Test collection 1');
expect(comp.selectedCollection).toEqual(collection1);
@@ -128,12 +134,12 @@ describe('ItemMoveComponent', () => {
});
comp.selectedCollectionName = 'selected-collection-id';
comp.selectedCollection = collection1;
- comp.moveCollection();
+ comp.moveToCollection();
- expect(mockItemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
+ expect(itemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
});
it('should call notificationsService success message on success', () => {
- comp.moveCollection();
+ comp.moveToCollection();
expect(notificationsServiceStub.success).toHaveBeenCalled();
});
@@ -142,26 +148,11 @@ describe('ItemMoveComponent', () => {
describe('ItemMoveComponent fail', () => {
beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
- declarations: [ItemMoveComponent],
- providers: [
- { provide: ActivatedRoute, useValue: routeStub },
- { provide: Router, useValue: routerStub },
- { provide: ItemDataService, useValue: mockItemDataServiceFail },
- { provide: NotificationsService, useValue: notificationsServiceStub },
- { provide: SearchService, useValue: mockSearchService },
- ], schemas: [
- CUSTOM_ELEMENTS_SCHEMA
- ]
- }).compileComponents();
- fixture = TestBed.createComponent(ItemMoveComponent);
- comp = fixture.componentInstance;
- fixture.detectChanges();
+ init(mockItemDataServiceFail);
});
it('should call notificationsService error message on fail', () => {
- comp.moveCollection();
+ comp.moveToCollection();
expect(notificationsServiceStub.error).toHaveBeenCalled();
});
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 b1ed121b40f..b7ab761fe58 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,25 +1,21 @@
import { Component, OnInit } from '@angular/core';
-import { first, map } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
import { RemoteData } from '../../../core/data/remote-data';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { PaginatedList } from '../../../core/data/paginated-list.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 {
- getFirstSucceededRemoteData,
- getFirstCompletedRemoteData, getAllSucceededRemoteDataPayload
+ getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
} from '../../../core/shared/operators';
import { ItemDataService } from '../../../core/data/item-data.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable } from 'rxjs';
import { Collection } from '../../../core/shared/collection.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
import { SearchService } from '../../../core/shared/search/search.service';
-import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
-import { SearchResult } from '../../../shared/search/search-result.model';
import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { RequestService } from '../../../core/data/request.service';
@Component({
selector: 'ds-item-move',
@@ -38,7 +34,8 @@ export class ItemMoveComponent implements OnInit {
inheritPolicies = false;
itemRD$: Observable>;
- collectionSearchResults: Observable = observableOf([]);
+ originalCollection: Collection;
+
selectedCollectionName: string;
selectedCollection: Collection;
canSubmit = false;
@@ -46,23 +43,26 @@ export class ItemMoveComponent implements OnInit {
item: Item;
processing = false;
- pagination = new PaginationComponentOptions();
-
/**
* Route to the item's page
*/
itemPageRoute$: Observable;
+ COLLECTIONS = [DSpaceObjectType.COLLECTION];
+
constructor(private route: ActivatedRoute,
private router: Router,
private notificationsService: NotificationsService,
private itemDataService: ItemDataService,
private searchService: SearchService,
- private translateService: TranslateService) {
- }
+ private translateService: TranslateService,
+ private requestService: RequestService,
+ ) {}
ngOnInit(): void {
- this.itemRD$ = this.route.data.pipe(map((data) => data.dso), getFirstSucceededRemoteData()) as Observable>;
+ this.itemRD$ = this.route.data.pipe(
+ map((data) => data.dso), getFirstSucceededRemoteData()
+ ) as Observable>;
this.itemPageRoute$ = this.itemRD$.pipe(
getAllSucceededRemoteDataPayload(),
map((item) => getItemPageRoute(item))
@@ -71,43 +71,22 @@ export class ItemMoveComponent implements OnInit {
this.item = rd.payload;
}
);
- this.pagination.pageSize = 5;
- this.loadSuggestions('');
- }
-
- /**
- * Find suggestions based on entered query
- * @param query - Search query
- */
- findSuggestions(query): void {
- this.loadSuggestions(query);
- }
-
- /**
- * Load all available collections to move the item to.
- * TODO: When the API support it, only fetch collections where user has ADD rights to.
- */
- loadSuggestions(query): void {
- this.collectionSearchResults = this.searchService.search(new PaginatedSearchOptions({
- pagination: this.pagination,
- dsoTypes: [DSpaceObjectType.COLLECTION],
- query: query
- })).pipe(
- first(),
- map((rd: RemoteData>>) => {
- return rd.payload.page.map((searchResult) => {
- return searchResult.indexableObject;
- });
- }) ,
- );
-
+ this.itemRD$.pipe(
+ getFirstSucceededRemoteData(),
+ getRemoteDataPayload(),
+ switchMap((item) => item.owningCollection),
+ getFirstSucceededRemoteData(),
+ getRemoteDataPayload(),
+ ).subscribe((collection) => {
+ this.originalCollection = collection;
+ });
}
/**
* Set the collection name and id based on the selected value
* @param data - obtained from the ds-input-suggestions component
*/
- onClick(data: any): void {
+ selectDso(data: any): void {
this.selectedCollection = data;
this.selectedCollectionName = data.name;
this.canSubmit = true;
@@ -123,26 +102,41 @@ export class ItemMoveComponent implements OnInit {
/**
* Moves the item to a new collection based on the selected collection
*/
- moveCollection() {
+ moveToCollection() {
this.processing = true;
- this.itemDataService.moveToCollection(this.item.id, this.selectedCollection).pipe(getFirstCompletedRemoteData()).subscribe(
- (response: RemoteData) => {
- this.router.navigate([getItemEditRoute(this.item)]);
- if (response.hasSucceeded) {
- this.notificationsService.success(this.translateService.get('item.edit.move.success'));
- } else {
- this.notificationsService.error(this.translateService.get('item.edit.move.error'));
- }
- this.processing = false;
+ const move$ = this.itemDataService.moveToCollection(this.item.id, this.selectedCollection)
+ .pipe(getFirstCompletedRemoteData());
+
+ move$.subscribe((response: RemoteData) => {
+ if (response.hasSucceeded) {
+ this.notificationsService.success(this.translateService.get('item.edit.move.success'));
+ } else {
+ this.notificationsService.error(this.translateService.get('item.edit.move.error'));
}
- );
+ });
+
+ move$.pipe(
+ switchMap(() => this.requestService.setStaleByHrefSubstring(this.item.id)),
+ switchMap(() =>
+ this.itemDataService.findById(
+ this.item.id,
+ false,
+ true,
+ followLink('owningCollection')
+ )),
+ getFirstCompletedRemoteData()
+ ).subscribe(() => {
+ this.processing = false;
+ this.router.navigate([getItemEditRoute(this.item)]);
+ });
}
- /**
- * Resets the can submit when the user changes the content of the input field
- * @param data
- */
- resetCollection(data: any) {
+ discard(): void {
+ this.selectedCollection = null;
this.canSubmit = false;
}
+
+ get canMove(): boolean {
+ return this.canSubmit && this.selectedCollection?.id !== this.originalCollection.id;
+ }
}
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 5583de5fd5a..2185108c8f7 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -6,21 +6,30 @@
-
+
-
+
+
-
- {{"item.edit.relationships.no-relationships" | translate}}
+
+
+
+ {{"item.edit.relationships.no-relationships" | translate}}
-
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 90fad00a456..67422340583 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -16,6 +16,12 @@ import { SharedModule } from '../../../../shared/shared.module';
import { EditRelationshipListComponent } from './edit-relationship-list.component';
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { HostWindowService } from '../../../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
let comp: EditRelationshipListComponent;
let fixture: ComponentFixture;
@@ -25,6 +31,8 @@ let linkService;
let objectUpdatesService;
let relationshipService;
let selectableListService;
+let paginationService;
+let hostWindowService;
const url = 'http://test-url.com/test-url';
@@ -37,9 +45,21 @@ let fieldUpdate1;
let fieldUpdate2;
let relationships;
let relationshipType;
+let paginationOptions;
describe('EditRelationshipListComponent', () => {
+ const resetComponent = () => {
+ fixture = TestBed.createComponent(EditRelationshipListComponent);
+ comp = fixture.componentInstance;
+ de = fixture.debugElement;
+ comp.item = item;
+ comp.itemType = entityType;
+ comp.url = url;
+ comp.relationshipType = relationshipType;
+ fixture.detectChanges();
+ };
+
beforeEach(waitForAsync(() => {
entityType = Object.assign(new ItemType(), {
@@ -63,6 +83,12 @@ describe('EditRelationshipListComponent', () => {
rightwardType: 'isPublicationOfAuthor',
});
+ paginationOptions = Object.assign(new PaginationComponentOptions(), {
+ id: `er${relationshipType.id}`,
+ pageSize: 5,
+ currentPage: 1,
+ });
+
author1 = Object.assign(new Item(), {
id: 'author1',
uuid: 'author1'
@@ -141,6 +167,10 @@ describe('EditRelationshipListComponent', () => {
resolveLinks: () => null,
};
+ paginationService = new PaginationServiceStub(paginationOptions);
+
+ hostWindowService = new HostWindowServiceStub(1200);
+
TestBed.configureTestingModule({
imports: [SharedModule, TranslateModule.forRoot()],
declarations: [EditRelationshipListComponent],
@@ -149,22 +179,15 @@ describe('EditRelationshipListComponent', () => {
{ provide: RelationshipService, useValue: relationshipService },
{ provide: SelectableListService, useValue: selectableListService },
{ provide: LinkService, useValue: linkService },
+ { provide: PaginationService, useValue: paginationService },
+ { provide: HostWindowService, useValue: hostWindowService },
], schemas: [
NO_ERRORS_SCHEMA
]
}).compileComponents();
- }));
- beforeEach(() => {
- fixture = TestBed.createComponent(EditRelationshipListComponent);
- comp = fixture.componentInstance;
- de = fixture.debugElement;
- comp.item = item;
- comp.itemType = entityType;
- comp.url = url;
- comp.relationshipType = relationshipType;
- fixture.detectChanges();
- });
+ resetComponent();
+ }));
describe('changeType is REMOVE', () => {
beforeEach(() => {
@@ -176,4 +199,82 @@ describe('EditRelationshipListComponent', () => {
expect(element.classList).toContain('alert-danger');
});
});
+
+ describe('pagination component', () => {
+ let paginationComp: PaginationComponent;
+
+ beforeEach(() => {
+ paginationComp = de.query(By.css('ds-pagination')).componentInstance;
+ });
+
+ it('should receive the correct pagination config', () => {
+ expect(paginationComp.paginationOptions).toEqual(paginationOptions);
+ });
+
+ it('should receive correct collection size', () => {
+ expect(paginationComp.collectionSize).toEqual(relationships.length);
+ });
+
+ });
+
+ describe('relationshipService.getItemRelationshipsByLabel', () => {
+ it('should receive the correct pagination info', () => {
+ expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+ const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+ const findListOptions = callArgs[2];
+
+ expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize);
+ expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage);
+ });
+
+ describe('when the publication is on the left side of the relationship', () => {
+ beforeEach(() => {
+ relationshipType = Object.assign(new RelationshipType(), {
+ id: '1',
+ uuid: '1',
+ leftType: createSuccessfulRemoteDataObject$(entityType), // publication
+ rightType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
+ leftwardType: 'isAuthorOfPublication',
+ rightwardType: 'isPublicationOfAuthor',
+ });
+ relationshipService.getItemRelationshipsByLabel.calls.reset();
+ resetComponent();
+ });
+
+ it('should fetch isAuthorOfPublication', () => {
+ expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+ const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+ const label = callArgs[1];
+
+ expect(label).toEqual('isAuthorOfPublication');
+ });
+ });
+
+ describe('when the publication is on the right side of the relationship', () => {
+ beforeEach(() => {
+ relationshipType = Object.assign(new RelationshipType(), {
+ id: '1',
+ uuid: '1',
+ leftType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
+ rightType: createSuccessfulRemoteDataObject$(entityType), // publication
+ leftwardType: 'isPublicationOfAuthor',
+ rightwardType: 'isAuthorOfPublication',
+ });
+ relationshipService.getItemRelationshipsByLabel.calls.reset();
+ resetComponent();
+ });
+
+ it('should fetch isAuthorOfPublication', () => {
+ expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+ const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+ const label = callArgs[1];
+
+ expect(label).toEqual('isAuthorOfPublication');
+ });
+ });
+ });
+
});
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 3f9637cdc97..9f417ab7995 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,9 +1,14 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, OnDestroy } from '@angular/core';
import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { LinkService } from '../../../../core/cache/builders/link.service';
import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
+import {
+ combineLatest as observableCombineLatest,
+ Observable,
+ of as observableOf,
+ from as observableFrom
+} from 'rxjs';
import {
FieldUpdate,
FieldUpdates,
@@ -11,14 +16,24 @@ import {
} from '../../../../core/data/object-updates/object-updates.reducer';
import { RelationshipService } from '../../../../core/data/relationship.service';
import { Item } from '../../../../core/shared/item.model';
-import { defaultIfEmpty, map, mergeMap, switchMap, take, startWith } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../../../shared/empty.util';
+import {
+ defaultIfEmpty,
+ map,
+ mergeMap,
+ switchMap,
+ take,
+ startWith,
+ toArray,
+ tap
+} from 'rxjs/operators';
+import { hasValue, hasValueOperator, hasNoValue } from '../../../../shared/empty.util';
import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
import {
- getAllSucceededRemoteData,
getRemoteDataPayload,
- getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload,
+ getFirstSucceededRemoteData,
+ getFirstSucceededRemoteDataPayload,
+ getAllSucceededRemoteData,
} from '../../../../core/shared/operators';
import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
@@ -30,6 +45,10 @@ import { followLink } from '../../../../shared/utils/follow-link-config.model';
import { PaginatedList } from '../../../../core/data/paginated-list.model';
import { RemoteData } from '../../../../core/data/remote-data';
import { Collection } from '../../../../core/shared/collection.model';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
@Component({
selector: 'ds-edit-relationship-list',
@@ -40,7 +59,7 @@ import { Collection } from '../../../../core/shared/collection.model';
* A component creating a list of editable relationships of a certain type
* The relationships are rendered as a list of related items
*/
-export class EditRelationshipListComponent implements OnInit {
+export class EditRelationshipListComponent implements OnInit, OnDestroy {
/**
* The item to display related items for
@@ -60,6 +79,17 @@ export class EditRelationshipListComponent implements OnInit {
*/
@Input() relationshipType: RelationshipType;
+ /**
+ * Observable that emits the left and right item type of {@link relationshipType} simultaneously.
+ */
+ private relationshipLeftAndRightType$: Observable<[ItemType, ItemType]>;
+
+ /**
+ * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType},
+ * false if it is on the right-hand side and undefined in the rare case that it is on neither side.
+ */
+ private currentItemIsLeftItem$: Observable;
+
private relatedEntityType$: Observable;
/**
@@ -70,7 +100,38 @@ export class EditRelationshipListComponent implements OnInit {
/**
* The FieldUpdates for the relationships in question
*/
- updates$: Observable;
+ updates$: BehaviorSubject = new BehaviorSubject(undefined);
+
+ /**
+ * The RemoteData for the relationships
+ */
+ relationshipsRd$: BehaviorSubject>> = new BehaviorSubject(undefined);
+
+ /**
+ * Whether the current page is the last page
+ */
+ isLastPage$: BehaviorSubject = new BehaviorSubject(true);
+
+ /**
+ * Whether we're loading
+ */
+ loading$: BehaviorSubject = new BehaviorSubject(true);
+
+ /**
+ * The number of added fields that haven't been saved yet
+ */
+ nbAddedFields$: BehaviorSubject = new BehaviorSubject(0);
+
+ /**
+ * Array to track all subscriptions and unsubscribe them onDestroy
+ * @type {Array}
+ */
+ private subs: Subscription[] = [];
+
+ /**
+ * The pagination config
+ */
+ paginationConfig: PaginationComponentOptions;
/**
* A reference to the lookup window
@@ -82,6 +143,7 @@ export class EditRelationshipListComponent implements OnInit {
protected linkService: LinkService,
protected relationshipService: RelationshipService,
protected modalService: NgbModal,
+ protected paginationService: PaginationService,
protected selectableListService: SelectableListService,
) {
}
@@ -172,6 +234,10 @@ export class EditRelationshipListComponent implements OnInit {
this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
});
}
+
+ this.loading$.next(true);
+ // emit the last page again to trigger a fieldupdates refresh
+ this.relationshipsRd$.next(this.relationshipsRd$.getValue());
});
});
};
@@ -186,6 +252,10 @@ export class EditRelationshipListComponent implements OnInit {
)
);
});
+
+ this.loading$.next(true);
+ // emit the last page again to trigger a fieldupdates refresh
+ this.relationshipsRd$.next(this.relationshipsRd$.getValue());
};
this.relatedEntityType$
.pipe(take(1))
@@ -212,10 +282,10 @@ export class EditRelationshipListComponent implements OnInit {
if (field.relationship) {
return this.getRelatedItem(field.relationship);
} else {
- return of(field.relatedItem);
+ return observableOf(field.relatedItem);
}
})
- ) : of([])
+ ) : observableOf([])
),
take(1),
map((items) => items.map((item) => {
@@ -267,18 +337,19 @@ export class EditRelationshipListComponent implements OnInit {
}
ngOnInit(): void {
+ // store the left and right type of the relationship in a single observable
+ this.relationshipLeftAndRightType$ = observableCombineLatest([
+ this.relationshipType.leftType,
+ this.relationshipType.rightType,
+ ].map((type) => type.pipe(
+ getFirstSucceededRemoteData(),
+ getRemoteDataPayload(),
+ ))) as Observable<[ItemType, ItemType]>;
- this.relatedEntityType$ =
- observableCombineLatest([
- this.relationshipType.leftType,
- this.relationshipType.rightType,
- ].map((type) => type.pipe(
- getFirstSucceededRemoteData(),
- getRemoteDataPayload(),
- ))).pipe(
- map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
- hasValueOperator()
- );
+ this.relatedEntityType$ = this.relationshipLeftAndRightType$.pipe(
+ map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
+ hasValueOperator()
+ );
this.relatedEntityType$.pipe(
take(1)
@@ -286,65 +357,142 @@ export class EditRelationshipListComponent implements OnInit {
(relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
);
- this.updates$ = this.getItemRelationships().pipe(
- switchMap((relationships) =>
- observableCombineLatest(
- relationships.map((relationship) => this.relationshipService.isLeftItem(relationship, this.item))
- ).pipe(
- defaultIfEmpty([]),
- map((isLeftItemArray) => isLeftItemArray.map((isLeftItem, index) => {
- const relationship = relationships[index];
- const nameVariant = isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
+ this.currentItemIsLeftItem$ = this.relationshipLeftAndRightType$.pipe(
+ map(([leftType, rightType]: [ItemType, ItemType]) => {
+ if (leftType.id === this.itemType.id) {
+ return true;
+ }
+
+ if (rightType.id === this.itemType.id) {
+ return false;
+ }
+
+ // should never happen...
+ console.warn(`The item ${this.item.uuid} is not on the right or the left side of relationship type ${this.relationshipType.uuid}`);
+ return undefined;
+ })
+ );
+
+ // initialize the pagination options
+ this.paginationConfig = new PaginationComponentOptions();
+ this.paginationConfig.id = `er${this.relationshipType.id}`;
+ this.paginationConfig.pageSize = 5;
+ this.paginationConfig.currentPage = 1;
+
+ // get the pagination params from the route
+ const currentPagination$ = this.paginationService.getCurrentPagination(
+ this.paginationConfig.id,
+ this.paginationConfig
+ ).pipe(
+ tap(() => this.loading$.next(true))
+ );
+
+ this.subs.push(
+ observableCombineLatest([
+ currentPagination$,
+ this.currentItemIsLeftItem$,
+ ]).pipe(
+ switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) =>
+ // get the relationships for the current item, relationshiptype and page
+ this.relationshipService.getItemRelationshipsByLabel(
+ this.item,
+ currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
+ {
+ elementsPerPage: currentPagination.pageSize,
+ currentPage: currentPagination.currentPage,
+ },
+ false,
+ true,
+ followLink('leftItem'),
+ followLink('rightItem'),
+ )),
+ ).subscribe((rd: RemoteData>) => {
+ this.relationshipsRd$.next(rd);
+ })
+ );
+
+ // keep isLastPage$ up to date based on relationshipsRd$
+ this.subs.push(this.relationshipsRd$.pipe(
+ hasValueOperator(),
+ getAllSucceededRemoteData()
+ ).subscribe((rd: RemoteData>) => {
+ this.isLastPage$.next(hasNoValue(rd.payload._links.next));
+ }));
+
+ this.subs.push(this.relationshipsRd$.pipe(
+ hasValueOperator(),
+ getAllSucceededRemoteData(),
+ switchMap((rd: RemoteData>) =>
+ // emit each relationship in the page separately
+ observableFrom(rd.payload.page).pipe(
+ mergeMap((relationship: Relationship) =>
+ // check for each relationship whether it's the left item
+ this.relationshipService.isLeftItem(relationship, this.item).pipe(
+ // emit an array containing both the relationship and whether it's the left item,
+ // as we'll need both
+ map((isLeftItem: boolean) => [relationship, isLeftItem])
+ )
+ ),
+ map(([relationship, isLeftItem]: [Relationship, boolean]) => {
+ // turn it into a RelationshipIdentifiable, an
+ const nameVariant =
+ isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
return {
uuid: relationship.id,
type: this.relationshipType,
relationship,
nameVariant,
} as RelationshipIdentifiable;
- })),
- )),
- switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields).pipe(
- map((fieldUpdates) => {
- const fieldUpdatesFiltered: FieldUpdates = {};
- Object.keys(fieldUpdates).forEach((uuid) => {
- if (hasValue(fieldUpdates[uuid])) {
- const field = fieldUpdates[uuid].field;
- if ((field as RelationshipIdentifiable).type.id === this.relationshipType.id) {
- fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
- }
- }
- });
- return fieldUpdatesFiltered;
- }),
+ }),
+ // wait until all relationships have been processed, and emit them all as a single array
+ toArray(),
+ // if the pipe above completes without emitting anything, emit an empty array instead
+ defaultIfEmpty([])
)),
+ switchMap((nextFields: RelationshipIdentifiable[]) => {
+ // Get a list that contains the unsaved changes for the page, as well as the page of
+ // RelationshipIdentifiables, as a single list of FieldUpdates
+ return this.objectUpdatesService.getFieldUpdates(this.url, nextFields).pipe(
+ map((fieldUpdates: FieldUpdates) => {
+ const fieldUpdatesFiltered: FieldUpdates = {};
+ this.nbAddedFields$.next(0);
+ // iterate over the fieldupdates and filter out the ones that pertain to this
+ // relationshiptype
+ Object.keys(fieldUpdates).forEach((uuid) => {
+ if (hasValue(fieldUpdates[uuid])) {
+ const field = fieldUpdates[uuid].field as RelationshipIdentifiable;
+ // only include fieldupdates regarding this RelationshipType
+ if (field.type.id === this.relationshipType.id) {
+ // if it's a newly added relationship
+ if (fieldUpdates[uuid].changeType === FieldChangeType.ADD) {
+ // increase the counter that tracks new relationships
+ this.nbAddedFields$.next(this.nbAddedFields$.getValue() + 1);
+ if (this.isLastPage$.getValue() === true) {
+ // only include newly added relationships to the output if we're on the last
+ // page
+ fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
+ }
+ } else {
+ // include all others
+ fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
+ }
+ }
+ }
+ });
+ return fieldUpdatesFiltered;
+ }),
+ );
+ }),
startWith({}),
- );
+ ).subscribe((updates: FieldUpdates) => {
+ this.loading$.next(false);
+ this.updates$.next(updates);
+ }));
}
- private getItemRelationships() {
- this.linkService.resolveLink(this.item,
- followLink('relationships', undefined, true, true, true,
- followLink('relationshipType'),
- followLink('leftItem'),
- followLink('rightItem'),
- ));
- return this.item.relationships.pipe(
- getAllSucceededRemoteData(),
- map((relationships: RemoteData>) => relationships.payload.page.filter((relationship: Relationship) => hasValue(relationship))),
- switchMap((itemRelationships: Relationship[]) =>
- observableCombineLatest(
- itemRelationships
- .map((relationship) => relationship.relationshipType.pipe(
- getFirstSucceededRemoteData(),
- getRemoteDataPayload(),
- ))
- ).pipe(
- defaultIfEmpty([]),
- map((relationshipTypes) => itemRelationships.filter(
- (relationship, index) => relationshipTypes[index].id === this.relationshipType.id)
- ),
- )
- ),
- );
+ ngOnDestroy(): void {
+ this.subs
+ .filter((subscription) => hasValue(subscription))
+ .forEach((subscription) => subscription.unsubscribe());
}
}
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 1c5ed3c02bf..e22ad8ddcb3 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -227,7 +227,6 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
* Sends all initial values of this item to the object updates service
*/
public initializeOriginalFields() {
- console.log('init');
return this.relationshipService.getRelatedItems(this.item).pipe(
take(1),
).subscribe((items: Item[]) => {
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
index c791cec600a..d69f87883bb 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,4 +1,4 @@
-
+
{{ label }}
\n' +
+ template: '\n' +
' '
})
-class NoContentComponent {}
+class NoContentComponent {
+ public hideIfNoTextContent = true;
+}
@Component({
selector: 'ds-component-with-empty-spans',
- template: '\n' +
+ template: '\n' +
' \n' +
' \n' +
' '
})
-class SpanContentComponent {}
+class SpanContentComponent {
+ @Input() hideIfNoTextContent = true;
+}
@Component({
selector: 'ds-component-with-text',
- template: '\n' +
+ template: '\n' +
' The quick brown fox jumps over the lazy dog\n' +
' '
})
-class TextContentComponent {}
+class TextContentComponent {
+ @Input() hideIfNoTextContent = true;
+}
-@Component({
- selector: 'ds-component-with-image',
- template: '\n' +
- ' 
\n' +
- ' '
-})
-class ImgContentComponent {}
/* tslint:enable:max-classes-per-file */
describe('MetadataFieldWrapperComponent', () => {
@@ -43,7 +42,7 @@ describe('MetadataFieldWrapperComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent, ImgContentComponent]
+ declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent]
}).compileComponents();
}));
@@ -58,38 +57,60 @@ describe('MetadataFieldWrapperComponent', () => {
expect(component).toBeDefined();
});
- it('should not show the component when there is no content', () => {
- const parentFixture = TestBed.createComponent(NoContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- expect(nativeWrapper.classList.contains('d-none')).toBe(true);
- });
+ describe('with hideIfNoTextContent=true', () => {
+ it('should not show the component when there is no content', () => {
+ const parentFixture = TestBed.createComponent(NoContentComponent);
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+ });
- it('should not show the component when there is DOM content but not text or an image', () => {
- const parentFixture = TestBed.createComponent(SpanContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- expect(nativeWrapper.classList.contains('d-none')).toBe(true);
- });
+ it('should not show the component when there is no text content', () => {
+ const parentFixture = TestBed.createComponent(SpanContentComponent);
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+ });
- it('should show the component when there is text content', () => {
- const parentFixture = TestBed.createComponent(TextContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- parentFixture.detectChanges();
- expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ it('should show the component when there is text content', () => {
+ const parentFixture = TestBed.createComponent(TextContentComponent);
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ parentFixture.detectChanges();
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
});
- it('should show the component when there is img content', () => {
- const parentFixture = TestBed.createComponent(ImgContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- parentFixture.detectChanges();
- expect(nativeWrapper.classList.contains('d-none')).toBe(false);
- });
+ describe('with hideIfNoTextContent=false', () => {
+ it('should show the component when there is no content', () => {
+ const parentFixture = TestBed.createComponent(NoContentComponent);
+ parentFixture.componentInstance.hideIfNoTextContent = false;
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
+ it('should show the component when there is no text content', () => {
+ const parentFixture = TestBed.createComponent(SpanContentComponent);
+ parentFixture.componentInstance.hideIfNoTextContent = false;
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
+
+ it('should show the component when there is text content', () => {
+ const parentFixture = TestBed.createComponent(TextContentComponent);
+ parentFixture.componentInstance.hideIfNoTextContent = false;
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ parentFixture.detectChanges();
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
+ });
});
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
index 8af108cceb8..5c6b99248f7 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -1,5 +1,4 @@
import { Component, Input } from '@angular/core';
-import { hasNoValue } from '../../../shared/empty.util';
/**
* This component renders any content inside this wrapper.
@@ -17,10 +16,5 @@ export class MetadataFieldWrapperComponent {
*/
@Input() label: string;
- /**
- * Make hasNoValue() available in the template
- */
- hasNoValue(o: any): boolean {
- return hasNoValue(o);
- }
+ @Input() hideIfNoTextContent = true;
}
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
index bc1c63cc322..c5393055dfc 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
@@ -11,7 +11,7 @@ {{"item.page.filesection.original.bundle"
[retainScrollPosition]="true">
-
+
>) => {
if (hasValue(rd.errorMessage)) {
@@ -85,7 +86,8 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
{elementsPerPage: options.pageSize, currentPage: options.currentPage},
true,
true,
- followLink('format')
+ followLink('format'),
+ followLink('thumbnail'),
)),
tap((rd: RemoteData>) => {
if (hasValue(rd.errorMessage)) {
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index 99b96511fe2..ca6a6c5958c 100644
--- a/src/app/+item-page/item.resolver.ts
+++ b/src/app/+item-page/item.resolver.ts
@@ -5,7 +5,6 @@ import { RemoteData } from '../core/data/remote-data';
import { ItemDataService } from '../core/data/item-data.service';
import { Item } from '../core/shared/item.model';
import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { FindListOptions } from '../core/data/request.models';
import { getFirstCompletedRemoteData } from '../core/shared/operators';
import { Store } from '@ngrx/store';
import { ResolvedAction } from '../core/resolving/resolver.actions';
@@ -15,13 +14,13 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
* Requesting them as embeds will limit the number of requests
*/
export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig- [] = [
- followLink('owningCollection', undefined, true, true, true,
- followLink('parentCommunity', undefined, true, true, true,
+ followLink('owningCollection', {},
+ followLink('parentCommunity', {},
followLink('parentCommunity'))
),
- followLink('bundles', new FindListOptions(), true, true, true, followLink('bitstreams')),
followLink('relationships'),
- followLink('version', undefined, true, true, true, followLink('versionhistory')),
+ followLink('version', {}, followLink('versionhistory')),
+ followLink('thumbnail')
];
/**
diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/+item-page/simple/item-types/publication/publication.component.html
index 27f5ff43a1e..9e61f00e482 100644
--- a/src/app/+item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/+item-page/simple/item-types/publication/publication.component.html
@@ -9,8 +9,8 @@
-
-
+
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/+item-page/simple/item-types/shared/item.component.ts
index 120eda930f7..793af180c99 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.ts
@@ -1,10 +1,6 @@
import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
import { environment } from '../../../../../environments/environment';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
import { getItemPageRoute } from '../../../item-page-routing-paths';
@Component({
@@ -21,19 +17,10 @@ export class ItemComponent implements OnInit {
* Route to the item page
*/
itemPageRoute: string;
- mediaViewer = environment.mediaViewer;
- constructor(protected bitstreamDataService: BitstreamDataService) {
- }
+ mediaViewer = environment.mediaViewer;
ngOnInit(): void {
this.itemPageRoute = getItemPageRoute(this.object);
}
-
- // TODO refactor to return RemoteData, and thumbnail template to deal with loading
- getThumbnail(): Observable {
- return this.bitstreamDataService.getThumbnailFor(this.object).pipe(
- getFirstSucceededRemoteDataPayload()
- );
- }
}
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index 89e6e7a4908..b0157dcfee7 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -9,8 +9,8 @@
-
-
+
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index b817c82a57e..c1caf27b9ac 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -16,9 +16,11 @@ import { SearchResult } from '../shared/search/search-result.model';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { SearchService } from '../core/shared/search/search.service';
import { currentPath } from '../shared/utils/route.utils';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
import { Context } from '../core/shared/context.model';
import { SortOptions } from '../core/cache/models/sort-options.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { Item } from '../core/shared/item.model';
@Component({
selector: 'ds-search',
@@ -128,8 +130,11 @@ export class SearchComponent implements OnInit {
this.searchLink = this.getSearchLink();
this.searchOptions$ = this.getSearchOptions();
this.sub = this.searchOptions$.pipe(
- switchMap((options) => this.service.search(options).pipe(getFirstSucceededRemoteData(), startWith(undefined))))
- .subscribe((results) => {
+ switchMap((options) => this.service.search(
+ options, undefined, true, true, followLink- ('thumbnail', { isOptional: true })
+ ).pipe(getFirstSucceededRemoteData(), startWith(undefined))
+ )
+ ).subscribe((results) => {
this.resultsRD$.next(results);
});
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index d229d12bd28..259aa311e74 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -3,6 +3,10 @@ import { getAccessControlModuleRoute } from '../app-routing-paths';
export const GROUP_EDIT_PATH = 'groups';
+export function getGroupsRoute() {
+ return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+}
+
export function getGroupEditRoute(id: string) {
return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
}
diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index cac49938a96..e64b0d170a6 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -5,6 +5,9 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
import { GROUP_EDIT_PATH } from './access-control-routing-paths';
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
@NgModule({
imports: [
@@ -15,7 +18,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' }
+ data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
+ canActivate: [SiteAdministratorGuard]
},
{
path: GROUP_EDIT_PATH,
@@ -23,7 +27,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' }
+ data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/newGroup`,
@@ -31,7 +36,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' }
+ data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/:groupId`,
@@ -39,7 +45,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' }
+ data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
+ canActivate: [GroupPageGuard]
}
])
]
diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
new file mode 100644
index 00000000000..48fa124c077
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -0,0 +1,83 @@
+import { GroupPageGuard } from './group-page.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+
+describe('GroupPageGuard', () => {
+ const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
+ const groupUuid = '0d6f89df-f95a-4829-943c-f21f434fb892';
+ const groupEndpointUrl = `${groupsEndpointUrl}/${groupUuid}`;
+ const routeSnapshotWithGroupId = {
+ params: {
+ groupId: groupUuid,
+ }
+ } as unknown as ActivatedRouteSnapshot;
+
+ let guard: GroupPageGuard;
+ let halEndpointService: HALEndpointService;
+ let authorizationService: AuthorizationDataService;
+ let router: Router;
+ let authService: AuthService;
+
+ beforeEach(() => {
+ halEndpointService = jasmine.createSpyObj(['getEndpoint']);
+ (halEndpointService as any).getEndpoint.and.returnValue(observableOf(groupsEndpointUrl));
+
+ authorizationService = jasmine.createSpyObj(['isAuthorized']);
+ // NOTE: value is set in beforeEach
+
+ router = jasmine.createSpyObj(['parseUrl']);
+ (router as any).parseUrl.and.returnValue = {};
+
+ authService = jasmine.createSpyObj(['isAuthenticated']);
+ (authService as any).isAuthenticated.and.returnValue(observableOf(true));
+
+ guard = new GroupPageGuard(halEndpointService, authorizationService, router, authService);
+ });
+
+ it('should be created', () => {
+ expect(guard).toBeTruthy();
+ });
+
+ describe('canActivate', () => {
+ describe('when the current user can manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(true));
+ });
+
+ it('should return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).toBeTrue();
+ done();
+ });
+ });
+ });
+
+ describe('when the current user can not manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(false));
+ });
+
+ it('should not return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).not.toBeTrue();
+ done();
+ });
+ });
+ });
+ });
+
+});
diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts
new file mode 100644
index 00000000000..057f67ddeb9
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
+
+ protected groupsEndpoint = 'groups';
+
+ constructor(protected halEndpointService: HALEndpointService,
+ protected authorizationService: AuthorizationDataService,
+ protected router: Router,
+ protected authService: AuthService) {
+ super(authorizationService, router, authService);
+ }
+
+ getFeatureIDs(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable
{
+ return observableOf([FeatureID.CanManageGroup]);
+ }
+
+ getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable {
+ return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
+ map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+ );
+ }
+
+}
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index e5e25ae9447..4135f4cc958 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -33,9 +33,9 @@ {{messagePrefix + 'search.head' | tra
- {{messagePrefix + 'search.head' | tra
{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}
-
+
+
+
+
{{ 'collection.delete.head' | transla
{{ 'collection.delete.text' | translate:{ dso: dso.name } }}
-
{{ 'community.delete.head' | translat
{{ 'community.delete.text' | translate:{ dso: dso.name } }}
-
{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle
{{'item.edit.move.description' | translate}}
-
-
-
+
+
{{'dso-selector.placeholder' | translate: { type: 'collection' } }}
+
+
+
+
+
+
@@ -33,16 +30,24 @@
-
-
+
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 dd91c65e1e1..d200891629b 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
@@ -21,6 +21,8 @@ import {
createSuccessfulRemoteDataObject$
} from '../../../shared/remote-data.utils';
import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RequestService } from '../../../core/data/request.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
describe('ItemMoveComponent', () => {
let comp: ItemMoveComponent;
@@ -47,18 +49,25 @@ describe('ItemMoveComponent', () => {
name: 'Test collection 2'
});
- const mockItemDataService = jasmine.createSpyObj({
- moveToCollection: createSuccessfulRemoteDataObject$(collection1)
+ let itemDataService;
+
+ const mockItemDataServiceSuccess = jasmine.createSpyObj({
+ moveToCollection: createSuccessfulRemoteDataObject$(collection1),
+ findById: createSuccessfulRemoteDataObject$(mockItem),
});
const mockItemDataServiceFail = jasmine.createSpyObj({
- moveToCollection: createFailedRemoteDataObject$('Internal server error', 500)
+ moveToCollection: createFailedRemoteDataObject$('Internal server error', 500),
+ findById: createSuccessfulRemoteDataObject$(mockItem),
});
const routeStub = {
data: observableOf({
dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
- id: 'item1'
+ id: 'item1',
+ owningCollection: createSuccessfulRemoteDataObject$(Object.assign(new Collection(), {
+ id: 'originalOwningCollection',
+ }))
}))
})
};
@@ -79,43 +88,40 @@ describe('ItemMoveComponent', () => {
const notificationsServiceStub = new NotificationsServiceStub();
+ const init = (mockItemDataService) => {
+ itemDataService = mockItemDataService;
+
+ TestBed.configureTestingModule({
+ imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+ declarations: [ItemMoveComponent],
+ providers: [
+ { provide: ActivatedRoute, useValue: routeStub },
+ { provide: Router, useValue: routerStub },
+ { provide: ItemDataService, useValue: mockItemDataService },
+ { provide: NotificationsService, useValue: notificationsServiceStub },
+ { provide: SearchService, useValue: mockSearchService },
+ { provide: RequestService, useValue: getMockRequestService() },
+ ], schemas: [
+ CUSTOM_ELEMENTS_SCHEMA
+ ]
+ }).compileComponents();
+ fixture = TestBed.createComponent(ItemMoveComponent);
+ comp = fixture.componentInstance;
+ fixture.detectChanges();
+ };
+
describe('ItemMoveComponent success', () => {
beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
- declarations: [ItemMoveComponent],
- providers: [
- { provide: ActivatedRoute, useValue: routeStub },
- { provide: Router, useValue: routerStub },
- { provide: ItemDataService, useValue: mockItemDataService },
- { provide: NotificationsService, useValue: notificationsServiceStub },
- { provide: SearchService, useValue: mockSearchService },
- ], schemas: [
- CUSTOM_ELEMENTS_SCHEMA
- ]
- }).compileComponents();
- fixture = TestBed.createComponent(ItemMoveComponent);
- comp = fixture.componentInstance;
- fixture.detectChanges();
- });
- it('should load suggestions', () => {
- const expected = [
- collection1,
- collection2
- ];
-
- comp.collectionSearchResults.subscribe((value) => {
- expect(value).toEqual(expected);
- }
- );
+ init(mockItemDataServiceSuccess);
});
+
it('should get current url ', () => {
expect(comp.getCurrentUrl()).toEqual('fake-url/fake-id/edit');
});
- it('should on click select the correct collection name and id', () => {
+ it('should select the correct collection name and id on click', () => {
const data = collection1;
- comp.onClick(data);
+ comp.selectDso(data);
expect(comp.selectedCollectionName).toEqual('Test collection 1');
expect(comp.selectedCollection).toEqual(collection1);
@@ -128,12 +134,12 @@ describe('ItemMoveComponent', () => {
});
comp.selectedCollectionName = 'selected-collection-id';
comp.selectedCollection = collection1;
- comp.moveCollection();
+ comp.moveToCollection();
- expect(mockItemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
+ expect(itemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
});
it('should call notificationsService success message on success', () => {
- comp.moveCollection();
+ comp.moveToCollection();
expect(notificationsServiceStub.success).toHaveBeenCalled();
});
@@ -142,26 +148,11 @@ describe('ItemMoveComponent', () => {
describe('ItemMoveComponent fail', () => {
beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
- declarations: [ItemMoveComponent],
- providers: [
- { provide: ActivatedRoute, useValue: routeStub },
- { provide: Router, useValue: routerStub },
- { provide: ItemDataService, useValue: mockItemDataServiceFail },
- { provide: NotificationsService, useValue: notificationsServiceStub },
- { provide: SearchService, useValue: mockSearchService },
- ], schemas: [
- CUSTOM_ELEMENTS_SCHEMA
- ]
- }).compileComponents();
- fixture = TestBed.createComponent(ItemMoveComponent);
- comp = fixture.componentInstance;
- fixture.detectChanges();
+ init(mockItemDataServiceFail);
});
it('should call notificationsService error message on fail', () => {
- comp.moveCollection();
+ comp.moveToCollection();
expect(notificationsServiceStub.error).toHaveBeenCalled();
});
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 b1ed121b40f..b7ab761fe58 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,25 +1,21 @@
import { Component, OnInit } from '@angular/core';
-import { first, map } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
import { RemoteData } from '../../../core/data/remote-data';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { PaginatedList } from '../../../core/data/paginated-list.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 {
- getFirstSucceededRemoteData,
- getFirstCompletedRemoteData, getAllSucceededRemoteDataPayload
+ getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
} from '../../../core/shared/operators';
import { ItemDataService } from '../../../core/data/item-data.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable } from 'rxjs';
import { Collection } from '../../../core/shared/collection.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
import { SearchService } from '../../../core/shared/search/search.service';
-import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
-import { SearchResult } from '../../../shared/search/search-result.model';
import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { RequestService } from '../../../core/data/request.service';
@Component({
selector: 'ds-item-move',
@@ -38,7 +34,8 @@ export class ItemMoveComponent implements OnInit {
inheritPolicies = false;
itemRD$: Observable{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle
+
-
-
+
+ {{"item.edit.relationships.no-relationships" | translate}}
+
+ {{"item.edit.relationships.no-relationships" | translate}}
+
\n' +
+ template: '\n' +
' '
})
-class NoContentComponent {}
+class NoContentComponent {
+ public hideIfNoTextContent = true;
+}
@Component({
selector: 'ds-component-with-empty-spans',
- template: '\n' +
+ template: '\n' +
' \n' +
' \n' +
' '
})
-class SpanContentComponent {}
+class SpanContentComponent {
+ @Input() hideIfNoTextContent = true;
+}
@Component({
selector: 'ds-component-with-text',
- template: '\n' +
+ template: '\n' +
' The quick brown fox jumps over the lazy dog\n' +
' '
})
-class TextContentComponent {}
+class TextContentComponent {
+ @Input() hideIfNoTextContent = true;
+}
-@Component({
- selector: 'ds-component-with-image',
- template: '\n' +
- ' \n' +
- ' '
-})
-class ImgContentComponent {}
/* tslint:enable:max-classes-per-file */
describe('MetadataFieldWrapperComponent', () => {
@@ -43,7 +42,7 @@ describe('MetadataFieldWrapperComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent, ImgContentComponent]
+ declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent]
}).compileComponents();
}));
@@ -58,38 +57,60 @@ describe('MetadataFieldWrapperComponent', () => {
expect(component).toBeDefined();
});
- it('should not show the component when there is no content', () => {
- const parentFixture = TestBed.createComponent(NoContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- expect(nativeWrapper.classList.contains('d-none')).toBe(true);
- });
+ describe('with hideIfNoTextContent=true', () => {
+ it('should not show the component when there is no content', () => {
+ const parentFixture = TestBed.createComponent(NoContentComponent);
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+ });
- it('should not show the component when there is DOM content but not text or an image', () => {
- const parentFixture = TestBed.createComponent(SpanContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- expect(nativeWrapper.classList.contains('d-none')).toBe(true);
- });
+ it('should not show the component when there is no text content', () => {
+ const parentFixture = TestBed.createComponent(SpanContentComponent);
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+ });
- it('should show the component when there is text content', () => {
- const parentFixture = TestBed.createComponent(TextContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- parentFixture.detectChanges();
- expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ it('should show the component when there is text content', () => {
+ const parentFixture = TestBed.createComponent(TextContentComponent);
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ parentFixture.detectChanges();
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
});
- it('should show the component when there is img content', () => {
- const parentFixture = TestBed.createComponent(ImgContentComponent);
- parentFixture.detectChanges();
- const parentNative = parentFixture.nativeElement;
- const nativeWrapper = parentNative.querySelector(wrapperSelector);
- parentFixture.detectChanges();
- expect(nativeWrapper.classList.contains('d-none')).toBe(false);
- });
+ describe('with hideIfNoTextContent=false', () => {
+ it('should show the component when there is no content', () => {
+ const parentFixture = TestBed.createComponent(NoContentComponent);
+ parentFixture.componentInstance.hideIfNoTextContent = false;
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
+ it('should show the component when there is no text content', () => {
+ const parentFixture = TestBed.createComponent(SpanContentComponent);
+ parentFixture.componentInstance.hideIfNoTextContent = false;
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
+
+ it('should show the component when there is text content', () => {
+ const parentFixture = TestBed.createComponent(TextContentComponent);
+ parentFixture.componentInstance.hideIfNoTextContent = false;
+ parentFixture.detectChanges();
+ const parentNative = parentFixture.nativeElement;
+ const nativeWrapper = parentNative.querySelector(wrapperSelector);
+ parentFixture.detectChanges();
+ expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+ });
+ });
});
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
index 8af108cceb8..5c6b99248f7 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -1,5 +1,4 @@
import { Component, Input } from '@angular/core';
-import { hasNoValue } from '../../../shared/empty.util';
/**
* This component renders any content inside this wrapper.
@@ -17,10 +16,5 @@ export class MetadataFieldWrapperComponent {
*/
@Input() label: string;
- /**
- * Make hasNoValue() available in the template
- */
- hasNoValue(o: any): boolean {
- return hasNoValue(o);
- }
+ @Input() hideIfNoTextContent = true;
}
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
index bc1c63cc322..c5393055dfc 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
@@ -11,7 +11,7 @@ {{"item.page.filesection.original.bundle"
[retainScrollPosition]="true">
-
{{ label }}
\n' +
- '{{"item.page.filesection.original.bundle"
[retainScrollPosition]="true">
-
+
>) => {
if (hasValue(rd.errorMessage)) {
@@ -85,7 +86,8 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
{elementsPerPage: options.pageSize, currentPage: options.currentPage},
true,
true,
- followLink('format')
+ followLink('format'),
+ followLink('thumbnail'),
)),
tap((rd: RemoteData>) => {
if (hasValue(rd.errorMessage)) {
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index 99b96511fe2..ca6a6c5958c 100644
--- a/src/app/+item-page/item.resolver.ts
+++ b/src/app/+item-page/item.resolver.ts
@@ -5,7 +5,6 @@ import { RemoteData } from '../core/data/remote-data';
import { ItemDataService } from '../core/data/item-data.service';
import { Item } from '../core/shared/item.model';
import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { FindListOptions } from '../core/data/request.models';
import { getFirstCompletedRemoteData } from '../core/shared/operators';
import { Store } from '@ngrx/store';
import { ResolvedAction } from '../core/resolving/resolver.actions';
@@ -15,13 +14,13 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
* Requesting them as embeds will limit the number of requests
*/
export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig- [] = [
- followLink('owningCollection', undefined, true, true, true,
- followLink('parentCommunity', undefined, true, true, true,
+ followLink('owningCollection', {},
+ followLink('parentCommunity', {},
followLink('parentCommunity'))
),
- followLink('bundles', new FindListOptions(), true, true, true, followLink('bitstreams')),
followLink('relationships'),
- followLink('version', undefined, true, true, true, followLink('versionhistory')),
+ followLink('version', {}, followLink('versionhistory')),
+ followLink('thumbnail')
];
/**
diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.html b/src/app/+item-page/simple/item-types/publication/publication.component.html
index 27f5ff43a1e..9e61f00e482 100644
--- a/src/app/+item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/+item-page/simple/item-types/publication/publication.component.html
@@ -9,8 +9,8 @@
-
-
+
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/+item-page/simple/item-types/shared/item.component.ts
index 120eda930f7..793af180c99 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.ts
@@ -1,10 +1,6 @@
import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
import { environment } from '../../../../../environments/environment';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
import { getItemPageRoute } from '../../../item-page-routing-paths';
@Component({
@@ -21,19 +17,10 @@ export class ItemComponent implements OnInit {
* Route to the item page
*/
itemPageRoute: string;
- mediaViewer = environment.mediaViewer;
- constructor(protected bitstreamDataService: BitstreamDataService) {
- }
+ mediaViewer = environment.mediaViewer;
ngOnInit(): void {
this.itemPageRoute = getItemPageRoute(this.object);
}
-
- // TODO refactor to return RemoteData, and thumbnail template to deal with loading
- getThumbnail(): Observable {
- return this.bitstreamDataService.getThumbnailFor(this.object).pipe(
- getFirstSucceededRemoteDataPayload()
- );
- }
}
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index 89e6e7a4908..b0157dcfee7 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -9,8 +9,8 @@
-
-
+
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index b817c82a57e..c1caf27b9ac 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -16,9 +16,11 @@ import { SearchResult } from '../shared/search/search-result.model';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { SearchService } from '../core/shared/search/search.service';
import { currentPath } from '../shared/utils/route.utils';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
import { Context } from '../core/shared/context.model';
import { SortOptions } from '../core/cache/models/sort-options.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { Item } from '../core/shared/item.model';
@Component({
selector: 'ds-search',
@@ -128,8 +130,11 @@ export class SearchComponent implements OnInit {
this.searchLink = this.getSearchLink();
this.searchOptions$ = this.getSearchOptions();
this.sub = this.searchOptions$.pipe(
- switchMap((options) => this.service.search(options).pipe(getFirstSucceededRemoteData(), startWith(undefined))))
- .subscribe((results) => {
+ switchMap((options) => this.service.search(
+ options, undefined, true, true, followLink- ('thumbnail', { isOptional: true })
+ ).pipe(getFirstSucceededRemoteData(), startWith(undefined))
+ )
+ ).subscribe((results) => {
this.resultsRD$.next(results);
});
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index d229d12bd28..259aa311e74 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -3,6 +3,10 @@ import { getAccessControlModuleRoute } from '../app-routing-paths';
export const GROUP_EDIT_PATH = 'groups';
+export function getGroupsRoute() {
+ return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+}
+
export function getGroupEditRoute(id: string) {
return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
}
diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index cac49938a96..e64b0d170a6 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -5,6 +5,9 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
import { GROUP_EDIT_PATH } from './access-control-routing-paths';
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
@NgModule({
imports: [
@@ -15,7 +18,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' }
+ data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
+ canActivate: [SiteAdministratorGuard]
},
{
path: GROUP_EDIT_PATH,
@@ -23,7 +27,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' }
+ data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/newGroup`,
@@ -31,7 +36,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' }
+ data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/:groupId`,
@@ -39,7 +45,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' }
+ data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
+ canActivate: [GroupPageGuard]
}
])
]
diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
new file mode 100644
index 00000000000..48fa124c077
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -0,0 +1,83 @@
+import { GroupPageGuard } from './group-page.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+
+describe('GroupPageGuard', () => {
+ const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
+ const groupUuid = '0d6f89df-f95a-4829-943c-f21f434fb892';
+ const groupEndpointUrl = `${groupsEndpointUrl}/${groupUuid}`;
+ const routeSnapshotWithGroupId = {
+ params: {
+ groupId: groupUuid,
+ }
+ } as unknown as ActivatedRouteSnapshot;
+
+ let guard: GroupPageGuard;
+ let halEndpointService: HALEndpointService;
+ let authorizationService: AuthorizationDataService;
+ let router: Router;
+ let authService: AuthService;
+
+ beforeEach(() => {
+ halEndpointService = jasmine.createSpyObj(['getEndpoint']);
+ (halEndpointService as any).getEndpoint.and.returnValue(observableOf(groupsEndpointUrl));
+
+ authorizationService = jasmine.createSpyObj(['isAuthorized']);
+ // NOTE: value is set in beforeEach
+
+ router = jasmine.createSpyObj(['parseUrl']);
+ (router as any).parseUrl.and.returnValue = {};
+
+ authService = jasmine.createSpyObj(['isAuthenticated']);
+ (authService as any).isAuthenticated.and.returnValue(observableOf(true));
+
+ guard = new GroupPageGuard(halEndpointService, authorizationService, router, authService);
+ });
+
+ it('should be created', () => {
+ expect(guard).toBeTruthy();
+ });
+
+ describe('canActivate', () => {
+ describe('when the current user can manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(true));
+ });
+
+ it('should return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).toBeTrue();
+ done();
+ });
+ });
+ });
+
+ describe('when the current user can not manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(false));
+ });
+
+ it('should not return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).not.toBeTrue();
+ done();
+ });
+ });
+ });
+ });
+
+});
diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts
new file mode 100644
index 00000000000..057f67ddeb9
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
+
+ protected groupsEndpoint = 'groups';
+
+ constructor(protected halEndpointService: HALEndpointService,
+ protected authorizationService: AuthorizationDataService,
+ protected router: Router,
+ protected authService: AuthService) {
+ super(authorizationService, router, authService);
+ }
+
+ getFeatureIDs(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable
{
+ return observableOf([FeatureID.CanManageGroup]);
+ }
+
+ getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable {
+ return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
+ map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+ );
+ }
+
+}
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index e5e25ae9447..4135f4cc958 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -33,9 +33,9 @@ {{messagePrefix + 'search.head' | tra
- {{messagePrefix + 'search.head' | tra
{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}
-
+
+
+
+
-
-
+
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/+item-page/simple/item-types/shared/item.component.ts
index 120eda930f7..793af180c99 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.ts
@@ -1,10 +1,6 @@
import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
import { environment } from '../../../../../environments/environment';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
import { getItemPageRoute } from '../../../item-page-routing-paths';
@Component({
@@ -21,19 +17,10 @@ export class ItemComponent implements OnInit {
* Route to the item page
*/
itemPageRoute: string;
- mediaViewer = environment.mediaViewer;
- constructor(protected bitstreamDataService: BitstreamDataService) {
- }
+ mediaViewer = environment.mediaViewer;
ngOnInit(): void {
this.itemPageRoute = getItemPageRoute(this.object);
}
-
- // TODO refactor to return RemoteData, and thumbnail template to deal with loading
- getThumbnail(): Observable {
- return this.bitstreamDataService.getThumbnailFor(this.object).pipe(
- getFirstSucceededRemoteDataPayload()
- );
- }
}
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index 89e6e7a4908..b0157dcfee7 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -9,8 +9,8 @@
-
-
+
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index b817c82a57e..c1caf27b9ac 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -16,9 +16,11 @@ import { SearchResult } from '../shared/search/search-result.model';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { SearchService } from '../core/shared/search/search.service';
import { currentPath } from '../shared/utils/route.utils';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
import { Context } from '../core/shared/context.model';
import { SortOptions } from '../core/cache/models/sort-options.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { Item } from '../core/shared/item.model';
@Component({
selector: 'ds-search',
@@ -128,8 +130,11 @@ export class SearchComponent implements OnInit {
this.searchLink = this.getSearchLink();
this.searchOptions$ = this.getSearchOptions();
this.sub = this.searchOptions$.pipe(
- switchMap((options) => this.service.search(options).pipe(getFirstSucceededRemoteData(), startWith(undefined))))
- .subscribe((results) => {
+ switchMap((options) => this.service.search(
+ options, undefined, true, true, followLink- ('thumbnail', { isOptional: true })
+ ).pipe(getFirstSucceededRemoteData(), startWith(undefined))
+ )
+ ).subscribe((results) => {
this.resultsRD$.next(results);
});
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index d229d12bd28..259aa311e74 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -3,6 +3,10 @@ import { getAccessControlModuleRoute } from '../app-routing-paths';
export const GROUP_EDIT_PATH = 'groups';
+export function getGroupsRoute() {
+ return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+}
+
export function getGroupEditRoute(id: string) {
return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
}
diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index cac49938a96..e64b0d170a6 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -5,6 +5,9 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
import { GROUP_EDIT_PATH } from './access-control-routing-paths';
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
@NgModule({
imports: [
@@ -15,7 +18,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' }
+ data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
+ canActivate: [SiteAdministratorGuard]
},
{
path: GROUP_EDIT_PATH,
@@ -23,7 +27,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' }
+ data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/newGroup`,
@@ -31,7 +36,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' }
+ data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/:groupId`,
@@ -39,7 +45,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' }
+ data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
+ canActivate: [GroupPageGuard]
}
])
]
diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
new file mode 100644
index 00000000000..48fa124c077
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -0,0 +1,83 @@
+import { GroupPageGuard } from './group-page.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+
+describe('GroupPageGuard', () => {
+ const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
+ const groupUuid = '0d6f89df-f95a-4829-943c-f21f434fb892';
+ const groupEndpointUrl = `${groupsEndpointUrl}/${groupUuid}`;
+ const routeSnapshotWithGroupId = {
+ params: {
+ groupId: groupUuid,
+ }
+ } as unknown as ActivatedRouteSnapshot;
+
+ let guard: GroupPageGuard;
+ let halEndpointService: HALEndpointService;
+ let authorizationService: AuthorizationDataService;
+ let router: Router;
+ let authService: AuthService;
+
+ beforeEach(() => {
+ halEndpointService = jasmine.createSpyObj(['getEndpoint']);
+ (halEndpointService as any).getEndpoint.and.returnValue(observableOf(groupsEndpointUrl));
+
+ authorizationService = jasmine.createSpyObj(['isAuthorized']);
+ // NOTE: value is set in beforeEach
+
+ router = jasmine.createSpyObj(['parseUrl']);
+ (router as any).parseUrl.and.returnValue = {};
+
+ authService = jasmine.createSpyObj(['isAuthenticated']);
+ (authService as any).isAuthenticated.and.returnValue(observableOf(true));
+
+ guard = new GroupPageGuard(halEndpointService, authorizationService, router, authService);
+ });
+
+ it('should be created', () => {
+ expect(guard).toBeTruthy();
+ });
+
+ describe('canActivate', () => {
+ describe('when the current user can manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(true));
+ });
+
+ it('should return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).toBeTrue();
+ done();
+ });
+ });
+ });
+
+ describe('when the current user can not manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(false));
+ });
+
+ it('should not return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).not.toBeTrue();
+ done();
+ });
+ });
+ });
+ });
+
+});
diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts
new file mode 100644
index 00000000000..057f67ddeb9
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
+
+ protected groupsEndpoint = 'groups';
+
+ constructor(protected halEndpointService: HALEndpointService,
+ protected authorizationService: AuthorizationDataService,
+ protected router: Router,
+ protected authService: AuthService) {
+ super(authorizationService, router, authService);
+ }
+
+ getFeatureIDs(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable
{
+ return observableOf([FeatureID.CanManageGroup]);
+ }
+
+ getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable {
+ return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
+ map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+ );
+ }
+
+}
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index e5e25ae9447..4135f4cc958 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -33,9 +33,9 @@ {{messagePrefix + 'search.head' | tra
- {{messagePrefix + 'search.head' | tra
{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}
-
+
+
+
+
-
-
+
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index b817c82a57e..c1caf27b9ac 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -16,9 +16,11 @@ import { SearchResult } from '../shared/search/search-result.model';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { SearchService } from '../core/shared/search/search.service';
import { currentPath } from '../shared/utils/route.utils';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
import { Context } from '../core/shared/context.model';
import { SortOptions } from '../core/cache/models/sort-options.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { Item } from '../core/shared/item.model';
@Component({
selector: 'ds-search',
@@ -128,8 +130,11 @@ export class SearchComponent implements OnInit {
this.searchLink = this.getSearchLink();
this.searchOptions$ = this.getSearchOptions();
this.sub = this.searchOptions$.pipe(
- switchMap((options) => this.service.search(options).pipe(getFirstSucceededRemoteData(), startWith(undefined))))
- .subscribe((results) => {
+ switchMap((options) => this.service.search(
+ options, undefined, true, true, followLink- ('thumbnail', { isOptional: true })
+ ).pipe(getFirstSucceededRemoteData(), startWith(undefined))
+ )
+ ).subscribe((results) => {
this.resultsRD$.next(results);
});
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index d229d12bd28..259aa311e74 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -3,6 +3,10 @@ import { getAccessControlModuleRoute } from '../app-routing-paths';
export const GROUP_EDIT_PATH = 'groups';
+export function getGroupsRoute() {
+ return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+}
+
export function getGroupEditRoute(id: string) {
return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
}
diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index cac49938a96..e64b0d170a6 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -5,6 +5,9 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
import { GROUP_EDIT_PATH } from './access-control-routing-paths';
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
@NgModule({
imports: [
@@ -15,7 +18,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' }
+ data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
+ canActivate: [SiteAdministratorGuard]
},
{
path: GROUP_EDIT_PATH,
@@ -23,7 +27,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' }
+ data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/newGroup`,
@@ -31,7 +36,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' }
+ data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
+ canActivate: [GroupAdministratorGuard]
},
{
path: `${GROUP_EDIT_PATH}/:groupId`,
@@ -39,7 +45,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
resolve: {
breadcrumb: I18nBreadcrumbResolver
},
- data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' }
+ data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
+ canActivate: [GroupPageGuard]
}
])
]
diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
new file mode 100644
index 00000000000..48fa124c077
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -0,0 +1,83 @@
+import { GroupPageGuard } from './group-page.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+
+describe('GroupPageGuard', () => {
+ const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
+ const groupUuid = '0d6f89df-f95a-4829-943c-f21f434fb892';
+ const groupEndpointUrl = `${groupsEndpointUrl}/${groupUuid}`;
+ const routeSnapshotWithGroupId = {
+ params: {
+ groupId: groupUuid,
+ }
+ } as unknown as ActivatedRouteSnapshot;
+
+ let guard: GroupPageGuard;
+ let halEndpointService: HALEndpointService;
+ let authorizationService: AuthorizationDataService;
+ let router: Router;
+ let authService: AuthService;
+
+ beforeEach(() => {
+ halEndpointService = jasmine.createSpyObj(['getEndpoint']);
+ (halEndpointService as any).getEndpoint.and.returnValue(observableOf(groupsEndpointUrl));
+
+ authorizationService = jasmine.createSpyObj(['isAuthorized']);
+ // NOTE: value is set in beforeEach
+
+ router = jasmine.createSpyObj(['parseUrl']);
+ (router as any).parseUrl.and.returnValue = {};
+
+ authService = jasmine.createSpyObj(['isAuthenticated']);
+ (authService as any).isAuthenticated.and.returnValue(observableOf(true));
+
+ guard = new GroupPageGuard(halEndpointService, authorizationService, router, authService);
+ });
+
+ it('should be created', () => {
+ expect(guard).toBeTruthy();
+ });
+
+ describe('canActivate', () => {
+ describe('when the current user can manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(true));
+ });
+
+ it('should return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).toBeTrue();
+ done();
+ });
+ });
+ });
+
+ describe('when the current user can not manage the group', () => {
+ beforeEach(() => {
+ (authorizationService as any).isAuthorized.and.returnValue(observableOf(false));
+ });
+
+ it('should not return true', (done) => {
+ guard.canActivate(
+ routeSnapshotWithGroupId, { url: 'current-url'} as any
+ ).subscribe((result) => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+ FeatureID.CanManageGroup, groupEndpointUrl, undefined
+ );
+ expect(result).not.toBeTrue();
+ done();
+ });
+ });
+ });
+ });
+
+});
diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts
new file mode 100644
index 00000000000..057f67ddeb9
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
+
+ protected groupsEndpoint = 'groups';
+
+ constructor(protected halEndpointService: HALEndpointService,
+ protected authorizationService: AuthorizationDataService,
+ protected router: Router,
+ protected authService: AuthService) {
+ super(authorizationService, router, authService);
+ }
+
+ getFeatureIDs(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable
{
+ return observableOf([FeatureID.CanManageGroup]);
+ }
+
+ getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable {
+ return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
+ map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+ );
+ }
+
+}
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index e5e25ae9447..4135f4cc958 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -33,9 +33,9 @@ {{messagePrefix + 'search.head' | tra
- {{messagePrefix + 'search.head' | tra
{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}
-
+
+
+
+
{{messagePrefix + 'search.head' | tra
-
+
+
+
+