diff --git a/config/environment.default.js b/config/environment.default.js index a6ef738f41..4ff088c0db 100644 --- a/config/environment.default.js +++ b/config/environment.default.js @@ -8,13 +8,19 @@ module.exports = { nameSpace: '/' }, // The REST API server settings. - rest: { - ssl: true, - host: 'dspace7.4science.it', - port: 443, - // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript - nameSpace: '/dspace-spring-rest/api' - }, + // rest: { + // ssl: true, + // host: 'dspace7.4science.it', + // port: 443, + // // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript + // nameSpace: '/dspace-spring-rest/api' + // }, + rest: { + ssl: false, + host: 'dspace7-internal.atmire.com', + port: 80, + nameSpace: '/rest/api' + }, // Caching settings cache: { // NOTE: how long should objects be cached for by default diff --git a/src/app/+collection-page/collection-page-resolver.service.ts b/src/app/+collection-page/collection-page-resolver.service.ts new file mode 100644 index 0000000000..ce319b74c3 --- /dev/null +++ b/src/app/+collection-page/collection-page-resolver.service.ts @@ -0,0 +1,21 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; +import { Collection } from '../core/shared/collection.model'; +import { Observable } from 'rxjs/Observable'; +import { CollectionDataService } from '../core/data/collection-data.service'; +import { RemoteData } from '../core/data/remote-data'; +import { filter } from 'rxjs/operators'; + +@Injectable() +export class CollectionPageResolverService implements Resolve> { + constructor(private collectionService: CollectionDataService, private router: Router) { + } + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> | Promise> | RemoteData { + const id = route.params.id; + console.log(id); + // const collection = this.collectionService.findById(id).pipe(filter((c) => c.hasSucceeded)); + return this.collectionService.findById(id).pipe(filter((c) => c.hasSucceeded)); + // return Observable.of(new RemoteData(false, false, true, null, new Collection())); + } +} diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts index c886aa655c..757066a176 100644 --- a/src/app/+collection-page/collection-page-routing.module.ts +++ b/src/app/+collection-page/collection-page-routing.module.ts @@ -2,12 +2,21 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CollectionPageComponent } from './collection-page.component'; +import { CollectionPageResolverService } from './collection-page-resolver.service'; @NgModule({ imports: [ RouterModule.forChild([ - { path: ':id', component: CollectionPageComponent, pathMatch: 'full' } + { + path: ':id', + component: CollectionPageComponent, + pathMatch: 'full', + resolve: { collection: CollectionPageResolverService } + } ]) + ], + providers: [ + CollectionPageResolverService ] }) export class CollectionPageRoutingModule { diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts index 4a935b73b9..2c78488bb5 100644 --- a/src/app/+collection-page/collection-page.component.ts +++ b/src/app/+collection-page/collection-page.component.ts @@ -44,6 +44,8 @@ export class CollectionPageComponent implements OnInit, OnDestroy { private metadata: MetadataService, private route: ActivatedRoute ) { + console.log('component'); + console.log('Collections data:', this.route.snapshot.data); this.paginationConfig = new PaginationComponentOptions(); this.paginationConfig.id = 'collection-page-pagination'; this.paginationConfig.pageSize = 5;