diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 2239d605cc..e65321cf39 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -91,7 +91,8 @@ "sub-collections": "Loading sub-collections...", "items": "Loading items...", "item": "Loading item...", - "objects": "Loading..." + "objects": "Loading...", + "search-results": "Loading search results..." }, "error": { "default": "Error", @@ -101,6 +102,7 @@ "sub-collections": "Error fetching sub-collections", "items": "Error fetching items", "item": "Error fetching item", - "objects": "Error fetching objects" + "objects": "Error fetching objects", + "search-results": "Error fetching search results" } } diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index e385de08b4..b0a544eb37 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -1,13 +1,13 @@
-
-
+
+
@@ -33,18 +33,19 @@
- - + +
-
+

{{'collection.page.browse.recent.head' | translate}}

+ [hideGear]="false" + (paginationChange)="onPaginationChange($event)">
- - + +
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts index 0bc86af045..2ca547dada 100644 --- a/src/app/+collection-page/collection-page.component.ts +++ b/src/app/+collection-page/collection-page.component.ts @@ -7,13 +7,13 @@ import { SortOptions } from '../core/cache/models/sort-options.model'; import { CollectionDataService } from '../core/data/collection-data.service'; import { ItemDataService } from '../core/data/item-data.service'; import { RemoteData } from '../core/data/remote-data'; + +import { MetadataService } from '../core/metadata/metadata.service'; import { Bitstream } from '../core/shared/bitstream.model'; import { Collection } from '../core/shared/collection.model'; import { Item } from '../core/shared/item.model'; -import { MetadataService } from '../core/metadata/metadata.service'; - import { fadeIn, fadeInOut } from '../shared/animations/fade'; import { hasValue, isNotEmpty } from '../shared/empty.util'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; @@ -29,9 +29,9 @@ import { PaginationComponentOptions } from '../shared/pagination/pagination-comp ] }) export class CollectionPageComponent implements OnInit, OnDestroy { - collectionData: RemoteData; + collectionData: Observable>; itemData: RemoteData; - logoData: RemoteData; + logoData: Observable>; paginationConfig: PaginationComponentOptions; sortConfig: SortOptions; private subs: Subscription[] = []; @@ -62,7 +62,10 @@ export class CollectionPageComponent implements OnInit, OnDestroy { this.collectionId = params.id; this.collectionData = this.collectionDataService.findById(this.collectionId); this.metadata.processRemoteData(this.collectionData); - this.subs.push(this.collectionData.payload.subscribe((collection) => this.logoData = collection.logo)); + this.subs.push(this.collectionData + .map((rd: RemoteData) => rd.payload) + .filter((collection: Collection) => hasValue(collection)) + .subscribe((collection: Collection) => this.logoData = collection.logo)); const page = +params.page || this.paginationConfig.currentPage; const pageSize = +params.pageSize || this.paginationConfig.pageSize; @@ -84,12 +87,14 @@ export class CollectionPageComponent implements OnInit, OnDestroy { } updatePage(searchOptions) { - this.itemData = this.itemDataService.findAll({ + this.subs.push(this.itemDataService.findAll({ scopeID: this.collectionId, currentPage: searchOptions.pagination.currentPage, elementsPerPage: searchOptions.pagination.pageSize, sort: searchOptions.sort - }); + }).subscribe((rd: RemoteData) => { + this.itemData = rd; + })); } ngOnDestroy(): void { @@ -99,4 +104,17 @@ export class CollectionPageComponent implements OnInit, OnDestroy { isNotEmpty(object: any) { return isNotEmpty(object); } + + onPaginationChange(event) { + this.updatePage({ + pagination: { + currentPage: event.page, + pageSize: event.pageSize + }, + sort: { + field: event.sortField, + direction: event.sortDirection + } + }) + } } diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html index 3935ffccae..e9f91e3f10 100644 --- a/src/app/+community-page/community-page.component.html +++ b/src/app/+community-page/community-page.component.html @@ -1,10 +1,10 @@ -
-
+
+
@@ -26,5 +26,5 @@
- - + + diff --git a/src/app/+community-page/community-page.component.ts b/src/app/+community-page/community-page.component.ts index c50df3b40c..40b57bc4cd 100644 --- a/src/app/+community-page/community-page.component.ts +++ b/src/app/+community-page/community-page.component.ts @@ -12,6 +12,7 @@ import { MetadataService } from '../core/metadata/metadata.service'; import { fadeInOut } from '../shared/animations/fade'; import { hasValue } from '../shared/empty.util'; +import { Observable } from 'rxjs/Observable'; @Component({ selector: 'ds-community-page', @@ -21,8 +22,8 @@ import { hasValue } from '../shared/empty.util'; animations: [fadeInOut] }) export class CommunityPageComponent implements OnInit, OnDestroy { - communityData: RemoteData; - logoData: RemoteData; + communityData: Observable>; + logoData: Observable>; private subs: Subscription[] = []; constructor( @@ -37,7 +38,10 @@ export class CommunityPageComponent implements OnInit, OnDestroy { this.route.params.subscribe((params: Params) => { this.communityData = this.communityDataService.findById(params.id); this.metadata.processRemoteData(this.communityData); - this.subs.push(this.communityData.payload.subscribe((community) => this.logoData = community.logo)); + this.subs.push(this.communityData + .map((rd: RemoteData) => rd.payload) + .filter((community: Community) => hasValue(community)) + .subscribe((community: Community) => this.logoData = community.logo)); }); } diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html index 31dc2cd326..16de33a642 100644 --- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html +++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html @@ -1,7 +1,7 @@ -
+

{{'community.sub-collection-list.head' | translate}}

- - + + diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts index 618890a60c..0f310d4aec 100644 --- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts +++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts @@ -5,6 +5,7 @@ import { RemoteData } from '../../core/data/remote-data'; import { Collection } from '../../core/shared/collection.model'; import { fadeIn } from '../../shared/animations/fade'; +import { Observable } from 'rxjs/Observable'; @Component({ selector: 'ds-community-page-sub-collection-list', @@ -13,7 +14,7 @@ import { fadeIn } from '../../shared/animations/fade'; animations:[fadeIn] }) export class CommunityPageSubCollectionListComponent implements OnInit { - subCollections: RemoteData; + subCollections: Observable>; constructor(private cds: CollectionDataService) { diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html index a5bd6c5c5d..e3e995f545 100644 --- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.html +++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.html @@ -1,13 +1,13 @@ -
+

{{'home.top-level-communities.head' | translate}}

{{'home.top-level-communities.help' | translate}}

- - \ No newline at end of file + + diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts index 3be32f5c6e..b7510db5ed 100644 --- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts +++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts @@ -1,4 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; import { SortOptions } from '../../core/cache/models/sort-options.model'; import { CommunityDataService } from '../../core/data/community-data.service'; @@ -16,7 +17,7 @@ import { PaginationComponentOptions } from '../../shared/pagination/pagination-c animations: [fadeInOut] }) export class TopLevelCommunityListComponent { - topLevelCommunities: RemoteData; + topLevelCommunities: Observable>; config: PaginationComponentOptions; sortConfig: SortOptions; diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/+item-page/field-components/collections/collections.component.ts index c3db3135e3..8b7b5d7f58 100644 --- a/src/app/+item-page/field-components/collections/collections.component.ts +++ b/src/app/+item-page/field-components/collections/collections.component.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { Collection } from '../../../core/shared/collection.model'; import { Item } from '../../../core/shared/item.model'; import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; +import { RemoteData } from '../../../core/data/remote-data'; /** * This component renders the parent collections section of the item @@ -34,7 +35,7 @@ export class CollectionsComponent implements OnInit { // TODO: this should use parents, but the collections // for an Item aren't returned by the REST API yet, // only the owning collection - this.collections = this.item.owner.payload.map((c) => [c]); + this.collections = this.item.owner.map((rd: RemoteData) => [rd.payload]); } } diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html index 7b25f88753..998be0eb76 100644 --- a/src/app/+item-page/full/full-item-page.component.html +++ b/src/app/+item-page/full/full-item-page.component.html @@ -1,5 +1,5 @@ -
-
+
+ - - + + 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 270cf1fcae..1a26b92f13 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 { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; @@ -13,6 +13,7 @@ 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'; /** * This component renders a simple item page. @@ -24,11 +25,12 @@ import { fadeInOut } from '../../shared/animations/fade'; selector: 'ds-full-item-page', styleUrls: ['./full-item-page.component.scss'], templateUrl: './full-item-page.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, animations: [fadeInOut] }) export class FullItemPageComponent extends ItemPageComponent implements OnInit { - item: RemoteData; + item: Observable>; metadata: Observable; @@ -43,7 +45,10 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit { initialize(params) { super.initialize(params); - this.metadata = this.item.payload.map((i) => i.metadata); + this.metadata = this.item + .map((rd: RemoteData) => rd.payload) + .filter((item: Item) => hasValue(item)) + .map((item: Item) => item.metadata); } } diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html index 10ceec2a6f..3ce80a0eed 100644 --- a/src/app/+item-page/simple/item-page.component.html +++ b/src/app/+item-page/simple/item-page.component.html @@ -1,5 +1,5 @@ -
-
+
+
@@ -23,5 +23,5 @@
- - + + diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts index 50c36fc76e..7856315810 100644 --- a/src/app/+item-page/simple/item-page.component.ts +++ b/src/app/+item-page/simple/item-page.component.ts @@ -11,6 +11,7 @@ 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'; /** * This component renders a simple item page. @@ -30,7 +31,7 @@ export class ItemPageComponent implements OnInit { private sub: any; - item: RemoteData; + item: Observable>; thumbnail: Observable; @@ -52,7 +53,10 @@ export class ItemPageComponent implements OnInit { this.id = +params.id; this.item = this.items.findById(params.id); this.metadataService.processRemoteData(this.item); - this.thumbnail = this.item.payload.flatMap((i) => i.getThumbnail()); + this.thumbnail = this.item + .map((rd: RemoteData) => rd.payload) + .filter((item: Item) => hasValue(item)) + .flatMap((item: Item) => item.getThumbnail()); } } diff --git a/src/app/+search-page/search-page.component.html b/src/app/+search-page/search-page.component.html index d5e3a831eb..4833b4c363 100644 --- a/src/app/+search-page/search-page.component.html +++ b/src/app/+search-page/search-page.component.html @@ -1,9 +1,9 @@
+ [scopes]="(scopeList | async)?.payload"> - +
diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts index 0b00021ed6..0b80b16196 100644 --- a/src/app/+search-page/search-page.component.spec.ts +++ b/src/app/+search-page/search-page.component.spec.ts @@ -9,7 +9,7 @@ import { Community } from '../core/shared/community.model'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model'; -describe('SearchPageComponent', () => { +fdescribe('SearchPageComponent', () => { let comp: SearchPageComponent; let fixture: ComponentFixture; let searchServiceObject: SearchService; @@ -27,8 +27,8 @@ describe('SearchPageComponent', () => { }; const mockCommunityList = []; const communityDataServiceStub = { - findAll: () => mockCommunityList, - findById: () => new Community() + findAll: () => Observable.of(mockCommunityList), + findById: () => Observable.of(new Community()) }; class RouterStub { diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts index 1592dc3c24..79b813a1b6 100644 --- a/src/app/+search-page/search-page.component.ts +++ b/src/app/+search-page/search-page.component.ts @@ -1,15 +1,16 @@ -import { Component, OnInit, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { SearchService } from './search-service/search.service'; +import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { RemoteData } from '../core/data/remote-data'; -import { SearchResult } from './search-result.model'; -import { DSpaceObject } from '../core/shared/dspace-object.model'; +import { Observable } from 'rxjs/Observable'; import { SortOptions } from '../core/cache/models/sort-options.model'; +import { CommunityDataService } from '../core/data/community-data.service'; +import { RemoteData } from '../core/data/remote-data'; +import { Community } from '../core/shared/community.model'; +import { DSpaceObject } from '../core/shared/dspace-object.model'; +import { isNotEmpty } from '../shared/empty.util'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; import { SearchOptions } from './search-options.model'; -import { CommunityDataService } from '../core/data/community-data.service'; -import { isNotEmpty } from '../shared/empty.util'; -import { Community } from '../core/shared/community.model'; +import { SearchResult } from './search-result.model'; +import { SearchService } from './search-service/search.service'; /** * This component renders a simple item page. @@ -21,7 +22,7 @@ import { Community } from '../core/shared/community.model'; selector: 'ds-search-page', styleUrls: ['./search-page.component.scss'], templateUrl: './search-page.component.html', - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class SearchPageComponent implements OnInit, OnDestroy { @@ -29,11 +30,11 @@ export class SearchPageComponent implements OnInit, OnDestroy { private scope: string; query: string; - scopeObject: RemoteData; - results: RemoteData>>; + scopeObject: Observable>; + results: Observable>>>; currentParams = {}; searchOptions: SearchOptions; - scopeList: RemoteData; + scopeList: Observable>; constructor( private service: SearchService, diff --git a/src/app/+search-page/search-results/search-results.component.html b/src/app/+search-page/search-results/search-results.component.html index 08e63d598d..808a952d8b 100644 --- a/src/app/+search-page/search-results/search-results.component.html +++ b/src/app/+search-page/search-results/search-results.component.html @@ -1,7 +1,11 @@ -

{{ 'search.results.title' | translate }}

- - \ No newline at end of file +
+

{{ 'search.results.title' | translate }}

+ + +
+ + diff --git a/src/app/+search-page/search-results/search-results.component.ts b/src/app/+search-page/search-results/search-results.component.ts index c645489694..4733699f95 100644 --- a/src/app/+search-page/search-results/search-results.component.ts +++ b/src/app/+search-page/search-results/search-results.component.ts @@ -1,8 +1,9 @@ import { Component, Input } from '@angular/core'; import { RemoteData } from '../../core/data/remote-data'; -import { SearchResult } from '../search-result.model'; import { DSpaceObject } from '../../core/shared/dspace-object.model'; +import { fadeIn, fadeInOut } from '../../shared/animations/fade'; import { SearchOptions } from '../search-options.model'; +import { SearchResult } from '../search-result.model'; /** * This component renders a simple item page. @@ -12,6 +13,10 @@ import { SearchOptions } from '../search-options.model'; @Component({ selector: 'ds-search-results', templateUrl: './search-results.component.html', + animations: [ + fadeIn, + fadeInOut + ] }) export class SearchResultsComponent { @Input() searchResults: RemoteData>>; diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts index e2804960ef..27035b92ee 100644 --- a/src/app/+search-page/search-service/search.service.ts +++ b/src/app/+search-page/search-service/search.service.ts @@ -80,7 +80,7 @@ export class SearchService { } - search(query: string, scopeId?: string, searchOptions?: SearchOptions): RemoteData>> { + search(query: string, scopeId?: string, searchOptions?: SearchOptions): Observable>>> { let self = `https://dspace7.4science.it/dspace-spring-rest/api/search?query=${query}`; if (hasValue(scopeId)) { self += `&scope=${scopeId}`; @@ -98,8 +98,8 @@ export class SearchService { self += `&sortField=${searchOptions.sort.field}`; } - const errorMessage = Observable.of(undefined); - const statusCode = Observable.of('200'); + const errorMessage = undefined; + const statusCode = '200'; const returningPageInfo = new PageInfo(); if (isNotEmpty(searchOptions)) { @@ -110,19 +110,20 @@ export class SearchService { returningPageInfo.currentPage = 1; } - const itemsRD = this.itemDataService.findAll({ + const itemsObs = this.itemDataService.findAll({ scopeID: scopeId, currentPage: returningPageInfo.currentPage, elementsPerPage: returningPageInfo.elementsPerPage }); - const pageInfo = itemsRD.pageInfo.map((info: PageInfo) => { - const totalElements = info.totalElements > 20 ? 20 : info.totalElements; - return Object.assign({}, info, { totalElements: totalElements }); - }); + return itemsObs + .filter((rd: RemoteData) => rd.hasSucceeded) + .map((rd: RemoteData) => { - const payload = itemsRD.payload.map((items: Item[]) => { - return shuffle(items) + const totalElements = rd.pageInfo.totalElements > 20 ? 20 : rd.pageInfo.totalElements; + const pageInfo = Object.assign({}, rd.pageInfo, { totalElements: totalElements }); + + const payload = shuffle(rd.payload) .map((item: Item, index: number) => { const mockResult: SearchResult = new ItemSearchResult(); mockResult.dspaceObject = item; @@ -132,40 +133,49 @@ export class SearchService { mockResult.hitHighlights = new Array(highlight); return mockResult; }); - }); - return new RemoteData( - Observable.of(self), - itemsRD.isRequestPending, - itemsRD.isResponsePending, - itemsRD.hasSucceeded, - errorMessage, - statusCode, - pageInfo, - payload - ) + return new RemoteData( + self, + rd.isRequestPending, + rd.isResponsePending, + rd.hasSucceeded, + errorMessage, + statusCode, + pageInfo, + payload + ) + }).startWith(new RemoteData( + '', + true, + false, + undefined, + undefined, + undefined, + undefined, + undefined + )); } - getConfig(): RemoteData { - const requestPending = Observable.of(false); - const responsePending = Observable.of(false); - const isSuccessful = Observable.of(true); - const errorMessage = Observable.of(undefined); - const statusCode = Observable.of('200'); - const returningPageInfo = Observable.of(new PageInfo()); - return new RemoteData( - Observable.of('https://dspace7.4science.it/dspace-spring-rest/api/search'), + getConfig(): Observable> { + const requestPending = false; + const responsePending = false; + const isSuccessful = true; + const errorMessage = undefined; + const statusCode = '200'; + const returningPageInfo = new PageInfo(); + return Observable.of(new RemoteData( + 'https://dspace7.4science.it/dspace-spring-rest/api/search', requestPending, responsePending, isSuccessful, errorMessage, statusCode, returningPageInfo, - Observable.of(this.config) - ); + this.config + )); } - getFacetValuesFor(searchFilterConfigName: string): RemoteData { + getFacetValuesFor(searchFilterConfigName: string): Observable> { const values: FacetValue[] = []; for (let i = 0; i < 5; i++) { const value = searchFilterConfigName + ' ' + (i + 1); @@ -175,21 +185,21 @@ export class SearchService { search: 'https://dspace7.4science.it/dspace-spring-rest/api/search?f.' + searchFilterConfigName + '=' + encodeURI(value) }); } - const requestPending = Observable.of(false); - const responsePending = Observable.of(false); - const isSuccessful = Observable.of(true); - const errorMessage = Observable.of(undefined); - const statusCode = Observable.of('200'); - const returningPageInfo = Observable.of(new PageInfo()); - return new RemoteData( - Observable.of('https://dspace7.4science.it/dspace-spring-rest/api/search'), + const requestPending = false; + const responsePending = false; + const isSuccessful = true; + const errorMessage = undefined; + const statusCode = '200'; + const returningPageInfo = new PageInfo(); + return Observable.of(new RemoteData( + 'https://dspace7.4science.it/dspace-spring-rest/api/search', requestPending, responsePending, isSuccessful, errorMessage, statusCode, returningPageInfo, - Observable.of(values) - ); + values + )); } } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 221c1c37d1..435b44b933 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -4,7 +4,7 @@ import { Inject, ViewEncapsulation, OnInit, - HostListener + HostListener, SimpleChanges, OnChanges } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; @@ -26,7 +26,7 @@ import { GLOBAL_CONFIG, GlobalConfig } from '../config'; changeDetection: ChangeDetectionStrategy.Default, encapsulation: ViewEncapsulation.None }) -export class AppComponent implements OnInit { +export class AppComponent implements OnInit, OnChanges { constructor( @Inject(GLOBAL_CONFIG) public config: GlobalConfig, @@ -71,4 +71,9 @@ export class AppComponent implements OnInit { ); } + ngOnChanges(changes: SimpleChanges): void { + console.log('AppComponent: onchanges called', changes); + } + + } diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts index faf9174c21..65b32b3c0b 100644 --- a/src/app/core/browse/browse.service.spec.ts +++ b/src/app/core/browse/browse.service.spec.ts @@ -72,30 +72,42 @@ describe('BrowseService', () => { }) ]; - beforeEach(() => { - scheduler = getTestScheduler(); - - responseCache = jasmine.createSpyObj('responseCache', { + function initMockResponseCacheService(isSuccessful: boolean) { + return jasmine.createSpyObj('responseCache', { get: cold('b-', { b: { - response: { browseDefinitions } + response: { + isSuccessful, + browseDefinitions, + } } }) }); + } - requestService = jasmine.createSpyObj('requestService', ['configure']); + function initMockRequestService() { + return jasmine.createSpyObj('requestService', ['configure']); + } - service = new BrowseService( + function initTestService() { + return new BrowseService( responseCache, requestService, envConfig ); + } + + beforeEach(() => { + scheduler = getTestScheduler(); }); describe('getBrowseURLFor', () => { - describe('when getEndpoint fires', () => { + describe('if getEndpoint fires', () => { beforeEach(() => { + responseCache = initMockResponseCacheService(true); + requestService = initMockRequestService(); + service = initTestService(); spyOn(service, 'getEndpoint').and .returnValue(hot('--a-', { a: browsesEndpointURL })); }); @@ -122,27 +134,27 @@ describe('BrowseService', () => { expect(result).toBeObservable(expected); }); - it('should return undefined when the key doesn\'t match', () => { + it('should throw an error when the key doesn\'t match', () => { const metadatumKey = 'dc.title'; // isn't in the definitions const linkName = 'items'; const result = service.getBrowseURLFor(metadatumKey, linkName); - const expected = cold('c---', { c: undefined }); + const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkName} on ${metadatumKey} isn't configured`)); expect(result).toBeObservable(expected); }); - it('should return undefined when the link doesn\'t match', () => { + it('should throw an error when the link doesn\'t match', () => { const metadatumKey = 'dc.date.issued'; const linkName = 'collections'; // isn't in the definitions const result = service.getBrowseURLFor(metadatumKey, linkName); - const expected = cold('c---', { c: undefined }); + const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkName} on ${metadatumKey} isn't configured`)); expect(result).toBeObservable(expected); }); - it('should configure a new BrowseEndpointRequest', (done: DoneFn) => { + it('should configure a new BrowseEndpointRequest', () => { const metadatumKey = 'dc.date.issued'; const linkName = 'items'; const expected = new BrowseEndpointRequest(browsesEndpointURL); @@ -150,17 +162,17 @@ describe('BrowseService', () => { scheduler.schedule(() => service.getBrowseURLFor(metadatumKey, linkName).subscribe()); scheduler.flush(); - setTimeout(() => { - expect(requestService.configure).toHaveBeenCalledWith(expected); - done(); - }, 0); + expect(requestService.configure).toHaveBeenCalledWith(expected); }); }); - describe('when getEndpoint doesn\'t fire', () => { - it('should return undefined as long as getEndpoint hasn\'t fired', () => { + describe('if getEndpoint doesn\'t fire', () => { + it('should return undefined', () => { + responseCache = initMockResponseCacheService(true); + requestService = initMockRequestService(); + service = initTestService(); spyOn(service, 'getEndpoint').and .returnValue(hot('----')); @@ -172,5 +184,22 @@ describe('BrowseService', () => { expect(result).toBeObservable(expected); }); }); + + describe('if the browses endpoint can\'t be retrieved', () => { + it('should throw an error', () => { + responseCache = initMockResponseCacheService(false); + requestService = initMockRequestService(); + service = initTestService(); + spyOn(service, 'getEndpoint').and + .returnValue(hot('--a-', { a: browsesEndpointURL })); + + const metadatumKey = 'dc.date.issued'; + const linkName = 'items'; + + const result = service.getBrowseURLFor(metadatumKey, linkName); + const expected = cold('c-#-', { c: undefined }, new Error(`Couldn't retrieve the browses endpoint`)); + expect(result).toBeObservable(expected); + }); + }); }); }); diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts index e250b9fa63..6d8d504b82 100644 --- a/src/app/core/browse/browse.service.ts +++ b/src/app/core/browse/browse.service.ts @@ -1,15 +1,15 @@ import { Inject, Injectable } from '@angular/core'; -import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { ResponseCacheService } from '../cache/response-cache.service'; -import { RequestService } from '../data/request.service'; -import { GlobalConfig } from '../../../config/global-config.interface'; -import { GLOBAL_CONFIG } from '../../../config'; -import { BrowseEndpointRequest, RestRequest } from '../data/request.models'; -import { ResponseCacheEntry } from '../cache/response-cache.reducer'; -import { BrowseSuccessResponse } from '../cache/response-cache.models'; -import { isNotEmpty } from '../../shared/empty.util'; -import { BrowseDefinition } from '../shared/browse-definition.model'; import { Observable } from 'rxjs/Observable'; +import { GLOBAL_CONFIG } from '../../../config'; +import { GlobalConfig } from '../../../config/global-config.interface'; +import { isEmpty, isNotEmpty } from '../../shared/empty.util'; +import { BrowseSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models'; +import { ResponseCacheEntry } from '../cache/response-cache.reducer'; +import { ResponseCacheService } from '../cache/response-cache.service'; +import { BrowseEndpointRequest, RestRequest } from '../data/request.models'; +import { RequestService } from '../data/request.service'; +import { BrowseDefinition } from '../shared/browse-definition.model'; +import { HALEndpointService } from '../shared/hal-endpoint.service'; @Injectable() export class BrowseService extends HALEndpointService { @@ -41,23 +41,32 @@ export class BrowseService extends HALEndpointService { .filter((href: string) => isNotEmpty(href)) .distinctUntilChanged() .map((endpointURL: string) => new BrowseEndpointRequest(endpointURL)) - .do((request: RestRequest) => { - setTimeout(() => { - this.requestService.configure(request); - }, 0); - }) - .flatMap((request: RestRequest) => this.responseCache.get(request.href) - .map((entry: ResponseCacheEntry) => entry.response) - .filter((response: BrowseSuccessResponse) => isNotEmpty(response) && isNotEmpty(response.browseDefinitions)) - .map((response: BrowseSuccessResponse) => response.browseDefinitions) - .map((browseDefinitions: BrowseDefinition[]) => browseDefinitions - .find((def: BrowseDefinition) => { - const matchingKeys = def.metadataKeys.find((key: string) => searchKeyArray.indexOf(key) >= 0); - return isNotEmpty(matchingKeys); + .do((request: RestRequest) => this.requestService.configure(request)) + .flatMap((request: RestRequest) => { + const [successResponse, errorResponse] = this.responseCache.get(request.href) + .map((entry: ResponseCacheEntry) => entry.response) + .partition((response: RestResponse) => response.isSuccessful); + + return Observable.merge( + errorResponse.flatMap((response: ErrorResponse) => + Observable.throw(new Error(`Couldn't retrieve the browses endpoint`))), + successResponse + .filter((response: BrowseSuccessResponse) => isNotEmpty(response.browseDefinitions)) + .map((response: BrowseSuccessResponse) => response.browseDefinitions) + .map((browseDefinitions: BrowseDefinition[]) => browseDefinitions + .find((def: BrowseDefinition) => { + const matchingKeys = def.metadataKeys.find((key: string) => searchKeyArray.indexOf(key) >= 0); + return isNotEmpty(matchingKeys); + }) + ).map((def: BrowseDefinition) => { + if (isEmpty(def) || isEmpty(def._links) || isEmpty(def._links[linkName])) { + throw new Error(`A browse endpoint for ${linkName} on ${metadatumKey} isn't configured`); + } else { + return def._links[linkName]; + } }) - ).filter((def: BrowseDefinition) => isNotEmpty(def) && isNotEmpty(def._links)) - .map((def: BrowseDefinition) => def._links[linkName]) - ).startWith(undefined) + ); + }).startWith(undefined) .distinctUntilChanged(); } diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts index 046250efda..2e3fc01b52 100644 --- a/src/app/core/cache/builders/remote-data-build.service.ts +++ b/src/app/core/cache/builders/remote-data-build.service.ts @@ -28,7 +28,7 @@ export class RemoteDataBuildService { buildSingle( hrefObs: string | Observable, normalizedType: GenericConstructor - ): RemoteData { + ): Observable> { if (typeof hrefObs === 'string') { hrefObs = Observable.of(hrefObs); } @@ -49,46 +49,8 @@ export class RemoteDataBuildService { requestHrefObs.flatMap((requestHref) => this.responseCache.get(requestHref)).filter((entry) => hasValue(entry)) ); - const requestPending = requestObs - .map((entry: RequestEntry) => entry.requestPending) - .startWith(true) - .distinctUntilChanged(); - - const responsePending = requestObs - .map((entry: RequestEntry) => entry.responsePending) - .startWith(false) - .distinctUntilChanged(); - - const isSuccessFul = responseCacheObs - .map((entry: ResponseCacheEntry) => entry.response.isSuccessful) - .startWith(false) - .distinctUntilChanged(); - - const errorMessage = responseCacheObs - .filter((entry: ResponseCacheEntry) => !entry.response.isSuccessful) - .map((entry: ResponseCacheEntry) => (entry.response as ErrorResponse).errorMessage) - .distinctUntilChanged(); - - const statusCode = responseCacheObs - .map((entry: ResponseCacheEntry) => entry.response.statusCode) - .distinctUntilChanged(); - - /* tslint:disable:no-string-literal */ - const pageInfo = responseCacheObs - .filter((entry: ResponseCacheEntry) => hasValue(entry.response) && hasValue(entry.response['pageInfo'])) - .map((entry: ResponseCacheEntry) => (entry.response as DSOSuccessResponse).pageInfo) - .map((pInfo: PageInfo) => { - if (isNotEmpty(pageInfo) && pInfo.currentPage >= 0) { - return Object.assign({}, pInfo, {currentPage: pInfo.currentPage + 1}); - } else { - return pInfo; - } - }) - .distinctUntilChanged(); - /* tslint:enable:no-string-literal */ - // always use self link if that is cached, only if it isn't, get it via the response. - const payload = + const payloadObs = Observable.combineLatest( hrefObs.flatMap((href: string) => this.objectCache.getBySelfLink(href, normalizedType)) .startWith(undefined), @@ -114,24 +76,53 @@ export class RemoteDataBuildService { ).filter((normalized) => hasValue(normalized)) .map((normalized: TNormalized) => { return this.build(normalized); - }).distinctUntilChanged(); + }) + .startWith(undefined) + .distinctUntilChanged(); + return this.toRemoteDataObservable(hrefObs, requestObs, responseCacheObs, payloadObs); + } - return new RemoteData( - hrefObs, - requestPending, - responsePending, - isSuccessFul, - errorMessage, - statusCode, - pageInfo, - payload - ); + private toRemoteDataObservable(hrefObs: Observable, requestObs: Observable, responseCacheObs: Observable, payloadObs: Observable) { + return Observable.combineLatest(hrefObs, requestObs, responseCacheObs.startWith(undefined), payloadObs, + (href: string, reqEntry: RequestEntry, resEntry: ResponseCacheEntry, payload: T) => { + const requestPending = hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true; + const responsePending = hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false; + let isSuccessFul: boolean; + let errorMessage: string; + let statusCode: string; + let pageInfo: PageInfo; + if (hasValue(resEntry) && hasValue(resEntry.response)) { + isSuccessFul = resEntry.response.isSuccessful; + errorMessage = isSuccessFul === false ? (resEntry.response as ErrorResponse).errorMessage : undefined; + statusCode = resEntry.response.statusCode; + + if (hasValue((resEntry.response as DSOSuccessResponse).pageInfo)) { + const resPageInfo = (resEntry.response as DSOSuccessResponse).pageInfo; + if (isNotEmpty(resPageInfo) && resPageInfo.currentPage >= 0) { + pageInfo = Object.assign({}, resPageInfo, { currentPage: resPageInfo.currentPage + 1 }); + } else { + pageInfo = resPageInfo; + } + } + } + + return new RemoteData( + href, + requestPending, + responsePending, + isSuccessFul, + errorMessage, + statusCode, + pageInfo, + payload + ); + }); } buildList( hrefObs: string | Observable, normalizedType: GenericConstructor - ): RemoteData { + ): Observable> { if (typeof hrefObs === 'string') { hrefObs = Observable.of(hrefObs); } @@ -141,38 +132,7 @@ export class RemoteDataBuildService { const responseCacheObs = hrefObs.flatMap((href: string) => this.responseCache.get(href)) .filter((entry) => hasValue(entry)); - const requestPending = requestObs - .map((entry: RequestEntry) => entry.requestPending) - .startWith(true) - .distinctUntilChanged(); - - const responsePending = requestObs - .map((entry: RequestEntry) => entry.responsePending) - .startWith(false) - .distinctUntilChanged(); - - const isSuccessFul = responseCacheObs - .map((entry: ResponseCacheEntry) => entry.response.isSuccessful) - .startWith(false) - .distinctUntilChanged(); - - const errorMessage = responseCacheObs - .filter((entry: ResponseCacheEntry) => !entry.response.isSuccessful) - .map((entry: ResponseCacheEntry) => (entry.response as ErrorResponse).errorMessage) - .distinctUntilChanged(); - - const statusCode = responseCacheObs - .map((entry: ResponseCacheEntry) => entry.response.statusCode) - .distinctUntilChanged(); - - /* tslint:disable:no-string-literal */ - const pageInfo = responseCacheObs - .filter((entry: ResponseCacheEntry) => hasValue(entry.response) && hasValue(entry.response['pageInfo'])) - .map((entry: ResponseCacheEntry) => (entry.response as DSOSuccessResponse).pageInfo) - .distinctUntilChanged(); - /* tslint:enable:no-string-literal */ - - const payload = responseCacheObs + const payloadObs = responseCacheObs .filter((entry: ResponseCacheEntry) => entry.response.isSuccessful) .map((entry: ResponseCacheEntry) => (entry.response as DSOSuccessResponse).resourceSelfLinks) .flatMap((resourceUUIDs: string[]) => { @@ -183,18 +143,10 @@ export class RemoteDataBuildService { }); }); }) + .startWith([]) .distinctUntilChanged(); - return new RemoteData( - hrefObs, - requestPending, - responsePending, - isSuccessFul, - errorMessage, - statusCode, - pageInfo, - payload - ); + return this.toRemoteDataObservable(hrefObs, requestObs, responseCacheObs, payloadObs); } build(normalized: TNormalized): TDomain { @@ -207,13 +159,9 @@ export class RemoteDataBuildService { const { resourceType, isList } = getRelationMetadata(normalized, relationship); const resourceConstructor = NormalizedObjectFactory.getConstructor(resourceType); if (Array.isArray(normalized[relationship])) { - // without the setTimeout, the actions inside requestService.configure - // are dispatched, but sometimes don't arrive. I'm unsure why atm. - setTimeout(() => { - normalized[relationship].forEach((href: string) => { - this.requestService.configure(new RestRequest(href)) - }); - }, 0); + normalized[relationship].forEach((href: string) => { + this.requestService.configure(new RestRequest(href)) + }); const rdArr = []; normalized[relationship].forEach((href: string) => { @@ -226,11 +174,7 @@ export class RemoteDataBuildService { links[relationship] = rdArr[0]; } } else { - // without the setTimeout, the actions inside requestService.configure - // are dispatched, but sometimes don't arrive. I'm unsure why atm. - setTimeout(() => { - this.requestService.configure(new RestRequest(normalized[relationship])); - }, 0); + this.requestService.configure(new RestRequest(normalized[relationship])); // The rest API can return a single URL to represent a list of resources (e.g. /items/:id/bitstreams) // in that case only 1 href will be stored in the normalized obj (so the isArray above fails), @@ -248,63 +192,55 @@ export class RemoteDataBuildService { return Object.assign(new domainModel(), normalized, links); } - aggregate(input: Array>): RemoteData { - const requestPending = Observable.combineLatest( - ...input.map((rd) => rd.isRequestPending), - ).map((...pendingArray) => pendingArray.every((e) => e === true)) - .distinctUntilChanged(); + aggregate(input: Array>>): Observable> { + return Observable.combineLatest( + ...input, + (...arr: Array>) => { + const requestPending: boolean = arr + .map((d: RemoteData) => d.isRequestPending) + .every((b: boolean) => b === true); - const responsePending = Observable.combineLatest( - ...input.map((rd) => rd.isResponsePending), - ).map((...pendingArray) => pendingArray.every((e) => e === true)) - .distinctUntilChanged(); + const responsePending: boolean = arr + .map((d: RemoteData) => d.isResponsePending) + .every((b: boolean) => b === true); - const isSuccessFul = Observable.combineLatest( - ...input.map((rd) => rd.hasSucceeded), - ).map((...successArray) => successArray.every((e) => e === true)) - .distinctUntilChanged(); + const isSuccessFul: boolean = arr + .map((d: RemoteData) => d.hasSucceeded) + .every((b: boolean) => b === true); - const errorMessage = Observable.combineLatest( - ...input.map((rd) => rd.errorMessage), - ).map((...errors) => errors - .map((e, idx) => { - if (hasValue(e)) { - return `[${idx}]: ${e}`; - } + const errorMessage: string = arr + .map((d: RemoteData) => d.errorMessage) + .map((e: string, idx: number) => { + if (hasValue(e)) { + return `[${idx}]: ${e}`; + } + }).filter((e: string) => hasValue(e)) + .join(', '); + + const statusCode: string = arr + .map((d: RemoteData) => d.statusCode) + .map((c: string, idx: number) => { + if (hasValue(c)) { + return `[${idx}]: ${c}`; + } + }).filter((c: string) => hasValue(c)) + .join(', '); + + const pageInfo = undefined; + + const payload: T[] = arr.map((d: RemoteData) => d.payload); + + return new RemoteData( + `dspace-angular://aggregated/object/${new Date().getTime()}`, + requestPending, + responsePending, + isSuccessFul, + errorMessage, + statusCode, + pageInfo, + payload + ); }) - .filter((e) => hasValue(e)) - .join(', ') - ); - - const statusCode = Observable.combineLatest( - ...input.map((rd) => rd.statusCode), - ).map((...statusCodes) => statusCodes - .map((code, idx) => { - if (hasValue(code)) { - return `[${idx}]: ${code}`; - } - }) - .filter((c) => hasValue(c)) - .join(', ') - ); - - const pageInfo = Observable.of(undefined); - - const payload = Observable.combineLatest(...input.map((rd) => rd.payload)) as Observable; - - return new RemoteData( - // This is an aggregated object, it doesn't necessarily correspond - // to a single REST endpoint, so instead of a self link, use the - // current time in ms for a somewhat unique id - Observable.of(`${new Date().getTime()}`), - requestPending, - responsePending, - isSuccessFul, - errorMessage, - statusCode, - pageInfo, - payload - ); } } diff --git a/src/app/core/cache/response-cache.service.ts b/src/app/core/cache/response-cache.service.ts index eac76c519e..d734940496 100644 --- a/src/app/core/cache/response-cache.service.ts +++ b/src/app/core/cache/response-cache.service.ts @@ -4,7 +4,7 @@ import { MemoizedSelector, Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import { ResponseCacheEntry } from './response-cache.reducer'; -import { hasNoValue } from '../../shared/empty.util'; +import { hasNoValue, hasValue } from '../../shared/empty.util'; import { ResponseCacheRemoveAction, ResponseCacheAddAction } from './response-cache.actions'; import { RestResponse } from './response-cache.models'; import { CoreState } from '../core.reducers'; diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts index f96ace4452..be7949826f 100644 --- a/src/app/core/data/comcol-data.service.spec.ts +++ b/src/app/core/data/comcol-data.service.spec.ts @@ -53,6 +53,7 @@ describe('ComColDataService', () => { const communitiesEndpoint = 'https://rest.api/core/communities'; const communityEndpoint = `${communitiesEndpoint}/${scopeID}`; const scopedEndpoint = `${communityEndpoint}/${LINK_NAME}`; + const serviceEndpoint = `https://rest.api/core/${LINK_NAME}`; function initMockCommunityDataService(): CommunityDataService { return jasmine.createSpyObj('responseCache', { @@ -102,7 +103,7 @@ describe('ComColDataService', () => { scheduler = getTestScheduler(); }); - it('should configure a new FindByIDRequest for the scope Community', (done: DoneFn) => { + it('should configure a new FindByIDRequest for the scope Community', () => { cds = initMockCommunityDataService(); requestService = initMockRequestService(); objectCache = initMockObjectCacheService(); @@ -114,10 +115,7 @@ describe('ComColDataService', () => { scheduler.schedule(() => service.getScopedEndpoint(scopeID).subscribe()); scheduler.flush(); - setTimeout(() => { - expect(requestService.configure).toHaveBeenCalledWith(expected); - done(); - }, 0); + expect(requestService.configure).toHaveBeenCalledWith(expected); }); describe('if the scope Community can be found', () => { @@ -159,5 +157,25 @@ describe('ComColDataService', () => { expect(result).toBeObservable(expected); }); }); + + describe('if the scope is not specified', () => { + beforeEach(() => { + cds = initMockCommunityDataService(); + requestService = initMockRequestService(); + objectCache = initMockObjectCacheService(); + responseCache = initMockResponceCacheService(true); + service = initTestService(); + }); + + it('should return this.getEndpoint()', () => { + spyOn(service, 'getEndpoint').and.returnValue(cold('--e-', { e: serviceEndpoint })) + + const result = service.getScopedEndpoint(undefined); + const expected = cold('--f-', { f: serviceEndpoint }); + + expect(result).toBeObservable(expected); + }); + }); + }); }); diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts index 3917499914..17d2fb313c 100644 --- a/src/app/core/data/comcol-data.service.ts +++ b/src/app/core/data/comcol-data.service.ts @@ -1,14 +1,14 @@ import { Observable } from 'rxjs/Observable'; -import { isNotEmpty } from '../../shared/empty.util'; +import { isEmpty, isNotEmpty } from '../../shared/empty.util'; import { NormalizedCommunity } from '../cache/models/normalized-community.model'; import { CacheableObject } from '../cache/object-cache.reducer'; -import { DSOSuccessResponse, RestResponse } from '../cache/response-cache.models'; +import { ObjectCacheService } from '../cache/object-cache.service'; +import { DSOSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models'; import { ResponseCacheEntry } from '../cache/response-cache.reducer'; import { CommunityDataService } from './community-data.service'; import { DataService } from './data.service'; import { FindByIDRequest } from './request.models'; -import { ObjectCacheService } from '../cache/object-cache.service'; export abstract class ComColDataService extends DataService { protected abstract cds: CommunityDataService; @@ -25,30 +25,32 @@ export abstract class ComColDataService containing the scoped URL */ public getScopedEndpoint(scopeID: string): Observable { - const scopeCommunityHrefObs = this.cds.getEndpoint() - .flatMap((endpoint: string) => this.cds.getFindByIDHref(endpoint, scopeID)) - .filter((href: string) => isNotEmpty(href)) - .take(1) - .do((href: string) => { - const request = new FindByIDRequest(href, scopeID); - setTimeout(() => { + if (isEmpty(scopeID)) { + return this.getEndpoint(); + } else { + const scopeCommunityHrefObs = this.cds.getEndpoint() + .flatMap((endpoint: string) => this.cds.getFindByIDHref(endpoint, scopeID)) + .filter((href: string) => isNotEmpty(href)) + .take(1) + .do((href: string) => { + const request = new FindByIDRequest(href, scopeID); this.requestService.configure(request); - }, 0); - }); + }); - const [successResponse, errorResponse] = scopeCommunityHrefObs - .flatMap((href: string) => this.responseCache.get(href)) - .map((entry: ResponseCacheEntry) => entry.response) - .share() - .partition((response: RestResponse) => response.isSuccessful); + const [successResponse, errorResponse] = scopeCommunityHrefObs + .flatMap((href: string) => this.responseCache.get(href)) + .map((entry: ResponseCacheEntry) => entry.response) + .share() + .partition((response: RestResponse) => response.isSuccessful); - return Observable.merge( - errorResponse.flatMap((response: DSOSuccessResponse) => - Observable.throw(new Error(`The Community with scope ${scopeID} couldn't be retrieved`))), - successResponse - .flatMap((response: DSOSuccessResponse) => this.objectCache.getByUUID(scopeID, NormalizedCommunity)) - .map((nc: NormalizedCommunity) => nc._links[this.linkName]) - .filter((href) => isNotEmpty(href)) - ).distinctUntilChanged(); + return Observable.merge( + errorResponse.flatMap((response: ErrorResponse) => + Observable.throw(new Error(`The Community with scope ${scopeID} couldn't be retrieved`))), + successResponse + .flatMap((response: DSOSuccessResponse) => this.objectCache.getByUUID(scopeID, NormalizedCommunity)) + .map((nc: NormalizedCommunity) => nc._links[this.linkName]) + .filter((href) => isNotEmpty(href)) + ).distinctUntilChanged(); + } } } diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts index ed9d84f04a..b9a729e9d4 100644 --- a/src/app/core/data/data.service.ts +++ b/src/app/core/data/data.service.ts @@ -11,6 +11,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service'; import { RemoteData } from './remote-data'; import { FindAllOptions, FindAllRequest, FindByIDRequest, RestRequest } from './request.models'; import { RequestService } from './request.service'; +import { URLCombiner } from '../url-combiner/url-combiner'; export abstract class DataService extends HALEndpointService { protected abstract responseCache: ResponseCacheService; @@ -29,11 +30,12 @@ export abstract class DataService public abstract getScopedEndpoint(scope: string): Observable protected getFindAllHref(endpoint, options: FindAllOptions = {}): Observable { - let result; + let result: Observable; const args = []; if (hasValue(options.scopeID)) { - result = this.getScopedEndpoint(options.scopeID); + result = this.getScopedEndpoint(options.scopeID).distinctUntilChanged(); + // result.take(1).subscribe((r) => console.log('result', r)); } else { result = Observable.of(endpoint); } @@ -56,22 +58,22 @@ export abstract class DataService } if (isNotEmpty(args)) { - return result.map((href: string) => `${href}?${args.join('&')}`); + return result.map((href: string) => new URLCombiner(href, `?${args.join('&')}`).toString()); } else { return result; } } - findAll(options: FindAllOptions = {}): RemoteData { - const hrefObs = this.getEndpoint() + findAll(options: FindAllOptions = {}): Observable> { + const hrefObs = this.getEndpoint().filter((href: string) => isNotEmpty(href)) .flatMap((endpoint: string) => this.getFindAllHref(endpoint, options)); hrefObs + .filter((href: string) => hasValue(href)) + .take(1) .subscribe((href: string) => { const request = new FindAllRequest(href, options); - setTimeout(() => { - this.requestService.configure(request); - }, 0); + this.requestService.configure(request); }); return this.rdbService.buildList(hrefObs, this.normalizedResourceType); @@ -81,27 +83,24 @@ export abstract class DataService return `${endpoint}/${resourceID}`; } - findById(id: string): RemoteData { + findById(id: string): Observable> { const hrefObs = this.getEndpoint() .map((endpoint: string) => this.getFindByIDHref(endpoint, id)); hrefObs + .filter((href: string) => hasValue(href)) + .take(1) .subscribe((href: string) => { const request = new FindByIDRequest(href, id); - setTimeout(() => { - this.requestService.configure(request); - }, 0); + this.requestService.configure(request); }); return this.rdbService.buildSingle(hrefObs, this.normalizedResourceType); } - findByHref(href: string): RemoteData { - setTimeout(() => { - this.requestService.configure(new RestRequest(href)); - }, 0); + findByHref(href: string): Observable> { + this.requestService.configure(new RestRequest(href)); return this.rdbService.buildSingle(href, this.normalizedResourceType); - // return this.rdbService.buildSingle(href)); } } diff --git a/src/app/core/data/remote-data.ts b/src/app/core/data/remote-data.ts index e3c7a17ef8..a832759632 100644 --- a/src/app/core/data/remote-data.ts +++ b/src/app/core/data/remote-data.ts @@ -14,57 +14,48 @@ export enum RemoteDataState { */ export class RemoteData { constructor( - public self: Observable, - private requestPending: Observable, - private responsePending: Observable, - private isSuccessFul: Observable, - public errorMessage: Observable, - public statusCode: Observable, - public pageInfo: Observable, - public payload: Observable + public self: string, + private requestPending: boolean, + private responsePending: boolean, + private isSuccessFul: boolean, + public errorMessage: string, + public statusCode: string, + public pageInfo: PageInfo, + public payload: T ) { } - get state(): Observable { - return Observable.combineLatest( - this.requestPending, - this.responsePending, - this.isSuccessFul, - (requestPending, responsePending, isSuccessFul) => { - if (requestPending) { - return RemoteDataState.RequestPending - } else if (responsePending) { - return RemoteDataState.ResponsePending - } else if (!isSuccessFul) { - return RemoteDataState.Failed - } else { - return RemoteDataState.Success - } - } - ).distinctUntilChanged(); + get state(): RemoteDataState { + if (this.isSuccessFul === true) { + return RemoteDataState.Success + } else if (this.isSuccessFul === false) { + return RemoteDataState.Failed + } else if (this.requestPending === true) { + return RemoteDataState.RequestPending + } else if (this.responsePending === true || this.isSuccessFul === undefined) { + return RemoteDataState.ResponsePending + } } - get isRequestPending(): Observable { - return this.state.map((state) => state === RemoteDataState.RequestPending).distinctUntilChanged(); + get isRequestPending(): boolean { + return this.state === RemoteDataState.RequestPending; } - get isResponsePending(): Observable { - return this.state.map((state) => state === RemoteDataState.ResponsePending).distinctUntilChanged(); + get isResponsePending(): boolean { + return this.state === RemoteDataState.ResponsePending; } - get isLoading(): Observable { - return this.state.map((state) => { - return state === RemoteDataState.RequestPending - || state === RemoteDataState.ResponsePending - }).distinctUntilChanged(); + get isLoading(): boolean { + return this.state === RemoteDataState.RequestPending + || this.state === RemoteDataState.ResponsePending; } - get hasFailed(): Observable { - return this.state.map((state) => state === RemoteDataState.Failed).distinctUntilChanged(); + get hasFailed(): boolean { + return this.state === RemoteDataState.Failed; } - get hasSucceeded(): Observable { - return this.state.map((state) => state === RemoteDataState.Success).distinctUntilChanged(); + get hasSucceeded(): boolean { + return this.state === RemoteDataState.Success; } } diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts index 4231f9efbb..6109e7b45c 100644 --- a/src/app/core/data/request.service.ts +++ b/src/app/core/data/request.service.ts @@ -22,6 +22,7 @@ function entryFromHrefSelector(href: string): MemoizedSelector hasValue(re)) + .take(1) + .subscribe((re: RequestEntry) => { + this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((pendingHref: string) => pendingHref !== href) + }); + } } diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts index 88fe174ef6..4c8775fcfb 100644 --- a/src/app/core/metadata/metadata.service.spec.ts +++ b/src/app/core/metadata/metadata.service.spec.ts @@ -31,6 +31,7 @@ import { Item } from '../../core/shared/item.model'; import { MockItem } from '../../shared/mocks/mock-item'; import { MockTranslateLoader } from '../../shared/mocks/mock-translate-loader'; import { BrowseService } from '../browse/browse.service'; +import { PageInfo } from '../shared/page-info.model'; /* tslint:disable:max-classes-per-file */ @Component({ @@ -175,33 +176,17 @@ describe('MetadataService', () => { expect(tagStore.get('description')[0].content).toEqual('This is a dummy item component for testing!'); })); - const mockRemoteData = (mockItem: Item): RemoteData => { - return new RemoteData( - Observable.create((observer) => { - observer.next(''); - }), - Observable.create((observer) => { - observer.next(false); - }), - Observable.create((observer) => { - observer.next(false); - }), - Observable.create((observer) => { - observer.next(true); - }), - Observable.create((observer) => { - observer.next(''); - }), - Observable.create((observer) => { - observer.next(200); - }), - Observable.create((observer) => { - observer.next({}); - }), - Observable.create((observer) => { - observer.next(MockItem); - }) - ); + const mockRemoteData = (mockItem: Item): Observable> => { + return Observable.of(new RemoteData( + '', + false, + false, + true, + '', + '200', + {} as PageInfo, + MockItem + )); } const mockType = (mockItem: Item, type: string): Item => { diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts index 32b002e721..39fb454ac5 100644 --- a/src/app/core/metadata/metadata.service.ts +++ b/src/app/core/metadata/metadata.service.ts @@ -25,6 +25,8 @@ import { Item } from '../shared/item.model'; import { Metadatum } from '../shared/metadatum.model'; import { GLOBAL_CONFIG, GlobalConfig } from '../../../config'; +import { BitstreamFormat } from '../shared/bitstream-format.model'; +import { hasValue } from '../../shared/empty.util'; @Injectable() export class MetadataService { @@ -64,13 +66,16 @@ export class MetadataService { }); } - public processRemoteData(remoteData: RemoteData): void { - remoteData.payload.take(1).subscribe((dspaceObject: DSpaceObject) => { - if (!this.initialized) { - this.initialize(dspaceObject); - } - this.currentObject.next(dspaceObject); - }); + public processRemoteData(remoteData: Observable>): void { + remoteData.map((rd: RemoteData) => rd.payload) + .filter((co: CacheableObject) => hasValue(co)) + .take(1) + .subscribe((dspaceObject: DSpaceObject) => { + if (!this.initialized) { + this.initialize(dspaceObject); + } + this.currentObject.next(dspaceObject); + }); } private processRouteChange(routeInfo: any): void { @@ -268,11 +273,14 @@ export class MetadataService { // taking only two, fist one is empty array item.getFiles().take(2).subscribe((bitstreams: Bitstream[]) => { for (const bitstream of bitstreams) { - bitstream.format.payload.take(1).subscribe((format) => { - if (format.mimetype === 'application/pdf') { - this.addMetaTag('citation_pdf_url', bitstream.content); - } - }); + bitstream.format.take(1) + .map((rd: RemoteData) => rd.payload) + .filter((format: BitstreamFormat) => hasValue(format)) + .subscribe((format: BitstreamFormat) => { + if (format.mimetype === 'application/pdf') { + this.addMetaTag('citation_pdf_url', bitstream.content); + } + }); } }); } diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts index 0b77a7b032..511c2c5cd2 100644 --- a/src/app/core/shared/bitstream.model.ts +++ b/src/app/core/shared/bitstream.model.ts @@ -2,6 +2,7 @@ import { DSpaceObject } from './dspace-object.model'; import { RemoteData } from '../data/remote-data'; import { Item } from './item.model'; import { BitstreamFormat } from './bitstream-format.model'; +import { Observable } from 'rxjs/Observable'; export class Bitstream extends DSpaceObject { @@ -23,17 +24,17 @@ export class Bitstream extends DSpaceObject { /** * An array of Bitstream Format of this Bitstream */ - format: RemoteData; + format: Observable>; /** * An array of Items that are direct parents of this Bitstream */ - parents: RemoteData; + parents: Observable>; /** * The Bundle that owns this Bitstream */ - owner: RemoteData; + owner: Observable>; /** * The URL to retrieve this Bitstream's file diff --git a/src/app/core/shared/bundle.model.ts b/src/app/core/shared/bundle.model.ts index 798b7c402c..9a8afb2661 100644 --- a/src/app/core/shared/bundle.model.ts +++ b/src/app/core/shared/bundle.model.ts @@ -2,23 +2,24 @@ import { DSpaceObject } from './dspace-object.model'; import { Bitstream } from './bitstream.model'; import { Item } from './item.model'; import { RemoteData } from '../data/remote-data'; +import { Observable } from 'rxjs/Observable'; export class Bundle extends DSpaceObject { /** * The primary bitstream of this Bundle */ - primaryBitstream: RemoteData; + primaryBitstream: Observable>; /** * An array of Items that are direct parents of this Bundle */ - parents: RemoteData; + parents: Observable>; /** * The Item that owns this Bundle */ - owner: RemoteData; + owner: Observable>; - bitstreams: RemoteData + bitstreams: Observable> } diff --git a/src/app/core/shared/collection.model.ts b/src/app/core/shared/collection.model.ts index 207837ef04..b2f8d90a65 100644 --- a/src/app/core/shared/collection.model.ts +++ b/src/app/core/shared/collection.model.ts @@ -2,6 +2,7 @@ import { DSpaceObject } from './dspace-object.model'; import { Bitstream } from './bitstream.model'; import { Item } from './item.model'; import { RemoteData } from '../data/remote-data'; +import { Observable } from 'rxjs/Observable'; export class Collection extends DSpaceObject { @@ -53,18 +54,18 @@ export class Collection extends DSpaceObject { /** * The Bitstream that represents the logo of this Collection */ - logo: RemoteData; + logo: Observable>; /** * An array of Collections that are direct parents of this Collection */ - parents: RemoteData; + parents: Observable>; /** * The Collection that owns this Collection */ - owner: RemoteData; + owner: Observable>; - items: RemoteData; + items: Observable>; } diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts index afe9fd734e..c34666b0f0 100644 --- a/src/app/core/shared/community.model.ts +++ b/src/app/core/shared/community.model.ts @@ -2,6 +2,7 @@ import { DSpaceObject } from './dspace-object.model'; import { Bitstream } from './bitstream.model'; import { Collection } from './collection.model'; import { RemoteData } from '../data/remote-data'; +import { Observable } from 'rxjs/Observable'; export class Community extends DSpaceObject { @@ -45,18 +46,18 @@ export class Community extends DSpaceObject { /** * The Bitstream that represents the logo of this Community */ - logo: RemoteData; + logo: Observable>; /** * An array of Communities that are direct parents of this Community */ - parents: RemoteData; + parents: Observable>; /** * The Community that owns this Community */ - owner: RemoteData; + owner: Observable>; - collections: RemoteData; + collections: Observable>; } diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts index 8584c179dc..572efecada 100644 --- a/src/app/core/shared/dspace-object.model.ts +++ b/src/app/core/shared/dspace-object.model.ts @@ -4,6 +4,7 @@ import { CacheableObject } from '../cache/object-cache.reducer'; import { RemoteData } from '../data/remote-data'; import { ResourceType } from './resource-type'; import { ListableObject } from '../../object-list/listable-object/listable-object.model'; +import { Observable } from 'rxjs/Observable'; /** * An abstract model class for a DSpaceObject. @@ -40,12 +41,12 @@ export abstract class DSpaceObject implements CacheableObject, ListableObject { /** * An array of DSpaceObjects that are direct parents of this DSpaceObject */ - parents: RemoteData; + parents: Observable>; /** * The DSpaceObject that owns this DSpaceObject */ - owner: RemoteData; + owner: Observable>; /** * Find a metadata field by key and language diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts index 8b38d39676..f7adc1eccf 100644 --- a/src/app/core/shared/hal-endpoint.service.spec.ts +++ b/src/app/core/shared/hal-endpoint.service.spec.ts @@ -51,13 +51,10 @@ describe('HALEndpointService', () => { ); }); - it('should configure a new RootEndpointRequest', (done) => { + it('should configure a new RootEndpointRequest', () => { (service as any).getEndpointMap(); const expected = new RootEndpointRequest(envConfig); - setTimeout(() => { - expect(requestService.configure).toHaveBeenCalledWith(expected); - done(); - }, 0); + expect(requestService.configure).toHaveBeenCalledWith(expected); }); it('should return an Observable of the endpoint map', () => { diff --git a/src/app/core/shared/hal-endpoint.service.ts b/src/app/core/shared/hal-endpoint.service.ts index bb5ec0134e..61f528d714 100644 --- a/src/app/core/shared/hal-endpoint.service.ts +++ b/src/app/core/shared/hal-endpoint.service.ts @@ -15,10 +15,9 @@ export abstract class HALEndpointService { protected getEndpointMap(): Observable { const request = new RootEndpointRequest(this.EnvConfig); - setTimeout(() => { - this.requestService.configure(request); - }, 0); + this.requestService.configure(request); return this.responseCache.get(request.href) + // .do((entry: ResponseCacheEntry) => console.log('entry.response', entry.response)) .map((entry: ResponseCacheEntry) => entry.response) .filter((response: RootSuccessResponse) => isNotEmpty(response) && isNotEmpty(response.endpointMap)) .map((response: RootSuccessResponse) => response.endpointMap) diff --git a/src/app/core/shared/item.model.spec.ts b/src/app/core/shared/item.model.spec.ts index 0c89828c9e..1e962f7038 100644 --- a/src/app/core/shared/item.model.spec.ts +++ b/src/app/core/shared/item.model.spec.ts @@ -103,23 +103,15 @@ describe('Item', () => { }); function createRemoteDataObject(object: any) { - const self = Observable.of(''); - const requestPending = Observable.of(false); - const responsePending = Observable.of(false); - const isSuccessful = Observable.of(true); - const errorMessage = Observable.of(undefined); - const statusCode = Observable.of('200'); - const pageInfo = Observable.of(new PageInfo()); - const payload = Observable.of(object); - return new RemoteData( - self, - requestPending, - responsePending, - isSuccessful, - errorMessage, - statusCode, - pageInfo, - payload - ); + return Observable.of(new RemoteData( + '', + false, + false, + true, + undefined, + '200', + new PageInfo(), + object + )); } diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts index 16cce9b610..dd60ad9b01 100644 --- a/src/app/core/shared/item.model.ts +++ b/src/app/core/shared/item.model.ts @@ -4,7 +4,7 @@ import { DSpaceObject } from './dspace-object.model'; import { Collection } from './collection.model'; import { RemoteData } from '../data/remote-data'; import { Bitstream } from './bitstream.model'; -import { isNotEmpty } from '../../shared/empty.util'; +import { hasValue, isNotEmpty } from '../../shared/empty.util'; export class Item extends DSpaceObject { @@ -36,18 +36,18 @@ export class Item extends DSpaceObject { /** * An array of Collections that are direct parents of this Item */ - parents: RemoteData; + parents: Observable>; /** * The Collection that owns this Item */ - owningCollection: RemoteData; + owningCollection: Observable>; - get owner(): RemoteData { + get owner(): Observable> { return this.owningCollection; } - bitstreams: RemoteData; + bitstreams: Observable>; /** * Retrieves the thumbnail of this item @@ -87,9 +87,14 @@ export class Item extends DSpaceObject { * @returns {Observable} the bitstreams with the given bundleName */ getBitstreamsByBundleName(bundleName: string): Observable { - return this.bitstreams.payload.startWith([]) + return this.bitstreams + .map((rd: RemoteData) => rd.payload) + .filter((bitstreams: Bitstream[]) => hasValue(bitstreams)) + .startWith([]) .map((bitstreams) => { - return bitstreams.filter((bitstream) => bitstream.bundleName === bundleName) + return bitstreams + .filter((bitstream) => hasValue(bitstream)) + .filter((bitstream) => bitstream.bundleName === bundleName) }); } diff --git a/src/app/object-list/object-list.component.html b/src/app/object-list/object-list.component.html index 84c800fef4..71f0b0e26c 100644 --- a/src/app/object-list/object-list.component.html +++ b/src/app/object-list/object-list.component.html @@ -1,7 +1,7 @@ -
    -
  • +
      +
    - - diff --git a/src/app/object-list/object-list.component.ts b/src/app/object-list/object-list.component.ts index 3a746c32e9..0f7decadd7 100644 --- a/src/app/object-list/object-list.component.ts +++ b/src/app/object-list/object-list.component.ts @@ -1,18 +1,12 @@ import { ChangeDetectionStrategy, - ChangeDetectorRef, Component, EventEmitter, Input, - OnChanges, - OnInit, Output, - SimpleChanges, ViewEncapsulation } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; - import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model'; import { RemoteData } from '../core/data/remote-data'; @@ -20,6 +14,7 @@ import { PageInfo } from '../core/shared/page-info.model'; import { ListableObject } from '../object-list/listable-object/listable-object.model'; import { fadeIn } from '../shared/animations/fade'; +import { hasValue } from '../shared/empty.util'; import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model'; @@ -31,14 +26,35 @@ import { PaginationComponentOptions } from '../shared/pagination/pagination-comp templateUrl: './object-list.component.html', animations: [fadeIn] }) -export class ObjectListComponent implements OnChanges, OnInit { +export class ObjectListComponent { - @Input() objects: RemoteData; @Input() config: PaginationComponentOptions; @Input() sortConfig: SortOptions; @Input() hideGear = false; @Input() hidePagerWhenSinglePage = true; - pageInfo: Observable; + private _objects: RemoteData; + pageInfo: PageInfo; + @Input() set objects(objects: RemoteData) { + this._objects = objects; + if (hasValue(objects)) { + this.pageInfo = objects.pageInfo; + } + } + get objects() { + return this._objects; + } + + /** + * An event fired when the page is changed. + * Event's payload equals to the newly selected page. + */ + @Output() change: EventEmitter<{ + pagination: PaginationComponentOptions, + sort: SortOptions + }> = new EventEmitter<{ + pagination: PaginationComponentOptions, + sort: SortOptions + }>(); /** * An event fired when the page is changed. @@ -67,26 +83,6 @@ export class ObjectListComponent implements OnChanges, OnInit { @Output() sortFieldChange: EventEmitter = new EventEmitter(); data: any = {}; - ngOnChanges(changes: SimpleChanges) { - if (changes.objects && !changes.objects.isFirstChange()) { - this.pageInfo = this.objects.pageInfo; - } - } - - ngOnInit(): void { - this.pageInfo = this.objects.pageInfo; - } - - /** - * @param route - * Route is a singleton service provided by Angular. - * @param router - * Router is a singleton service provided by Angular. - */ - constructor( - private cdRef: ChangeDetectorRef) { - } - onPageChange(event) { this.pageChange.emit(event); } diff --git a/src/app/pagenotfound/pagenotfound.component.ts b/src/app/pagenotfound/pagenotfound.component.ts index 762a4000a1..bd119a4de9 100644 --- a/src/app/pagenotfound/pagenotfound.component.ts +++ b/src/app/pagenotfound/pagenotfound.component.ts @@ -5,7 +5,7 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; selector: 'ds-pagenotfound', styleUrls: ['./pagenotfound.component.scss'], templateUrl: './pagenotfound.component.html', - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.Default }) export class PageNotFoundComponent { constructor(responseService: ServerResponseService) { diff --git a/src/app/shared/mocks/mock-item.ts b/src/app/shared/mocks/mock-item.ts index 0331491aa0..6b34a31888 100644 --- a/src/app/shared/mocks/mock-item.ts +++ b/src/app/shared/mocks/mock-item.ts @@ -9,141 +9,87 @@ export const MockItem: Item = Object.assign(new Item(), { isArchived: true, isDiscoverable: true, isWithdrawn: false, - bitstreams: { - self: { - _isScalar: true, - value: '1507836003548', - scheduler: null - }, - requestPending: Observable.create((observer) => { - observer.next(false); - }), - responsePending: Observable.create((observer) => { - observer.next(false); - }), - isSuccessFul: Observable.create((observer) => { - observer.next(true); - }), - errorMessage: Observable.create((observer) => { - observer.next(''); - }), - statusCode: Observable.create((observer) => { - observer.next(202); - }), - pageInfo: Observable.create((observer) => { - observer.next({}); - }), - payload: Observable.create((observer) => { - observer.next([ - { - sizeBytes: 10201, - content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content', - format: { - self: { - _isScalar: true, - value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10', - scheduler: null - }, - requestPending: Observable.create((observer) => { - observer.next(false); - }), - responsePending: Observable.create((observer) => { - observer.next(false); - }), - isSuccessFul: Observable.create((observer) => { - observer.next(true); - }), - errorMessage: Observable.create((observer) => { - observer.next(''); - }), - statusCode: Observable.create((observer) => { - observer.next(202); - }), - pageInfo: Observable.create((observer) => { - observer.next({}); - }), - payload: Observable.create((observer) => { - observer.next({ - shortDescription: 'Microsoft Word XML', - description: 'Microsoft Word XML', - mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - supportLevel: 0, - internal: false, - extensions: null, - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10' - }); - }) - }, - bundleName: 'ORIGINAL', - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713', - id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713', - uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713', - type: 'bitstream', - name: 'test_word.docx', - metadata: [ - { - key: 'dc.title', - language: null, - value: 'test_word.docx' - } - ] - }, - { - sizeBytes: 31302, - content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content', - format: { - self: { - _isScalar: true, - value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4', - scheduler: null - }, - requestPending: Observable.create((observer) => { - observer.next(false); - }), - responsePending: Observable.create((observer) => { - observer.next(false); - }), - isSuccessFul: Observable.create((observer) => { - observer.next(true); - }), - errorMessage: Observable.create((observer) => { - observer.next(''); - }), - statusCode: Observable.create((observer) => { - observer.next(202); - }), - pageInfo: Observable.create((observer) => { - observer.next({}); - }), - payload: Observable.create((observer) => { - observer.next({ - shortDescription: 'Adobe PDF', - description: 'Adobe Portable Document Format', - mimetype: 'application/pdf', - supportLevel: 0, - internal: false, - extensions: null, - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4' - }); - }) - }, - bundleName: 'ORIGINAL', - self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28', - id: '99b00f3c-1cc6-4689-8158-91965bee6b28', - uuid: '99b00f3c-1cc6-4689-8158-91965bee6b28', - type: 'bitstream', - name: 'test_pdf.pdf', - metadata: [ - { - key: 'dc.title', - language: null, - value: 'test_pdf.pdf' - } - ] - } - ]); - }) - }, + bitstreams: Observable.of({ + self: 'dspace-angular://aggregated/object/1507836003548', + requestPending: false, + responsePending: false, + isSuccessFul: true, + errorMessage: '', + statusCode: '202', + pageInfo: {}, + payload: [ + { + sizeBytes: 10201, + content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content', + format: Observable.of({ + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10', + requestPending: false, + responsePending: false, + isSuccessFul: true, + errorMessage: '', + statusCode: '202', + pageInfo: {}, + payload: { + shortDescription: 'Microsoft Word XML', + description: 'Microsoft Word XML', + mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + supportLevel: 0, + internal: false, + extensions: null, + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10' + } + }), + bundleName: 'ORIGINAL', + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713', + id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713', + uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713', + type: 'bitstream', + name: 'test_word.docx', + metadata: [ + { + key: 'dc.title', + language: null, + value: 'test_word.docx' + } + ] + }, + { + sizeBytes: 31302, + content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content', + format: Observable.of({ + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4', + requestPending: false, + responsePending: false, + isSuccessFul: true, + errorMessage: '', + statusCode: '202', + pageInfo: {}, + payload: { + shortDescription: 'Adobe PDF', + description: 'Adobe Portable Document Format', + mimetype: 'application/pdf', + supportLevel: 0, + internal: false, + extensions: null, + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4' + } + }), + bundleName: 'ORIGINAL', + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28', + id: '99b00f3c-1cc6-4689-8158-91965bee6b28', + uuid: '99b00f3c-1cc6-4689-8158-91965bee6b28', + type: 'bitstream', + name: 'test_pdf.pdf', + metadata: [ + { + key: 'dc.title', + language: null, + value: 'test_pdf.pdf' + } + ] + } + ] + }), self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357', id: '0ec7ff22-f211-40ab-a69e-c819b0b1f357', uuid: '0ec7ff22-f211-40ab-a69e-c819b0b1f357', @@ -241,33 +187,15 @@ export const MockItem: Item = Object.assign(new Item(), { value: 'text' } ], - owningCollection: { - self: { - _isScalar: true, - value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb', - scheduler: null - }, - requestPending: Observable.create((observer) => { - observer.next(false); - }), - responsePending: Observable.create((observer) => { - observer.next(false); - }), - isSuccessFul: Observable.create((observer) => { - observer.next(true); - }), - errorMessage: Observable.create((observer) => { - observer.next(''); - }), - statusCode: Observable.create((observer) => { - observer.next(202); - }), - pageInfo: Observable.create((observer) => { - observer.next({}); - }), - payload: Observable.create((observer) => { - observer.next([]); - }) - } -}) + owningCollection: Observable.of({ + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb', + requestPending: false, + responsePending: false, + isSuccessFul: true, + errorMessage: '', + statusCode: '202', + pageInfo: {}, + payload: [] + } + )}); /* tslint:enable:no-shadowed-variable */ diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html index dfdc20024a..18469f686a 100644 --- a/src/app/shared/search-form/search-form.component.html +++ b/src/app/shared/search-form/search-form.component.html @@ -1,11 +1,11 @@
    -
    +
    -
    +
    diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts index 0da50658a5..ee1a8cd8f5 100644 --- a/src/app/shared/search-form/search-form.component.spec.ts +++ b/src/app/shared/search-form/search-form.component.spec.ts @@ -8,6 +8,7 @@ import { ResourceType } from '../../core/shared/resource-type'; import { RouterTestingModule } from '@angular/router/testing'; import { Community } from '../../core/shared/community.model'; import { TranslateModule } from '@ngx-translate/core'; +import { DSpaceObject } from '../../core/shared/dspace-object.model'; describe('SearchFormComponent', () => { let comp: SearchFormComponent; @@ -30,7 +31,7 @@ describe('SearchFormComponent', () => { }); it('should display scopes when available with default and all scopes', () => { - comp.scopes = Observable.of(objects); + comp.scopes = objects; fixture.detectChanges(); const select: HTMLElement = de.query(By.css('select')).nativeElement; expect(select).toBeDefined(); @@ -64,7 +65,7 @@ describe('SearchFormComponent', () => { })); it('should select correct scope option in scope select', fakeAsync(() => { - comp.scopes = Observable.of(objects); + comp.scopes = objects; fixture.detectChanges(); const testCommunity = objects[1]; @@ -100,7 +101,7 @@ describe('SearchFormComponent', () => { // })); }); -export const objects = [ +export const objects: DSpaceObject[] = [ Object.assign(new Community(), { handle: '10673/11', logo: { diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts index a30e0f0745..76b33a8fd6 100644 --- a/src/app/shared/search-form/search-form.component.ts +++ b/src/app/shared/search-form/search-form.component.ts @@ -20,7 +20,7 @@ export class SearchFormComponent { selectedId = ''; // Optional existing search parameters @Input() currentParams: {}; - @Input() scopes: Observable; + @Input() scopes: DSpaceObject[]; @Input() set scope(dso: DSpaceObject) {