{{ 'collection.delete.text' | translate:{ dso: dso.name } }}
-
{{ 'community.delete.text' | translate:{ dso: dso.name } }}
-
{{'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 dd91c65e1e..d200891629 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();
+ init(mockItemDataServiceSuccess);
});
- it('should load suggestions', () => {
- const expected = [
- collection1,
- collection2
- ];
- comp.collectionSearchResults.subscribe((value) => {
- expect(value).toEqual(expected);
- }
- );
- });
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 b1ed121b40..b7ab761fe5 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.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 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 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);
- });
+ 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 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 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 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);
+ 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 8af108cceb..5c6b99248f 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 bc1c63cc32..c5393055df 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 @@
[retainScrollPosition]="true">
-
{{ label }}
\n' +
- '
+
>) => {
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/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index cb6a1ccf60..5e1bec7656 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -1,4 +1,4 @@
-import {filter, map} from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute, Data, Router } from '@angular/router';
@@ -11,8 +11,6 @@ import { ItemDataService } from '../../core/data/item-data.service';
import { RemoteData } from '../../core/data/remote-data';
import { Item } from '../../core/shared/item.model';
-import { MetadataService } from '../../core/metadata/metadata.service';
-
import { fadeInOut } from '../../shared/animations/fade';
import { hasValue } from '../../shared/empty.util';
import { AuthService } from '../../core/auth/auth.service';
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index 99b96511fe..ca6a6c5958 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-page.component.ts b/src/app/+item-page/simple/item-page.component.ts
index c647647339..cc23ba86d5 100644
--- a/src/app/+item-page/simple/item-page.component.ts
+++ b/src/app/+item-page/simple/item-page.component.ts
@@ -8,8 +8,6 @@ import { RemoteData } from '../../core/data/remote-data';
import { Item } from '../../core/shared/item.model';
-import { MetadataService } from '../../core/metadata/metadata.service';
-
import { fadeInOut } from '../../shared/animations/fade';
import { getAllSucceededRemoteDataPayload, redirectOn4xx } from '../../core/shared/operators';
import { ViewMode } from '../../core/shared/view-mode.model';
@@ -54,7 +52,6 @@ export class ItemPageComponent implements OnInit {
protected route: ActivatedRoute,
private router: Router,
private items: ItemDataService,
- private metadataService: MetadataService,
private authService: AuthService,
) { }
@@ -66,7 +63,6 @@ export class ItemPageComponent implements OnInit {
map((data) => data.dso as RemoteData
- ),
redirectOn4xx(this.router, this.authService)
);
- this.metadataService.processRemoteData(this.itemRD$);
this.itemPageRoute$ = this.itemRD$.pipe(
getAllSucceededRemoteDataPayload(),
map((item) => getItemPageRoute(item))
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 27f5ff43a1..9e61f00e48 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 120eda930f..793af180c9 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 89e6e7a490..b0157dcfee 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 b817c82a57..c1caf27b9a 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 d229d12bd2..259aa311e7 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 cac49938a9..e64b0d170a 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 0000000000..48fa124c07
--- /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 0000000000..057f67ddeb
--- /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 e5e25ae944..4135f4cc95 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 @@
- {{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}
-
+
+
+
+