upgrade to angular 6

src/app/+item-page/full/full-item-page.component.spec.ts

@@ -14,12 +14,12 @@ import { Item } from '../../core/shared/item.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { RemoteData } from '../../core/data/remote-data';
-import { Observable } from 'rxjs/Observable';
+import { of as observableOf } from 'rxjs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'dc.title',
@@ -28,7 +28,7 @@ const mockItem: Item = Object.assign(new Item(), {
     }]
 });
 const routeStub = Object.assign(new ActivatedRouteStub(), {
-  data: Observable.of({ item: new RemoteData(false, false, true, null, mockItem) })
+  data: observableOf({ item: new RemoteData(false, false, true, null, mockItem) })
 });
 const metadataServiceStub = {
   /* tslint:disable:no-empty */

src/app/+item-page/full/full-item-page.component.ts

@@ -2,7 +2,7 @@ import {filter, map} from 'rxjs/operators';
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { Observable } from 'rxjs';
+import { Observable ,  BehaviorSubject } from 'rxjs';
 
 import { ItemPageComponent } from '../simple/item-page.component';
 import { Metadatum } from '../../core/shared/metadatum.model';
@@ -15,7 +15,6 @@ import { MetadataService } from '../../core/metadata/metadata.service';
 
 import { fadeInOut } from '../../shared/animations/fade';
 import { hasValue } from '../../shared/empty.util';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 /**
  * This component renders a simple item page.

src/app/+item-page/simple/entity-types/journal-issue/journal-issue.component.spec.ts

@@ -1,13 +1,14 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { createRelationshipsObservable, getEntityPageFieldsTest } from '../shared/entity.component.spec';
 import { JournalIssueComponent } from './journal-issue.component';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'journalissue.identifier.number',

src/app/+item-page/simple/entity-types/journal-issue/journal-issue.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { rendersEntityType } from '../../../../shared/entities/entity-type-decorator';

src/app/+item-page/simple/entity-types/journal-volume/journal-volume.component.spec.ts

@@ -1,13 +1,14 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { createRelationshipsObservable, getEntityPageFieldsTest } from '../shared/entity.component.spec';
 import { JournalVolumeComponent } from './journal-volume.component';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'journalvolume.identifier.volume',

src/app/+item-page/simple/entity-types/journal-volume/journal-volume.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { rendersEntityType } from '../../../../shared/entities/entity-type-decorator';

src/app/+item-page/simple/entity-types/journal/journal.component.spec.ts

@@ -4,7 +4,7 @@ import { TruncatableService } from '../../../../shared/truncatable/truncatable.s
 import { ITEM } from '../../../../shared/entities/switcher/entity-type-switcher.component';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { By } from '@angular/platform-browser';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
@@ -15,12 +15,13 @@ import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { JournalComponent } from './journal.component';
+import { of as observableOf } from 'rxjs';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'journal.identifier.issn',

src/app/+item-page/simple/entity-types/journal/journal.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { rendersEntityType } from '../../../../shared/entities/entity-type-decorator';

src/app/+item-page/simple/entity-types/orgunit/orgunit.component.spec.ts

@@ -1,13 +1,14 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { createRelationshipsObservable, getEntityPageFieldsTest } from '../shared/entity.component.spec';
 import { OrgunitComponent } from './orgunit.component';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'orgunit.identifier.dateestablished',

src/app/+item-page/simple/entity-types/orgunit/orgunit.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { rendersEntityType } from '../../../../shared/entities/entity-type-decorator';

src/app/+item-page/simple/entity-types/person/person.component.spec.ts

@@ -1,13 +1,14 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { createRelationshipsObservable, getEntityPageFieldsTest } from '../shared/entity.component.spec';
 import { PersonComponent } from './person.component';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'person.identifier.email',

src/app/+item-page/simple/entity-types/person/person.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable ,  of as observableOf } from 'rxjs';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { rendersEntityType } from '../../../../shared/entities/entity-type-decorator';
@@ -71,7 +71,7 @@ export class PersonComponent extends EntityComponent {
       );
 
       this.fixedFilterQuery = this.fixedFilterService.getQueryByRelations('isAuthorOfPublication', this.item.id);
-      this.fixedFilter$ = Observable.of('publication');
+      this.fixedFilter$ = observableOf('publication');
     }
   }
 }

src/app/+item-page/simple/entity-types/project/project.component.spec.ts

@@ -1,13 +1,14 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { createRelationshipsObservable, getEntityPageFieldsTest } from '../shared/entity.component.spec';
 import { ProjectComponent } from './project.component';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'project.identifier.status',

src/app/+item-page/simple/entity-types/project/project.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { rendersEntityType } from '../../../../shared/entities/entity-type-decorator';

src/app/+item-page/simple/entity-types/publication/publication.component.spec.ts

@@ -9,16 +9,17 @@ import { SearchFixedFilterService } from '../../../../+search-page/search-filter
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from '../shared/entity.component.spec';
 import { PublicationComponent } from './publication.component';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [],
   relationships: createRelationshipsObservable()
 });

src/app/+item-page/simple/entity-types/publication/publication.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import {

src/app/+item-page/simple/entity-types/shared/entity.component.spec.ts

@@ -15,9 +15,10 @@ import { RelationshipType } from '../../../../core/shared/entities/relationship-
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Relationship } from '../../../../core/shared/entities/relationship.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { compareArraysUsing, compareArraysUsingIds } from './entity.component';
+import { of as observableOf } from 'rxjs';
 
 /**
  * Create a generic test for an entity-page-fields component using a mockItem and the type of component
@@ -94,9 +95,9 @@ export function containsFieldInput(fields: DebugElement[], metadataKey: string):
 }
 
 export function createRelationshipsObservable() {
-  return Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [
+  return observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [
     Object.assign(new Relationship(), {
-      relationshipType: Observable.of(new RemoteData(false, false, true, null, new RelationshipType()))
+      relationshipType: observableOf(new RemoteData(false, false, true, null, new RelationshipType()))
     })
   ])));
 }

src/app/+item-page/simple/entity-types/shared/entity.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable ,  zip as observableZip, combineLatest as observableCombineLatest } from 'rxjs';
 import { distinctUntilChanged, filter, flatMap, map } from 'rxjs/operators';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { PaginatedList } from '../../../../core/data/paginated-list';
@@ -65,7 +65,7 @@ export const relationsToItems = (thisId: string, ids: ItemDataService) =>
   (source: Observable<Relationship[]>): Observable<Item[]> =>
     source.pipe(
       flatMap((rels: Relationship[]) =>
-        Observable.zip(
+        observableZip(
           ...rels.map((rel: Relationship) => {
             let queryId = rel.leftId;
             if (rel.leftId === thisId) {
@@ -111,16 +111,14 @@ export class EntityComponent implements OnInit {
 
       const relTypesCurrentPage$ = relsCurrentPage$.pipe(
         flatMap((rels: Relationship[]) =>
-          Observable.zip(
-            ...rels.map((rel: Relationship) => rel.relationshipType),
-            (...arr: Array<RemoteData<RelationshipType>>) =>
-              arr.map((d: RemoteData<RelationshipType>) => d.payload)
+          observableZip(...rels.map((rel: Relationship) => rel.relationshipType)).pipe(
+            map(([...arr]: Array<RemoteData<RelationshipType>>) => arr.map((d: RemoteData<RelationshipType>) => d.payload))
           )
         ),
         distinctUntilChanged(compareArraysUsingIds())
       );
 
-      this.resolvedRelsAndTypes$ = Observable.combineLatest(
+      this.resolvedRelsAndTypes$ = observableCombineLatest(
         relsCurrentPage$,
         relTypesCurrentPage$
       );

src/app/+item-page/simple/field-components/specific-field/item-page-field.component.spec.ts

@@ -4,11 +4,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Item } from '../../../../core/shared/item.model';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { MockTranslateLoader } from '../../../../shared/mocks/mock-translate-loader';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { ItemPageFieldComponent } from './item-page-field.component';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
+import { of as observableOf } from 'rxjs';
 
 let comp: ItemPageFieldComponent;
 let fixture: ComponentFixture<ItemPageFieldComponent>;
@@ -50,7 +51,7 @@ describe('ItemPageFieldComponent', () => {
 
 export function mockItemWithMetadataFieldAndValue(field: string, value: string): Item {
   return Object.assign(new Item(), {
-    bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+    bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
     metadata: [
       {
         key: field,

src/app/+item-page/simple/item-page.component.spec.ts

@@ -8,7 +8,7 @@ import { ActivatedRoute } from '@angular/router';
 import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
 import { MetadataService } from '../../core/metadata/metadata.service';
 import { VarDirective } from '../../shared/utils/var.directive';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
 import { PaginatedList } from '../../core/data/paginated-list';
@@ -16,9 +16,10 @@ import { PageInfo } from '../../core/shared/page-info.model';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from './entity-types/shared/entity.component.spec';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [],
   relationships: createRelationshipsObservable()
 });
@@ -33,7 +34,7 @@ describe('ItemPageComponent', () => {
     /* tslint:enable:no-empty */
   };
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: Observable.of({ item: new RemoteData(false, false, true, null, mockItem) })
+    data: observableOf({ item: new RemoteData(false, false, true, null, mockItem) })
   });
 
   beforeEach(async(() => {
@@ -65,7 +66,7 @@ describe('ItemPageComponent', () => {
 
   describe('when the item is loading', () => {
     beforeEach(() => {
-      comp.itemRD$ = Observable.of(new RemoteData(true, true, true, null, undefined));
+      comp.itemRD$ = observableOf(new RemoteData(true, true, true, null, undefined));
       fixture.detectChanges();
     });
 
@@ -77,7 +78,7 @@ describe('ItemPageComponent', () => {
 
   describe('when the item failed loading', () => {
     beforeEach(() => {
-      comp.itemRD$ = Observable.of(new RemoteData(false, false, false, null, undefined));
+      comp.itemRD$ = observableOf(new RemoteData(false, false, false, null, undefined));
       fixture.detectChanges();
     });
 

src/app/+item-page/simple/related-entities/related-entities.component.spec.ts

@@ -2,20 +2,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { RelatedEntitiesComponent } from './related-entities-component';
 import { Item } from '../../../core/shared/item.model';
-import { Observable } from 'rxjs/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from '../entity-types/shared/entity.component.spec';
+import { of as observableOf } from 'rxjs';
 
 const mockItem1: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [],
   relationships: createRelationshipsObservable()
 });
 const mockItem2: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [],
   relationships: createRelationshipsObservable()
 });

src/app/+search-page/filtered-search-page.component.ts

@@ -7,7 +7,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 import { pushInOut } from '../shared/animations/push';
 import { RouteService } from '../shared/services/route.service';
 import { SearchConfigurationService } from './search-service/search-configuration.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PaginatedSearchOptions } from './paginated-search-options.model';
 
 /**

src/app/+search-page/filtered-search-page.guard.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 @Injectable()
 

src/app/+search-page/search-filters/search-filter/search-filter.service.ts

@@ -1,6 +1,6 @@
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { mergeMap, map, distinctUntilChanged } from 'rxjs/operators';
 import { Injectable, InjectionToken } from '@angular/core';
-import { map, distinctUntilChanged } from 'rxjs/operators';
 import { SearchFiltersState, SearchFilterState } from './search-filter.reducer';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import {
@@ -82,12 +82,12 @@ export class SearchFilterService {
   getCurrentPagination(pagination: any = {}): Observable<PaginationComponentOptions> {
     const page$ = this.routeService.getQueryParameterValue('page');
     const size$ = this.routeService.getQueryParameterValue('pageSize');
-    return Observable.combineLatest(page$, size$, (page, size) => {
+    return observableCombineLatest(page$, size$).pipe(map(([page, size]) => {
       return Object.assign(new PaginationComponentOptions(), pagination, {
         currentPage: page || 1,
         pageSize: size || pagination.pageSize
       });
-    });
+    }))
   }
 
   /**
@@ -99,12 +99,12 @@ export class SearchFilterService {
   getCurrentSort(defaultSort: SortOptions): Observable<SortOptions> {
     const sortDirection$ = this.routeService.getQueryParameterValue('sortDirection');
     const sortField$ = this.routeService.getQueryParameterValue('sortField');
-    return Observable.combineLatest(sortDirection$, sortField$, (sortDirection, sortField) => {
+    return observableCombineLatest(sortDirection$, sortField$).pipe(map(([sortDirection, sortField]) => {
         const field = sortField || defaultSort.field;
         const direction = SortDirection[sortDirection] || defaultSort.direction;
         return new SortOptions(field, direction)
       }
-    );
+    ))
   }
 
   /**
@@ -121,7 +121,7 @@ export class SearchFilterService {
    */
   getCurrentFixedFilter(): Observable<string> {
     const filter: Observable<string> = this.routeService.getRouteParameterValue('filter');
-    return filter.flatMap((f) => this.fixedFilterService.getQueryByFilterName(f));
+    return filter.pipe(mergeMap((f) => this.fixedFilterService.getQueryByFilterName(f)));
   }
 
   /**
@@ -139,7 +139,7 @@ export class SearchFilterService {
    * @returns {Observable<PaginatedSearchOptions>}
    */
   getPaginatedSearchOptions(defaults: any = {}): Observable<PaginatedSearchOptions> {
-    return Observable.combineLatest(
+    return observableCombineLatest(
       this.getCurrentPagination(defaults.pagination),
       this.getCurrentSort(defaults.sort),
       this.getCurrentView(),
@@ -170,7 +170,7 @@ export class SearchFilterService {
    * @returns {Observable<SearchOptions>}
    */
   getSearchOptions(defaults: any = {}): Observable<SearchOptions> {
-    return Observable.combineLatest(
+    return observableCombineLatest(
       this.getCurrentView(),
       this.getCurrentScope(),
       this.getCurrentQuery(),

src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts

@@ -6,7 +6,7 @@ import { ResponseCacheService } from '../../../core/cache/response-cache.service
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { FilteredDiscoveryQueryResponse } from '../../../core/cache/response-cache.models';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { Observable } from 'rxjs/Observable';
+import { of as observableOf } from 'rxjs';
 
 describe('SearchFixedFilterService', () => {
   let service: SearchFixedFilterService;
@@ -21,12 +21,12 @@ describe('SearchFixedFilterService', () => {
     generateRequestId: () => 'fake-id'
   }) as RequestService;
   const responseCacheStub = Object.assign(new ResponseCacheService(undefined), {
-    get: () => Observable.of(Object.assign(new ResponseCacheEntry(), {
+    get: () => observableOf(Object.assign(new ResponseCacheEntry(), {
       response: new FilteredDiscoveryQueryResponse(filterQuery, '200', new PageInfo())
     }))
   });
   const halServiceStub = Object.assign(new HALEndpointService(responseCacheStub, requestServiceStub, undefined), {
-    getEndpoint: () => Observable.of('fake-url')
+    getEndpoint: () => observableOf('fake-url')
   });
 
   beforeEach(() => {

src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { flatMap, map } from 'rxjs/operators';
-import { Observable } from 'rxjs/Observable';
+import { Observable ,  of as observableOf } from 'rxjs';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
 import { GetRequest, RestRequest } from '../../../core/data/request.models';
 import { FilteredDiscoveryQueryResponse } from '../../../core/cache/response-cache.models';
@@ -61,7 +61,7 @@ export class SearchFixedFilterService {
 
       return filterQuery;
     }
-    return Observable.of(undefined);
+    return observableOf(undefined);
   }
 
   /**

src/app/+search-page/search-page.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable ,  Subscription ,  BehaviorSubject } from 'rxjs';
 import { switchMap, } from 'rxjs/operators';
 import { PaginatedList } from '../core/data/paginated-list';
 import { RemoteData } from '../core/data/remote-data';
@@ -11,9 +11,7 @@ import { SearchFilterService } from './search-filters/search-filter/search-filte
 import { SearchResult } from './search-result.model';
 import { SearchService } from './search-service/search.service';
 import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
-import { Subscription } from 'rxjs/Subscription';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { SearchConfigurationService } from './search-service/search-configuration.service';
 import { getSucceededRemoteData } from '../core/shared/operators';
 import { RouteService } from '../shared/services/route.service';

src/app/core/cache/builders/remote-data-build.service.ts

@@ -5,8 +5,7 @@ import {
   race as observableRace
 } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { distinctUntilChanged, filter, flatMap, map, startWith, switchMap } from 'rxjs/operators';
+import { distinctUntilChanged, flatMap, map, startWith } from 'rxjs/operators';
 import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../../shared/empty.util';
 import { PaginatedList } from '../../data/paginated-list';
 import { RemoteData } from '../../data/remote-data';

src/app/core/data/request.service.spec.ts

@@ -22,7 +22,7 @@ import {
 import { RequestService } from './request.service';
 import { ActionsSubject, Store } from '@ngrx/store';
 import { TestScheduler } from 'rxjs/testing';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 
 describe('RequestService', () => {
   let scheduler: TestScheduler;

src/app/core/shared/entities/relationship-type.model.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { CacheableObject } from '../../cache/object-cache.reducer';
 import { RemoteData } from '../../data/remote-data';
 import { ResourceType } from '../resource-type';

src/app/core/shared/entities/relationship.model.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { CacheableObject } from '../../cache/object-cache.reducer';
 import { RemoteData } from '../../data/remote-data';
 import { ResourceType } from '../resource-type';

src/app/core/shared/item.model.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { filter, map, startWith, tap } from 'rxjs/operators';
 
 import { DSpaceObject } from './dspace-object.model';

src/app/shared/entities/switcher/entity-type-switcher.component.spec.ts

@@ -1,7 +1,7 @@
 import { EntityTypeSwitcherComponent } from './entity-type-switcher.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { Item } from '../../../core/shared/item.model';
 import { PaginatedList } from '../../../core/data/paginated-list';
@@ -9,10 +9,11 @@ import { RemoteData } from '../../../core/data/remote-data';
 import * as decorator from '../entity-type-decorator';
 import { ElementViewMode } from '../../view-mode';
 import { getComponentByEntityType } from '../entity-type-decorator';
+import { of as observableOf } from 'rxjs';
 
 const relationType = 'type';
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/form/form.component.spec.ts

@@ -23,7 +23,7 @@ import { MockStore } from '../testing/mock-store';
 import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model';
 import { GLOBAL_CONFIG } from '../../../config';
 import { createTestComponent } from '../testing/utils';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 
 let TEST_FORM_MODEL;
 

src/app/shared/object-list/item-list-element/entity-list-element.component.spec.ts

@@ -2,15 +2,16 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { EntityListElementComponent } from './entity-list-element.component';
 import { Item } from '../../../core/shared/item.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { By } from '@angular/platform-browser';
 import { createRelationshipsObservable } from '../../../+item-page/simple/entity-types/shared/entity.component.spec';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [],
   relationships: createRelationshipsObservable()
 });

src/app/shared/object-list/item-list-element/entity-types/entity-search-result.component.spec.ts

@@ -4,16 +4,17 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { EntitySearchResultComponent } from './entity-search-result-component';
 import { Item } from '../../../../core/shared/item.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { ITEM } from '../../../entities/switcher/entity-type-switcher.component';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { createRelationshipsObservable } from '../../../../+item-page/simple/entity-types/shared/entity.component.spec';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [],
   relationships: createRelationshipsObservable()
 });

src/app/shared/object-list/item-list-element/entity-types/journal-issue/journal-issue-list-element.component.spec.ts

@@ -1,18 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ITEM } from '../../../../entities/switcher/entity-type-switcher.component';
 import { JournalIssueListElementComponent } from './journal-issue-list-element.component';
+import { of as observableOf } from 'rxjs';
 
 let journalIssueListElementComponent: JournalIssueListElementComponent;
 let fixture: ComponentFixture<JournalIssueListElementComponent>;
 
 const mockItemWithMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',
@@ -31,7 +32,7 @@ const mockItemWithMetadata: Item = Object.assign(new Item(), {
     }]
 });
 const mockItemWithoutMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/object-list/item-list-element/entity-types/journal-volume/journal-volume-list-element.component.spec.ts

@@ -1,18 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ITEM } from '../../../../entities/switcher/entity-type-switcher.component';
 import { JournalVolumeListElementComponent } from './journal-volume-list-element.component';
+import { of as observableOf } from 'rxjs';
 
 let journalVolumeListElementComponent: JournalVolumeListElementComponent;
 let fixture: ComponentFixture<JournalVolumeListElementComponent>;
 
 const mockItemWithMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',
@@ -31,7 +32,7 @@ const mockItemWithMetadata: Item = Object.assign(new Item(), {
     }]
 });
 const mockItemWithoutMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/object-list/item-list-element/entity-types/journal/journal-list-element.component.spec.ts

@@ -1,18 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ITEM } from '../../../../entities/switcher/entity-type-switcher.component';
 import { JournalListElementComponent } from './journal-list-element.component';
+import { of as observableOf } from 'rxjs';
 
 let journalListElementComponent: JournalListElementComponent;
 let fixture: ComponentFixture<JournalListElementComponent>;
 
 const mockItemWithMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',
@@ -26,7 +27,7 @@ const mockItemWithMetadata: Item = Object.assign(new Item(), {
     }]
 });
 const mockItemWithoutMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/object-list/item-list-element/entity-types/orgunit/orgunit-list-element.component.spec.ts

@@ -1,18 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ITEM } from '../../../../entities/switcher/entity-type-switcher.component';
 import { OrgUnitListElementComponent } from './orgunit-list-element.component';
+import { of as observableOf } from 'rxjs';
 
 let orgUnitListElementComponent: OrgUnitListElementComponent;
 let fixture: ComponentFixture<OrgUnitListElementComponent>;
 
 const mockItemWithMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',
@@ -26,7 +27,7 @@ const mockItemWithMetadata: Item = Object.assign(new Item(), {
     }]
 });
 const mockItemWithoutMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/object-list/item-list-element/entity-types/person/person-list-element.component.spec.ts

@@ -1,18 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ITEM } from '../../../../entities/switcher/entity-type-switcher.component';
 import { PersonListElementComponent } from './person-list-element.component';
+import { of as observableOf } from 'rxjs';
 
 let personListElementComponent: PersonListElementComponent;
 let fixture: ComponentFixture<PersonListElementComponent>;
 
 const mockItemWithMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',
@@ -26,7 +27,7 @@ const mockItemWithMetadata: Item = Object.assign(new Item(), {
     }]
 });
 const mockItemWithoutMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/object-list/item-list-element/entity-types/project/project-list-element.component.spec.ts

@@ -1,18 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ITEM } from '../../../../entities/switcher/entity-type-switcher.component';
 import { ProjectListElementComponent } from './project-list-element.component';
+import { of as observableOf } from 'rxjs';
 
 let projectListElementComponent: ProjectListElementComponent;
 let fixture: ComponentFixture<ProjectListElementComponent>;
 
 const mockItemWithMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',
@@ -26,7 +27,7 @@ const mockItemWithMetadata: Item = Object.assign(new Item(), {
     }]
 });
 const mockItemWithoutMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/object-list/item-list-element/entity-types/publication/publication-list-element.component.spec.ts

@@ -1,18 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PublicationListElementComponent } from './publication-list-element.component';
 import { Item } from '../../../../../core/shared/item.model';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { ITEM } from '../../../../entities/switcher/entity-type-switcher.component';
+import { of as observableOf } from 'rxjs';
 
 let publicationListElementComponent: PublicationListElementComponent;
 let fixture: ComponentFixture<PublicationListElementComponent>;
 
 const mockItemWithMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',
@@ -41,7 +42,7 @@ const mockItemWithMetadata: Item = Object.assign(new Item(), {
     }]
 });
 const mockItemWithoutMetadata: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of({}),
+  bitstreams: observableOf({}),
   metadata: [
     {
       key: 'dc.title',

src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts

@@ -1,5 +1,5 @@
 import { Item } from '../../../../core/shared/item.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
@@ -12,9 +12,10 @@ import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { createRelationshipsObservable } from '../../../../+item-page/simple/entity-types/shared/entity.component.spec';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
-  bitstreams: Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
+  bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
   metadata: [],
   relationships: createRelationshipsObservable()
 });

src/app/shared/services/route.service.ts

@@ -1,6 +1,6 @@
 import { distinctUntilChanged, map, mergeMap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ActivatedRoute, Params, Router, } from '@angular/router';
 
 @Injectable()
@@ -41,11 +41,11 @@ export class RouteService {
   }
 
   getRouteParameterValue(paramName: string): Observable<string> {
-    return this.params.map((params) => params[paramName]).distinctUntilChanged();
+    return this.params.pipe(map((params) => params[paramName]),distinctUntilChanged(),);
   }
 
   getRouteDataValue(datafield: string): Observable<any> {
-    return this.route.data.map((data) => data[datafield]).distinctUntilChanged();
+    return this.route.data.pipe(map((data) => data[datafield]),distinctUntilChanged(),);
   }
 
   getQueryParamsWithPrefix(prefix: string): Observable<Params> {

src/app/shared/shared.module.ts

@@ -93,6 +93,7 @@ import { InputSuggestionsComponent } from './input-suggestions/input-suggestions
 import { CapitalizePipe } from './utils/capitalize.pipe';
 import { ObjectKeysPipe } from './utils/object-keys-pipe';
 import { MomentModule } from 'ngx-moment';
+import { NouisliderModule } from 'ng2-nouislider';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -108,6 +109,7 @@ const MODULES = [
   NgbTimepickerModule,
   NgbTypeaheadModule,
   NgxPaginationModule,
+  NouisliderModule,
   ReactiveFormsModule,
   RouterModule,
   TranslateModule,

src/app/shared/testing/router-stub.ts

@@ -1,11 +1,10 @@
-import { Observable } from 'rxjs/Observable';
-
+import { of as observableOf } from 'rxjs';
 export class RouterStub {
   url: string;
   //noinspection TypeScriptUnresolvedFunction
   navigate = jasmine.createSpy('navigate');
   parseUrl = jasmine.createSpy('parseUrl');
-  events = Observable.of({});
+  events = observableOf({});
   navigateByUrl(url): void {
     this.url = url;
   }