upgrade to angular6

package.json

@@ -23,9 +23,9 @@
     "prebuild": "yarn run clean:dist",
     "prebuild:aot": "yarn run prebuild",
     "prebuild:prod": "yarn run prebuild",
-    "build": "webpack --progress",
-    "build:aot": "webpack --env.aot --env.server && webpack --env.aot --env.client",
-    "build:prod": "webpack --env.aot --env.server -p && webpack --env.aot --env.client -p",
+    "build": "webpack --progress --mode development",
+    "build:aot": "webpack --env.aot --env.server --mode development && webpack --env.aot --env.client --mode development",
+    "build:prod": "webpack --env.aot --env.server --mode production && webpack --env.aot --env.client --mode production",
     "postbuild:prod": "yarn run rollup",
     "rollup": "rollup -c rollup.config.js",
     "prestart": "yarn run build:prod",
@@ -40,15 +40,9 @@
     "server": "node dist/server.js",
     "server:watch": "nodemon dist/server.js",
     "server:watch:debug": "nodemon --debug dist/server.js",
-    "webpack:watch": "webpack -w",
-    "webpack:watch:aot": "webpack -w --env.aot --env.server && webpack -w --env.aot --env.client",
-    "webpack:watch:prod": "webpack -w --env.aot --env.server -p && webpack -w --env.aot --env.client -p",
+    "webpack:watch": "webpack -w --mode development",
     "watch": "yarn run build && npm-run-all -p webpack:watch server:watch",
-    "watch:aot": "yarn run build:aot && npm-run-all -p webpack:watch:aot server:watch",
-    "watch:prod": "yarn run build:prod && npm-run-all -p webpack:watch:prod server:watch",
     "watch:debug": "yarn run build && npm-run-all -p webpack:watch server:watch:debug",
-    "watch:debug:aot": "yarn run build:aot && npm-run-all -p webpack:watch:aot server:watch:debug",
-    "watch:debug:prod": "yarn run build:prod && npm-run-all -p webpack:watch:prod server:watch:debug",
     "predebug": "yarn run build",
     "predebug:server": "yarn run build",
     "debug": "node --debug-brk dist/server.js",
