-
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 927effd303..553bd00f56 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -23,6 +23,7 @@ import { MockRouter } from '../../shared/mocks/mock-router';
import { ResourceType } from '../../core/shared/resource-type';
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { VarDirective } from '../../shared/utils/var.directive';
describe('BrowseByMetadataPageComponent', () => {
let comp: BrowseByMetadataPageComponent;
@@ -86,7 +87,7 @@ describe('BrowseByMetadataPageComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
- declarations: [BrowseByMetadataPageComponent, EnumKeysPipe],
+ declarations: [BrowseByMetadataPageComponent, EnumKeysPipe, VarDirective],
providers: [
{ provide: ActivatedRoute, useValue: activatedRouteStub },
{ provide: BrowseService, useValue: mockBrowseService },
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
index 3bc69e5fcb..90623eb3c7 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -18,6 +18,7 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
import { BrowseService } from '../../core/browse/browse.service';
import { MockRouter } from '../../shared/mocks/mock-router';
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { VarDirective } from '../../shared/utils/var.directive';
describe('BrowseByTitlePageComponent', () => {
let comp: BrowseByTitlePageComponent;
@@ -64,7 +65,7 @@ describe('BrowseByTitlePageComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
- declarations: [BrowseByTitlePageComponent, EnumKeysPipe],
+ declarations: [BrowseByTitlePageComponent, EnumKeysPipe, VarDirective],
providers: [
{ provide: ActivatedRoute, useValue: activatedRouteStub },
{ provide: BrowseService, useValue: mockBrowseService },
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 2b16bc1ca6..436cd351a0 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -3,18 +3,22 @@
*ngVar="(collectionRD$ | async) as collectionRD">
+
-
+
+
+
+
+
+
+
-
-
{{'collection.page.browse.recent.head' | translate}}
+
+
{{'collection.page.browse.recent.head' | translate}}
-
-
-
+
+
+
+
+
+
diff --git a/src/app/core/submission/submission-object-data.service.spec.ts b/src/app/core/submission/submission-object-data.service.spec.ts
new file mode 100644
index 0000000000..b7c06272e6
--- /dev/null
+++ b/src/app/core/submission/submission-object-data.service.spec.ts
@@ -0,0 +1,95 @@
+import { Observable } from 'rxjs';
+import { SubmissionService } from '../../submission/submission.service';
+import { RemoteData } from '../data/remote-data';
+import { SubmissionObject } from './models/submission-object.model';
+import { WorkspaceItem } from './models/workspaceitem.model';
+import { SubmissionObjectDataService } from './submission-object-data.service';
+import { SubmissionScopeType } from './submission-scope-type';
+import { WorkflowItemDataService } from './workflowitem-data.service';
+import { WorkspaceitemDataService } from './workspaceitem-data.service';
+
+describe('SubmissionObjectDataService', () => {
+ let service: SubmissionObjectDataService;
+ let submissionService: SubmissionService;
+ let workspaceitemDataService: WorkspaceitemDataService;
+ let workflowItemDataService: WorkflowItemDataService;
+
+ const submissionId = '1234';
+ const wsiResult = 'wsiResult' as any;
+ const wfiResult = 'wfiResult' as any;
+
+ beforeEach(() => {
+ workspaceitemDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
+ findById: wsiResult
+ });
+ workflowItemDataService = jasmine.createSpyObj('WorkflowItemDataService', {
+ findById: wfiResult
+ });
+ });
+
+ describe('findById', () => {
+ it('should call SubmissionService.getSubmissionScope to determine the type of submission object', () => {
+ submissionService = jasmine.createSpyObj('SubmissionService', {
+ getSubmissionScope: {}
+ });
+ service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+ service.findById(submissionId);
+ expect(submissionService.getSubmissionScope).toHaveBeenCalled();
+ });
+
+ describe('when the submission ID refers to a WorkspaceItem', () => {
+ beforeEach(() => {
+ submissionService = jasmine.createSpyObj('SubmissionService', {
+ getSubmissionScope: SubmissionScopeType.WorkspaceItem
+ });
+ service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+ });
+
+ it('should forward the result of WorkspaceitemDataService.findById()', () => {
+ const result = service.findById(submissionId);
+ expect(workspaceitemDataService.findById).toHaveBeenCalledWith(submissionId);
+ expect(result).toBe(wsiResult);
+ });
+ });
+
+ describe('when the submission ID refers to a WorkflowItem', () => {
+ beforeEach(() => {
+ submissionService = jasmine.createSpyObj('SubmissionService', {
+ getSubmissionScope: SubmissionScopeType.WorkflowItem
+ });
+ service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+ });
+
+ it('should forward the result of WorkflowItemDataService.findById()', () => {
+ const result = service.findById(submissionId);
+ expect(workflowItemDataService.findById).toHaveBeenCalledWith(submissionId);
+ expect(result).toBe(wfiResult);
+ });
+ });
+
+ describe('when the type of submission object is unknown', () => {
+ beforeEach(() => {
+ submissionService = jasmine.createSpyObj('SubmissionService', {
+ getSubmissionScope: 'Something else'
+ });
+ service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+ });
+
+ it('shouldn\'t call any data service methods', () => {
+ service.findById(submissionId);
+ expect(workspaceitemDataService.findById).not.toHaveBeenCalled();
+ expect(workflowItemDataService.findById).not.toHaveBeenCalled();
+ });
+
+ it('should return a RemoteData containing an error', (done) => {
+ const result = service.findById(submissionId);
+ result.subscribe((rd: RemoteData
) => {
+ expect(rd.hasFailed).toBe(true);
+ expect(rd.error).toBeDefined();
+ done();
+ })
+ });
+ });
+
+ });
+});
diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
new file mode 100644
index 0000000000..15ede18cb8
--- /dev/null
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { of as observableOf, Observable } from 'rxjs';
+import { SubmissionService } from '../../submission/submission.service';
+import { RemoteData } from '../data/remote-data';
+import { RemoteDataError } from '../data/remote-data-error';
+import { SubmissionObject } from './models/submission-object.model';
+import { SubmissionScopeType } from './submission-scope-type';
+import { WorkflowItemDataService } from './workflowitem-data.service';
+import { WorkspaceitemDataService } from './workspaceitem-data.service';
+
+/**
+ * A service to retrieve submission objects (WorkspaceItem/WorkflowItem)
+ * without knowing their type
+ */
+@Injectable({
+ providedIn: 'root'
+})
+export class SubmissionObjectDataService {
+ constructor(
+ private workspaceitemDataService: WorkspaceitemDataService,
+ private workflowItemDataService: WorkflowItemDataService,
+ private submissionService: SubmissionService
+ ) {
+ }
+
+ /**
+ * Retrieve a submission object based on its ID.
+ *
+ * @param id The identifier of a submission object
+ */
+ findById(id: string): Observable> {
+ switch (this.submissionService.getSubmissionScope()) {
+ case SubmissionScopeType.WorkspaceItem:
+ return this.workspaceitemDataService.findById(id);
+ case SubmissionScopeType.WorkflowItem:
+ return this.workflowItemDataService.findById(id);
+ default:
+ const error = new RemoteDataError(
+ undefined,
+ undefined,
+ 'The request couldn\'t be sent. Unable to determine the type of submission object'
+ );
+ return observableOf(new RemoteData(false, false, false, error, undefined));
+ }
+ }
+}
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index f7cd7e0d35..09d3cd3d60 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,5 +1,5 @@
- {{title | translate}}
+ {{title | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 6c4bc78213..230b0bc136 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -26,6 +26,10 @@ export class BrowseByComponent implements OnInit {
*/
@Input() title: string;
+ /**
+ * The parent name
+ */
+ @Input() parentname: string;
/**
* The list of objects to display
*/
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
index 1c73fbb3df..504d9f4bcd 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,6 +1,24 @@
-
{{'browse.comcol.head' | translate}}
-
+
{{'browse.comcol.head' | translate}}
+
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index dcc7840bb4..1bc83d74a5 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,6 +1,27 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+ ChangeDetectionStrategy,
+ Component,
+ Inject,
+ Input, NgZone,
+ OnDestroy,
+ OnInit
+} from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { filter, map, startWith, tap } from 'rxjs/operators';
+import { getCollectionPageRoute } from '../../+collection-page/collection-page-routing.module';
+import { getCommunityPageRoute } from '../../+community-page/community-page-routing.module';
import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
+import { Router, ActivatedRoute, RouterModule, UrlSegment } from '@angular/router';
import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface';
+import { hasValue } from '../empty.util';
+
+export interface ComColPageNavOption {
+ id: string;
+ label: string,
+ routerLink: string
+ params?: any;
+};
/**
* A component to display the "Browse By" section of a Community or Collection page
@@ -8,24 +29,63 @@ import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interf
*/
@Component({
selector: 'ds-comcol-page-browse-by',
- templateUrl: './comcol-page-browse-by.component.html',
+ styleUrls: ['./comcol-page-browse-by.component.scss'],
+ templateUrl: './comcol-page-browse-by.component.html'
})
export class ComcolPageBrowseByComponent implements OnInit {
/**
* The ID of the Community or Collection
*/
@Input() id: string;
-
+ @Input() contentType: string;
/**
* List of currently active browse configurations
*/
types: BrowseByTypeConfig[];
- constructor(@Inject(GLOBAL_CONFIG) public config: GlobalConfig) {
+ allOptions: ComColPageNavOption[];
+
+ currentOptionId$: Observable
;
+
+ constructor(
+ @Inject(GLOBAL_CONFIG) public config: GlobalConfig,
+ private route: ActivatedRoute,
+ private router: Router) {
}
ngOnInit(): void {
- this.types = this.config.browseBy.types;
+ this.allOptions = this.config.browseBy.types
+ .map((config: BrowseByTypeConfig) => ({
+ id: config.id,
+ label: `browse.comcol.by.${config.id}`,
+ routerLink: `/browse/${config.id}`,
+ params: { scope: this.id }
+ }));
+
+ if (this.contentType === 'collection') {
+ this.allOptions = [ {
+ id: this.id,
+ label: 'collection.page.browse.recent.head',
+ routerLink: getCollectionPageRoute(this.id)
+ }, ...this.allOptions ];
+ } else if (this.contentType === 'community') {
+ this.allOptions = [{
+ id: this.id,
+ label: 'community.all-lists.head',
+ routerLink: getCommunityPageRoute(this.id)
+ }, ...this.allOptions ];
+ }
+
+ this.currentOptionId$ = this.route.url.pipe(
+ filter((urlSegments: UrlSegment[]) => hasValue(urlSegments)),
+ map((urlSegments: UrlSegment[]) => urlSegments[urlSegments.length - 1].path)
+ );
}
+ onSelectChange(newId: string) {
+ const selectedOption = this.allOptions
+ .find((option: ComColPageNavOption) => option.id === newId);
+
+ this.router.navigate([selectedOption.routerLink], { queryParams: selectedOption.params });
+ }
}
diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol-page-handle/comcol-page-handle.component.html
new file mode 100644
index 0000000000..b3ca75bf94
--- /dev/null
+++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.html
@@ -0,0 +1,4 @@
+
+
{{ title | translate }}
+
+