@@ -69,31 +63,30 @@
     "coverage": "http-server -c-1 -o -p 9875 ./coverage"
   },
   "dependencies": {
-    "@angular/animations": "^5.2.5",
-    "@angular/common": "^5.2.5",
-    "@angular/core": "^5.2.5",
-    "@angular/forms": "^5.2.5",
-    "@angular/http": "^5.2.5",
-    "@angular/platform-browser": "^5.2.5",
-    "@angular/platform-browser-dynamic": "^5.2.5",
-    "@angular/platform-server": "^5.2.5",
-    "@angular/router": "^5.2.5",
+    "@angular/animations": "^6.1.4",
+    "@angular/common": "^6.1.4",
+    "@angular/core": "^6.1.4",
+    "@angular/forms": "^6.1.4",
+    "@angular/http": "^6.1.4",
+    "@angular/platform-browser": "^6.1.4",
+    "@angular/platform-browser-dynamic": "^6.1.4",
+    "@angular/platform-server": "^6.1.4",
+    "@angular/router": "^6.1.4",
     "@angularclass/bootloader": "1.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^1.0.0",
-    "@ng-dynamic-forms/core": "5.4.7",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "5.4.7",
-    "@ngrx/effects": "^5.1.0",
-    "@ngrx/router-store": "^5.0.1",
-    "@ngrx/store": "^5.1.0",
-    "@nguniversal/express-engine": "5.0.0",
-    "@ngx-translate/core": "9.1.1",
-    "@ngx-translate/http-loader": "2.0.1",
-    "@nicky-lenaers/ngx-scroll-to": "^0.6.0",
-    "angular-idle-preload": "2.0.4",
-    "angular2-moment": "^1.9.0",
+    "@ng-bootstrap/ng-bootstrap": "^2.0.0",
+    "@ng-dynamic-forms/core": "6.0.9",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "6.0.9",
+    "@ngrx/effects": "^6.1.0",
+    "@ngrx/router-store": "^6.1.0",
+    "@ngrx/store": "^6.1.0",
+    "@nguniversal/express-engine": "6.1.0",
+    "@ngx-translate/core": "10.0.2",
+    "@ngx-translate/http-loader": "3.0.1",
+    "@nicky-lenaers/ngx-scroll-to": "^1.0.0",
+    "angular-idle-preload": "3.0.0",
     "angular-sortablejs": "^2.5.0",
-    "angular2-text-mask": "8.0.4",
-    "angulartics2": "^5.2.0",
+    "angular2-text-mask": "9.0.0",
+    "angulartics2": "^6.2.0",
     "body-parser": "1.18.2",
     "bootstrap": "4.1.1",
     "cerialize": "0.1.18",
@@ -112,26 +105,27 @@
     "methods": "1.1.2",
     "moment": "^2.22.1",
     "morgan": "1.9.0",
-    "ng2-nouislider": "^1.7.11",
     "ng2-file-upload": "1.2.1",
-    "ngx-infinite-scroll": "0.8.2",
+    "ng2-nouislider": "^1.7.11",
+    "ngx-bootstrap": "^3.0.1",
+    "ngx-infinite-scroll": "6.0.1",
     "ngx-pagination": "3.0.3",
     "nouislider": "^11.0.0",
     "pem": "1.12.3",
     "reflect-metadata": "0.1.12",
-    "rxjs": "5.5.6",
+    "rxjs": "^6.2.2",
     "sortablejs": "1.7.0",
     "text-mask-core": "5.0.1",
     "ts-md5": "^1.2.4",
     "uuid": "^3.2.1",
     "webfontloader": "1.6.28",
-    "zone.js": "0.8.20"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/compiler": "^5.2.5",
-    "@angular/compiler-cli": "^5.2.5",
-    "@ngrx/store-devtools": "^5.1.0",
-    "@ngtools/webpack": "^1.10.0",
+    "@angular/compiler": "^6.1.4",
+    "@angular/compiler-cli": "^6.1.4",
+    "@ngrx/store-devtools": "^6.1.0",
+    "@ngtools/webpack": "^6.1.5",
     "@types/acorn": "^4.0.3",
     "@types/cookie-parser": "1.4.1",
     "@types/deep-freeze": "0.1.1",
@@ -140,6 +134,7 @@
     "@types/hammerjs": "2.0.35",
     "@types/jasmine": "^2.8.6",
     "@types/js-cookie": "2.1.0",
+    "@types/lodash": "^4.14.110",
     "@types/memory-cache": "0.2.0",
     "@types/mime": "2.0.0",
     "@types/node": "^9.4.6",
@@ -152,18 +147,18 @@
     "autoprefixer": "^8.0.0",
     "awesome-typescript-loader": "3.4.1",
     "caniuse-lite": "^1.0.30000697",
-    "codelyzer": "^4.1.0",
+    "codelyzer": "^4.4.4",
     "compression-webpack-plugin": "^1.1.6",
     "copy-webpack-plugin": "^4.4.1",
     "coveralls": "3.0.0",
     "css-loader": "0.28.9",
     "deep-freeze": "0.0.1",
     "exports-loader": "^0.7.0",
-    "html-webpack-plugin": "2.30.1",
+    "html-webpack-plugin": "3.2.0",
     "imports-loader": "0.7.1",
-    "istanbul-instrumenter-loader": "3.0.0",
-    "jasmine-core": "^2.99.1",
-    "jasmine-marbles": "0.2.0",
+    "istanbul-instrumenter-loader": "3.0.1",
+    "jasmine-core": "^3.2.1",
+    "jasmine-marbles": "0.3.0",
     "jasmine-spec-reporter": "4.2.1",
     "json-loader": "0.5.7",
     "karma": "2.0.0",
@@ -178,8 +173,8 @@
     "karma-remap-istanbul": "0.6.0",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webdriver-launcher": "1.0.5",
-    "karma-webpack": "2.0.9",
-    "ngrx-store-freeze": "^0.2.1",
+    "karma-webpack": "3.0.0",
+    "ngrx-store-freeze": "^0.2.4",
     "node-sass": "^4.7.2",
     "nodemon": "^1.15.0",
     "npm-run-all": "4.1.2",
@@ -201,21 +196,22 @@
     "rollup-plugin-node-resolve": "^3.0.3",
     "rollup-plugin-uglify": "3.0.0",
     "sass-loader": "6.0.6",
-    "script-ext-html-webpack-plugin": "1.8.8",
+    "script-ext-html-webpack-plugin": "2.0.1",
     "source-map": "0.6.1",
     "source-map-loader": "0.2.3",
-    "string-replace-loader": "1.3.0",
+    "string-replace-loader": "2.1.1",
     "to-string-loader": "1.1.5",
     "ts-helpers": "1.1.2",
     "ts-node": "4.1.0",
     "tslint": "5.9.1",
     "typedoc": "^0.9.0",
-    "typescript": "2.6.2",
-    "webpack": "^3.11.0",
-    "webpack-bundle-analyzer": "^2.10.0",
-    "webpack-dev-middleware": "^2.0.5",
-    "webpack-dev-server": "2.11.1",
-    "webpack-merge": "4.1.1",
-    "webpack-node-externals": "1.6.0"
+    "typescript": "^2.9.1",
+    "webpack": "^4.17.1",
+    "webpack-bundle-analyzer": "^2.13.1",
+    "webpack-command": "^0.4.1",
+    "webpack-dev-middleware": "3.2.0",
+    "webpack-dev-server": "^3.1.5",
+    "webpack-merge": "4.1.4",
+    "webpack-node-externals": "1.7.2"
   }
 }

spec-bundle.js

@@ -28,7 +28,7 @@ require('zone.js/dist/async-test');
 require('zone.js/dist/fake-async-test');
 
 // RxJS
-require('rxjs/Rx');
+require('rxjs');
 
 var testing = require('@angular/core/testing');
 var browser = require('@angular/platform-browser-dynamic/testing');

src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts

@@ -1,7 +1,7 @@
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { CommonModule } from '@angular/common';

src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { BitstreamFormat } from '../../../core/registry/mock-bitstream-format.model';

src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts

@@ -1,6 +1,6 @@
 import { MetadataRegistryComponent } from './metadata-registry.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { TranslateModule } from '@ngx-translate/core';

src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';

src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts

@@ -1,6 +1,6 @@
 import { MetadataSchemaComponent } from './metadata-schema.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';

src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataField } from '../../../core/metadata/metadatafield.model';

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

@@ -1,8 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-
-import { Subscription } from 'rxjs/Subscription';
+import { Observable ,  Subscription } from 'rxjs';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { PaginatedList } from '../core/data/paginated-list';
@@ -56,7 +54,9 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.collectionRD$ = this.route.data.map((data) => data.collection);
+    this.collectionRD$ = this.route.data.pipe(
+      map((data) => data.collection)
+    );
     this.logoRD$ = this.collectionRD$.pipe(
       map((rd: RemoteData<Collection>) => rd.payload),
       filter((collection: Collection) => hasValue(collection)),
@@ -75,8 +75,8 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
           pagination: pagination,
           sort: this.sortConfig
         });
-      }));
-
+      })
+    );
   }
 
   updatePage(searchOptions) {

src/app/+collection-page/collection-page.resolver.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { Collection } from '../core/shared/collection.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { RemoteData } from '../core/data/remote-data';
 import { getSucceededRemoteData } from '../core/shared/operators';

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

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription ,  Observable } from 'rxjs';
 import { CommunityDataService } from '../core/data/community-data.service';
 import { RemoteData } from '../core/data/remote-data';
 import { Bitstream } from '../core/shared/bitstream.model';
@@ -12,7 +12,6 @@ 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',
@@ -35,7 +34,7 @@ export class CommunityPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.communityRD$ = this.route.data.map((data) => data.community);
+    this.communityRD$ = this.route.data.pipe((data) => data.community);
     this.logoRD$ = this.communityRD$
       .map((rd: RemoteData<Community>) => rd.payload)
       .filter((community: Community) => hasValue(community))

src/app/+community-page/community-page.resolver.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../core/data/remote-data';
 import { getSucceededRemoteData } from '../core/shared/operators';
 import { Community } from '../core/shared/community.model';

src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';

src/app/+home-page/top-level-community-list/top-level-community-list.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { PaginatedList } from '../../core/data/paginated-list';

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

@@ -6,7 +6,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/mock-remote-data-build.service';
 import { Item } from '../../../core/shared/item.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { TranslateModule } from '@ngx-translate/core';
 

src/app/+item-page/field-components/collections/collections.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';

src/app/+item-page/full/field-components/file-section/full-file-section.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';

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

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { ItemPageComponent } from '../simple/item-page.component';
 import { Metadatum } from '../../core/shared/metadatum.model';

src/app/+item-page/item-page.resolver.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../core/data/remote-data';
 import { getSucceededRemoteData } from '../core/shared/operators';
 import { ItemDataService } from '../core/data/item-data.service';

src/app/+item-page/simple/field-components/file-section/file-section.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';

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

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';

src/app/+login-page/login-page.component.spec.ts

@@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import 'rxjs/add/observable/of';
 
 import { LoginPageComponent } from './login-page.component';

src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts

@@ -7,7 +7,7 @@ import { SearchFilterConfig } from '../../../search-service/search-filter-config
 import { FilterType } from '../../../search-service/filter-type.model';
 import { FacetValue } from '../../../search-service/facet-value.model';
 import { FormsModule } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SearchService } from '../../../search-service/search.service';
 import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
 import { RemoteData } from '../../../../core/data/remote-data';

src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts

@@ -1,10 +1,7 @@
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
-import { Subscription } from 'rxjs/Subscription';
+import { BehaviorSubject ,  Observable ,  Subject ,  Subscription } from 'rxjs';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { RemoteData } from '../../../../core/data/remote-data';

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

@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { SearchFilterService } from './search-filter.service';
 import { SearchService } from '../../search-service/search.service';

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

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
 import { SearchFilterService } from './search-filter.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { slide } from '../../../shared/animations/slide';
 import { isNotEmpty } from '../../../shared/empty.util';
 

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

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SearchFilterService } from './search-filter.service';
 import { Store } from '@ngrx/store';
 import {

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

@@ -2,7 +2,7 @@ import { Injectable, InjectionToken } from '@angular/core';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 import { SearchFiltersState, SearchFilterState } from './search-filter.reducer';
 import { createSelector, MemoizedSelector, Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,

src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts

@@ -7,7 +7,7 @@ import { SearchFilterConfig } from '../../../search-service/search-filter-config
 import { FilterType } from '../../../search-service/filter-type.model';
 import { FacetValue } from '../../../search-service/facet-value.model';
 import { FormsModule } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SearchService } from '../../../search-service/search.service';
 import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
 import { RemoteData } from '../../../../core/data/remote-data';

src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts

@@ -12,10 +12,9 @@ import { FILTER_CONFIG, SearchFilterService } from '../search-filter.service';
 import { SearchService } from '../../../search-service/search.service';
 import { Router } from '@angular/router';
 import * as moment from 'moment';
-import { Observable } from 'rxjs/Observable';
+import { Observable ,  Subscription } from 'rxjs';
 import { RouteService } from '../../../../shared/services/route.service';
 import { hasValue } from '../../../../shared/empty.util';
-import { Subscription } from 'rxjs/Subscription';
 import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
 
 /**

src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts

@@ -1,6 +1,6 @@
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Component, HostBinding, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FilterType } from '../../../search-service/filter-type.model';
 import {
   facetLoad,

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

@@ -7,7 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { SearchFilterService } from './search-filter/search-filter.service';
 import { SearchFiltersComponent } from './search-filters.component';
 import { SearchService } from '../search-service/search.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SearchConfigurationService } from '../search-service/search-configuration.service';
 
 describe('SearchFiltersComponent', () => {

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

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { SearchService } from '../search-service/search.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { SearchFilterConfig } from '../search-service/search-filter-config.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SearchConfigurationService } from '../search-service/search-configuration.service';
 import { isNotEmpty } from '../../shared/empty.util';
 import { SearchFilterService } from './search-filter/search-filter.service';

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

@@ -6,7 +6,7 @@ import { SearchService } from '../search-service/search.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { SearchServiceStub } from '../../shared/testing/search-service-stub';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Params } from '@angular/router';
 import { ObjectKeysPipe } from '../../shared/utils/object-keys-pipe';
 import { SearchConfigurationService } from '../search-service/search-configuration.service';

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

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { SearchService } from '../search-service/search.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Params } from '@angular/router';
 import { map } from 'rxjs/operators';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';

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

@@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold, hot } from 'jasmine-marbles';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import 'rxjs/add/observable/of';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../core/data/community-data.service';

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

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable ,  Subscription ,  BehaviorSubject } from 'rxjs';
 import { flatMap, 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 } from '../shared/empty.util';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { SearchConfigurationService } from './search-service/search-configuration.service';
 import { getSucceededRemoteData } from '../core/shared/operators';
 

src/app/+search-page/search-service/search-configuration.service.spec.ts

@@ -3,7 +3,7 @@ import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SearchFilter } from '../search-filter.model';
 
 describe('SearchConfigurationService', () => {

src/app/+search-page/search-service/search-configuration.service.ts

@@ -1,15 +1,13 @@
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SearchOptions } from '../search-options.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable ,  BehaviorSubject ,  Subscription } from 'rxjs';
 import { ActivatedRoute, Params } from '@angular/router';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
 import { Injectable, OnDestroy } from '@angular/core';
 import { RouteService } from '../../shared/services/route.service';
 import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { RemoteData } from '../../core/data/remote-data';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Subscription } from 'rxjs/Subscription';
 import { getSucceededRemoteData } from '../../core/shared/operators';
 import { SearchFilter } from '../search-filter.model';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';

src/app/+search-page/search-service/search.service.spec.ts

@@ -12,7 +12,7 @@ import { ResponseCacheService } from '../../core/cache/response-cache.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
 import { RouterStub } from '../../shared/testing/router-stub';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { ResponseCacheEntry } from '../../core/cache/response-cache.reducer';

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

@@ -6,7 +6,7 @@ import {
   Router,
   UrlSegmentGroup
 } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { flatMap, map, switchMap } from 'rxjs/operators';
 import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
 import {

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

@@ -1,7 +1,7 @@
 import { SearchService } from '../search-service/search.service';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { SearchSettingsComponent } from './search-settings.component';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { TranslateModule } from '@ngx-translate/core';

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

@@ -4,7 +4,7 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
 import { SearchFilterService } from '../search-filters/search-filter/search-filter.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { SearchConfigurationService } from '../search-service/search-configuration.service';
 
 @Component({

src/app/+search-page/search-sidebar/search-sidebar.effects.spec.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { cold, hot } from 'jasmine-marbles';
 import * as fromRouter from '@ngrx/router-store';

src/app/+search-page/search-sidebar/search-sidebar.service.spec.ts

@@ -2,7 +2,7 @@ import { Store } from '@ngrx/store';
 import { SearchSidebarService } from './search-sidebar.service';
 import { AppState } from '../../app.reducer';
 import { async, inject, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import 'rxjs/add/observable/of';
 import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from './search-sidebar.actions';
 import { HostWindowService } from '../../shared/host-window.service';

src/app/+search-page/search-sidebar/search-sidebar.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { SearchSidebarState } from './search-sidebar.reducer';
 import { createSelector, Store } from '@ngrx/store';
 import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from './search-sidebar.actions';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { AppState } from '../../app.reducer';
 import { HostWindowService } from '../../shared/host-window.service';
 

src/app/app.module.ts

@@ -7,7 +7,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EffectsModule } from '@ngrx/effects';
 import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
 import { META_REDUCERS, MetaReducer, StoreModule } from '@ngrx/store';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -47,9 +46,6 @@ export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppStat
 
 const DEV_MODULES: any[] = [];
 
-if (!ENV_CONFIG.production) {
-  DEV_MODULES.push(StoreDevtoolsModule.instrument({ maxAge: 500 }));
-}
 
 @NgModule({
   imports: [

src/app/core/auth/auth-request.service.ts

@@ -1,10 +1,10 @@
+import { Observable, throwError as observableThrowError } from 'rxjs';
 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 { GLOBAL_CONFIG } from '../../../config';
 import { GlobalConfig } from '../../../config/global-config.interface';
-import { Observable } from 'rxjs/Observable';
 import { isNotEmpty } from '../../shared/empty.util';
 import { AuthGetRequest, AuthPostRequest, PostRequest, RestRequest } from '../data/request.models';
 import { ResponseCacheEntry } from '../cache/response-cache.reducer';
@@ -30,7 +30,7 @@ export class AuthRequestService {
       .partition((response: RestResponse) => response.isSuccessful);
     return Observable.merge(
       errorResponse.flatMap((response: ErrorResponse) =>
-        Observable.throw(new Error(response.errorMessage))),
+        observableThrowError(new Error(response.errorMessage))),
       successResponse
         .filter((response: AuthStatusResponse) => isNotEmpty(response))
         .map((response: AuthStatusResponse) => response.response)

src/app/core/auth/auth.effects.spec.ts

@@ -4,7 +4,7 @@ import { provideMockActions } from '@ngrx/effects/testing';
 import { Store } from '@ngrx/store';
 import { cold, hot } from 'jasmine-marbles';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import 'rxjs/add/observable/of'
 
 import { AuthEffects } from './auth.effects';

src/app/core/auth/auth.effects.ts

@@ -5,7 +5,7 @@ import { Actions, Effect } from '@ngrx/effects';
 import { Action, Store } from '@ngrx/store';
 
 // import rxjs
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 // import services
 import { AuthService } from './auth.service';

src/app/core/auth/auth.interceptor.spec.ts

@@ -4,7 +4,7 @@ import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { Router } from '@angular/router';
 
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { AuthInterceptor } from './auth.interceptor';
 import { AuthService } from './auth.service';

src/app/core/auth/auth.interceptor.ts

@@ -1,13 +1,10 @@
+
+import {throwError as observableThrowError,  Observable } from 'rxjs';
 import { Injectable, Injector } from '@angular/core';
 import {
   HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpResponse,
   HttpErrorResponse, HttpResponseBase
 } from '@angular/common/http';
-
-import { Observable } from 'rxjs/Rx';
-import 'rxjs/add/observable/throw'
-import 'rxjs/add/operator/catch';
-
 import { find } from 'lodash';
 
 import { AppState } from '../../app.reducer';
@@ -146,7 +143,7 @@ export class AuthInterceptor implements HttpInterceptor {
           }
         }
         // Return error response as is.
-        return Observable.throw(error);
+        return observableThrowError(error);
       }) as any;
 
   }

src/app/core/auth/auth.service.spec.ts

@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { Store, StoreModule } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 import 'rxjs/add/observable/of';
 

src/app/core/auth/auth.service.ts

@@ -6,7 +6,7 @@ import { REQUEST } from '@nguniversal/express-engine/tokens';
 import { RouterReducerState } from '@ngrx/router-store';
 import { Store } from '@ngrx/store';
 import { CookieAttributes } from 'js-cookie';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { map, withLatestFrom } from 'rxjs/operators';
 
 import { Eperson } from '../eperson/models/eperson.model';

src/app/core/auth/authenticated.guard.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, CanLoad, Route, Router, RouterStateSnapshot } from '@angular/router';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 
 // reducers

src/app/core/auth/server-auth.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { HttpHeaders } from '@angular/common/http';
 import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { AuthStatus } from './models/auth-status.model';

src/app/core/browse/browse.service.spec.ts

@@ -1,5 +1,5 @@
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/Rx';
+import { TestScheduler } from 'rxjs';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/mock-remote-data-build.service';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import { getMockResponseCacheService } from '../../shared/mocks/mock-response-cache.service';

src/app/core/browse/browse.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, startWith } from 'rxjs/operators';
 import {
   ensureArrayHasValue,

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { distinctUntilChanged, flatMap, map, startWith } from 'rxjs/operators';
 import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../../shared/empty.util';
 import { PaginatedList } from '../../data/paginated-list';

src/app/core/cache/object-cache.effects.spec.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { cold, hot } from 'jasmine-marbles';
 import { ObjectCacheEffects } from './object-cache.effects';

src/app/core/cache/object-cache.service.spec.ts

@@ -1,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { ObjectCacheService } from './object-cache.service';
 import { AddToObjectCacheAction, RemoveFromObjectCacheAction } from './object-cache.actions';

src/app/core/cache/object-cache.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { MemoizedSelector, Store } from '@ngrx/store';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { IndexName } from '../index/index.reducer';
 
 import { ObjectCacheEntry, CacheableObject } from './object-cache.reducer';

src/app/core/cache/response-cache.effects.spec.ts

@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { cold, hot } from 'jasmine-marbles';
 import { StoreActionTypes } from '../../store.actions';

src/app/core/cache/response-cache.service.spec.ts

@@ -1,7 +1,7 @@
 import { Store } from '@ngrx/store';
 
 import { ResponseCacheService } from './response-cache.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { CoreState } from '../core.reducers';
 import { RestResponse } from './response-cache.models';
 import { ResponseCacheEntry } from './response-cache.reducer';

src/app/core/cache/response-cache.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { MemoizedSelector, Store } from '@ngrx/store';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { ResponseCacheEntry } from './response-cache.reducer';
 import { hasNoValue } from '../../shared/empty.util';

src/app/core/config/config.service.spec.ts

@@ -1,5 +1,5 @@
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/Rx';
+import { TestScheduler } from 'rxjs';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
 import { ConfigService } from './config.service';

src/app/core/config/config.service.ts

@@ -1,4 +1,5 @@
-import { Observable } from 'rxjs/Observable';
+
+import {throwError as observableThrowError,  Observable } from 'rxjs';
 
 import { RequestService } from '../data/request.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
@@ -23,7 +24,7 @@ export abstract class ConfigService {
       .partition((response: RestResponse) => response.isSuccessful);
     return Observable.merge(
       errorResponse.flatMap((response: ErrorResponse) =>
-        Observable.throw(new Error(`Couldn't retrieve the config`))),
+        observableThrowError(new Error(`Couldn't retrieve the config`))),
       successResponse
         .filter((response: ConfigSuccessResponse) => isNotEmpty(response) && isNotEmpty(response.configDefinition))
         .map((response: ConfigSuccessResponse) => new ConfigData(response.pageInfo, response.configDefinition))

src/app/core/data/comcol-data.service.spec.ts

@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/Rx';
+import { TestScheduler } from 'rxjs';
 import { GlobalConfig } from '../../../config';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';

src/app/core/data/comcol-data.service.ts

@@ -1,4 +1,5 @@
-import { Observable } from 'rxjs/Observable';
+
+import {throwError as observableThrowError,  Observable } from 'rxjs';
 import { isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { NormalizedCommunity } from '../cache/models/normalized-community.model';
 import { CacheableObject } from '../cache/object-cache.reducer';
@@ -48,7 +49,7 @@ export abstract class ComColDataService<TNormalized extends NormalizedObject, TD
 
       return Observable.merge(
         errorResponse.flatMap((response: ErrorResponse) =>
-          Observable.throw(new Error(`The Community with scope ${scopeID} couldn't be retrieved`))),
+          observableThrowError(new Error(`The Community with scope ${scopeID} couldn't be retrieved`))),
         successResponse
           .flatMap((response: DSOSuccessResponse) => this.objectCache.getByUUID(scopeID))
           .map((nc: NormalizedCommunity) => nc._links[this.linkPath])

src/app/core/data/community-data.service.ts

@@ -13,7 +13,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { FindAllOptions, FindAllRequest } from './request.models';
 import { RemoteData } from './remote-data';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { PaginatedList } from './paginated-list';
 
 @Injectable()

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

@@ -6,7 +6,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { CoreState } from '../core.reducers';
 import { Store } from '@ngrx/store';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FindAllOptions } from './request.models';
 import { SortOptions, SortDirection } from '../cache/models/sort-options.model';
 

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

@@ -1,5 +1,5 @@
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ResponseCacheService } from '../cache/response-cache.service';

src/app/core/data/dspace-object-data.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { NormalizedDSpaceObject } from '../cache/models/normalized-dspace-object.model';
 import { ResponseCacheService } from '../cache/response-cache.service';

src/app/core/data/item-data.service.spec.ts

@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
 import { cold, getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/Rx';
+import { TestScheduler } from 'rxjs';
 import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ResponseCacheService } from '../cache/response-cache.service';

src/app/core/data/item-data.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
 import { isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { BrowseService } from '../browse/browse.service';

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

@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
 import { cold, hot } from 'jasmine-marbles';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import 'rxjs/add/observable/of';
 import { getMockObjectCacheService } from '../../shared/mocks/mock-object-cache.service';
 import { getMockResponseCacheService } from '../../shared/mocks/mock-response-cache.service';

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

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 
 import { createSelector, MemoizedSelector, Store } from '@ngrx/store';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { hasValue } from '../../shared/empty.util';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';

src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts

@@ -1,7 +1,8 @@
+
+import {throwError as observableThrowError,  Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { Request } from '@angular/http';
 import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http'
-import { Observable } from 'rxjs/Observable';
 import { RestRequestMethod } from '../data/request.models';
 
 import { DSpaceRESTV2Response } from './dspace-rest-v2-response.model';
@@ -40,7 +41,7 @@ export class DSpaceRESTv2Service {
       .map((res: HttpResponse<any>) => ({ payload: res.body, statusCode: res.statusText }))
       .catch((err) => {
         console.log('Error: ', err);
-        return Observable.throw(err);
+        return observableThrowError(err);
       });
   }
 
@@ -70,7 +71,7 @@ export class DSpaceRESTv2Service {
       .map((res) => ({ payload: res.body, headers: res.headers, statusCode: res.statusText }))
       .catch((err) => {
         console.log('Error: ', err);
-        return Observable.throw(err);
+        return observableThrowError(err);
       });
   }
 

src/app/core/integration/integration.service.spec.ts

@@ -1,5 +1,5 @@
 import { cold, getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/Rx';
+import { TestScheduler } from 'rxjs';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
 

src/app/core/integration/integration.service.ts

@@ -1,4 +1,5 @@
-import { Observable } from 'rxjs/Observable';
+
+import {throwError as observableThrowError,  Observable } from 'rxjs';
 import { RequestService } from '../data/request.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
 import { ErrorResponse, IntegrationSuccessResponse, RestResponse } from '../cache/response-cache.models';
@@ -23,7 +24,7 @@ export abstract class IntegrationService {
       .partition((response: RestResponse) => response.isSuccessful);
     return Observable.merge(
       errorResponse.flatMap((response: ErrorResponse) =>
-        Observable.throw(new Error(`Couldn't retrieve the integration data`))),
+        observableThrowError(new Error(`Couldn't retrieve the integration data`))),
       successResponse
         .filter((response: IntegrationSuccessResponse) => isNotEmpty(response))
         .map((response: IntegrationSuccessResponse) => new IntegrationData(response.pageInfo, response.dataDefinition))

src/app/core/metadata/metadata.service.spec.ts

@@ -10,7 +10,7 @@ import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
 
 import { Store, StoreModule } from '@ngrx/store';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteDataError } from '../data/remote-data-error';
 import { UUIDService } from '../shared/uuid.service';
 

src/app/core/metadata/metadata.service.ts

@@ -1,5 +1,5 @@
-import 'rxjs/add/operator/first'
-import 'rxjs/add/operator/take'
+
+
 
 import { Inject, Injectable } from '@angular/core';
 import {
@@ -14,8 +14,7 @@ import { Meta, MetaDefinition, Title } from '@angular/platform-browser';
 
 import { TranslateService } from '@ngx-translate/core';
 
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Observable } from 'rxjs/Observable';
+import { BehaviorSubject ,  Observable } from 'rxjs';
 
 import { RemoteData } from '../data/remote-data';
 import { Bitstream } from '../shared/bitstream.model';

src/app/core/registry/registry.service.spec.ts

@@ -6,7 +6,7 @@ import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { ResponseCacheEntry } from '../cache/response-cache.reducer';
 import { RequestEntry } from '../data/request.reducer';
 import { RemoteData } from '../data/remote-data';

src/app/core/registry/registry.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list';
 import { PageInfo } from '../shared/page-info.model';

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

@@ -2,7 +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';
+import { Observable } from 'rxjs';
 
 export class Bitstream extends DSpaceObject {
 

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

@@ -2,7 +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';
+import { Observable } from 'rxjs';
 
 export class Bundle extends DSpaceObject {
   /**

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

@@ -2,7 +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';
+import { Observable } from 'rxjs';
 
 export class Collection extends DSpaceObject {
 

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

@@ -2,7 +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';
+import { Observable } from 'rxjs';
 import { PaginatedList } from '../data/paginated-list';
 
 export class Community extends DSpaceObject {

src/app/core/shared/dspace-object.model.ts

@@ -4,7 +4,7 @@ import { CacheableObject } from '../cache/object-cache.reducer';
 import { RemoteData } from '../data/remote-data';
 import { ResourceType } from './resource-type';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 /**
  * An abstract model class for a DSpaceObject.

src/app/core/shared/hal-endpoint.service.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { distinctUntilChanged, map, flatMap, startWith, tap } from 'rxjs/operators';
 import { RequestService } from '../data/request.service';
 import { ResponseCacheService } from '../cache/response-cache.service';

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

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { Item } from './item.model';
 import { RemoteData } from '../data/remote-data';

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

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { DSpaceObject } from './dspace-object.model';
 import { Collection } from './collection.model';

src/app/core/shared/operators.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { filter, first, flatMap, map, tap } from 'rxjs/operators';
 import { hasValueOperator } from '../../shared/empty.util';
 import { DSOSuccessResponse } from '../cache/response-cache.models';

src/app/header/header.component.spec.ts

@@ -4,7 +4,7 @@ import { Store, StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 import { HeaderComponent } from './header.component';
 import { HeaderState } from './header.reducer';

src/app/header/header.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { createSelector, Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RouterReducerState } from '@ngrx/router-store';
 
 import { HeaderState } from './header.reducer';

src/app/header/header.effects.spec.ts

@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { HeaderEffects } from './header.effects';
 import { HeaderCollapseAction } from './header.actions';
 import { HostWindowResizeAction } from '../shared/host-window.actions';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { cold, hot } from 'jasmine-marbles';
 import * as fromRouter from '@ngrx/router-store';

src/app/shared/animations/slide.ts

@@ -1,4 +1,4 @@
-import { animate, state, transition, trigger, style, stagger, query } from '@angular/animations';
+import { animate, state, style, transition, trigger } from '@angular/animations';
 
 export const slide = trigger('slide', [
 

src/app/shared/auth-nav-menu/auth-nav-menu.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { RouterReducerState } from '@ngrx/router-store';
 import { Store } from '@ngrx/store';
 

src/app/shared/chips/models/chips.model.ts

@@ -1,5 +1,5 @@
 import { findIndex, isEqual, isObject } from 'lodash';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 import { ChipsItem, ChipsItemIcon } from './chips-item.model';
 import { hasValue, isNotEmpty } from '../../empty.util';
 

src/app/shared/empty.util.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 /**