Merge remote-tracking branch 'remotes/origin/master' into submission

# Conflicts:
#	package.json
#	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.module.ts
#	src/app/core/auth/auth.interceptor.ts
#	src/app/core/cache/response-cache.service.spec.ts
#	src/app/core/data/browse-response-parsing.service.spec.ts
#	src/app/core/data/data.service.spec.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
#	src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
#	src/app/core/integration/integration.service.ts
#	src/app/core/metadata/metadata.service.spec.ts
#	src/app/core/registry/registry.service.spec.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/item.model.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
#	src/app/shared/form/builder/form-builder.service.spec.ts
#	src/app/shared/form/form.service.spec.ts
#	src/app/shared/notifications/notification/notification.component.spec.ts
#	src/app/shared/services/route.service.spec.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
#	yarn.lock

angular.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "cli": {
+    "defaultCollection": "@ngrx/schematics"
+  },
+  "projects": {
+    "core": {
+      "root": "",
+      "projectType": "application"
+    }
+  }
+}

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": "webpack --progress --mode development",
-    "build:aot": "webpack --env.aot --env.server && webpack --env.aot --env.client",
+    "build:aot": "webpack --env.aot --env.server --mode development && webpack --env.aot --env.client --mode development",
-    "build:prod": "webpack --env.aot --env.server -p && webpack --env.aot --env.client -p",
+    "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,21 +40,15 @@
     "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": "webpack -w --mode development",
-    "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",
     "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",
     "debug:server": "node-nightly --inspect --debug-brk dist/server.js",
-    "debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js",
+    "debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --mode development",
-    "debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --env.aot --env.client --env.server -p",
+    "debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --env.aot --env.client --env.server --mode production",
     "ci": "yarn run lint && yarn run build:aot && yarn run test:headless && npm-run-all -p -r server e2e",
     "protractor": "node node_modules/protractor/bin/protractor",
     "pree2e": "yarn run webdriver:update",
@@ -69,31 +63,31 @@
     "coverage": "http-server -c-1 -o -p 9875 ./coverage"
   },
   "dependencies": {
-    "@angular/animations": "^5.2.5",
+    "@angular/animations": "^6.1.4",
-    "@angular/common": "^5.2.5",
+    "@angular/cli": "^6.1.5",
-    "@angular/core": "^5.2.5",
+    "@angular/common": "^6.1.4",
-    "@angular/forms": "^5.2.5",
+    "@angular/core": "^6.1.4",
-    "@angular/http": "^5.2.5",
+    "@angular/forms": "^6.1.4",
-    "@angular/platform-browser": "^5.2.5",
+    "@angular/http": "^6.1.4",
-    "@angular/platform-browser-dynamic": "^5.2.5",
+    "@angular/platform-browser": "^6.1.4",
-    "@angular/platform-server": "^5.2.5",
+    "@angular/platform-browser-dynamic": "^6.1.4",
-    "@angular/router": "^5.2.5",
+    "@angular/platform-server": "^6.1.4",
+    "@angular/router": "^6.1.4",
     "@angularclass/bootloader": "1.0.1",
-    "@ng-bootstrap/ng-bootstrap": "1.1.2",
+    "@ng-bootstrap/ng-bootstrap": "^2.0.0",
-    "@ng-dynamic-forms/core": "5.4.7",
+    "@ng-dynamic-forms/core": "6.0.9",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "5.4.7",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "6.0.9",
-    "@ngrx/effects": "^5.1.0",
+    "@ngrx/effects": "^6.1.0",
-    "@ngrx/router-store": "^5.0.1",
+    "@ngrx/router-store": "^6.1.0",
-    "@ngrx/store": "^5.1.0",
+    "@ngrx/store": "^6.1.0",
-    "@nguniversal/express-engine": "5.0.0",
+    "@nguniversal/express-engine": "6.1.0",
-    "@ngx-translate/core": "9.1.1",
+    "@ngx-translate/core": "10.0.2",
-    "@ngx-translate/http-loader": "2.0.1",
+    "@ngx-translate/http-loader": "3.0.1",
-    "@nicky-lenaers/ngx-scroll-to": "^0.6.0",
+    "@nicky-lenaers/ngx-scroll-to": "^1.0.0",
-    "angular-idle-preload": "2.0.4",
+    "angular-idle-preload": "3.0.0",
     "angular-sortablejs": "^2.5.0",
-    "angular2-moment": "^1.9.0",
+    "angular2-text-mask": "9.0.0",
-    "angular2-text-mask": "8.0.4",
+    "angulartics2": "^6.2.0",
-    "angulartics2": "^5.2.0",
     "body-parser": "1.18.2",
     "bootstrap": "4.1.3",
     "cerialize": "0.1.18",
@@ -104,6 +98,7 @@
     "express-session": "1.15.6",
     "file-saver": "^1.3.8",
     "font-awesome": "4.7.0",
+    "fork-ts-checker-webpack-plugin": "^0.4.10",
     "http-server": "0.11.1",
     "https": "1.0.0",
     "js-cookie": "2.2.0",
@@ -113,111 +108,118 @@
     "methods": "1.1.2",
     "moment": "^2.22.1",
     "morgan": "1.9.0",
+    "ng-mocks": "^6.2.1",
     "ng2-file-upload": "1.2.1",
     "ng2-nouislider": "^1.7.11",
-    "ngx-infinite-scroll": "0.8.2",
+    "ngx-bootstrap": "^3.0.1",
+    "ngx-infinite-scroll": "6.0.1",
+    "ngx-moment": "^3.1.0",
     "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-loader": "^5.2.1",
     "ts-md5": "^1.2.4",
     "uuid": "^3.2.1",
     "webfontloader": "1.6.28",
-    "zone.js": "0.8.20"
+    "webpack-cli": "^3.1.0",
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/compiler": "^5.2.5",
+    "@angular/compiler": "^6.1.4",
-    "@angular/compiler-cli": "^5.2.5",
+    "@angular/compiler-cli": "^6.1.4",
-    "@ngrx/store-devtools": "^5.1.0",
+    "@ngrx/entity": "^6.1.0",
-    "@ngtools/webpack": "^1.10.0",
+    "@ngrx/schematics": "^6.1.0",
+    "@ngrx/store-devtools": "^6.1.0",
+    "@ngtools/webpack": "^6.1.5",
+    "@schematics/angular": "^0.7.5",
     "@types/acorn": "^4.0.3",
     "@types/cookie-parser": "1.4.1",
     "@types/deep-freeze": "0.1.1",
     "@types/express": "^4.11.1",
-    "@types/express-serve-static-core": "4.11.1",
+    "@types/express-serve-static-core": "4.16.0",
     "@types/file-saver": "^1.3.0",
     "@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",
+    "@types/node": "^10.9.4",
-    "@types/serve-static": "1.13.1",
+    "@types/serve-static": "1.13.2",
     "@types/uuid": "^3.4.3",
     "@types/webfontloader": "1.6.29",
     "ajv": "^6.1.1",
     "ajv-keywords": "^3.1.0",
     "angular2-template-loader": "0.6.2",
-    "autoprefixer": "^8.0.0",
+    "autoprefixer": "^9.1.3",
-    "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",
+    "css-loader": "1.0.0",
     "deep-freeze": "0.0.1",
     "exports-loader": "^0.7.0",
-    "html-webpack-plugin": "2.30.1",
+    "html-webpack-plugin": "^4.0.0-alpha",
-    "imports-loader": "0.7.1",
+    "imports-loader": "0.8.0",
-    "istanbul-instrumenter-loader": "3.0.0",
+    "istanbul-instrumenter-loader": "3.0.1",
-    "jasmine-core": "^2.99.1",
+    "jasmine-core": "^3.2.1",
-    "jasmine-marbles": "0.2.0",
+    "jasmine-marbles": "0.3.1",
     "jasmine-spec-reporter": "4.2.1",
-    "json-loader": "0.5.7",
+    "karma": "3.0.0",
-    "karma": "2.0.0",
     "karma-chrome-launcher": "2.2.0",
     "karma-cli": "1.0.1",
-    "karma-coverage": "1.1.1",
+    "karma-coverage": "1.1.2",
     "karma-istanbul-preprocessor": "0.0.2",
-    "karma-jasmine": "1.1.1",
+    "karma-jasmine": "1.1.2",
     "karma-mocha-reporter": "2.2.5",
     "karma-phantomjs-launcher": "1.0.4",
     "karma-remap-coverage": "^0.1.5",
     "karma-remap-istanbul": "0.6.0",
     "karma-sourcemap-loader": "0.3.7",
     "karma-webdriver-launcher": "1.0.5",
-    "karma-webpack": "2.0.9",
+    "karma-webpack": "3.0.0",
-    "ngrx-store-freeze": "^0.2.1",
+    "ngrx-store-freeze": "^0.2.4",
     "node-sass": "^4.7.2",
     "nodemon": "^1.15.0",
-    "npm-run-all": "4.1.2",
+    "npm-run-all": "4.1.3",
-    "postcss": "^6.0.18",
+    "postcss": "^7.0.2",
-    "postcss-apply": "0.8.0",
+    "postcss-apply": "0.11.0",
-    "postcss-cli": "^5.0.0",
+    "postcss-cli": "^6.0.0",
     "postcss-cssnext": "3.1.0",
-    "postcss-loader": "^2.1.0",
+    "postcss-loader": "^3.0.0",
     "postcss-responsive-type": "1.0.0",
     "postcss-smart-import": "0.7.6",
     "protractor": "^5.3.0",
     "protractor-istanbul-plugin": "2.0.0",
     "raw-loader": "0.5.1",
-    "resolve-url-loader": "2.2.1",
+    "resolve-url-loader": "^2.3.0",
     "rimraf": "2.6.2",
-    "rollup": "^0.56.0",
+    "rollup": "^0.65.0",
-    "rollup-plugin-commonjs": "^8.3.0",
+    "rollup-plugin-commonjs": "^9.1.6",
-    "rollup-plugin-node-globals": "1.1.0",
+    "rollup-plugin-node-globals": "1.2.1",
     "rollup-plugin-node-resolve": "^3.0.3",
-    "rollup-plugin-uglify": "3.0.0",
+    "rollup-plugin-terser": "^2.0.2",
-    "sass-loader": "6.0.6",
+    "sass-loader": "7.1.0",
-    "script-ext-html-webpack-plugin": "1.8.8",
+    "script-ext-html-webpack-plugin": "2.0.1",
-    "source-map": "0.6.1",
+    "source-map": "0.7.3",
-    "source-map-loader": "0.2.3",
+    "source-map-loader": "0.2.4",
-    "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",
+    "tslint": "5.11.0",
     "typedoc": "^0.9.0",
-    "typescript": "2.6.2",
+    "typescript": "^2.9.1",
-    "webpack": "^3.11.0",
+    "webpack": "^4.17.1",
-    "webpack-bundle-analyzer": "^2.10.0",
+    "webpack-bundle-analyzer": "^2.13.1",
-    "webpack-dev-middleware": "^2.0.5",
+    "webpack-dev-middleware": "3.2.0",
-    "webpack-dev-server": "2.11.1",
+    "webpack-dev-server": "^3.1.5",
-    "webpack-merge": "4.1.1",
+    "webpack-merge": "4.1.4",
-    "webpack-node-externals": "1.6.0"
+    "webpack-node-externals": "1.7.2"
   }
 }

resources/i18n/en.json

@@ -92,7 +92,8 @@
     },
     "results": {
       "head": "Search Results",
-      "no-results": "There were no results for this search"
+      "no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+      "no-results-link": "quotes around it"
     },
     "sidebar": {
       "close": "Back to results",

rollup.config.js

@@ -1,6 +1,6 @@
 import nodeResolve from 'rollup-plugin-node-resolve'
 import commonjs from 'rollup-plugin-commonjs';
-import uglify from 'rollup-plugin-uglify'
+import terser from 'rollup-plugin-terser'
 
 export default {
   input: 'dist/client.js',
@@ -8,7 +8,6 @@ export default {
    file: 'dist/client.js',
    format: 'iife',
   },
-  sourcemap: false,
   plugins: [
     nodeResolve({
       jsnext: true,
@@ -17,6 +16,6 @@ export default {
     commonjs({
       include: 'node_modules/rxjs/**'
     }),
-    uglify()
+    terser.terser()
   ]
 }

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,14 +1,13 @@
 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 { of as observableOf } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
-import { SharedModule } from '../../../shared/shared.module';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
@@ -53,7 +52,7 @@ describe('BitstreamFormatsComponent', () => {
       extensions: null
     }
   ];
-  const mockFormats = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFormatsList)));
+  const mockFormats = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFormatsList)));
   const registryServiceStub = {
     getBitstreamFormats: () => mockFormats
   };

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 { of as observableOf } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { TranslateModule } from '@ngx-translate/core';
@@ -8,7 +8,6 @@ import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { SharedModule } from '../../../shared/shared.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
@@ -33,7 +32,7 @@ describe('MetadataRegistryComponent', () => {
       namespace: 'http://dspace.org/mockschema'
     }
   ];
-  const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
+  const mockSchemas = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
   const registryServiceStub = {
     getMetadataSchemas: () => mockSchemas
   };
@@ -68,5 +67,4 @@ describe('MetadataRegistryComponent', () => {
     const mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(3)')).nativeElement;
     expect(mockName.textContent).toBe('mock');
   });
-
 });

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,9 +1,6 @@
 import { MetadataSchemaComponent } from './metadata-schema.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { of as observableOf } from 'rxjs';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/of';
-
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
@@ -69,15 +66,15 @@ describe('MetadataSchemaComponent', () => {
       schema: mockSchemasList[1]
     }
   ];
-  const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
+  const mockSchemas = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
   const registryServiceStub = {
     getMetadataSchemas: () => mockSchemas,
-    getMetadataFieldsBySchema: (schema: MetadataSchema) => Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema)))),
+    getMetadataFieldsBySchema: (schema: MetadataSchema) => observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema)))),
-    getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0]))
+    getMetadataSchemaByName: (schemaName: string) => observableOf(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0]))
   };
   const schemaNameParam = 'mock';
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: Observable.of({
+    params: observableOf({
       schemaName: schemaNameParam
     })
   });
@@ -87,10 +84,10 @@ describe('MetadataSchemaComponent', () => {
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
       declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe],
       providers: [
-        {provide: RegistryService, useValue: registryServiceStub},
+        { provide: RegistryService, useValue: registryServiceStub },
-        {provide: ActivatedRoute, useValue: activatedRouteStub},
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
-        {provide: HostWindowService, useValue: new HostWindowServiceStub(0)},
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        {provide: Router, useValue: new RouterStub()}
+        { provide: Router, useValue: new RouterStub() }
       ]
     }).compileComponents();
   }));

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/+browse-by/+browse-by-author-page/browse-by-author-page.component.ts

@@ -1,14 +1,13 @@
+
+import {combineLatest as observableCombineLatest,  Observable, Subscription } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { Observable } from 'rxjs/Observable';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { Subscription } from 'rxjs/Subscription';
 import { ActivatedRoute } from '@angular/router';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { Metadatum } from '../../core/shared/metadatum.model';
 import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Item } from '../../core/shared/item.model';
@@ -47,7 +46,7 @@ export class BrowseByAuthorPageComponent implements OnInit {
       sort: this.sortConfig
     });
     this.subs.push(
-      Observable.combineLatest(
+      observableCombineLatest(
         this.route.params,
         this.route.queryParams,
         (params, queryParams, ) => {

src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.ts

@@ -1,13 +1,13 @@
+
+import {combineLatest as observableCombineLatest,  Observable ,  Subscription } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { Observable } from 'rxjs/Observable';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { Item } from '../../core/shared/item.model';
-import { Subscription } from 'rxjs/Subscription';
 import { ActivatedRoute, PRIMARY_OUTLET, UrlSegmentGroup } from '@angular/router';
 import { hasValue } from '../../shared/empty.util';
 import { Collection } from '../../core/shared/collection.model';
@@ -45,7 +45,7 @@ export class BrowseByTitlePageComponent implements OnInit {
       sort: this.sortConfig
     });
     this.subs.push(
-      Observable.combineLatest(
+      observableCombineLatest(
         this.route.params,
         this.route.queryParams,
         (params, queryParams, ) => {

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 { Observable,  Subscription } from 'rxjs';
-
-import { Subscription } from 'rxjs/Subscription';
 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,8 @@
+import {mergeMap, filter, map} from 'rxjs/operators';
 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 +13,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,11 +35,11 @@ export class CommunityPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
-    this.communityRD$ = this.route.data.map((data) => data.community);
+    this.communityRD$ = this.route.data.pipe(map((data) => data.community));
-    this.logoRD$ = this.communityRD$
+    this.logoRD$ = this.communityRD$.pipe(
-      .map((rd: RemoteData<Community>) => rd.payload)
+      map((rd: RemoteData<Community>) => rd.payload),
-      .filter((community: Community) => hasValue(community))
+      filter((community: Community) => hasValue(community)),
-      .flatMap((community: Community) => community.logo);
+      mergeMap((community: Community) => community.logo));
   }
 
   ngOnDestroy(): void {

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 { of as observableOf } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,8 +22,8 @@ const mockCollection1: Collection = Object.assign(new Collection(), {
     }]
 });
 
-const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: Observable.of(new RemoteData(false, false, true, null, mockCollection1))});
+const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: observableOf(new RemoteData(false, false, true, null, mockCollection1))});
-const failedMockItem: Item = Object.assign(new Item(), {owningCollection: Observable.of(new RemoteData(false, false, false, null, mockCollection1))});
+const failedMockItem: Item = Object.assign(new Item(), {owningCollection: observableOf(new RemoteData(false, false, false, null, mockCollection1))});
 
 describe('CollectionsComponent', () => {
   beforeEach(async(() => {

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

@@ -1,5 +1,7 @@
+
+import {map} from 'rxjs/operators';
 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';
@@ -35,11 +37,11 @@ export class CollectionsComponent implements OnInit {
     // TODO: this should use parents, but the collections
     // for an Item aren't returned by the REST API yet,
     // only the owning collection
-    this.collections = this.item.owner.map((rd: RemoteData<Collection>) => [rd.payload]);
+    this.collections = this.item.owner.pipe(map((rd: RemoteData<Collection>) => [rd.payload]));
   }
 
   hasSucceeded() {
-    return this.item.owner.map((rd: RemoteData<Collection>) => rd.hasSucceeded);
+    return this.item.owner.pipe(map((rd: RemoteData<Collection>) => rd.hasSucceeded));
   }
 
 }

src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html

@@ -1,7 +1,5 @@
-<div class="simple-view-element">
+<div class="simple-view-element" [class.d-none]="content.textContent.trim().length === 0">
-  <span *ngIf="content.children.length != 0">
+  <h5 class="simple-view-element-header" *ngIf="label">{{ label }}</h5>
-    <h5 class="simple-view-element-header" *ngIf="label">{{ label }}</h5>
-  </span>
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
   </div>

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

@@ -7,7 +7,8 @@ import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.componen
 @Component({
     selector: 'ds-component-with-content',
     template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
-      '    <div class="my content">\n' +
+      '    <div class="my-content">\n' +
+      '    <span></span>\n' +
       '    </div>\n' +
       '</ds-metadata-field-wrapper>'
 })
@@ -30,25 +31,37 @@ describe('MetadataFieldWrapperComponent', () => {
 
   const wrapperSelector = '.simple-view-element';
   const labelSelector = '.simple-view-element-header';
+  const contentSelector = '.my-content';
 
   it('should create', () => {
     expect(component).toBeDefined();
   });
 
-  it('should not show a label when there is no content', () => {
+  it('should not show the component when there is no content', () => {
     component.label = 'test label';
     fixture.detectChanges();
-    const debugLabel = fixture.debugElement.query(By.css(labelSelector));
+    const parentNative = fixture.nativeElement;
-    expect(debugLabel).toBeNull();
+    const nativeWrapper = parentNative.querySelector(wrapperSelector);
+    expect(nativeWrapper.classList.contains('d-none')).toBe(true);
   });
 
-  it('should show a label when there is content', () => {
+  it('should not show the component when there is DOM content but no text', () => {
     const parentFixture = TestBed.createComponent(ContentComponent);
     parentFixture.detectChanges();
-    const parentComponent = parentFixture.componentInstance;
     const parentNative = parentFixture.nativeElement;
-    const nativeLabel = parentNative.querySelector(labelSelector);
+    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    expect(nativeLabel.textContent).toContain('test label');
+    expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+  });
+
+  it('should show the component when there is text content', () => {
+    const parentFixture = TestBed.createComponent(ContentComponent);
+    parentFixture.detectChanges();
+    const parentNative = parentFixture.nativeElement;
+    const nativeContent = parentNative.querySelector(contentSelector);
+    nativeContent.textContent = 'lorem ipsum';
+    const nativeWrapper = parentNative.querySelector(wrapperSelector);
+    parentFixture.detectChanges();
+    expect(nativeWrapper.classList.contains('d-none')).toBe(false);
   });
 
 });

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

@@ -1,10 +1,10 @@
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
 
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
 import { FileSectionComponent } from '../../../simple/field-components/file-section/file-section.component';
-import { hasValue } from '../../../../shared/empty.util';
+import { map } from 'rxjs/operators';
 
 /**
  * This component renders the file section of the item
@@ -33,7 +33,7 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
   initialize(): void {
     const originals = this.item.getFiles();
     const licenses = this.item.getBitstreamsByBundleName('LICENSE');
-    this.bitstreamsObs = Observable.combineLatest(originals, licenses, (o, l) => [...o, ...l]);
+    this.bitstreamsObs = observableCombineLatest(originals, licenses).pipe(map(([o, l]) => [...o, ...l]));
     this.bitstreamsObs.subscribe(
       (files) =>
         files.forEach(

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

@@ -1,7 +1,9 @@
+
+import {filter, map} from 'rxjs/operators';
 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';
@@ -41,9 +43,9 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit {
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/
   ngOnInit(): void {
     super.ngOnInit();
-    this.metadata$ = this.itemRD$
+    this.metadata$ = this.itemRD$.pipe(
-      .map((rd: RemoteData<Item>) => rd.payload)
+      map((rd: RemoteData<Item>) => rd.payload),
-      .filter((item: Item) => hasValue(item))
+      filter((item: Item) => hasValue(item)),
-      .map((item: Item) => item.metadata);
+      map((item: Item) => item.metadata),);
   }
 }

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,9 @@
+
+import {mergeMap, filter, map} from 'rxjs/operators';
 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';
@@ -44,11 +46,11 @@ export class ItemPageComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.data.map((data) => data.item);
+    this.itemRD$ = this.route.data.pipe(map((data) => data.item));
     this.metadataService.processRemoteData(this.itemRD$);
-    this.thumbnail$ = this.itemRD$
+    this.thumbnail$ = this.itemRD$.pipe(
-      .map((rd: RemoteData<Item>) => rd.payload)
+      map((rd: RemoteData<Item>) => rd.payload),
-      .filter((item: Item) => hasValue(item))
+      filter((item: Item) => hasValue(item)),
-      .flatMap((item: Item) => item.getThumbnail());
+      mergeMap((item: Item) => item.getThumbnail()),);
   }
 }

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

@@ -4,8 +4,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable } from 'rxjs/Observable';
+import { of as observableOf } from 'rxjs';
-import 'rxjs/add/observable/of';
 
 import { LoginPageComponent } from './login-page.component';
 import { ActivatedRouteStub } from '../shared/testing/active-router-stub';
@@ -21,7 +20,7 @@ describe('LoginPageComponent', () => {
     /* tslint:disable:no-empty */
     dispatch: {},
     /* tslint:enable:no-empty */
-    select: Observable.of(true)
+    select: observableOf(true)
   });
 
   beforeEach(async(() => {

src/app/+search-page/paginated-search-options.model.spec.ts

@@ -1,4 +1,3 @@
-import 'rxjs/add/observable/of';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from './paginated-search-options.model';

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 { of as observableOf } from 'rxjs';
 import { SearchService } from '../../../search-service/search.service';
 import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -54,9 +54,9 @@ describe('SearchFacetFilterComponent', () => {
   let filterService;
   let searchService;
   let router;
-  const page = Observable.of(0);
+  const page = observableOf(0);
 
-  const mockValues = Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), values)));
+  const mockValues = observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), values)));
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
@@ -65,11 +65,11 @@ describe('SearchFacetFilterComponent', () => {
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
         { provide: Router, useValue: new RouterStub() },
         { provide: FILTER_CONFIG, useValue: new SearchFilterConfig() },
-        { provide: RemoteDataBuildService, useValue: {aggregate: () => Observable.of({})} },
+        { provide: RemoteDataBuildService, useValue: {aggregate: () => observableOf({})} },
-        { provide: SearchConfigurationService, useValue: {searchOptions: Observable.of({})} },
+        { provide: SearchConfigurationService, useValue: {searchOptions: observableOf({})} },
         {
           provide: SearchFilterService, useValue: {
-            getSelectedValuesForFilter: () => Observable.of(selectedValues),
+            getSelectedValuesForFilter: () => observableOf(selectedValues),
             isFilterActiveWithValue: (paramName: string, filterValue: string) => true,
             getPage: (paramName: string) => page,
             /* tslint:disable:no-empty */

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

@@ -1,23 +1,26 @@
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+  BehaviorSubject,
+  Observable,
+  Subject,
+  Subscription
+} from 'rxjs';
+import { switchMap, distinctUntilChanged, first, map } from 'rxjs/operators';
 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 { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { hasNoValue, hasValue, isNotEmpty } from '../../../../shared/empty.util';
 import { EmphasizePipe } from '../../../../shared/utils/emphasize.pipe';
-import { SearchOptions } from '../../../search-options.model';
 import { FacetValue } from '../../../search-service/facet-value.model';
 import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
 import { SearchService } from '../../../search-service/search.service';
 import { FILTER_CONFIG, SearchFilterService } from '../search-filter.service';
 import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
 import { getSucceededRemoteData } from '../../../../core/shared/operators';
-import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -56,7 +59,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
   /**
    * Emits the result values for this filter found by the current filter query
    */
-  filterSearchResults: Observable<any[]> = Observable.of([]);
+  filterSearchResults: Observable<any[]> = observableOf([]);
 
   /**
    * Emits the active values for this filter
@@ -82,25 +85,28 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   ngOnInit(): void {
     this.filterValues$ = new BehaviorSubject(new RemoteData(true, false, undefined, undefined, undefined));
-    this.currentPage = this.getCurrentPage().distinctUntilChanged();
+    this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
     this.selectedValues = this.filterService.getSelectedValuesForFilter(this.filterConfig);
     const searchOptions = this.searchConfigService.searchOptions;
     this.subs.push(this.searchConfigService.searchOptions.subscribe(() => this.updateFilterValueList()));
-    const facetValues = Observable.combineLatest(searchOptions, this.currentPage, (options, page) => {
+    const facetValues = observableCombineLatest(searchOptions, this.currentPage).pipe(
-      return { options, page }
+      map(([options, page]) => {
-    }).switchMap(({ options, page }) => {
+        return { options, page }
-      return this.searchService.getFacetValuesFor(this.filterConfig, page, options)
+      }),
-        .pipe(
+      switchMap(({ options, page }) => {
-          getSucceededRemoteData(),
+        return this.searchService.getFacetValuesFor(this.filterConfig, page, options)
-          map((results) => {
+          .pipe(
-              return {
+            getSucceededRemoteData(),
-                values: Observable.of(results),
+            map((results) => {
-                page: page
+                return {
-              };
+                  values: observableOf(results),
-            }
+                  page: page
+                };
+              }
+            )
           )
-        )
+      })
-    });
+    );
     let filterValues = [];
     this.subs.push(facetValues.subscribe((facetOutcome) => {
       const newValues$ = facetOutcome.values;
@@ -120,7 +126,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
         this.animationState = 'ready';
         this.filterValues$.next(rd);
       }));
-      this.subs.push(newValues$.first().subscribe((rd) => {
+      this.subs.push(newValues$.pipe(first()).subscribe((rd) => {
         this.isLastPage$.next(hasNoValue(rd.payload.next))
       }));
     }));
@@ -183,7 +189,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    * @param data The string from the input field
    */
   onSubmit(data: any) {
-    this.selectedValues.first().subscribe((selectedValues) => {
+    this.selectedValues.pipe(first()).subscribe((selectedValues) => {
         if (isNotEmpty(data)) {
           this.router.navigate([this.getSearchLink()], {
             queryParams:
@@ -192,7 +198,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
           });
           this.filter = '';
         }
-        this.filterSearchResults = Observable.of([]);
+        this.filterSearchResults = observableOf([]);
       }
     )
   }
@@ -214,12 +220,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    * @returns {Observable<any>} The changed filter parameters
    */
   getRemoveParams(value: string): Observable<any> {
-    return this.selectedValues.map((selectedValues) => {
+    return this.selectedValues.pipe(map((selectedValues) => {
       return {
         [this.filterConfig.paramName]: selectedValues.filter((v) => v !== value),
         page: 1
       };
-    });
+    }));
   }
 
   /**
@@ -228,12 +234,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    * @returns {Observable<any>} The changed filter parameters
    */
   getAddParams(value: string): Observable<any> {
-    return this.selectedValues.map((selectedValues) => {
+    return this.selectedValues.pipe(map((selectedValues) => {
       return {
         [this.filterConfig.paramName]: [...selectedValues, value],
         page: 1
       };
-    });
+    }));
   }
 
   /**
@@ -252,7 +258,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   findSuggestions(data): void {
     if (isNotEmpty(data)) {
-      this.searchConfigService.searchOptions.first().subscribe(
+      this.searchConfigService.searchOptions.pipe(first()).subscribe(
         (options) => {
           this.filterSearchResults = this.searchService.getFacetValuesFor(this.filterConfig, 1, options, data.toLowerCase())
             .pipe(
@@ -267,7 +273,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
         }
       )
     } else {
-      this.filterSearchResults = Observable.of([]);
+      this.filterSearchResults = observableOf([]);
     }
   }
 

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, of as observableOf } from 'rxjs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { SearchFilterService } from './search-filter.service';
 import { SearchService } from '../../search-service/search.service';
@@ -38,19 +38,19 @@ describe('SearchFilterComponent', () => {
     initialExpand: (filter) => {
     },
     getSelectedValuesForFilter: (filter) => {
-      return Observable.of([filterName1, filterName2, filterName3])
+      return observableOf([filterName1, filterName2, filterName3])
     },
     isFilterActive: (filter) => {
-      return Observable.of([filterName1, filterName2, filterName3].indexOf(filter) >= 0);
+      return observableOf([filterName1, filterName2, filterName3].indexOf(filter) >= 0);
     },
     isCollapsed: (filter) => {
-      return Observable.of(true)
+      return observableOf(true)
     }
     /* tslint:enable:no-empty */
 
   };
   let filterService;
-  const mockResults = Observable.of(['test', 'data']);
+  const mockResults = observableOf(['test', 'data']);
   const searchServiceStub = {
     getFacetValuesFor: (filter) => mockResults
   };
@@ -140,7 +140,7 @@ describe('SearchFilterComponent', () => {
   describe('when isCollapsed is called and the filter is collapsed', () => {
     let isActive: Observable<boolean>;
     beforeEach(() => {
-      filterService.isCollapsed = () => Observable.of(true);
+      filterService.isCollapsed = () => observableOf(true);
       isActive = comp.isCollapsed();
     });
 
@@ -155,7 +155,7 @@ describe('SearchFilterComponent', () => {
   describe('when isCollapsed is called and the filter is not collapsed', () => {
     let isActive: Observable<boolean>;
     beforeEach(() => {
-      filterService.isCollapsed = () => Observable.of(false);
+      filterService.isCollapsed = () => observableOf(false);
       isActive = comp.isCollapsed();
     });
 

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

@@ -1,7 +1,9 @@
+
+import {first} from 'rxjs/operators';
 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';
 
@@ -35,7 +37,7 @@ export class SearchFilterComponent implements OnInit {
    * Else, the filter should initially be collapsed
    */
   ngOnInit() {
-    this.getSelectedValues().first().subscribe((isActive) => {
+    this.getSelectedValues().pipe(first()).subscribe((isActive) => {
       if (this.filter.isOpenByDefault || isNotEmpty(isActive)) {
         this.initialExpand();
       } else {

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

@@ -1,16 +1,20 @@
-import { Observable } from 'rxjs/Observable';
 import { SearchFilterService } from './search-filter.service';
 import { Store } from '@ngrx/store';
 import {
-  SearchFilterCollapseAction, SearchFilterDecrementPageAction, SearchFilterExpandAction,
+  SearchFilterCollapseAction,
+  SearchFilterDecrementPageAction,
+  SearchFilterExpandAction,
   SearchFilterIncrementPageAction,
-  SearchFilterInitialCollapseAction, SearchFilterInitialExpandAction, SearchFilterResetPageAction,
+  SearchFilterInitialCollapseAction,
+  SearchFilterInitialExpandAction,
+  SearchFilterResetPageAction,
   SearchFilterToggleAction
 } from './search-filter.actions';
 import { SearchFiltersState } from './search-filter.reducer';
 import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
 import { FilterType } from '../../search-service/filter-type.model';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+import { of as observableOf } from 'rxjs';
 
 describe('SearchFilterService', () => {
   let service: SearchFilterService;
@@ -28,7 +32,7 @@ describe('SearchFilterService', () => {
     /* tslint:disable:no-empty */
     dispatch: {},
     /* tslint:enable:no-empty */
-    select: Observable.of(true)
+    select: observableOf(true)
   });
 
   const routeServiceStub: any = {
@@ -42,10 +46,10 @@ describe('SearchFilterService', () => {
     addQueryParameterValue: (param: string, value: string) => {
     },
     getQueryParameterValues: (param: string) => {
-      return Observable.of({});
+      return observableOf({});
     },
     getQueryParamsWithPrefix: (param: string) => {
-      return Observable.of({});
+      return observableOf({});
     }
     /* tslint:enable:no-empty */
   };

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

@@ -1,8 +1,8 @@
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable, InjectionToken } from '@angular/core';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { SearchFiltersState, SearchFilterState } from './search-filter.reducer';
-import { createSelector, MemoizedSelector, Store } from '@ngrx/store';
+import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,
@@ -13,14 +13,10 @@ import {
   SearchFilterResetPageAction,
   SearchFilterToggleAction
 } from './search-filter.actions';
-import { hasValue, isEmpty, isNotEmpty, } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty, } from '../../../shared/empty.util';
 import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
 import { RouteService } from '../../../shared/services/route.service';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { Params } from '@angular/router';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SearchOptions } from '../../search-options.model';
-import { PaginatedSearchOptions } from '../../paginated-search-options.model';
-import { ActivatedRoute, Params } from '@angular/router';
 
 const filterStateSelector = (state: SearchFiltersState) => state.searchFilter;
 
@@ -63,13 +59,19 @@ export class SearchFilterService {
    */
   getSelectedValuesForFilter(filterConfig: SearchFilterConfig): Observable<string[]> {
     const values$ = this.routeService.getQueryParameterValues(filterConfig.paramName);
-    const prefixValues$ = this.routeService.getQueryParamsWithPrefix(filterConfig.paramName + '.').map((params: Params) => [].concat(...Object.values(params)));
+    const prefixValues$ = this.routeService.getQueryParamsWithPrefix(filterConfig.paramName + '.').pipe(
-    return Observable.combineLatest(values$, prefixValues$, (values, prefixValues) => {
+      map((params: Params) => [].concat(...Object.values(params)))
-      if (isNotEmpty(values)) {
+    );
-        return values;
+
-      }
+    return observableCombineLatest(values$, prefixValues$).pipe(
-      return prefixValues;
+      map(([values, prefixValues]) => {
-    })
+          if (isNotEmpty(values)) {
+            return values;
+          }
+          return prefixValues;
+        }
+      )
+    )
   }
 
   /**
@@ -78,14 +80,16 @@ export class SearchFilterService {
    * @returns {Observable<boolean>} Emits the current collapsed state of the given filter, if it's unavailable, return false
    */
   isCollapsed(filterName: string): Observable<boolean> {
-    return this.store.select(filterByNameSelector(filterName))
+    return this.store.pipe(
-      .map((object: SearchFilterState) => {
+      select(filterByNameSelector(filterName)),
+      map((object: SearchFilterState) => {
         if (object) {
           return object.filterCollapsed;
         } else {
           return false;
         }
-      });
+      })
+    );
   }
 
   /**
@@ -94,14 +98,15 @@ export class SearchFilterService {
    * @returns {Observable<boolean>} Emits the current page state of the given filter, if it's unavailable, return 1
    */
   getPage(filterName: string): Observable<number> {
-    return this.store.select(filterByNameSelector(filterName))
+    return this.store.pipe(
-      .map((object: SearchFilterState) => {
+      select(filterByNameSelector(filterName)),
+      map((object: SearchFilterState) => {
         if (object) {
           return object.page;
         } else {
           return 1;
         }
-      });
+      }));
   }
 
   /**
@@ -159,6 +164,7 @@ export class SearchFilterService {
   public incrementPage(filterName: string): void {
     this.store.dispatch(new SearchFilterIncrementPageAction(filterName));
   }
+
   /**
    * Dispatches a reset page action to the store for a given filter
    * @param {string} filterName The filter for which the action is dispatched

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 { of as observableOf } from 'rxjs'
 import { SearchService } from '../../../search-service/search.service';
 import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
 import { RemoteData } from '../../../../core/data/remote-data';
@@ -56,13 +56,13 @@ describe('SearchRangeFilterComponent', () => {
   ];
 
   const searchLink = '/search';
-  const selectedValues = Observable.of([value1]);
+  const selectedValues = observableOf([value1]);
   let filterService;
   let searchService;
   let router;
-  const page = Observable.of(0);
+  const page = observableOf(0);
 
-  const mockValues = Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), values)));
+  const mockValues = observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), values)));
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
@@ -71,10 +71,10 @@ describe('SearchRangeFilterComponent', () => {
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
         { provide: Router, useValue: new RouterStub() },
         { provide: FILTER_CONFIG, useValue: mockFilterConfig },
-        { provide: RemoteDataBuildService, useValue: {aggregate: () => Observable.of({})} },
+        { provide: RemoteDataBuildService, useValue: {aggregate: () => observableOf({})} },
-        { provide: RouteService, useValue: {getQueryParameterValue: () => Observable.of({})} },
+        { provide: RouteService, useValue: {getQueryParameterValue: () => observableOf({})} },
         { provide: SearchConfigurationService, useValue: {
-            searchOptions: Observable.of({}) }
+            searchOptions: observableOf({}) }
         },
         {
           provide: SearchFilterService, useValue: {

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

@@ -1,3 +1,10 @@
+import {
+  of as observableOf,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription
+} from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
 import { isPlatformBrowser } from '@angular/common';
 import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
@@ -12,10 +19,8 @@ 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 { 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';
 
 /**
@@ -80,13 +85,15 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     super.ngOnInit();
     this.min = moment(this.filterConfig.minValue, dateFormats).year() || this.min;
     this.max = moment(this.filterConfig.maxValue, dateFormats).year() || this.max;
-    const iniMin = this.route.getQueryParameterValue(this.filterConfig.paramName + minSuffix).startWith(undefined);
+    const iniMin = this.route.getQueryParameterValue(this.filterConfig.paramName + minSuffix).pipe(startWith(undefined));
-    const iniMax = this.route.getQueryParameterValue(this.filterConfig.paramName + maxSuffix).startWith(undefined);
+    const iniMax = this.route.getQueryParameterValue(this.filterConfig.paramName + maxSuffix).pipe(startWith(undefined));
-    this.sub = Observable.combineLatest(iniMin, iniMax, (min, max) => {
+    this.sub = observableCombineLatest(iniMin, iniMax).pipe(
-      const minimum = hasValue(min) ? min : this.min;
+      map(([min, max]) => {
-      const maximum = hasValue(max) ? max : this.max;
+        const minimum = hasValue(min) ? min : this.min;
-      return [minimum, maximum]
+        const maximum = hasValue(max) ? max : this.max;
-    }).subscribe((minmax) => this.range = minmax);
+        return [minimum, maximum]
+      })
+    ).subscribe((minmax) => this.range = minmax);
   }
 
   /**
@@ -98,7 +105,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     const parts = value.split(rangeDelimiter);
     const min = parts.length > 1 ? parts[0].trim() : value;
     const max = parts.length > 1 ? parts[1].trim() : value;
-    return Observable.of(
+    return observableOf(
       {
         [this.filterConfig.paramName + minSuffix]: [min],
         [this.filterConfig.paramName + maxSuffix]: [max],

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,8 +7,8 @@ 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 { SearchConfigurationService } from '../search-service/search-configuration.service';
+import { of as observableOf } from 'rxjs';
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
@@ -17,7 +17,7 @@ describe('SearchFiltersComponent', () => {
   const searchServiceStub = {
     /* tslint:disable:no-empty */
     getConfig: () =>
-      Observable.of({ hasSucceeded: true, payload: [] }),
+      observableOf({ hasSucceeded: true, payload: [] }),
     getClearFiltersQueryParams: () => {
     },
     getSearchLink: () => {
@@ -31,7 +31,7 @@ describe('SearchFiltersComponent', () => {
   };
 
   const searchConfigServiceStub = jasmine.createSpyObj('SearchConfigurationService', {
-    getCurrentFrontendFilters: Observable.of({})
+    getCurrentFrontendFilters: observableOf({})
   });
 
   beforeEach(async(() => {

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

@@ -1,8 +1,10 @@
+import { Observable, of as observableOf } from 'rxjs';
+
+import { filter, map, mergeMap, startWith, switchMap } from 'rxjs/operators';
 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 { SearchConfigurationService } from '../search-service/search-configuration.service';
 import { isNotEmpty } from '../../shared/empty.util';
 import { SearchFilterService } from './search-filter/search-filter.service';
@@ -37,10 +39,10 @@ export class SearchFiltersComponent {
    */
   constructor(private searchService: SearchService, private searchConfigService: SearchConfigurationService, private filterService: SearchFilterService) {
     this.filters = searchService.getConfig().pipe(getSucceededRemoteData());
-    this.clearParams = searchConfigService.getCurrentFrontendFilters().map((filters) => {
+    this.clearParams = searchConfigService.getCurrentFrontendFilters().pipe(map((filters) => {
       Object.keys(filters).forEach((f) => filters[f] = null);
       return filters;
-    });
+    }));
   }
 
   /**
@@ -55,22 +57,23 @@ export class SearchFiltersComponent {
    * @param {SearchFilterConfig} filter The filter to check for
    * @returns {Observable<boolean>} Emits true whenever a given filter config should be shown
    */
-  isActive(filter: SearchFilterConfig): Observable<boolean> {
+  isActive(filterConfig: SearchFilterConfig): Observable<boolean> {
-    return this.filterService.getSelectedValuesForFilter(filter)
+    // console.log(filter.name);
-      .flatMap((isActive) => {
+    return this.filterService.getSelectedValuesForFilter(filterConfig).pipe(
+      mergeMap((isActive) => {
         if (isNotEmpty(isActive)) {
-          return Observable.of(true);
+          return observableOf(true);
         } else {
-          return this.searchConfigService.searchOptions
+          return this.searchConfigService.searchOptions.pipe(
-            .switchMap((options) => {
+            switchMap((options) => {
-                return this.searchService.getFacetValuesFor(filter, 1, options)
+                return this.searchService.getFacetValuesFor(filterConfig, 1, options).pipe(
-                  .filter((RD) => !RD.isLoading)
+                  filter((RD) => !RD.isLoading),
-                  .map((valuesRD) => {
+                  map((valuesRD) => {
                     return valuesRD.payload.totalElements > 0
-                  })
+                  }),)
               }
-            )
+            ))
         }
-      }).startWith(true);
+      }),startWith(true),);
   }
 }

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, of as observableOf } from 'rxjs';
 import { Params } from '@angular/router';
 import { ObjectKeysPipe } from '../../shared/utils/object-keys-pipe';
 import { SearchConfigurationService } from '../search-service/search-configuration.service';
@@ -35,7 +35,7 @@ describe('SearchLabelsComponent', () => {
       declarations: [SearchLabelsComponent, ObjectKeysPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
-        { provide: SearchConfigurationService, useValue: {getCurrentFrontendFilters : () =>  Observable.of({})} }
+        { provide: SearchConfigurationService, useValue: {getCurrentFrontendFilters : () =>  observableOf({})} }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(SearchLabelsComponent, {
@@ -47,7 +47,7 @@ describe('SearchLabelsComponent', () => {
     fixture = TestBed.createComponent(SearchLabelsComponent);
     comp = fixture.componentInstance;
     searchService = (comp as any).searchService;
-    (comp as any).appliedFilters = Observable.of(mockFilters);
+    (comp as any).appliedFilters = observableOf(mockFilters);
     fixture.detectChanges();
   });
 

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-options.model.spec.ts

@@ -1,4 +1,3 @@
-import 'rxjs/add/observable/of';
 import { PaginatedSearchOptions } from './paginated-search-options.model';
 import { SearchOptions } from './search-options.model';
 import { SearchFilter } from './search-filter.model';

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

@@ -5,8 +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 { of as observableOf } 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';
 import { HostWindowService } from '../shared/host-window.service';
@@ -30,18 +29,18 @@ describe('SearchPageComponent', () => {
     /* tslint:disable:no-empty */
     dispatch: {},
     /* tslint:enable:no-empty */
-    select: Observable.of(true)
+    select: observableOf(true)
   });
   const pagination: PaginationComponentOptions = new PaginationComponentOptions();
   pagination.id = 'search-results-pagination';
   pagination.currentPage = 1;
   pagination.pageSize = 10;
   const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
-  const mockResults = Observable.of(new RemoteData(false, false, true, null, ['test', 'data']));
+  const mockResults = observableOf(new RemoteData(false, false, true, null, ['test', 'data']));
   const searchServiceStub = jasmine.createSpyObj('SearchService', {
     search: mockResults,
     getSearchLink: '/search',
-    getScopes: Observable.of(['test-scope'])
+    getScopes: observableOf(['test-scope'])
   });
   const queryParam = 'test query';
   const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
@@ -52,15 +51,15 @@ describe('SearchPageComponent', () => {
     sort
   };
   const activatedRouteStub = {
-    queryParams: Observable.of({
+    queryParams: observableOf({
       query: queryParam,
       scope: scopeParam
     })
   };
   const sidebarService = {
-    isCollapsed: Observable.of(true),
+    isCollapsed: observableOf(true),
-    collapse: () => this.isCollapsed = Observable.of(true),
+    collapse: () => this.isCollapsed = observableOf(true),
-    expand: () => this.isCollapsed = Observable.of(false)
+    expand: () => this.isCollapsed = observableOf(false)
   };
 
   beforeEach(async(() => {
@@ -80,9 +79,9 @@ describe('SearchPageComponent', () => {
         {
           provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService',
             {
-              isXs: Observable.of(true),
+              isXs: observableOf(true),
-              isSm: Observable.of(false),
+              isSm: observableOf(false),
-              isXsOrSm: Observable.of(true)
+              isXsOrSm: observableOf(true)
             })
         },
         {
@@ -98,7 +97,7 @@ describe('SearchPageComponent', () => {
             paginatedSearchOptions: hot('a', {
               a: paginatedSearchOptions
             }),
-            getCurrentScope: (a) => Observable.of('test-id')
+            getCurrentScope: (a) => observableOf('test-id')
           }
         },
       ],
@@ -154,7 +153,7 @@ describe('SearchPageComponent', () => {
 
     beforeEach(() => {
       menu = fixture.debugElement.query(By.css('#search-sidebar-sm')).nativeElement;
-      comp.isSidebarCollapsed = () => Observable.of(true);
+      comp.isSidebarCollapsed = () => observableOf(true);
       fixture.detectChanges();
     });
 
@@ -169,7 +168,7 @@ describe('SearchPageComponent', () => {
 
     beforeEach(() => {
       menu = fixture.debugElement.query(By.css('#search-sidebar-sm')).nativeElement;
-      comp.isSidebarCollapsed = () => Observable.of(false);
+      comp.isSidebarCollapsed = () => observableOf(false);
       fixture.detectChanges();
     });
 

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

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { flatMap, switchMap, } from 'rxjs/operators';
+import { switchMap, } from 'rxjs/operators';
 import { PaginatedList } from '../core/data/paginated-list';
 import { RemoteData } from '../core/data/remote-data';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
@@ -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';
 
@@ -78,8 +76,8 @@ export class SearchPageComponent implements OnInit {
    */
   ngOnInit(): void {
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
-    this.sub = this.searchOptions$
+    this.sub = this.searchOptions$.pipe(
-      .switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData()))
+      switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData())))
       .subscribe((results) => {
         this.resultsRD$.next(results);
       });

src/app/+search-page/search-results/search-results.component.html

@@ -7,5 +7,12 @@
   [hideGear]="true">
 </ds-viewable-collection></div>
 <ds-loading *ngIf="!searchResults || searchResults?.isLoading" message="{{'loading.search-results' | translate}}"></ds-loading>
-<ds-error *ngIf="searchResults?.hasFailed" message="{{'error.search-results' | translate}}"></ds-error>
+<ds-error *ngIf="searchResults?.hasFailed && (!searchResults?.error || searchResults?.error?.statusCode != 400)" message="{{'error.search-results' | translate}}"></ds-error>
-<ds-error *ngIf="searchResults?.payload?.page.length == 0" message="{{'search.results.no-results' | translate}}"></ds-error>
+<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.error?.statusCode == 400">
+    {{ 'search.results.no-results' | translate }}
+    <a [routerLink]="['/search']"
+      [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
+      queryParamsHandling="merge">
+      {{"search.results.no-results-link" | translate}}
+    </a>
+</div> 

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

@@ -1,40 +1,92 @@
 import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ResourceType } from '../../core/shared/resource-type';
 import { Community } from '../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
+import { QueryParamsDirectiveStub } from '../../shared/testing/query-params-directive-stub';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
   let fixture: ComponentFixture<SearchResultsComponent>;
-  let heading: DebugElement;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
+      imports: [TranslateModule.forRoot(), NoopAnimationsModule],
-      declarations: [SearchResultsComponent],
+      declarations: [
+        SearchResultsComponent,
+        QueryParamsDirectiveStub],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SearchResultsComponent);
-    comp = fixture.componentInstance; // SearchFormComponent test instance
+    comp = fixture.componentInstance; // SearchResultsComponent test instance
-    heading = fixture.debugElement.query(By.css('heading'));
   });
 
-  it('should display heading when results are not empty', fakeAsync(() => {
+  it('should display results when results are not empty', () => {
-    (comp as any).searchResults = 'test';
+    (comp as any).searchResults = { hasSucceeded: true, isLoading: false, payload: { page: { length: 2 } } };
-    (comp as any).searchConfig = {pagination: ''};
+    (comp as any).searchConfig = {};
     fixture.detectChanges();
-    tick();
+    expect(fixture.debugElement.query(By.css('ds-viewable-collection'))).not.toBeNull();
-    expect(heading).toBeDefined();
+  });
-  }));
 
-  it('should not display heading when results is empty', () => {
+  it('should not display link when results are not empty', () => {
-    expect(heading).toBeNull();
+    (comp as any).searchResults = { hasSucceeded: true, isLoading: false, payload: { page: { length: 2 } } };
+    (comp as any).searchConfig = {};
+    fixture.detectChanges();
+    expect(fixture.debugElement.query(By.css('a'))).toBeNull();
+  });
+
+  it('should display error message if error is != 400', () => {
+    (comp as any).searchResults = { hasFailed: true, error: { statusCode: 500 } };
+    fixture.detectChanges();
+    expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
+  });
+
+  it('should display link with new search where query is quoted if search return a error 400', () => {
+    (comp as any).searchResults = { hasFailed: true, error: { statusCode: 400 } };
+    (comp as any).searchConfig = { query: 'foobar' };
+    fixture.detectChanges();
+
+    const linkDes = fixture.debugElement.queryAll(By.directive(QueryParamsDirectiveStub));
+
+    // get attached link directive instances
+    // using each DebugElement's injector
+    const routerLinkQuery = linkDes.map((de) => de.injector.get(QueryParamsDirectiveStub));
+
+    expect(routerLinkQuery.length).toBe(1, 'should have 1 router link with query params');
+    expect(routerLinkQuery[0].queryParams.query).toBe('"foobar"', 'query params should be "foobar"');
+  });
+
+  it('should display link with new search where query is quoted if search result is empty', () => {
+    (comp as any).searchResults = { payload: { page: { length: 0 } } };
+    (comp as any).searchConfig = { query: 'foobar' };
+    fixture.detectChanges();
+
+    const linkDes = fixture.debugElement.queryAll(By.directive(QueryParamsDirectiveStub));
+
+    // get attached link directive instances
+    // using each DebugElement's injector
+    const routerLinkQuery = linkDes.map((de) => de.injector.get(QueryParamsDirectiveStub));
+
+    expect(routerLinkQuery.length).toBe(1, 'should have 1 router link with query params');
+    expect(routerLinkQuery[0].queryParams.query).toBe('"foobar"', 'query params should be "foobar"');
+  });
+
+  it('should add quotes around the given string', () => {
+    expect(comp.surroundStringWithQuotes('teststring')).toEqual('"teststring"');
+  });
+
+  it('should not add quotes around the given string if they are already there', () => {
+    expect(comp.surroundStringWithQuotes('"teststring"')).toEqual('"teststring"');
+  });
+
+  it('should not add quotes around a given empty string', () => {
+    expect(comp.surroundStringWithQuotes('')).toEqual('');
   });
 });
 

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

@@ -6,6 +6,7 @@ import { SearchOptions } from '../search-options.model';
 import { SearchResult } from '../search-result.model';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { isNotEmpty } from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-search-results',
@@ -35,4 +36,16 @@ export class SearchResultsComponent {
    */
   @Input() viewMode: ViewMode;
 
+  /**
+   * Method to change the given string by surrounding it by quotes if not already present.
+   */
+  surroundStringWithQuotes(input: string): string {
+    let result = input;
+
+    if (isNotEmpty(result) && !(result.startsWith('\"') && result.endsWith('\"'))) {
+      result = `"${result}"`;
+    }
+
+    return result;
+  }
 }

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

@@ -3,8 +3,8 @@ 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 { SearchFilter } from '../search-filter.model';
+import { of as observableOf } from 'rxjs';
 
 describe('SearchConfigurationService', () => {
   let service: SearchConfigurationService;
@@ -24,8 +24,8 @@ describe('SearchConfigurationService', () => {
   const backendFilters = [new SearchFilter('f.author', ['another value']), new SearchFilter('f.date', ['[2013 TO 2018]'])];
 
   const spy = jasmine.createSpyObj('RouteService', {
-    getQueryParameterValue: Observable.of(value1),
+    getQueryParameterValue: observableOf(value1),
-    getQueryParamsWithPrefix: Observable.of(prefixFilter)
+    getQueryParamsWithPrefix: observableOf(prefixFilter)
   });
 
   const activatedRoute: any = new ActivatedRouteStub();

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

@@ -1,15 +1,21 @@
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  merge as observableMerge,
+  Observable,
+  of as observableOf,
+  Subscription
+} from 'rxjs';
+import { filter, map } from 'rxjs/operators';
 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 { 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 { hasNoValue, hasValue, 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';
@@ -87,27 +93,27 @@ export class SearchConfigurationService implements OnDestroy {
    * @returns {Observable<string>} Emits the current scope's identifier
    */
   getCurrentScope(defaultScope: string) {
-    return this.routeService.getQueryParameterValue('scope').map((scope) => {
+    return this.routeService.getQueryParameterValue('scope').pipe(map((scope) => {
       return scope || defaultScope;
-    });
+    }));
   }
 
   /**
    * @returns {Observable<string>} Emits the current query string
    */
   getCurrentQuery(defaultQuery: string) {
-    return this.routeService.getQueryParameterValue('query').map((query) => {
+    return this.routeService.getQueryParameterValue('query').pipe(map((query) => {
       return query || defaultQuery;
-    });
+    }));
   }
 
   /**
    * @returns {Observable<number>} Emits the current DSpaceObject type as a number
    */
   getCurrentDSOType(): Observable<DSpaceObjectType> {
-    return this.routeService.getQueryParameterValue('dsoType')
+    return this.routeService.getQueryParameterValue('dsoType').pipe(
-      .filter((type) => hasValue(type) && hasValue(DSpaceObjectType[type.toUpperCase()]))
+      filter((type) => hasValue(type) && hasValue(DSpaceObjectType[type.toUpperCase()])),
-      .map((type) => DSpaceObjectType[type.toUpperCase()]);
+      map((type) => DSpaceObjectType[type.toUpperCase()]),);
   }
 
   /**
@@ -116,12 +122,13 @@ export class SearchConfigurationService implements OnDestroy {
   getCurrentPagination(defaultPagination: PaginationComponentOptions): 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(), defaultPagination, {
+        return Object.assign(new PaginationComponentOptions(), defaultPagination, {
-        currentPage: page || defaultPagination.currentPage,
+          currentPage: page || defaultPagination.currentPage,
-        pageSize: size || defaultPagination.pageSize
+          pageSize: size || defaultPagination.pageSize
-      });
+        });
-    });
+      })
+    );
   }
 
   /**
@@ -130,7 +137,7 @@ export class SearchConfigurationService implements OnDestroy {
   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]) => {
         // Dirty fix because sometimes the observable value is null somehow
         sortField = this.route.snapshot.queryParamMap.get('sortField');
 
@@ -138,20 +145,21 @@ export class SearchConfigurationService implements OnDestroy {
         const direction = SortDirection[sortDirection] || defaultSort.direction;
         return new SortOptions(field, direction)
       }
-    )
+      )
+    );
   }
 
   /**
    * @returns {Observable<Params>} Emits the current active filters with their values as they are sent to the backend
    */
   getCurrentFilters(): Observable<SearchFilter[]> {
-    return this.routeService.getQueryParamsWithPrefix('f.').map((filterParams) => {
+    return this.routeService.getQueryParamsWithPrefix('f.').pipe(map((filterParams) => {
       if (isNotEmpty(filterParams)) {
         const filters = [];
         Object.keys(filterParams).forEach((key) => {
           if (key.endsWith('.min') || key.endsWith('.max')) {
             const realKey = key.slice(0, -4);
-            if (hasNoValue(filters.find((filter) => filter.key === realKey))) {
+            if (hasNoValue(filters.find((f) => f.key === realKey))) {
               const min = filterParams[realKey + '.min'] ? filterParams[realKey + '.min'][0] : '*';
               const max = filterParams[realKey + '.max'] ? filterParams[realKey + '.max'][0] : '*';
               filters.push(new SearchFilter(realKey, ['[' + min + ' TO ' + max + ']']));
@@ -163,7 +171,7 @@ export class SearchConfigurationService implements OnDestroy {
         return filters;
       }
       return [];
-    });
+    }));
   }
 
   /**
@@ -179,7 +187,7 @@ export class SearchConfigurationService implements OnDestroy {
    * @returns {Subscription} The subscription to unsubscribe from
    */
   subscribeToSearchOptions(defaults: SearchOptions): Subscription {
-    return Observable.merge(
+    return observableMerge(
       this.getScopePart(defaults.scope),
       this.getQueryPart(defaults.query),
       this.getDSOTypePart(),
@@ -197,7 +205,7 @@ export class SearchConfigurationService implements OnDestroy {
    * @returns {Subscription} The subscription to unsubscribe from
    */
   subscribeToPaginatedSearchOptions(defaults: PaginatedSearchOptions): Subscription {
-    return Observable.merge(
+    return observableMerge(
       this.getPaginationPart(defaults.pagination),
       this.getSortPart(defaults.sort),
       this.getScopePart(defaults.scope),
@@ -222,7 +230,7 @@ export class SearchConfigurationService implements OnDestroy {
         scope: this.defaultScope,
         query: this.defaultQuery
       });
-      this._defaults = Observable.of(new RemoteData(false, false, true, null, options));
+      this._defaults = observableOf(new RemoteData(false, false, true, null, options));
     }
     return this._defaults;
   }
@@ -240,53 +248,53 @@ export class SearchConfigurationService implements OnDestroy {
    * @returns {Observable<string>} Emits the current scope's identifier
    */
   private getScopePart(defaultScope: string): Observable<any> {
-    return this.getCurrentScope(defaultScope).map((scope) => {
+    return this.getCurrentScope(defaultScope).pipe(map((scope) => {
       return { scope }
-    });
+    }));
   }
 
   /**
    * @returns {Observable<string>} Emits the current query string as a partial SearchOptions object
    */
   private getQueryPart(defaultQuery: string): Observable<any> {
-    return this.getCurrentQuery(defaultQuery).map((query) => {
+    return this.getCurrentQuery(defaultQuery).pipe(map((query) => {
       return { query }
-    });
+    }));
   }
 
   /**
    * @returns {Observable<string>} Emits the current query string as a partial SearchOptions object
    */
   private getDSOTypePart(): Observable<any> {
-    return this.getCurrentDSOType().map((dsoType) => {
+    return this.getCurrentDSOType().pipe(map((dsoType) => {
       return { dsoType }
-    });
+    }));
   }
 
   /**
    * @returns {Observable<string>} Emits the current pagination settings as a partial SearchOptions object
    */
   private getPaginationPart(defaultPagination: PaginationComponentOptions): Observable<any> {
-    return this.getCurrentPagination(defaultPagination).map((pagination) => {
+    return this.getCurrentPagination(defaultPagination).pipe(map((pagination) => {
       return { pagination }
-    });
+    }));
   }
 
   /**
    * @returns {Observable<string>} Emits the current sorting settings as a partial SearchOptions object
    */
   private getSortPart(defaultSort: SortOptions): Observable<any> {
-    return this.getCurrentSort(defaultSort).map((sort) => {
+    return this.getCurrentSort(defaultSort).pipe(map((sort) => {
       return { sort }
-    });
+    }));
   }
 
   /**
    * @returns {Observable<Params>} Emits the current active filters as a partial SearchOptions object
    */
   private getFiltersPart(): Observable<any> {
-    return this.getCurrentFilters().map((filters) => {
+    return this.getCurrentFilters().pipe(map((filters) => {
       return { filters }
-    });
+    }));
   }
 }

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

@@ -12,9 +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, combineLatest as observableCombineLatest } from 'rxjs';
-import 'rxjs/add/observable/of';
-import 'rxjs/add/observable/combineLatest';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { ResponseCacheEntry } from '../../core/cache/response-cache.reducer';
@@ -30,6 +28,8 @@ import { SearchFilterConfig } from './search-filter-config.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { of as observableOf } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -58,8 +58,8 @@ describe('SearchService', () => {
           { provide: RequestService, useValue: getMockRequestService() },
           { provide: RemoteDataBuildService, useValue: {} },
           { provide: HALEndpointService, useValue: {} },
-          { provide: CommunityDataService, useValue: {}},
+          { provide: CommunityDataService, useValue: {} },
-          { provide: DSpaceObjectDataService, useValue: {}},
+          { provide: DSpaceObjectDataService, useValue: {} },
           SearchService
         ],
       });
@@ -87,13 +87,15 @@ describe('SearchService', () => {
 
     const remoteDataBuildService = {
       toRemoteDataObservable: (requestEntryObs: Observable<RequestEntry>, responseCacheObs: Observable<ResponseCacheEntry>, payloadObs: Observable<any>) => {
-        return Observable.combineLatest(requestEntryObs,
+        return observableCombineLatest(requestEntryObs,
-          responseCacheObs, payloadObs, (req, res, pay) => {
+          responseCacheObs, payloadObs).pipe(
+          map(([req, res, pay]) => {
             return { req, res, pay };
-          });
+          })
+        );
       },
       aggregate: (input: Array<Observable<RemoteData<any>>>): Observable<RemoteData<any[]>> => {
-        return Observable.of(new RemoteData(false, false, true, null, []));
+        return observableOf(new RemoteData(false, false, true, null, []));
       }
     };
 
@@ -115,8 +117,8 @@ describe('SearchService', () => {
           { provide: RequestService, useValue: getMockRequestService() },
           { provide: RemoteDataBuildService, useValue: remoteDataBuildService },
           { provide: HALEndpointService, useValue: halService },
-          { provide: CommunityDataService, useValue: {}},
+          { provide: CommunityDataService, useValue: {} },
-          { provide: DSpaceObjectDataService, useValue: {}},
+          { provide: DSpaceObjectDataService, useValue: {} },
           SearchService
         ],
       });
@@ -162,8 +164,8 @@ describe('SearchService', () => {
       const response = new SearchSuccessResponse(queryResponse, 200, 'OK');
       const responseEntry = Object.assign(new ResponseCacheEntry(), { response: response });
       beforeEach(() => {
-        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(Observable.of(endPoint));
+        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
-        (searchService as any).responseCache.get.and.returnValue(Observable.of(responseEntry));
+        (searchService as any).responseCache.get.and.returnValue(observableOf(responseEntry));
         /* tslint:disable:no-empty */
         searchService.search(searchOptions).subscribe((t) => {
         }); // subscribe to make sure all methods are called
@@ -192,8 +194,8 @@ describe('SearchService', () => {
       const response = new FacetConfigSuccessResponse(filterConfig, 200, 'OK');
       const responseEntry = Object.assign(new ResponseCacheEntry(), { response: response });
       beforeEach(() => {
-        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(Observable.of(endPoint));
+        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
-        (searchService as any).responseCache.get.and.returnValue(Observable.of(responseEntry));
+        (searchService as any).responseCache.get.and.returnValue(observableOf(responseEntry));
         /* tslint:disable:no-empty */
         searchService.getConfig(null).subscribe((t) => {
         }); // subscribe to make sure all methods are called
@@ -224,8 +226,8 @@ describe('SearchService', () => {
       const response = new FacetConfigSuccessResponse(filterConfig, 200, 'OK');
       const responseEntry = Object.assign(new ResponseCacheEntry(), { response: response });
       beforeEach(() => {
-        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(Observable.of(endPoint));
+        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
-        (searchService as any).responseCache.get.and.returnValue(Observable.of(responseEntry));
+        (searchService as any).responseCache.get.and.returnValue(observableOf(responseEntry));
         /* tslint:disable:no-empty */
         searchService.getConfig(scope).subscribe((t) => {
         }); // subscribe to make sure all methods are called

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

@@ -1,3 +1,4 @@
+import { of as observableOf, combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable, OnDestroy } from '@angular/core';
 import {
   ActivatedRoute,
@@ -6,7 +7,6 @@ import {
   Router,
   UrlSegmentGroup
 } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
 import { flatMap, map, switchMap } from 'rxjs/operators';
 import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
 import {
@@ -122,30 +122,33 @@ export class SearchService implements OnDestroy {
     );
 
     // Create search results again with the correct dso objects linked to each result
-    const tDomainListObs = Observable.combineLatest(sqrObs, dsoObs, (sqr: SearchQueryResponse, dsos: RemoteData<DSpaceObject[]>) => {
+    const tDomainListObs = observableCombineLatest(sqrObs, dsoObs).pipe(
-
+      map(([sqr, dsos]) => {
-      return sqr.objects.map((object: NormalizedSearchResult, index: number) => {
+        return sqr.objects.map((object: NormalizedSearchResult, index: number) => {
-        let co = DSpaceObject;
+          let co = DSpaceObject;
-        if (dsos.payload[index]) {
+          if (dsos.payload[index]) {
-          const constructor: GenericConstructor<ListableObject> = dsos.payload[index].constructor as GenericConstructor<ListableObject>;
+            const constructor: GenericConstructor<ListableObject> = dsos.payload[index].constructor as GenericConstructor<ListableObject>;
-          co = getSearchResultFor(constructor);
+            co = getSearchResultFor(constructor);
-          return Object.assign(new co(), object, {
+            return Object.assign(new co(), object, {
-            dspaceObject: dsos.payload[index]
+              dspaceObject: dsos.payload[index]
-          });
+            });
-        } else {
+          } else {
-          return undefined;
+            return undefined;
-        }
+          }
-      });
+        });
-    });
+      })
+    );
 
     const pageInfoObs: Observable<PageInfo> = responseCacheObs.pipe(
       map((entry: ResponseCacheEntry) => entry.response),
       map((response: FacetValueSuccessResponse) => response.pageInfo)
     );
 
-    const payloadObs = Observable.combineLatest(tDomainListObs, pageInfoObs, (tDomainList, pageInfo) => {
+    const payloadObs = observableCombineLatest(tDomainListObs, pageInfoObs).pipe(
-      return new PaginatedList(pageInfo, tDomainList);
+      map(([tDomainList, pageInfo]) => {
-    });
+        return new PaginatedList(pageInfo, tDomainList);
+      })
+    );
 
     return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs);
   }
@@ -244,9 +247,11 @@ export class SearchService implements OnDestroy {
       map((response: FacetValueSuccessResponse) => response.pageInfo)
     );
 
-    const payloadObs = Observable.combineLatest(facetValueObs, pageInfoObs, (facetValue, pageInfo) => {
+    const payloadObs = observableCombineLatest(facetValueObs, pageInfoObs).pipe(
-      return new PaginatedList(pageInfo, facetValue);
+      map(([facetValue, pageInfo]) => {
-    });
+        return new PaginatedList(pageInfo, facetValue);
+      })
+    );
 
     return this.rdb.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs);
   }
@@ -272,12 +277,14 @@ export class SearchService implements OnDestroy {
       switchMap((dsoRD: RemoteData<DSpaceObject>) => {
           if (dsoRD.payload.type === ResourceType.Community) {
             const community: Community = dsoRD.payload as Community;
-            return Observable.combineLatest(community.subcommunities, community.collections, (subCommunities, collections) => {
+            return observableCombineLatest(community.subcommunities, community.collections).pipe(
-              /*if this is a community, we also need to show the direct children*/
+              map(([subCommunities, collections]) => {
-              return [community, ...subCommunities.payload.page, ...collections.payload.page]
+                /*if this is a community, we also need to show the direct children*/
-            })
+                return [community, ...subCommunities.payload.page, ...collections.payload.page]
+              })
+            );
           } else {
-            return Observable.of([dsoRD.payload]);
+            return observableOf([dsoRD.payload]);
           }
         }
       ));
@@ -291,13 +298,13 @@ export class SearchService implements OnDestroy {
    * @returns {Observable<ViewMode>} The current view mode
    */
   getViewMode(): Observable<ViewMode> {
-    return this.route.queryParams.map((params) => {
+    return this.route.queryParams.pipe(map((params) => {
       if (isNotEmpty(params.view) && hasValue(params.view)) {
         return params.view;
       } else {
         return ViewMode.List;
       }
-    });
+    }));
   }
 
   /**

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 { of as observableOf } 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';
@@ -15,6 +15,7 @@ import { SearchFilterService } from '../search-filters/search-filter/search-filt
 import { hot } from 'jasmine-marbles';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { SearchConfigurationService } from '../search-service/search-configuration.service';
+import { first } from 'rxjs/operators';
 
 describe('SearchSettingsComponent', () => {
 
@@ -43,16 +44,16 @@ describe('SearchSettingsComponent', () => {
   };
 
   const activatedRouteStub = {
-    queryParams: Observable.of({
+    queryParams: observableOf({
       query: queryParam,
       scope: scopeParam
     })
   };
 
   const sidebarService = {
-    isCollapsed: Observable.of(true),
+    isCollapsed: observableOf(true),
-    collapse: () => this.isCollapsed = Observable.of(true),
+    collapse: () => this.isCollapsed = observableOf(true),
-    expand: () => this.isCollapsed = Observable.of(false)
+    expand: () => this.isCollapsed = observableOf(false)
   };
 
   beforeEach(async(() => {
@@ -101,7 +102,7 @@ describe('SearchSettingsComponent', () => {
   });
 
   it('it should show the order settings with the respective selectable options', () => {
-    (comp as any).searchOptions$.first().subscribe((options) => {
+    (comp as any).searchOptions$.pipe(first()).subscribe((options) => {
       fixture.detectChanges();
       const orderSetting = fixture.debugElement.query(By.css('div.result-order-settings'));
       expect(orderSetting).toBeDefined();
@@ -111,7 +112,7 @@ describe('SearchSettingsComponent', () => {
   });
 
   it('it should show the size settings with the respective selectable options', () => {
-    (comp as any).searchOptions$.first().subscribe((options) => {
+    (comp as any).searchOptions$.pipe(first()).subscribe((options) => {
         fixture.detectChanges();
         const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
         expect(pageSizeSetting).toBeDefined();
@@ -122,7 +123,7 @@ describe('SearchSettingsComponent', () => {
   });
 
   it('should have the proper order value selected by default', () => {
-    (comp as any).searchOptions$.first().subscribe((options) => {
+    (comp as any).searchOptions$.pipe(first()).subscribe((options) => {
       fixture.detectChanges();
       const orderSetting = fixture.debugElement.query(By.css('div.result-order-settings'));
       const childElementToBeSelected = orderSetting.query(By.css('.form-control option[value="0"][selected="selected"]'));
@@ -131,7 +132,7 @@ describe('SearchSettingsComponent', () => {
   });
 
   it('should have the proper rpp value selected by default', () => {
-    (comp as any).searchOptions$.first().subscribe((options) => {
+    (comp as any).searchOptions$.pipe(first()).subscribe((options) => {
       fixture.detectChanges();
       const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
       const childElementToBeSelected = pageSizeSetting.query(By.css('.form-control option[value="10"][selected="selected"]'));

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

@@ -3,8 +3,7 @@ import { SearchService } from '../search-service/search.service';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 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';
-import { Observable } from 'rxjs/Observable';
 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.effects.ts

@@ -1,5 +1,6 @@
+import { map, tap, filter } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Effect, Actions } from '@ngrx/effects'
+import { Effect, Actions, ofType } from '@ngrx/effects'
 import * as fromRouter from '@ngrx/router-store';
 
 import { SearchSidebarCollapseAction } from './search-sidebar.actions';
@@ -12,10 +13,14 @@ import { URLBaser } from '../../core/url-baser/url-baser';
 export class SearchSidebarEffects {
   private previousPath: string;
   @Effect() routeChange$ = this.actions$
-    .ofType(fromRouter.ROUTER_NAVIGATION)
+    .pipe(
-    .filter((action) => this.previousPath !== this.getBaseUrl(action))
+      ofType(fromRouter.ROUTER_NAVIGATION),
-    .do((action) => {this.previousPath = this.getBaseUrl(action)})
+      filter((action) => this.previousPath !== this.getBaseUrl(action)),
-    .map(() => new SearchSidebarCollapseAction());
+      tap((action) => {
+        this.previousPath = this.getBaseUrl(action)
+      }),
+      map(() => new SearchSidebarCollapseAction())
+    );
 
   constructor(private actions$: Actions) {
 

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

@@ -1,9 +1,8 @@
 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 { async, TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs/Observable';
+import { of as observableOf } from 'rxjs';
-import 'rxjs/add/observable/of';
 import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from './search-sidebar.actions';
 import { HostWindowService } from '../../shared/host-window.service';
 
@@ -13,13 +12,13 @@ describe('SearchSidebarService', () => {
     /* tslint:disable:no-empty */
     dispatch: {},
     /* tslint:enable:no-empty */
-    select: Observable.of(true)
+    pipe: observableOf(true)
   });
   const windowService = jasmine.createSpyObj('hostWindowService',
     {
-      isXs: Observable.of(true),
+      isXs: observableOf(true),
-      isSm: Observable.of(false),
+      isSm: observableOf(false),
-      isXsOrSm: Observable.of(true)
+      isXsOrSm: observableOf(true)
     });
   beforeEach(async(() => {
     TestBed.configureTestingModule({

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

@@ -1,10 +1,11 @@
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { SearchSidebarState } from './search-sidebar.reducer';
-import { createSelector, Store } from '@ngrx/store';
+import { createSelector, select, Store } from '@ngrx/store';
 import { SearchSidebarCollapseAction, SearchSidebarExpandAction } from './search-sidebar.actions';
-import { Observable } from 'rxjs/Observable';
 import { AppState } from '../../app.reducer';
 import { HostWindowService } from '../../shared/host-window.service';
+import { map } from 'rxjs/operators';
 
 const sidebarStateSelector = (state: AppState) => state.searchSidebar;
 const sidebarCollapsedSelector = createSelector(sidebarStateSelector, (sidebar: SearchSidebarState) => sidebar.sidebarCollapsed);
@@ -26,7 +27,7 @@ export class SearchSidebarService {
 
   constructor(private store: Store<AppState>, private windowService: HostWindowService) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
-    this.isCollapsedInStore = this.store.select(sidebarCollapsedSelector);
+    this.isCollapsedInStore = this.store.pipe(select(sidebarCollapsedSelector));
   }
 
   /**
@@ -34,10 +35,12 @@ export class SearchSidebarService {
    * @returns {Observable<boolean>} Emits true if the user's screen size is mobile or when the state in the store is currently collapsed
    */
   get isCollapsed(): Observable<boolean> {
-    return Observable.combineLatest(
+    return observableCombineLatest(
       this.isXsOrSm$,
-      this.isCollapsedInStore,
+      this.isCollapsedInStore
-      (mobile, store) => mobile ? store : true);
+    ).pipe(
+      map(([mobile, store]) => mobile ? store : true)
+    );
   }
 
   /**

src/app/app.component.spec.ts

@@ -97,7 +97,7 @@ describe('App component', () => {
     let store: Store<HostWindowState>;
 
     beforeEach(() => {
-      store = fixture.debugElement.injector.get(Store);
+      store = fixture.debugElement.injector.get(Store) as Store<HostWindowState>;
       spyOn(store, 'dispatch');
 
       window.dispatchEvent(new Event('resize'));

src/app/app.component.ts

@@ -1,3 +1,4 @@
+import { filter, first, take } from 'rxjs/operators';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -9,7 +10,7 @@ import {
 } from '@angular/core';
 import { NavigationCancel, NavigationEnd, NavigationStart, Router } from '@angular/router';
 
-import { Store } from '@ngrx/store';
+import { select, Store } from '@ngrx/store';
 
 import { TranslateService } from '@ngx-translate/core';
 
@@ -66,10 +67,10 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.dispatchWindowSize(this._window.nativeWindow.innerWidth, this._window.nativeWindow.innerHeight);
 
     // Whether is not authenticathed try to retrieve a possible stored auth token
-    this.store.select(isAuthenticated)
+    this.store.pipe(select(isAuthenticated),
-      .take(1)
+      first(),
-      .filter((authenticated) => !authenticated)
+      filter((authenticated) => !authenticated)
-      .subscribe((authenticated) => this.authService.checkAuthenticationToken());
+    ).subscribe((authenticated) => this.authService.checkAuthenticationToken());
 
   }
 

src/app/app.module.ts

@@ -46,55 +46,73 @@ export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppStat
   return config.debug ? [...metaReducers, ...debugMetaReducers] : metaReducers;
 }
 
-const DEV_MODULES: any[] = [];
+const IMPORTS = [
+  CommonModule,
+  SharedModule,
+  HttpClientModule,
+  AppRoutingModule,
+  CoreModule.forRoot(),
+  ScrollToModule.forRoot(),
+  NgbModule.forRoot(),
+  TranslateModule.forRoot(),
+  EffectsModule.forRoot(appEffects),
+  StoreModule.forRoot(appReducers),
+  StoreRouterConnectingModule,
+];
 
-if (!ENV_CONFIG.production) {
+IMPORTS.push(
-  DEV_MODULES.push(StoreDevtoolsModule.instrument({ maxAge: 500 }));
+  StoreDevtoolsModule.instrument({
-}
+    maxAge: 100,
+    logOnly: ENV_CONFIG.production,
+  })
+);
+
+const PROVIDERS = [
+  {
+    provide: GLOBAL_CONFIG,
+    useFactory: (getConfig)
+  },
+  {
+    provide: APP_BASE_HREF,
+    useFactory: (getBase)
+  },
+  {
+    provide: META_REDUCERS,
+    useFactory: getMetaReducers,
+    deps: [GLOBAL_CONFIG]
+  },
+  {
+    provide: RouterStateSerializer,
+    useClass: DSpaceRouterStateSerializer
+  }
+];
+
+const DECLARATIONS = [
+  AppComponent,
+  HeaderComponent,
+  FooterComponent,
+  PageNotFoundComponent,
+  NotificationComponent,
+  NotificationsBoardComponent
+];
+
+const EXPORTS = [
+  AppComponent
+];
 
 @NgModule({
   imports: [
-    CommonModule,
+    ...IMPORTS
-    SharedModule,
-    HttpClientModule,
-    AppRoutingModule,
-    CoreModule.forRoot(),
-    ScrollToModule.forRoot(),
-    NgbModule.forRoot(),
-    TranslateModule.forRoot(),
-    EffectsModule.forRoot(appEffects),
-    StoreModule.forRoot(appReducers),
-    StoreRouterConnectingModule,
-    ...DEV_MODULES
   ],
   providers: [
-    {
+    ...PROVIDERS
-      provide: GLOBAL_CONFIG,
-      useFactory: (getConfig)
-    },
-    {
-      provide: APP_BASE_HREF,
-      useFactory: (getBase)
-    },
-    {
-      provide: META_REDUCERS,
-      useFactory: getMetaReducers,
-      deps: [GLOBAL_CONFIG]
-    },
-    {
-      provide: RouterStateSerializer,
-      useClass: DSpaceRouterStateSerializer
-    }
   ],
   declarations: [
-    AppComponent,
+    ...DECLARATIONS
-    HeaderComponent,
-    FooterComponent,
-    PageNotFoundComponent,
-    NotificationComponent,
-    NotificationsBoardComponent
   ],
-  exports: [AppComponent]
+  exports: [
+    ...EXPORTS
+  ]
 })
 export class AppModule {
 

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

@@ -1,14 +1,15 @@
+import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
+import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
 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';
-import { AuthStatusResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models';
+import { AuthStatusResponse, ErrorResponse } from '../cache/response-cache.models';
 import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 
 @Injectable()
@@ -23,18 +24,18 @@ export class AuthRequestService {
   }
 
   protected fetchRequest(request: RestRequest): Observable<any> {
-    const [successResponse, errorResponse] = this.responseCache.get(request.href)
+    return this.responseCache.get(request.href).pipe(
-      .map((entry: ResponseCacheEntry) => entry.response)
+      map((entry: ResponseCacheEntry) => entry.response),
       // TODO to review when https://github.com/DSpace/dspace-angular/issues/217 will be fixed
-      .do(() => this.responseCache.remove(request.href))
+      tap(() => this.responseCache.remove(request.href)),
-      .partition((response: RestResponse) => response.isSuccessful);
+      mergeMap((response) => {
-    return Observable.merge(
+        if (response.isSuccessful && isNotEmpty(response)) {
-      errorResponse.flatMap((response: ErrorResponse) =>
+            return observableOf((response as AuthStatusResponse).response);
-        Observable.throw(new Error(response.errorMessage))),
+        } else if (!response.isSuccessful) {
-      successResponse
+          return observableThrowError(new Error((response as ErrorResponse).errorMessage));
-        .filter((response: AuthStatusResponse) => isNotEmpty(response))
+        }
-        .map((response: AuthStatusResponse) => response.response)
+      })
-        .distinctUntilChanged());
+    );
   }
 
   protected getEndpointByMethod(endpoint: string, method: string): string {
@@ -42,24 +43,24 @@ export class AuthRequestService {
   }
 
   public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable<any> {
-    return this.halService.getEndpoint(this.linkName)
+    return this.halService.getEndpoint(this.linkName).pipe(
-      .filter((href: string) => isNotEmpty(href))
+      filter((href: string) => isNotEmpty(href)),
-      .map((endpointURL) => this.getEndpointByMethod(endpointURL, method))
+      map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
-      .distinctUntilChanged()
+      distinctUntilChanged(),
-      .map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options))
+      map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
-      .do((request: PostRequest) => this.requestService.configure(request, true))
+      tap((request: PostRequest) => this.requestService.configure(request, true)),
-      .flatMap((request: PostRequest) => this.fetchRequest(request))
+      mergeMap((request: PostRequest) => this.fetchRequest(request)),
-      .distinctUntilChanged();
+      distinctUntilChanged());
   }
 
   public getRequest(method: string, options?: HttpOptions): Observable<any> {
-    return this.halService.getEndpoint(this.linkName)
+    return this.halService.getEndpoint(this.linkName).pipe(
-      .filter((href: string) => isNotEmpty(href))
+      filter((href: string) => isNotEmpty(href)),
-      .map((endpointURL) => this.getEndpointByMethod(endpointURL, method))
+      map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
-      .distinctUntilChanged()
+      distinctUntilChanged(),
-      .map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options))
+      map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)),
-      .do((request: PostRequest) => this.requestService.configure(request, true))
+      tap((request: PostRequest) => this.requestService.configure(request, true)),
-      .flatMap((request: PostRequest) => this.fetchRequest(request))
+      mergeMap((request: PostRequest) => this.fetchRequest(request)),
-      .distinctUntilChanged();
+      distinctUntilChanged());
   }
 }

src/app/core/auth/auth-response-parsing.service.spec.ts

@@ -2,20 +2,18 @@ import { AuthStatusResponse } from '../cache/response-cache.models';
 
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
-
-import { Store } from '@ngrx/store';
-import { CoreState } from '../core.reducers';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthResponseParsingService } from './auth-response-parsing.service';
 import { AuthGetRequest, AuthPostRequest } from '../data/request.models';
-import { getMockStore } from '../../shared/mocks/mock-store';
+import { MockStore } from '../../shared/testing/mock-store';
+import { ObjectCacheState } from '../cache/object-cache.reducer';
 
 describe('AuthResponseParsingService', () => {
   let service: AuthResponseParsingService;
 
-  const EnvConfig = {cache: {msToLive: 1000}} as GlobalConfig;
+  const EnvConfig = { cache: { msToLive: 1000 } } as GlobalConfig;
-  const store = getMockStore() as Store<CoreState>;
+  const store = new MockStore<ObjectCacheState>({});
-  const objectCacheService = new ObjectCacheService(store);
+  const objectCacheService = new ObjectCacheService(store as any);
 
   beforeEach(() => {
     service = new AuthResponseParsingService(EnvConfig, objectCacheService);

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

@@ -4,8 +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, of as observableOf, throwError as observableThrow } from 'rxjs';
-import 'rxjs/add/observable/of'
 
 import { AuthEffects } from './auth.effects';
 import {
@@ -30,16 +29,21 @@ import { EPersonMock } from '../../shared/testing/eperson-mock';
 describe('AuthEffects', () => {
   let authEffects: AuthEffects;
   let actions: Observable<any>;
-  const authServiceStub = new AuthServiceStub();
+  let authServiceStub;
   const store: Store<TruncatablesState> = jasmine.createSpyObj('store', {
     /* tslint:disable:no-empty */
     dispatch: {},
     /* tslint:enable:no-empty */
-    select: Observable.of(true)
+    select: observableOf(true)
   });
-  const token = authServiceStub.getToken();
+  let token;
 
+  function init() {
+    authServiceStub = new AuthServiceStub();
+    token = authServiceStub.getToken();
+  }
   beforeEach(() => {
+    init();
     TestBed.configureTestingModule({
       providers: [
         AuthEffects,
@@ -71,7 +75,7 @@ describe('AuthEffects', () => {
 
     describe('when credentials are wrong', () => {
       it('should return a AUTHENTICATE_ERROR action in response to a AUTHENTICATE action', () => {
-        spyOn((authEffects as any).authService, 'authenticate').and.returnValue(Observable.throw(new Error('Message Error test')));
+        spyOn((authEffects as any).authService, 'authenticate').and.returnValue(observableThrow(new Error('Message Error test')));
 
         actions = hot('--a-', {
           a: {
@@ -112,7 +116,7 @@ describe('AuthEffects', () => {
 
     describe('when token is not valid', () => {
       it('should return a AUTHENTICATED_ERROR action in response to a AUTHENTICATED action', () => {
-        spyOn((authEffects as any).authService, 'authenticatedUser').and.returnValue(Observable.throw(new Error('Message Error test')));
+        spyOn((authEffects as any).authService, 'authenticatedUser').and.returnValue(observableThrow(new Error('Message Error test')));
 
         actions = hot('--a-', {a: {type: AuthActionTypes.AUTHENTICATED, payload: token}});
 
@@ -138,7 +142,7 @@ describe('AuthEffects', () => {
 
     describe('when check token failed', () => {
       it('should return a CHECK_AUTHENTICATION_TOKEN_ERROR action in response to a CHECK_AUTHENTICATION_TOKEN action', () => {
-        spyOn((authEffects as any).authService, 'hasValidAuthenticationToken').and.returnValue(Observable.throw(''));
+        spyOn((authEffects as any).authService, 'hasValidAuthenticationToken').and.returnValue(observableThrow(''));
 
         actions = hot('--a-', {a: {type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN, payload: token}});
 
@@ -164,7 +168,7 @@ describe('AuthEffects', () => {
 
     describe('when refresh token failed', () => {
       it('should return a REFRESH_TOKEN_ERROR action in response to a REFRESH_TOKEN action', () => {
-        spyOn((authEffects as any).authService, 'refreshAuthenticationToken').and.returnValue(Observable.throw(''));
+        spyOn((authEffects as any).authService, 'refreshAuthenticationToken').and.returnValue(observableThrow(''));
 
         actions = hot('--a-', {a: {type: AuthActionTypes.REFRESH_TOKEN, payload: token}});
 
@@ -190,7 +194,7 @@ describe('AuthEffects', () => {
 
     describe('when refresh token failed', () => {
       it('should return a REFRESH_TOKEN_ERROR action in response to a LOG_OUT action', () => {
-        spyOn((authEffects as any).authService, 'logout').and.returnValue(Observable.throw(new Error('Message Error test')));
+        spyOn((authEffects as any).authService, 'logout').and.returnValue(observableThrow(new Error('Message Error test')));
 
         actions = hot('--a-', {a: {type: AuthActionTypes.LOG_OUT, payload: token}});
 

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

@@ -1,11 +1,11 @@
+import { of as observableOf, Observable } from 'rxjs';
+
+import { filter, debounceTime, switchMap, take, tap, catchError, map, first } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 
 // import @ngrx
-import { Actions, Effect } from '@ngrx/effects';
+import { Actions, Effect, ofType } from '@ngrx/effects';
-import { Action, Store } from '@ngrx/store';
+import { Action, select, Store } from '@ngrx/store';
-
-// import rxjs
-import { Observable } from 'rxjs/Observable';
 
 // import services
 import { AuthService } from './auth.service';
@@ -43,112 +43,131 @@ export class AuthEffects {
    * @method authenticate
    */
   @Effect()
-  public authenticate$: Observable<Action> = this.actions$
+  public authenticate$: Observable<Action> = this.actions$.pipe(
-    .ofType(AuthActionTypes.AUTHENTICATE)
+      ofType(AuthActionTypes.AUTHENTICATE),
-    .switchMap((action: AuthenticateAction) => {
+      switchMap((action: AuthenticateAction) => {
-      return this.authService.authenticate(action.payload.email, action.payload.password)
+        return this.authService.authenticate(action.payload.email, action.payload.password).pipe(
-        .first()
+          first(),
-        .map((response: AuthStatus) => new AuthenticationSuccessAction(response.token))
+          map((response: AuthStatus) => new AuthenticationSuccessAction(response.token)),
-        .catch((error) => Observable.of(new AuthenticationErrorAction(error)));
+          catchError((error) => observableOf(new AuthenticationErrorAction(error)))
-    });
+        );
+      })
+    );
 
   @Effect()
-  public authenticateSuccess$: Observable<Action> = this.actions$
+  public authenticateSuccess$: Observable<Action> = this.actions$.pipe(
-    .ofType(AuthActionTypes.AUTHENTICATE_SUCCESS)
+      ofType(AuthActionTypes.AUTHENTICATE_SUCCESS),
-    .do((action: AuthenticationSuccessAction) => this.authService.storeToken(action.payload))
+      tap((action: AuthenticationSuccessAction) => this.authService.storeToken(action.payload)),
-    .map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload));
+      map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload))
+    );
 
   @Effect()
-  public authenticated$: Observable<Action> = this.actions$
+  public authenticated$: Observable<Action> = this.actions$.pipe(
-    .ofType(AuthActionTypes.AUTHENTICATED)
+      ofType(AuthActionTypes.AUTHENTICATED),
-    .switchMap((action: AuthenticatedAction) => {
+      switchMap((action: AuthenticatedAction) => {
-      return this.authService.authenticatedUser(action.payload)
+        return this.authService.authenticatedUser(action.payload).pipe(
-        .map((user: EPerson) => new AuthenticatedSuccessAction((user !== null), action.payload, user))
+          map((user: EPerson) => new AuthenticatedSuccessAction((user !== null), action.payload, user)),
-        .catch((error) => Observable.of(new AuthenticatedErrorAction(error)));
+          catchError((error) => observableOf(new AuthenticatedErrorAction(error))),);
-    });
+      })
+    );
 
   // It means "reacts to this action but don't send another"
-  @Effect({dispatch: false})
+  @Effect({ dispatch: false })
-  public authenticatedError$: Observable<Action> = this.actions$
+  public authenticatedError$: Observable<Action> = this.actions$.pipe(
-    .ofType(AuthActionTypes.AUTHENTICATED_ERROR)
+      ofType(AuthActionTypes.AUTHENTICATED_ERROR),
-    .do((action: LogOutSuccessAction) => this.authService.removeToken());
+      tap((action: LogOutSuccessAction) => this.authService.removeToken())
+    );
 
   @Effect()
-  public checkToken$: Observable<Action> = this.actions$
+  public checkToken$: Observable<Action> = this.actions$.pipe(ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN),
-    .ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN)
+      switchMap(() => {
-    .switchMap(() => {
+        return this.authService.hasValidAuthenticationToken().pipe(
-      return this.authService.hasValidAuthenticationToken()
+          map((token: AuthTokenInfo) => new AuthenticatedAction(token)),
-        .map((token: AuthTokenInfo) => new AuthenticatedAction(token))
+          catchError((error) => observableOf(new CheckAuthenticationTokenErrorAction()))
-        .catch((error) => Observable.of(new CheckAuthenticationTokenErrorAction()));
+        );
-    });
+      })
+    );
 
   @Effect()
-  public createUser$: Observable<Action> = this.actions$
+  public createUser$: Observable<Action> = this.actions$.pipe(
-    .ofType(AuthActionTypes.REGISTRATION)
+      ofType(AuthActionTypes.REGISTRATION),
-    .debounceTime(500) // to remove when functionality is implemented
+      debounceTime(500), // to remove when functionality is implemented
-    .switchMap((action: RegistrationAction) => {
+      switchMap((action: RegistrationAction) => {
-      return this.authService.create(action.payload)
+        return this.authService.create(action.payload).pipe(
-        .map((user: EPerson) => new RegistrationSuccessAction(user))
+          map((user: EPerson) => new RegistrationSuccessAction(user)),
-        .catch((error) => Observable.of(new RegistrationErrorAction(error)));
+          catchError((error) => observableOf(new RegistrationErrorAction(error)))
-    });
+        );
+      })
+    );
 
   @Effect()
-  public refreshToken$: Observable<Action> = this.actions$
+  public refreshToken$: Observable<Action> = this.actions$.pipe(ofType(AuthActionTypes.REFRESH_TOKEN),
-    .ofType(AuthActionTypes.REFRESH_TOKEN)
+      switchMap((action: RefreshTokenAction) => {
-    .switchMap((action: RefreshTokenAction) => {
+        return this.authService.refreshAuthenticationToken(action.payload).pipe(
-      return this.authService.refreshAuthenticationToken(action.payload)
+          map((token: AuthTokenInfo) => new RefreshTokenSuccessAction(token)),
-        .map((token: AuthTokenInfo) => new RefreshTokenSuccessAction(token))
+          catchError((error) => observableOf(new RefreshTokenErrorAction()))
-        .catch((error) => Observable.of(new RefreshTokenErrorAction()));
+        );
-    });
+      })
+    );
 
   // It means "reacts to this action but don't send another"
-  @Effect({dispatch: false})
+  @Effect({ dispatch: false })
-  public refreshTokenSuccess$: Observable<Action> = this.actions$
+  public refreshTokenSuccess$: Observable<Action> = this.actions$.pipe(
-    .ofType(AuthActionTypes.REFRESH_TOKEN_SUCCESS)
+      ofType(AuthActionTypes.REFRESH_TOKEN_SUCCESS),
-    .do((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload));
+      tap((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload))
+    );
 
   /**
    * When the store is rehydrated in the browser,
    * clear a possible invalid token or authentication errors
    */
-  @Effect({dispatch: false})
+  @Effect({ dispatch: false })
-  public clearInvalidTokenOnRehydrate$: Observable<any> = this.actions$
+  public clearInvalidTokenOnRehydrate$: Observable<any> = this.actions$.pipe(
-    .ofType(StoreActionTypes.REHYDRATE)
+    ofType(StoreActionTypes.REHYDRATE),
-    .switchMap(() => {
+    switchMap(() => {
-      return this.store.select(isAuthenticated)
+      return this.store.pipe(
-        .take(1)
+        select(isAuthenticated),
-        .filter((authenticated) => !authenticated)
+        first(),
-        .do(() => this.authService.removeToken())
+        filter((authenticated) => !authenticated),
-        .do(() => this.authService.resetAuthenticationError());
+        tap(() => this.authService.removeToken()),
-    });
+        tap(() => this.authService.resetAuthenticationError())
+      );
+    }));
 
   @Effect()
   public logOut$: Observable<Action> = this.actions$
-    .ofType(AuthActionTypes.LOG_OUT)
+    .pipe(
-    .switchMap(() => {
+      ofType(AuthActionTypes.LOG_OUT),
-      return this.authService.logout()
+      switchMap(() => {
-        .map((value) => new LogOutSuccessAction())
+        return this.authService.logout().pipe(
-        .catch((error) => Observable.of(new LogOutErrorAction(error)));
+          map((value) => new LogOutSuccessAction()),
-    });
+          catchError((error) => observableOf(new LogOutErrorAction(error)))
+        );
+      })
+    );
 
-  @Effect({dispatch: false})
+  @Effect({ dispatch: false })
   public logOutSuccess$: Observable<Action> = this.actions$
-    .ofType(AuthActionTypes.LOG_OUT_SUCCESS)
+    .pipe(ofType(AuthActionTypes.LOG_OUT_SUCCESS),
-    .do(() => this.authService.removeToken())
+      tap(() => this.authService.removeToken()),
-    .do(() => this.authService.clearRedirectUrl())
+      tap(() => this.authService.clearRedirectUrl()),
-    .do(() => this.authService.refreshAfterLogout());
+      tap(() => this.authService.refreshAfterLogout())
+    );
 
-  @Effect({dispatch: false})
+  @Effect({ dispatch: false })
   public redirectToLogin$: Observable<Action> = this.actions$
-    .ofType(AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED)
+    .pipe(ofType(AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED),
-    .do(() => this.authService.removeToken())
+      tap(() => this.authService.removeToken()),
-    .do(() => this.authService.redirectToLogin());
+      tap(() => this.authService.redirectToLogin())
+    );
 
-  @Effect({dispatch: false})
+  @Effect({ dispatch: false })
   public redirectToLoginTokenExpired$: Observable<Action> = this.actions$
-    .ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED)
+    .pipe(
-    .do(() => this.authService.removeToken())
+      ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED),
-    .do(() => this.authService.redirectToLoginWhenTokenExpired());
+      tap(() => this.authService.removeToken()),
+      tap(() => this.authService.redirectToLoginWhenTokenExpired())
+    );
 
   /**
    * @constructor

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 { of as observableOf } from 'rxjs';
 
 import { AuthInterceptor } from './auth.interceptor';
 import { AuthService } from './auth.service';
@@ -23,7 +23,7 @@ describe(`AuthInterceptor`, () => {
     /* tslint:disable:no-empty */
     dispatch: {},
     /* tslint:enable:no-empty */
-    select: Observable.of(true)
+    select: observableOf(true)
   });
 
   beforeEach(() => {

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

@@ -1,13 +1,16 @@
+import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
+
+import { catchError, filter, map } from 'rxjs/operators';
 import { Injectable, Injector } from '@angular/core';
 import {
-  HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpResponse,
+  HttpErrorResponse,
-  HttpErrorResponse, HttpResponseBase
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+  HttpResponse,
+  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';
@@ -79,11 +82,11 @@ export class AuthInterceptor implements HttpInterceptor {
       // The access token is expired
       // Redirect to the login route
       this.store.dispatch(new RedirectWhenTokenExpiredAction('auth.messages.expired'));
-      return Observable.of(null);
+      return observableOf(null);
     } else if (!this.isAuthRequest(req) && isNotEmpty(token)) {
       // Intercept a request that is not to the authentication endpoint
-      authService.isTokenExpiring()
+      authService.isTokenExpiring().pipe(
-        .filter((isExpiring) => isExpiring)
+        filter((isExpiring) => isExpiring))
         .subscribe(() => {
           // If the current request url is already in the refresh token request list, skip it
           if (isUndefined(find(this.refreshTokenRequestUrls, req.url))) {
@@ -101,8 +104,8 @@ export class AuthInterceptor implements HttpInterceptor {
     }
 
     // Pass on the new request instead of the original request.
-    return next.handle(newReq)
+    return next.handle(newReq).pipe(
-      .map((response) => {
+      map((response) => {
         // Intercept a Login/Logout response
         if (response instanceof HttpResponse && this.isSuccess(response) && (this.isLoginResponse(response) || this.isLogoutResponse(response))) {
           // It's a success Login/Logout response
@@ -122,8 +125,8 @@ export class AuthInterceptor implements HttpInterceptor {
         } else {
           return response;
         }
-      })
+      }),
-      .catch((error, caught) => {
+      catchError((error, caught) => {
         // Intercept an error response
         if (error instanceof HttpErrorResponse) {
           // Checks if is a response from a request to an authentication endpoint
@@ -138,7 +141,7 @@ export class AuthInterceptor implements HttpInterceptor {
               statusText: error.statusText,
               url: error.url
             });
-            return Observable.of(authResponse);
+            return observableOf(authResponse);
           } else if (this.isUnauthorized(error) && isNotNull(token) && authService.isTokenExpired()) {
             // The access token provided is expired, revoked, malformed, or invalid for other reasons
             // Redirect to the login route
@@ -146,8 +149,7 @@ export class AuthInterceptor implements HttpInterceptor {
           }
         }
         // Return error response as is.
-        return Observable.throw(error);
+        return observableThrowError(error);
-      }) as any;
+      })) as any;
-
   }
 }

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

@@ -3,9 +3,8 @@ import { CommonModule } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { Store, StoreModule } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-import 'rxjs/add/observable/of';
+import { of as observableOf } from 'rxjs';
 
 import { authReducer, AuthState } from './auth.reducer';
 import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service';
@@ -29,41 +28,53 @@ describe('AuthService test', () => {
 
   const mockStore: Store<AuthState> = jasmine.createSpyObj('store', {
     dispatch: {},
-    select: Observable.of(true)
+    pipe: observableOf(true)
   });
   let authService: AuthService;
-  const authRequest = new AuthRequestServiceStub();
+  let authRequest;
   const window = new NativeWindowRef();
   const routerStub = new RouterStub();
-  const routeStub = new ActivatedRouteStub();
+  let routeStub;
   let storage: CookieService;
-  const token: AuthTokenInfo = new AuthTokenInfo('test_token');
+  let token: AuthTokenInfo;
-  token.expires = Date.now() + (1000 * 60 * 60);
+  let authenticatedState;
-  let authenticatedState = {
-    authenticated: true,
-    loaded: true,
-    loading: false,
-    authToken: token,
-    user: EPersonMock
-  };
   const rdbService = getMockRemoteDataBuildService();
-  describe('', () => {
 
+  function init() {
+    token = new AuthTokenInfo('test_token');
+    token.expires = Date.now() + (1000 * 60 * 60);
+    authenticatedState = {
+      authenticated: true,
+      loaded: true,
+      loading: false,
+      authToken: token,
+      user: EPersonMock
+    };
+    authRequest = new AuthRequestServiceStub();
+    routeStub = new ActivatedRouteStub();
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('', () => {
     beforeEach(() => {
+
       TestBed.configureTestingModule({
         imports: [
           CommonModule,
-          StoreModule.forRoot({authReducer}),
+          StoreModule.forRoot({ authReducer }),
         ],
         declarations: [],
         providers: [
-          {provide: AuthRequestService, useValue: authRequest},
+          { provide: AuthRequestService, useValue: authRequest },
-          {provide: NativeWindowService, useValue: window},
+          { provide: NativeWindowService, useValue: window },
-          {provide: REQUEST, useValue: {}},
+          { provide: REQUEST, useValue: {} },
-          {provide: Router, useValue: routerStub},
+          { provide: Router, useValue: routerStub },
-          {provide: ActivatedRoute, useValue: routeStub},
+          { provide: ActivatedRoute, useValue: routeStub },
           {provide: Store, useValue: mockStore},
-          {provide: RemoteDataBuildService, useValue: rdbService},
+          { provide: RemoteDataBuildService, useValue: rdbService },
           CookieService,
           AuthService
         ],
@@ -116,15 +127,16 @@ describe('AuthService test', () => {
   describe('', () => {
 
     beforeEach(async(() => {
+      init();
       TestBed.configureTestingModule({
         imports: [
-          StoreModule.forRoot({authReducer})
+          StoreModule.forRoot({ authReducer })
         ],
         providers: [
-          {provide: AuthRequestService, useValue: authRequest},
+          { provide: AuthRequestService, useValue: authRequest },
-          {provide: REQUEST, useValue: {}},
+          { provide: REQUEST, useValue: {} },
-          {provide: Router, useValue: routerStub},
+          { provide: Router, useValue: routerStub },
-          {provide: RemoteDataBuildService, useValue: rdbService},
+          { provide: RemoteDataBuildService, useValue: rdbService },
           CookieService
         ]
       }).compileComponents();
@@ -136,7 +148,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, authReqService, router, cookieService, store, rdbService);
+      authService = new AuthService({}, window, undefined, authReqService, router, cookieService, store, rdbService);
     }));
 
     it('should return true when user is logged in', () => {
@@ -168,12 +180,12 @@ describe('AuthService test', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [
-          StoreModule.forRoot({authReducer})
+          StoreModule.forRoot({ authReducer })
         ],
         providers: [
-          {provide: AuthRequestService, useValue: authRequest},
+          { provide: AuthRequestService, useValue: authRequest },
-          {provide: REQUEST, useValue: {}},
+          { provide: REQUEST, useValue: {} },
-          {provide: Router, useValue: routerStub},
+          { provide: Router, useValue: routerStub },
           ClientCookieService,
           CookieService
         ]
@@ -195,7 +207,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, authReqService, router, cookieService, store, rdbService);
+      authService = new AuthService({}, window, undefined, authReqService, router, cookieService, store, rdbService);
       storage = (authService as any).storage;
       spyOn(storage, 'get');
       spyOn(storage, 'remove');

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

@@ -1,13 +1,22 @@
-import { Inject, Injectable } from '@angular/core';
+import { Observable, of as observableOf } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  first,
+  map,
+  startWith,
+  switchMap,
+  take,
+  withLatestFrom
+} from 'rxjs/operators';
+import { Inject, Injectable, Optional } from '@angular/core';
 import { PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree } from '@angular/router';
 import { HttpHeaders } from '@angular/common/http';
-import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
 
 import { RouterReducerState } from '@ngrx/router-store';
-import { Store } from '@ngrx/store';
+import { select, Store } from '@ngrx/store';
 import { CookieAttributes } from 'js-cookie';
-import { Observable } from 'rxjs/Observable';
-import { map, switchMap, withLatestFrom } from 'rxjs/operators';
 
 import { EPerson } from '../eperson/models/eperson.model';
 import { AuthRequestService } from './auth-request.service';
@@ -50,26 +59,30 @@ export class AuthService {
   constructor(@Inject(REQUEST) protected req: any,
               @Inject(NativeWindowService) protected _window: NativeWindowRef,
               protected authRequestService: AuthRequestService,
+              @Optional() @Inject(RESPONSE) private response: any,
               protected router: Router,
               protected storage: CookieService,
               protected store: Store<AppState>,
               protected rdbService: RemoteDataBuildService
   ) {
-    this.store.select(isAuthenticated)
+    this.store.pipe(
-      .startWith(false)
+      select(isAuthenticated),
-      .subscribe((authenticated: boolean) => this._authenticated = authenticated);
+      startWith(false)
+    ).subscribe((authenticated: boolean) => this._authenticated = authenticated);
 
     // If current route is different from the one setted in authentication guard
     // and is not the login route, clear redirect url and messages
-    const routeUrl$ = this.store.select(routerStateSelector)
+    const routeUrl$ = this.store.pipe(
-      .filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state))
+      select(routerStateSelector),
-      .filter((routerState: RouterReducerState) => !this.isLoginRoute(routerState.state.url))
+      filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state)),
-      .map((routerState: RouterReducerState) => routerState.state.url);
+      filter((routerState: RouterReducerState) => !this.isLoginRoute(routerState.state.url)),
-    const redirectUrl$ = this.store.select(getRedirectUrl).distinctUntilChanged();
+      map((routerState: RouterReducerState) => routerState.state.url)
+    );
+    const redirectUrl$ = this.store.pipe(select(getRedirectUrl), distinctUntilChanged());
     routeUrl$.pipe(
       withLatestFrom(redirectUrl$),
       map(([routeUrl, redirectUrl]) => [routeUrl, redirectUrl])
-    ).filter(([routeUrl, redirectUrl]) => isNotEmpty(redirectUrl) && (routeUrl !== redirectUrl))
+    ).pipe(filter(([routeUrl, redirectUrl]) => isNotEmpty(redirectUrl) && (routeUrl !== redirectUrl)))
       .subscribe(() => {
         this.clearRedirectUrl();
       });
@@ -102,14 +115,14 @@ export class AuthService {
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
     options.headers = headers;
-    return this.authRequestService.postToEndpoint('login', body, options)
+    return this.authRequestService.postToEndpoint('login', body, options).pipe(
-      .map((status: AuthStatus) => {
+      map((status: AuthStatus) => {
         if (status.authenticated) {
           return status;
         } else {
           throw(new Error('Invalid email or password'));
         }
-      })
+      }))
 
   }
 
@@ -118,7 +131,7 @@ export class AuthService {
    * @returns {Observable<boolean>}
    */
   public isAuthenticated(): Observable<boolean> {
-    return this.store.select(isAuthenticated);
+    return this.store.pipe(select(isAuthenticated));
   }
 
   /**
@@ -158,9 +171,10 @@ export class AuthService {
    * Checks if token is present into storage and is not expired
    */
   public hasValidAuthenticationToken(): Observable<AuthTokenInfo> {
-    return this.store.select(getAuthenticationToken)
+    return this.store.pipe(
-      .take(1)
+      select(getAuthenticationToken),
-      .map((authTokenInfo: AuthTokenInfo) => {
+      take(1),
+      map((authTokenInfo: AuthTokenInfo) => {
         let token: AuthTokenInfo;
         // Retrieve authentication token info and check if is valid
         token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM);
@@ -169,7 +183,8 @@ export class AuthService {
         } else {
           throw false;
         }
-      });
+      })
+    );
   }
 
   /**
@@ -181,14 +196,14 @@ export class AuthService {
     headers = headers.append('Accept', 'application/json');
     headers = headers.append('Authorization', `Bearer ${token.accessToken}`);
     options.headers = headers;
-    return this.authRequestService.postToEndpoint('login', {}, options)
+    return this.authRequestService.postToEndpoint('login', {}, options).pipe(
-      .map((status: AuthStatus) => {
+      map((status: AuthStatus) => {
         if (status.authenticated) {
           return status.token;
         } else {
           throw(new Error('Not authenticated'));
         }
-      });
+      }));
   }
 
   /**
@@ -207,7 +222,7 @@ export class AuthService {
     // details and then return the new user object
     // but, let's just return the new user for this example.
     // this._authenticated = true;
-    return Observable.of(user);
+    return observableOf(user);
   }
 
   /**
@@ -219,14 +234,15 @@ export class AuthService {
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
     const options: HttpOptions = Object.create({ headers, responseType: 'text' });
-    return this.authRequestService.getRequest('logout', options)
+    return this.authRequestService.getRequest('logout', options).pipe(
-      .map((status: AuthStatus) => {
+      map((status: AuthStatus) => {
         if (!status.authenticated) {
           return true;
         } else {
           throw(new Error('auth.errors.invalid-user'));
         }
-      })
+      }))
+
   }
 
   /**
@@ -246,7 +262,7 @@ export class AuthService {
    */
   public getToken(): AuthTokenInfo {
     let token: AuthTokenInfo;
-    this.store.select(getAuthenticationToken)
+    this.store.pipe(select(getAuthenticationToken))
       .subscribe((authTokenInfo: AuthTokenInfo) => {
         // Retrieve authentication token info and check if is valid
         token = authTokenInfo || null;
@@ -259,9 +275,10 @@ export class AuthService {
    * @returns {boolean}
    */
   public isTokenExpiring(): Observable<boolean> {
-    return this.store.select(isTokenRefreshing)
+    return this.store.pipe(
-      .first()
+      select(isTokenRefreshing),
-      .map((isRefreshing: boolean) => {
+      first(),
+      map((isRefreshing: boolean) => {
         if (this.isTokenExpired() || isRefreshing) {
           return false;
         } else {
@@ -269,6 +286,7 @@ export class AuthService {
           return token.expires - (60 * 5 * 1000) < Date.now();
         }
       })
+    )
   }
 
   /**
@@ -328,6 +346,10 @@ export class AuthService {
     if (this._window.nativeWindow.location) {
       // Hard redirect to login page, so that all state is definitely lost
       this._window.nativeWindow.location.href = redirectUrl;
+    } else if (this.response) {
+      if (!this.response._headerSent) {
+        this.response.redirect(302, redirectUrl);
+      }
     } else {
       this.router.navigateByUrl(redirectUrl);
     }
@@ -337,17 +359,13 @@ export class AuthService {
    * Redirect to the route navigated before the login
    */
   public redirectToPreviousUrl() {
-    this.getRedirectUrl()
+    this.getRedirectUrl().pipe(
-      .first()
+      first())
       .subscribe((redirectUrl) => {
+
         if (isNotEmpty(redirectUrl)) {
           this.clearRedirectUrl();
-
+          this.router.onSameUrlNavigation = 'reload';
-          // override the route reuse strategy
-          this.router.routeReuseStrategy.shouldReuseRoute = () => {
-            return false;
-          };
-          this.router.navigated = false;
           const url = decodeURIComponent(redirectUrl);
           this.router.navigateByUrl(url);
           /* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
@@ -376,9 +394,9 @@ export class AuthService {
   getRedirectUrl(): Observable<string> {
     const redirectUrl = this.storage.get(REDIRECT_COOKIE);
     if (isNotEmpty(redirectUrl)) {
-      return Observable.of(redirectUrl);
+      return observableOf(redirectUrl);
     } else {
-      return this.store.select(getRedirectUrl);
+      return this.store.pipe(select(getRedirectUrl));
     }
   }
 

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

@@ -1,8 +1,10 @@
+
+import {take} from 'rxjs/operators';
 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';
+import { select, Store } from '@ngrx/store';
 
 // reducers
 import { CoreState } from '../core.reducers';
@@ -52,12 +54,12 @@ export class AuthenticatedGuard implements CanActivate, CanLoad {
 
   private handleAuth(url: string): Observable<boolean> {
     // get observable
-    const observable = this.store.select(isAuthenticated);
+    const observable = this.store.pipe(select(isAuthenticated));
 
     // redirect to sign in page if user is not authenticated
-    observable
+    observable.pipe(
       // .filter(() => isEmpty(this.router.routerState.snapshot.url) || this.router.routerState.snapshot.url === url)
-      .take(1)
+      take(1))
       .subscribe((authenticated) => {
         if (!authenticated) {
           this.authService.setRedirectUrl(url);

src/app/core/auth/models/auth-status.model.ts

@@ -2,7 +2,7 @@ import { AuthError } from './auth-error.model';
 import { AuthTokenInfo } from './auth-token-info.model';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { RemoteData } from '../../data/remote-data';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 export class AuthStatus {
 

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

@@ -1,7 +1,7 @@
 import { first, map, switchMap } from 'rxjs/operators';
 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/testing';
 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.spec.ts

@@ -0,0 +1,59 @@
+import { RemoteDataBuildService } from './remote-data-build.service';
+import { Item } from '../../shared/item.model';
+import { PaginatedList } from '../../data/paginated-list';
+import { PageInfo } from '../../shared/page-info.model';
+import { RemoteData } from '../../data/remote-data';
+import { of as observableOf } from 'rxjs';
+
+const pageInfo = new PageInfo();
+const array = [
+  Object.assign(new Item(), {
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Item nr 1'
+      }]
+  }),
+  Object.assign(new Item(), {
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Item nr 2'
+      }]
+  })
+];
+const paginatedList = new PaginatedList(pageInfo, array);
+const arrayRD = new RemoteData(false, false, true, undefined, array);
+const paginatedListRD = new RemoteData(false, false, true, undefined, paginatedList);
+
+describe('RemoteDataBuildService', () => {
+  let service: RemoteDataBuildService;
+
+  beforeEach(() => {
+    service = new RemoteDataBuildService(undefined, undefined, undefined);
+  });
+
+  describe('when toPaginatedList is called', () => {
+    let expected: RemoteData<PaginatedList<Item>>;
+
+    beforeEach(() => {
+      expected = paginatedListRD;
+    });
+
+    it('should return the correct remoteData of a paginatedList when the input is a (remoteData of an) array', () => {
+      const result = (service as any).toPaginatedList(observableOf(arrayRD), pageInfo);
+      result.subscribe((resultRD) => {
+        expect(resultRD).toEqual(expected);
+      });
+    });
+
+    it('should return the correct remoteData of a paginatedList when the input is a (remoteData of a) paginated list', () => {
+      const result = (service as any).toPaginatedList(observableOf(paginatedListRD), pageInfo);
+      result.subscribe((resultRD) => {
+        expect(resultRD).toEqual(expected);
+      });
+    });
+  });
+});

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

@@ -1,5 +1,10 @@
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  race as observableRace
+} from 'rxjs';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
 import { distinctUntilChanged, flatMap, map, startWith } from 'rxjs/operators';
 import { hasValue, hasValueOperator, isEmpty, isNotEmpty } from '../../../shared/empty.util';
 import { PaginatedList } from '../../data/paginated-list';
@@ -17,10 +22,10 @@ import { ResponseCacheService } from '../response-cache.service';
 import { getMapsTo, getRelationMetadata, getRelationships } from './build-decorators';
 import { PageInfo } from '../../shared/page-info.model';
 import {
+  filterSuccessfulResponses,
   getRequestFromSelflink,
   getResourceLinksFromResponse,
-  getResponseFromSelflink,
+  getResponseFromSelflink
-  filterSuccessfulResponses
 } from '../../shared/operators';
 
 @Injectable()
@@ -32,24 +37,24 @@ export class RemoteDataBuildService {
 
   buildSingle<TNormalized extends NormalizedObject, TDomain>(href$: string | Observable<string>): Observable<RemoteData<TDomain>> {
     if (typeof href$ === 'string') {
-      href$ = Observable.of(href$);
+      href$ = observableOf(href$);
     }
     const requestHref$ = href$.pipe(flatMap((href: string) =>
       this.objectCache.getRequestHrefBySelfLink(href)));
 
-    const requestEntry$ = Observable.race(
+    const requestEntry$ = observableRace(
       href$.pipe(getRequestFromSelflink(this.requestService)),
       requestHref$.pipe(getRequestFromSelflink(this.requestService))
     );
 
-    const responseCache$ = Observable.race(
+    const responseCache$ = observableRace(
       href$.pipe(getResponseFromSelflink(this.responseCache)),
       requestHref$.pipe(getResponseFromSelflink(this.responseCache))
     );
 
     // always use self link if that is cached, only if it isn't, get it via the response.
     const payload$ =
-      Observable.combineLatest(
+      observableCombineLatest(
         href$.pipe(
           flatMap((href: string) => this.objectCache.getBySelfLink<TNormalized>(href)),
           startWith(undefined)
@@ -60,20 +65,20 @@ export class RemoteDataBuildService {
             if (isNotEmpty(resourceSelfLinks)) {
               return this.objectCache.getBySelfLink(resourceSelfLinks[0]);
             } else {
-              return Observable.of(undefined);
+              return observableOf(undefined);
             }
           }),
           distinctUntilChanged(),
           startWith(undefined)
-        ),
+        )
-        (fromSelfLink, fromResponse) => {
+      ).pipe(
+        map(([fromSelfLink, fromResponse]) => {
           if (hasValue(fromSelfLink)) {
             return fromSelfLink;
           } else {
             return fromResponse;
           }
-        }
+        }),
-      ).pipe(
         hasValueOperator(),
         map((normalized: TNormalized) => {
           return this.build<TNormalized, TDomain>(normalized);
@@ -85,8 +90,8 @@ export class RemoteDataBuildService {
   }
 
   toRemoteDataObservable<T>(requestEntry$: Observable<RequestEntry>, responseCache$: Observable<ResponseCacheEntry>, payload$: Observable<T>) {
-    return Observable.combineLatest(requestEntry$, responseCache$.startWith(undefined), payload$,
+    return observableCombineLatest(requestEntry$, responseCache$.pipe(startWith(undefined)), payload$).pipe(
-      (reqEntry: RequestEntry, resEntry: ResponseCacheEntry, payload: T) => {
+      map(([reqEntry, resEntry, payload]) => {
         const requestPending = hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true;
         const responsePending = hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false;
         let isSuccessful: boolean;
@@ -105,12 +110,13 @@ export class RemoteDataBuildService {
           error,
           payload
         );
-      });
+      })
+    );
   }
 
   buildList<TNormalized extends NormalizedObject, TDomain>(href$: string | Observable<string>): Observable<RemoteData<PaginatedList<TDomain>>> {
     if (typeof href$ === 'string') {
-      href$ = Observable.of(href$);
+      href$ = observableOf(href$);
     }
 
     const requestEntry$ = href$.pipe(getRequestFromSelflink(this.requestService));
@@ -119,12 +125,12 @@ export class RemoteDataBuildService {
     const tDomainList$ = responseCache$.pipe(
       getResourceLinksFromResponse(),
       flatMap((resourceUUIDs: string[]) => {
-        return this.objectCache.getList(resourceUUIDs)
+        return this.objectCache.getList(resourceUUIDs).pipe(
-          .map((normList: TNormalized[]) => {
+          map((normList: TNormalized[]) => {
             return normList.map((normalized: TNormalized) => {
               return this.build<TNormalized, TDomain>(normalized);
             });
-          });
+          }));
       }),
       startWith([]),
       distinctUntilChanged()
@@ -142,11 +148,13 @@ export class RemoteDataBuildService {
           }
         }
       })
-  );
+    );
 
-    const payload$ = Observable.combineLatest(tDomainList$, pageInfo$, (tDomainList, pageInfo) => {
+    const payload$ = observableCombineLatest(tDomainList$, pageInfo$).pipe(
-      return new PaginatedList(pageInfo, tDomainList);
+      map(([tDomainList, pageInfo]) => {
-    });
+        return new PaginatedList(pageInfo, tDomainList);
+      })
+    );
 
     return this.toRemoteDataObservable(requestEntry$, responseCache$, payload$);
   }
@@ -190,7 +198,7 @@ export class RemoteDataBuildService {
         }
 
         if (hasValue(normalized[relationship].page)) {
-          links[relationship] = this.aggregatePaginatedList(result, normalized[relationship].pageInfo);
+          links[relationship] = this.toPaginatedList(result, normalized[relationship].pageInfo);
         } else {
           links[relationship] = result;
         }
@@ -204,12 +212,11 @@ export class RemoteDataBuildService {
   aggregate<T>(input: Array<Observable<RemoteData<T>>>): Observable<RemoteData<T[]>> {
 
     if (isEmpty(input)) {
-      return Observable.of(new RemoteData(false, false, true, null, []));
+      return observableOf(new RemoteData(false, false, true, null, []));
     }
 
-    return Observable.combineLatest(
+    return observableCombineLatest(...input).pipe(
-      ...input,
+      map((arr) => {
-      (...arr: Array<RemoteData<T>>) => {
         const requestPending: boolean = arr
           .map((d: RemoteData<T>) => d.isRequestPending)
           .every((b: boolean) => b === true);
@@ -251,11 +258,19 @@ export class RemoteDataBuildService {
           error,
           payload
         );
-      })
+      }))
   }
 
-  aggregatePaginatedList<T>(input: Observable<RemoteData<T[]>>, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<T>>> {
+  private toPaginatedList<T>(input: Observable<RemoteData<T[] | PaginatedList<T>>>, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<T>>> {
-    return input.map((rd) => Object.assign(rd, {payload: new PaginatedList(pageInfo, rd.payload)}));
+    return input.pipe(
+      map((rd: RemoteData<T[] | PaginatedList<T>>) => {
+        if (Array.isArray(rd.payload)) {
+          return Object.assign(rd, { payload: new PaginatedList(pageInfo, rd.payload) })
+        } else {
+          return Object.assign(rd, { payload: new PaginatedList(pageInfo, rd.payload.page) });
+        }
+      })
+    );
   }
 
 }

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.effects.ts

@@ -1,5 +1,6 @@
+import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, Effect } from '@ngrx/effects';
+import { Actions, Effect, ofType } from '@ngrx/effects';
 
 import { StoreActionTypes } from '../../store.actions';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
@@ -16,9 +17,11 @@ export class ObjectCacheEffects {
    * time ago, and will likely need to be revisited later
    */
   @Effect() fixTimestampsOnRehydrate = this.actions$
-    .ofType(StoreActionTypes.REHYDRATE)
+    .pipe(ofType(StoreActionTypes.REHYDRATE),
-    .map(() => new ResetObjectCacheTimestampsAction(new Date().getTime()));
+      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime()))
+    );
 
-  constructor(private actions$: Actions) { }
+  constructor(private actions$: Actions) {
+  }
 
 }

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

@@ -1,11 +1,13 @@
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { of as observableOf } from 'rxjs';
 
 import { ObjectCacheService } from './object-cache.service';
 import { AddToObjectCacheAction, RemoveFromObjectCacheAction } from './object-cache.actions';
 import { CoreState } from '../core.reducers';
 import { ResourceType } from '../shared/resource-type';
 import { NormalizedItem } from './models/normalized-item.model';
+import { first } from 'rxjs/operators';
+import * as ngrx from '@ngrx/store';
 
 describe('ObjectCacheService', () => {
   let service: ObjectCacheService;
@@ -51,10 +53,14 @@ describe('ObjectCacheService', () => {
 
   describe('getBySelfLink', () => {
     it('should return an observable of the cached object with the specified self link and type', () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(cacheEntry));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(cacheEntry);
+        };
+      });
 
       // due to the implementation of spyOn above, this subscribe will be synchronous
-      service.getBySelfLink(selfLink).take(1).subscribe((o) => {
+      service.getBySelfLink(selfLink).pipe(first()).subscribe((o) => {
           expect(o.self).toBe(selfLink);
           // this only works if testObj is an instance of TestClass
           expect(o instanceof NormalizedItem).toBeTruthy();
@@ -63,7 +69,11 @@ describe('ObjectCacheService', () => {
     });
 
     it('should not return a cached object that has exceeded its time to live', () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(invalidCacheEntry));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(invalidCacheEntry);
+        };
+      });
 
       let getObsHasFired = false;
       const subscription = service.getBySelfLink(selfLink).subscribe((o) => getObsHasFired = true);
@@ -76,9 +86,9 @@ describe('ObjectCacheService', () => {
     it('should return an observable of the array of cached objects with the specified self link and type', () => {
       const item = new NormalizedItem();
       item.self = selfLink;
-      spyOn(service, 'getBySelfLink').and.returnValue(Observable.of(item));
+      spyOn(service, 'getBySelfLink').and.returnValue(observableOf(item));
 
-      service.getList([selfLink, selfLink]).take(1).subscribe((arr) => {
+      service.getList([selfLink, selfLink]).pipe(first()).subscribe((arr) => {
         expect(arr[0].self).toBe(selfLink);
         expect(arr[0] instanceof NormalizedItem).toBeTruthy();
       });
@@ -87,19 +97,31 @@ describe('ObjectCacheService', () => {
 
   describe('has', () => {
     it('should return true if the object with the supplied self link is cached and still valid', () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(cacheEntry));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(cacheEntry);
+        };
+      });
 
       expect(service.hasBySelfLink(selfLink)).toBe(true);
     });
 
     it("should return false if the object with the supplied self link isn't cached", () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(undefined));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(undefined);
+        };
+      });
 
       expect(service.hasBySelfLink(selfLink)).toBe(false);
     });
 
     it('should return false if the object with the supplied self link is cached but has exceeded its time to live', () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(invalidCacheEntry));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(invalidCacheEntry);
+        };
+      });
 
       expect(service.hasBySelfLink(selfLink)).toBe(false);
     });

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

@@ -1,16 +1,16 @@
-import { Injectable } from '@angular/core';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { MemoizedSelector, Store } from '@ngrx/store';
 
-import { Observable } from 'rxjs/Observable';
+import { distinctUntilChanged, filter, first, map, mergeMap, take } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { MemoizedSelector, select, Store } from '@ngrx/store';
 import { IndexName } from '../index/index.reducer';
 
-import { ObjectCacheEntry, CacheableObject } from './object-cache.reducer';
+import { CacheableObject, ObjectCacheEntry } from './object-cache.reducer';
 import { AddToObjectCacheAction, RemoveFromObjectCacheAction } from './object-cache.actions';
 import { hasNoValue } from '../../shared/empty.util';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { coreSelector, CoreState } from '../core.reducers';
 import { pathSelector } from '../shared/selectors';
-import { Item } from '../shared/item.model';
 import { NormalizedObjectFactory } from './models/normalized-object-factory';
 import { NormalizedObject } from './models/normalized-object.model';
 
@@ -73,33 +73,40 @@ export class ObjectCacheService {
    *    An observable of the requested object
    */
   getByUUID<T extends NormalizedObject>(uuid: string): Observable<T> {
-    return this.store.select(selfLinkFromUuidSelector(uuid))
+    return this.store.pipe(
-      .flatMap((selfLink: string) => this.getBySelfLink(selfLink))
+      select(selfLinkFromUuidSelector(uuid)),
+      mergeMap((selfLink: string) => this.getBySelfLink(selfLink)
+      )
+    )
   }
 
   getBySelfLink<T extends NormalizedObject>(selfLink: string): Observable<T> {
-    return this.getEntry(selfLink)
+    return this.getEntry(selfLink).pipe(
-      .map((entry: ObjectCacheEntry) => {
+      map((entry: ObjectCacheEntry) => {
-        const type: GenericConstructor<NormalizedObject>= NormalizedObjectFactory.getConstructor(entry.data.type);
+        const type: GenericConstructor<NormalizedObject> = NormalizedObjectFactory.getConstructor(entry.data.type);
         return Object.assign(new type(), entry.data) as T
-      });
+      }));
   }
 
   private getEntry(selfLink: string): Observable<ObjectCacheEntry> {
-    return this.store.select(entryFromSelfLinkSelector(selfLink))
+    return this.store.pipe(
-      .filter((entry) => this.isValid(entry))
+      select(entryFromSelfLinkSelector(selfLink)),
-      .distinctUntilChanged();
+      filter((entry) => this.isValid(entry)),
+      distinctUntilChanged()
+    );
   }
 
   getRequestHrefBySelfLink(selfLink: string): Observable<string> {
-    return this.getEntry(selfLink)
+    return this.getEntry(selfLink).pipe(
-      .map((entry: ObjectCacheEntry) => entry.requestHref)
+      map((entry: ObjectCacheEntry) => entry.requestHref),
-      .distinctUntilChanged();
+      distinctUntilChanged(),);
   }
 
   getRequestHrefByUUID(uuid: string): Observable<string> {
-    return this.store.select(selfLinkFromUuidSelector(uuid))
+    return this.store.pipe(
-      .flatMap((selfLink: string) => this.getRequestHrefBySelfLink(selfLink));
+      select(selfLinkFromUuidSelector(uuid)),
+      mergeMap((selfLink: string) => this.getRequestHrefBySelfLink(selfLink))
+    );
   }
 
   /**
@@ -122,7 +129,7 @@ export class ObjectCacheService {
    * @return Observable<Array<T>>
    */
   getList<T extends NormalizedObject>(selfLinks: string[]): Observable<T[]> {
-    return Observable.combineLatest(
+    return observableCombineLatest(
       selfLinks.map((selfLink: string) => this.getBySelfLink<T>(selfLink))
     );
   }
@@ -139,9 +146,10 @@ export class ObjectCacheService {
   hasByUUID(uuid: string): boolean {
     let result: boolean;
 
-    this.store.select(selfLinkFromUuidSelector(uuid))
+    this.store.pipe(
-      .take(1)
+      select(selfLinkFromUuidSelector(uuid)),
-      .subscribe((selfLink: string) => result = this.hasBySelfLink(selfLink));
+      first()
+    ).subscribe((selfLink: string) => result = this.hasBySelfLink(selfLink));
 
     return result;
   }
@@ -158,9 +166,9 @@ export class ObjectCacheService {
   hasBySelfLink(selfLink: string): boolean {
     let result = false;
 
-    this.store.select(entryFromSelfLinkSelector(selfLink))
+    this.store.pipe(select(entryFromSelfLinkSelector(selfLink)),
-      .take(1)
+      first()
-      .subscribe((entry: ObjectCacheEntry) => result = this.isValid(entry));
+    ).subscribe((entry: ObjectCacheEntry) => result = this.isValid(entry));
 
     return result;
   }

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.effects.ts

@@ -1,5 +1,6 @@
+import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, Effect } from '@ngrx/effects';
+import { Actions, Effect, ofType } from '@ngrx/effects';
 
 import { ResetResponseCacheTimestampsAction } from './response-cache.actions';
 import { StoreActionTypes } from '../../store.actions';
@@ -16,9 +17,11 @@ export class ResponseCacheEffects {
    * time ago, and will likely need to be revisited later
    */
   @Effect() fixTimestampsOnRehydrate = this.actions$
-    .ofType(StoreActionTypes.REHYDRATE)
+    .pipe(ofType(StoreActionTypes.REHYDRATE),
-    .map(() => new ResetResponseCacheTimestampsAction(new Date().getTime()));
+      map(() => new ResetResponseCacheTimestampsAction(new Date().getTime()))
+    );
 
-  constructor(private actions$: Actions, ) { }
+  constructor(private actions$: Actions,) {
+  }
 
 }

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

@@ -1,11 +1,13 @@
 import { Store } from '@ngrx/store';
 
 import { ResponseCacheService } from './response-cache.service';
-import { Observable } from 'rxjs/Observable';
+import { of as observableOf } from 'rxjs';
-import 'rxjs/add/observable/of';
 import { CoreState } from '../core.reducers';
 import { RestResponse } from './response-cache.models';
 import { ResponseCacheEntry } from './response-cache.reducer';
+import { first } from 'rxjs/operators';
+import * as ngrx from '@ngrx/store'
+import { cold } from 'jasmine-marbles';
 
 describe('ResponseCacheService', () => {
   let service: ResponseCacheService;
@@ -41,20 +43,23 @@ describe('ResponseCacheService', () => {
 
   describe('get', () => {
     it('should return an observable of the cached request with the specified key', () => {
-      spyOn(store, 'select').and.callFake((...args: any[]) => {
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
-        return Observable.of(validCacheEntry(keys[1]));
+        return () => {
+          return () => observableOf(validCacheEntry(keys[1]));
+        };
       });
-
       let testObj: ResponseCacheEntry;
-      service.get(keys[1]).first().subscribe((entry) => {
+      service.get(keys[1]).pipe(first()).subscribe((entry) => {
         testObj = entry;
       });
       expect(testObj.key).toEqual(keys[1]);
     });
 
     it('should not return a cached request that has exceeded its time to live', () => {
-      spyOn(store, 'select').and.callFake((...args: any[]) => {
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
-        return Observable.of(invalidCacheEntry(keys[1]));
+        return () => {
+          return () => observableOf(invalidCacheEntry(keys[1]));
+        };
       });
 
       let getObsHasFired = false;
@@ -66,17 +71,29 @@ describe('ResponseCacheService', () => {
 
   describe('has', () => {
     it('should return true if the request with the supplied key is cached and still valid', () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(validCacheEntry(keys[1])));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(validCacheEntry(keys[1]));
+        };
+      });
       expect(service.has(keys[1])).toBe(true);
     });
 
     it('should return false if the request with the supplied key isn\'t cached', () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(undefined));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(undefined);
+        };
+      });
       expect(service.has(keys[1])).toBe(false);
     });
 
     it('should return false if the request with the supplied key is cached but has exceeded its time to live', () => {
-      spyOn(store, 'select').and.returnValue(Observable.of(invalidCacheEntry(keys[1])));
+      spyOnProperty(ngrx, 'select').and.callFake(() => {
+        return () => {
+          return () => observableOf(invalidCacheEntry(keys[1]));
+        };
+      });
       expect(service.has(keys[1])).toBe(false);
     });
   });

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

@@ -1,7 +1,8 @@
+import { filter, take, distinctUntilChanged, first } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { MemoizedSelector, Store } from '@ngrx/store';
+import { MemoizedSelector, select, 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';
@@ -21,7 +22,8 @@ function entryFromKeySelector(key: string): MemoizedSelector<CoreState, Response
 export class ResponseCacheService {
   constructor(
     private store: Store<CoreState>
-  ) { }
+  ) {
+  }
 
   add(key: string, response: RestResponse, msToLive: number): Observable<ResponseCacheEntry> {
     if (!this.has(key)) {
@@ -39,9 +41,11 @@ export class ResponseCacheService {
    *    an observable of the ResponseCacheEntry with the specified key
    */
   get(key: string): Observable<ResponseCacheEntry> {
-    return this.store.select(entryFromKeySelector(key))
+    return this.store.pipe(
-      .filter((entry: ResponseCacheEntry) => this.isValid(entry))
+      select(entryFromKeySelector(key)),
-      .distinctUntilChanged()
+      filter((entry: ResponseCacheEntry) => this.isValid(entry)),
+      distinctUntilChanged()
+    )
   }
 
   /**
@@ -56,11 +60,11 @@ export class ResponseCacheService {
   has(key: string): boolean {
     let result: boolean;
 
-    this.store.select(entryFromKeySelector(key))
+    this.store.pipe(select(entryFromKeySelector(key)),
-      .take(1)
+      first()
-      .subscribe((entry: ResponseCacheEntry) => {
+    ).subscribe((entry: ResponseCacheEntry) => {
-        result = this.isValid(entry);
+      result = this.isValid(entry);
-      });
+    });
 
     return result;
   }
@@ -70,6 +74,7 @@ export class ResponseCacheService {
       this.store.dispatch(new ResponseCacheRemoveAction(key));
     }
   }
+
   /**
    * Check whether a ResponseCacheEntry should still be cached
    *

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/testing';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
 import { ConfigService } from './config.service';
@@ -56,11 +56,11 @@ describe('ConfigService', () => {
   }
 
   beforeEach(() => {
+    scheduler = getTestScheduler();
     responseCache = initMockResponseCacheService(true);
     requestService = getMockRequestService();
-    service = initTestService();
-    scheduler = getTestScheduler();
     halService = new HALEndpointServiceStub(configEndpoint);
+    service = initTestService();
   });
 
   describe('getConfigByHref', () => {

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

@@ -1,8 +1,8 @@
-import { Observable } from 'rxjs/Observable';
+import { Observable, of as observableOf, throwError as observableThrowError, merge as observableMerge } from 'rxjs';
-
+import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
 import { RequestService } from '../data/request.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
-import { ConfigSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models';
+import { ConfigSuccessResponse } from '../cache/response-cache.models';
 import { ConfigRequest, FindAllOptions, RestRequest } from '../data/request.models';
 import { ResponseCacheEntry } from '../cache/response-cache.reducer';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
@@ -18,16 +18,17 @@ export abstract class ConfigService {
   protected abstract halService: HALEndpointService;
 
   protected getConfig(request: RestRequest): Observable<ConfigData> {
-    const [successResponse, errorResponse] =  this.responseCache.get(request.href)
+    const responses = this.responseCache.get(request.href).pipe(map((entry: ResponseCacheEntry) => entry.response));
-      .map((entry: ResponseCacheEntry) => entry.response)
+    const errorResponses = responses.pipe(
-      .partition((response: RestResponse) => response.isSuccessful);
+      filter((response) => !response.isSuccessful),
-    return Observable.merge(
+      mergeMap(() => observableThrowError(new Error(`Couldn't retrieve the config`)))
-      errorResponse.flatMap((response: ErrorResponse) =>
+    );
-        Observable.throw(new Error(`Couldn't retrieve the config`))),
+    const successResponses = responses.pipe(
-      successResponse
+      filter((response) => response.isSuccessful && isNotEmpty(response) && isNotEmpty((response as ConfigSuccessResponse).configDefinition)),
-        .filter((response: ConfigSuccessResponse) => isNotEmpty(response) && isNotEmpty(response.configDefinition))
+      map((response: ConfigSuccessResponse) => new ConfigData(response.pageInfo, response.configDefinition))
-        .map((response: ConfigSuccessResponse) => new ConfigData(response.pageInfo, response.configDefinition))
+    );
-        .distinctUntilChanged());
+    return observableMerge(errorResponses, successResponses);
+
   }
 
   protected getConfigByNameHref(endpoint, resourceName): string {
@@ -65,13 +66,13 @@ export abstract class ConfigService {
   }
 
   public getConfigAll(): Observable<ConfigData> {
-    return this.halService.getEndpoint(this.linkPath)
+    return this.halService.getEndpoint(this.linkPath).pipe(
-      .filter((href: string) => isNotEmpty(href))
+      filter((href: string) => isNotEmpty(href)),
-      .distinctUntilChanged()
+      distinctUntilChanged(),
-      .map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL))
+      map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL)),
-      .do((request: RestRequest) => this.requestService.configure(request))
+      tap((request: RestRequest) => this.requestService.configure(request)),
-      .flatMap((request: RestRequest) => this.getConfig(request))
+      mergeMap((request: RestRequest) => this.getConfig(request)),
-      .distinctUntilChanged();
+      distinctUntilChanged());
   }
 
   public getConfigByHref(href: string): Observable<ConfigData> {
@@ -82,25 +83,26 @@ export abstract class ConfigService {
   }
 
   public getConfigByName(name: string): Observable<ConfigData> {
-    return this.halService.getEndpoint(this.linkPath)
+    return this.halService.getEndpoint(this.linkPath).pipe(
-      .map((endpoint: string) => this.getConfigByNameHref(endpoint, name))
+      map((endpoint: string) => this.getConfigByNameHref(endpoint, name)),
-      .filter((href: string) => isNotEmpty(href))
+      filter((href: string) => isNotEmpty(href)),
-      .distinctUntilChanged()
+      distinctUntilChanged(),
-      .map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL))
+      map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL)),
-      .do((request: RestRequest) => this.requestService.configure(request))
+      tap((request: RestRequest) => this.requestService.configure(request)),
-      .flatMap((request: RestRequest) => this.getConfig(request))
+      mergeMap((request: RestRequest) => this.getConfig(request)),
-      .distinctUntilChanged();
+      distinctUntilChanged());
   }
 
   public getConfigBySearch(options: FindAllOptions = {}): Observable<ConfigData> {
-    return this.halService.getEndpoint(this.linkPath)
+    console.log(this.halService.getEndpoint(this.linkPath));
-      .map((endpoint: string) => this.getConfigSearchHref(endpoint, options))
+    return this.halService.getEndpoint(this.linkPath).pipe(
-      .filter((href: string) => isNotEmpty(href))
+      map((endpoint: string) => this.getConfigSearchHref(endpoint, options)),
-      .distinctUntilChanged()
+      filter((href: string) => isNotEmpty(href)),
-      .map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL))
+      distinctUntilChanged(),
-      .do((request: RestRequest) => this.requestService.configure(request))
+      map((endpointURL: string) => new ConfigRequest(this.requestService.generateRequestId(), endpointURL)),
-      .flatMap((request: RestRequest) => this.getConfig(request))
+      tap((request: RestRequest) => this.requestService.configure(request)),
-      .distinctUntilChanged();
+      mergeMap((request: RestRequest) => this.getConfig(request)),
+      distinctUntilChanged());
   }
 
 }

src/app/core/data/base-response-parsing.service.ts

@@ -127,7 +127,7 @@ export abstract class BaseResponseParsingService {
   }
 
   processPageInfo(payload: any): PageInfo {
-    if (isNotEmpty(payload.page)) {
+    if (hasValue(payload.page)) {
       const pageObj = Object.assign({}, payload.page, { _links: payload._links });
       const pageInfoObject = new DSpaceRESTv2Serializer(PageInfo).deserialize(pageObj);
       if (pageInfoObject.currentPage >= 0) {

src/app/core/data/browse-response-parsing.service.spec.ts

@@ -10,134 +10,148 @@ describe('BrowseResponseParsingService', () => {
   beforeEach(() => {
     service = new BrowseResponseParsingService();
   });
+  let validRequest;
+  let validResponse;
+  let invalidResponse1;
+  let invalidResponse2;
+  let invalidResponse3;
+  let definitions;
 
   describe('parse', () => {
-    const validRequest = new BrowseEndpointRequest('client/b186e8ce-e99c-4183-bc9a-42b4821bdb78', 'https://rest.api/discover/browses');
+    beforeEach(() => {
+      validRequest = new BrowseEndpointRequest('client/b186e8ce-e99c-4183-bc9a-42b4821bdb78', 'https://rest.api/discover/browses');
 
-    const validResponse = {
+      validResponse = {
-      payload: {
+        payload: {
-        _embedded: {
+          _embedded: {
-          browses: [{
+            browses: [{
-            metadataBrowse: false,
+              metadataBrowse: false,
-            sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
+              sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
+                name: 'dateissued',
+                metadata: 'dc.date.issued'
+              }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
+              order: 'ASC',
+              type: 'browse',
+              metadata: ['dc.date.issued'],
+              _links: {
+                self: { href: 'https://rest.api/discover/browses/dateissued' },
+                items: { href: 'https://rest.api/discover/browses/dateissued/items' }
+              }
+            }, {
+              metadataBrowse: true,
+              sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
+                name: 'dateissued',
+                metadata: 'dc.date.issued'
+              }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
+              order: 'ASC',
+              type: 'browse',
+              metadata: ['dc.contributor.*', 'dc.creator'],
+              _links: {
+                self: { href: 'https://rest.api/discover/browses/author' },
+                entries: { href: 'https://rest.api/discover/browses/author/entries' },
+                items: { href: 'https://rest.api/discover/browses/author/items' }
+              }
+            }]
+          },
+          _links: { self: { href: 'https://rest.api/discover/browses' } },
+          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
+        }, statusCode: 200, statusText: 'OK'
+      } as DSpaceRESTV2Response;
+
+      invalidResponse1 = {
+        payload: {
+          _embedded: {
+            browse: {
+              metadataBrowse: false,
+              sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
+                name: 'dateissued',
+                metadata: 'dc.date.issued'
+              }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
+              order: 'ASC',
+              type: 'browse',
+              metadata: ['dc.date.issued'],
+              _links: {
+                self: { href: 'https://rest.api/discover/browses/dateissued' },
+                items: { href: 'https://rest.api/discover/browses/dateissued/items' }
+              }
+            }
+          },
+          _links: { self: { href: 'https://rest.api/discover/browses' } },
+          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
+        }, statusCode: 200, statusText: 'OK'
+      } as DSpaceRESTV2Response;
+
+      invalidResponse2 = {
+        payload: {
+          _links: { self: { href: 'https://rest.api/discover/browses' } },
+          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
+        }, statusCode: 200, statusText: 'OK'
+      } as DSpaceRESTV2Response;
+
+      invalidResponse3 = {
+        payload: {
+          _links: { self: { href: 'https://rest.api/discover/browses' } },
+          page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
+        }, statusCode: 500, statusText: 'Internal Server Error'
+      } as DSpaceRESTV2Response;
+
+      definitions = [
+        Object.assign(new BrowseDefinition(), {
+          metadataBrowse: false,
+          sortOptions: [
+            {
+              name: 'title',
+              metadata: 'dc.title'
+            },
+            {
               name: 'dateissued',
               metadata: 'dc.date.issued'
-            }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
+            },
-            order: 'ASC',
+            {
-            type: 'browse',
+              name: 'dateaccessioned',
-            metadata: ['dc.date.issued'],
+              metadata: 'dc.date.accessioned'
-            _links: {
-              self: { href: 'https://rest.api/discover/browses/dateissued' },
-              items: { href: 'https://rest.api/discover/browses/dateissued/items' }
             }
-          }, {
+          ],
-            metadataBrowse: true,
+          defaultSortOrder: 'ASC',
-            sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
+          type: 'browse',
+          metadataKeys: [
+            'dc.date.issued'
+          ],
+          _links: {
+            self: 'https://rest.api/discover/browses/dateissued',
+            items: 'https://rest.api/discover/browses/dateissued/items'
+          }
+        }),
+        Object.assign(new BrowseDefinition(), {
+          metadataBrowse: true,
+          sortOptions: [
+            {
+              name: 'title',
+              metadata: 'dc.title'
+            },
+            {
               name: 'dateissued',
               metadata: 'dc.date.issued'
-            }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
+            },
-            order: 'ASC',
+            {
-            type: 'browse',
+              name: 'dateaccessioned',
-            metadata: ['dc.contributor.*', 'dc.creator'],
+              metadata: 'dc.date.accessioned'
-            _links: {
-              self: { href: 'https://rest.api/discover/browses/author' },
-              entries: { href: 'https://rest.api/discover/browses/author/entries' },
-              items: { href: 'https://rest.api/discover/browses/author/items' }
-            }
-          }]
-        },
-        _links: { self: { href: 'https://rest.api/discover/browses' } },
-        page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-      }, statusCode: 200, statusText: 'OK'
-    } as DSpaceRESTV2Response;
-
-    const invalidResponse1 = {
-      payload: {
-        _embedded: {
-          browse: {
-            metadataBrowse: false,
-            sortOptions: [{ name: 'title', metadata: 'dc.title' }, {
-              name: 'dateissued',
-              metadata: 'dc.date.issued'
-            }, { name: 'dateaccessioned', metadata: 'dc.date.accessioned' }],
-            order: 'ASC',
-            type: 'browse',
-            metadata: ['dc.date.issued'],
-            _links: {
-              self: { href: 'https://rest.api/discover/browses/dateissued' },
-              items: { href: 'https://rest.api/discover/browses/dateissued/items' }
             }
+          ],
+          defaultSortOrder: 'ASC',
+          type: 'browse',
+          metadataKeys: [
+            'dc.contributor.*',
+            'dc.creator'
+          ],
+          _links: {
+            self: 'https://rest.api/discover/browses/author',
+            entries: 'https://rest.api/discover/browses/author/entries',
+            items: 'https://rest.api/discover/browses/author/items'
           }
-        },
+        })
-        _links: { self: { href: 'https://rest.api/discover/browses' } },
+      ];
-        page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
+    });
-      }, statusCode: 200, statusText: 'OK'
-    } as DSpaceRESTV2Response;
-
-    const invalidResponse2 = {
-      payload: {
-        _links: { self: { href: 'https://rest.api/discover/browses' } },
-        page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-      }, statusCode: 200, statusText: 'OK'
-    } as DSpaceRESTV2Response ;
-
-    const invalidResponse3 = {
-      payload: {
-        _links: { self: { href: 'https://rest.api/discover/browses' } },
-        page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
-      }, statusCode: 500, statusText: 'Internal Server Error'
-    } as DSpaceRESTV2Response;
-
-    const definitions = [
-      Object.assign(new BrowseDefinition(), {
-        metadataBrowse: false,
-        sortOptions: [
-          {
-            name: 'title',
-            metadata: 'dc.title'
-          },
-          {
-            name: 'dateissued',
-            metadata: 'dc.date.issued'
-          },
-          {
-            name: 'dateaccessioned',
-            metadata: 'dc.date.accessioned'
-          }
-        ],
-        defaultSortOrder: 'ASC',
-        type: 'browse',
-        metadataKeys: [
-          'dc.date.issued'
-        ],
-        _links: { }
-      }),
-      Object.assign(new BrowseDefinition(), {
-        metadataBrowse: true,
-        sortOptions: [
-          {
-            name: 'title',
-            metadata: 'dc.title'
-          },
-          {
-            name: 'dateissued',
-            metadata: 'dc.date.issued'
-          },
-          {
-            name: 'dateaccessioned',
-            metadata: 'dc.date.accessioned'
-          }
-        ],
-        defaultSortOrder: 'ASC',
-        type: 'browse',
-        metadataKeys: [
-          'dc.contributor.*',
-          'dc.creator'
-        ],
-        _links: { }
-      })
-    ];
-
     it('should return a GenericSuccessResponse if data contains a valid browse endpoint response', () => {
       const response = service.parse(validRequest, validResponse);
       expect(response.constructor).toBe(GenericSuccessResponse);

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

@@ -1,10 +1,9 @@
 import { Store } from '@ngrx/store';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/Rx';
+import { TestScheduler } from 'rxjs/testing';
 import { GlobalConfig } from '../../../config';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { NormalizedCommunity } from '../cache/models/normalized-community.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
 import { CoreState } from '../core.reducers';

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

@@ -1,9 +1,8 @@
-import { Observable } from 'rxjs/Observable';
+import { distinctUntilChanged, filter, map, mergeMap, take, tap } from 'rxjs/operators';
+import { merge as observableMerge, Observable, throwError as observableThrowError } from 'rxjs';
 import { isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { NormalizedCommunity } from '../cache/models/normalized-community.model';
-import { CacheableObject } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { DSOSuccessResponse, ErrorResponse, RestResponse } from '../cache/response-cache.models';
 import { ResponseCacheEntry } from '../cache/response-cache.reducer';
 import { CommunityDataService } from './community-data.service';
 
@@ -12,7 +11,7 @@ import { FindAllOptions, FindByIDRequest } from './request.models';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 
-export abstract class ComColDataService<TNormalized extends NormalizedObject, TDomain>  extends DataService<TNormalized, TDomain> {
+export abstract class ComColDataService<TNormalized extends NormalizedObject, TDomain> extends DataService<TNormalized, TDomain> {
   protected abstract cds: CommunityDataService;
   protected abstract objectCache: ObjectCacheService;
   protected abstract halService: HALEndpointService;
@@ -31,29 +30,30 @@ export abstract class ComColDataService<TNormalized extends NormalizedObject, TD
     if (isEmpty(options.scopeID)) {
       return this.halService.getEndpoint(this.linkPath);
     } else {
-      const scopeCommunityHrefObs = this.cds.getEndpoint()
+      const scopeCommunityHrefObs = this.cds.getEndpoint().pipe(
-        .flatMap((endpoint: string) => this.cds.getFindByIDHref(endpoint, options.scopeID))
+        mergeMap((endpoint: string) => this.cds.getFindByIDHref(endpoint, options.scopeID)),
-        .filter((href: string) => isNotEmpty(href))
+        filter((href: string) => isNotEmpty(href)),
-        .take(1)
+        take(1),
-        .do((href: string) => {
+        tap((href: string) => {
           const request = new FindByIDRequest(this.requestService.generateRequestId(), href, options.scopeID);
           this.requestService.configure(request);
-        });
+        }));
 
-      const [successResponse, errorResponse] = scopeCommunityHrefObs
+      const responses = scopeCommunityHrefObs.pipe(
-        .flatMap((href: string) => this.responseCache.get(href))
+        mergeMap((href: string) => this.responseCache.get(href)),
-        .map((entry: ResponseCacheEntry) => entry.response)
+        map((entry: ResponseCacheEntry) => entry.response));
-        .share()
+      const errorResponses = responses.pipe(
-        .partition((response: RestResponse) => response.isSuccessful);
+        filter((response) => !response.isSuccessful),
+        mergeMap(() => observableThrowError(new Error(`The Community with scope ${options.scopeID} couldn't be retrieved`)))
+      );
+      const successResponses = responses.pipe(
+        filter((response) => response.isSuccessful),
+        mergeMap(() => this.objectCache.getByUUID(options.scopeID)),
+        map((nc: NormalizedCommunity) => nc._links[this.linkPath]),
+        filter((href) => isNotEmpty(href))
+      );
 
-      return Observable.merge(
+      return observableMerge(errorResponses, successResponses).pipe(distinctUntilChanged());
-        errorResponse.flatMap((response: ErrorResponse) =>
-          Observable.throw(new Error(`The Community with scope ${options.scopeID} couldn't be retrieved`))),
-        successResponse
-          .flatMap((response: DSOSuccessResponse) => this.objectCache.getByUUID(options.scopeID))
-          .map((nc: NormalizedCommunity) => nc._links[this.linkPath])
-          .filter((href) => isNotEmpty(href))
-      ).distinctUntilChanged();
     }
   }
 }

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

@@ -1,3 +1,5 @@
+
+import {mergeMap, filter, take} from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 
 import { Store } from '@ngrx/store';
@@ -13,7 +15,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()
@@ -39,11 +41,12 @@ export class CommunityDataService extends ComColDataService<NormalizedCommunity,
   }
 
   findTop(options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<Community>>> {
-    const hrefObs = this.getFindAllHref(options);
+    const hrefObs = this.halService.getEndpoint(this.topLinkPath).pipe(filter((href: string) => isNotEmpty(href)),
+      mergeMap((endpoint: string) => this.getFindAllHref(options)),);
 
-    hrefObs
+    hrefObs.pipe(
-      .filter((href: string) => hasValue(href))
+      filter((href: string) => hasValue(href)),
-      .take(1)
+      take(1),)
       .subscribe((href: string) => {
         const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
         this.requestService.configure(request);

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

@@ -6,10 +6,10 @@ 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 'rxjs/add/observable/of';
 import { FindAllOptions } from './request.models';
 import { SortOptions, SortDirection } from '../cache/models/sort-options.model';
+import { of as observableOf } from 'rxjs';
 
 const endpoint = 'https://rest.api/core';
 
@@ -18,108 +18,108 @@ class NormalizedTestObject extends NormalizedObject {
 }
 
 class TestService extends DataService<NormalizedTestObject, any> {
-    protected forceBypassCache = false;
+  protected forceBypassCache = false;
-    constructor(
+  constructor(
-        protected responseCache: ResponseCacheService,
+    protected responseCache: ResponseCacheService,
-        protected requestService: RequestService,
+    protected requestService: RequestService,
-        protected rdbService: RemoteDataBuildService,
+    protected rdbService: RemoteDataBuildService,
-        protected store: Store<CoreState>,
+    protected store: Store<CoreState>,
-        protected linkPath: string,
+    protected linkPath: string,
-        protected halService: HALEndpointService
+    protected halService: HALEndpointService
-    ) {
+  ) {
-        super();
+    super();
-    }
+  }
 
-    public getBrowseEndpoint(options: FindAllOptions): Observable<string> {
+  public getBrowseEndpoint(options: FindAllOptions): Observable<string> {
-        return Observable.of(endpoint);
+    return observableOf(endpoint);
-    }
+  }
 }
 
 describe('DataService', () => {
-    let service: TestService;
+  let service: TestService;
-    let options: FindAllOptions;
+  let options: FindAllOptions;
-    const responseCache = {} as ResponseCacheService;
+  const responseCache = {} as ResponseCacheService;
-    const requestService = {} as RequestService;
+  const requestService = {} as RequestService;
-    const halService = {} as HALEndpointService;
+  const halService = {} as HALEndpointService;
-    const rdbService = {} as RemoteDataBuildService;
+  const rdbService = {} as RemoteDataBuildService;
-    const store = {} as Store<CoreState>;
+  const store = {} as Store<CoreState>;
 
-    function initTestService(): TestService {
+  function initTestService(): TestService {
-        return new TestService(
+    return new TestService(
-            responseCache,
+      responseCache,
-            requestService,
+      requestService,
-            rdbService,
+      rdbService,
-            store,
+      store,
-            endpoint,
+      endpoint,
-            halService
+      halService
-          );
+    );
-    }
+  }
 
-    service = initTestService();
+  service = initTestService();
 
-    describe('getFindAllHref', () => {
+  describe('getFindAllHref', () => {
 
-        it('should return an observable with the endpoint', () => {
+    it('should return an observable with the endpoint', () => {
-            options = {};
+      options = {};
 
-            (service as any).getFindAllHref(options).subscribe((value) => {
+      (service as any).getFindAllHref(options).subscribe((value) => {
-                    expect(value).toBe(endpoint);
+          expect(value).toBe(endpoint);
-                }
+        }
-            );
+      );
-        });
-
-        it('should include page in href if currentPage provided in options', () => {
-            options = { currentPage: 2 };
-            const expected = `${endpoint}?page=${options.currentPage - 1}`;
-
-            (service as any).getFindAllHref(options).subscribe((value) => {
-                expect(value).toBe(expected);
-            });
-        });
-
-        it('should include size in href if elementsPerPage provided in options', () => {
-            options = { elementsPerPage: 5 };
-            const expected = `${endpoint}?size=${options.elementsPerPage}`;
-
-            (service as any).getFindAllHref(options).subscribe((value) => {
-                expect(value).toBe(expected);
-            });
-        });
-
-        it('should include sort href if SortOptions provided in options', () => {
-            const sortOptions = new SortOptions('field1', SortDirection.ASC);
-            options = { sort:  sortOptions};
-            const expected = `${endpoint}?sort=${sortOptions.field},${sortOptions.direction}`;
-
-            (service as any).getFindAllHref(options).subscribe((value) => {
-                expect(value).toBe(expected);
-            });
-        });
-
-        it('should include startsWith in href if startsWith provided in options', () => {
-            options = { startsWith: 'ab' };
-            const expected = `${endpoint}?startsWith=${options.startsWith}`;
-
-            (service as any).getFindAllHref(options).subscribe((value) => {
-                expect(value).toBe(expected);
-            });
-        });
-
-        it('should include all provided options in href', () => {
-            const sortOptions = new SortOptions('field1', SortDirection.DESC)
-            options = {
-                currentPage: 6,
-                elementsPerPage: 10,
-                sort: sortOptions,
-                startsWith: 'ab'
-            }
-            const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
-                `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
-
-            (service as any).getFindAllHref(options).subscribe((value) => {
-                expect(value).toBe(expected);
-        });
-        })
     });
 
+    it('should include page in href if currentPage provided in options', () => {
+      options = { currentPage: 2 };
+      const expected = `${endpoint}?page=${options.currentPage - 1}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include size in href if elementsPerPage provided in options', () => {
+      options = { elementsPerPage: 5 };
+      const expected = `${endpoint}?size=${options.elementsPerPage}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include sort href if SortOptions provided in options', () => {
+      const sortOptions = new SortOptions('field1', SortDirection.ASC);
+      options = { sort: sortOptions };
+      const expected = `${endpoint}?sort=${sortOptions.field},${sortOptions.direction}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include startsWith in href if startsWith provided in options', () => {
+      options = { startsWith: 'ab' };
+      const expected = `${endpoint}?startsWith=${options.startsWith}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    });
+
+    it('should include all provided options in href', () => {
+      const sortOptions = new SortOptions('field1', SortDirection.DESC)
+      options = {
+        currentPage: 6,
+        elementsPerPage: 10,
+        sort: sortOptions,
+        startsWith: 'ab'
+      }
+      const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
+        `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
+
+      (service as any).getFindAllHref(options).subscribe((value) => {
+        expect(value).toBe(expected);
+      });
+    })
+  });
+
 });

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

@@ -1,6 +1,6 @@
-import { filter, take } from 'rxjs/operators';
+import { distinctUntilChanged, filter, take, first, map } from 'rxjs/operators';
+import { of as observableOf, Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
@@ -30,7 +30,7 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
     let result: Observable<string>;
     const args = [];
 
-    result = this.getBrowseEndpoint(options).distinctUntilChanged();
+    result = this.getBrowseEndpoint(options).pipe(distinctUntilChanged());
 
     if (hasValue(options.currentPage) && typeof options.currentPage === 'number') {
       /* TODO: this is a temporary fix for the pagination start index (0 or 1) discrepancy between the rest and the frontend respectively */
@@ -50,7 +50,7 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
     }
 
     if (isNotEmpty(args)) {
-      return result.map((href: string) => new URLCombiner(href, `?${args.join('&')}`).toString());
+      return result.pipe(map((href: string) => new URLCombiner(href, `?${args.join('&')}`).toString()));
     } else {
       return result;
     }
@@ -111,11 +111,11 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
   }
 
   findById(id: string): Observable<RemoteData<TDomain>> {
-    const hrefObs = this.halService.getEndpoint(this.linkPath)
+    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
-      .map((endpoint: string) => this.getFindByIDHref(endpoint, id));
+      map((endpoint: string) => this.getFindByIDHref(endpoint, id)));
 
-    hrefObs
+    hrefObs.pipe(
-      .first((href: string) => hasValue(href))
+      first((href: string) => hasValue(href)))
       .subscribe((href: string) => {
         const request = new FindByIDRequest(this.requestService.generateRequestId(), href, id);
         this.requestService.configure(request, this.forceBypassCache);

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

@@ -1,5 +1,5 @@
 import { cold, getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from '../../../../node_modules/rxjs';
+import { TestScheduler } from 'rxjs/testing';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.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/testing';
 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,9 +1,9 @@
-import { Inject, Injectable } from '@angular/core';
 
+import {distinctUntilChanged, map, filter} from 'rxjs/operators';
+import { 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 { isNotEmpty } from '../../shared/empty.util';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { NormalizedItem } from '../cache/models/normalized-item.model';
@@ -43,10 +43,10 @@ export class ItemDataService extends DataService<NormalizedItem, Item> {
     if (options.sort && options.sort.field) {
       field = options.sort.field;
     }
-    return this.bs.getBrowseURLFor(field, this.linkPath)
+    return this.bs.getBrowseURLFor(field, this.linkPath).pipe(
-      .filter((href: string) => isNotEmpty(href))
+      filter((href: string) => isNotEmpty(href)),
-      .map((href: string) => new URLCombiner(href, `?scope=${options.scopeID}`).toString())
+      map((href: string) => new URLCombiner(href, `?scope=${options.scopeID}`).toString()),
-      .distinctUntilChanged();
+      distinctUntilChanged(),);
   }
 
 }

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

@@ -1,9 +1,9 @@
+
+import {of as observableOf,  Observable } from 'rxjs';
 import { Inject, Injectable, Injector } from '@angular/core';
 import { Request } from '@angular/http';
 import { RequestArgs } from '@angular/http/src/interfaces';
 import { Actions, Effect, ofType } from '@ngrx/effects';
-// tslint:disable-next-line:import-blacklist
-import { Observable } from 'rxjs';
 
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
 import { isNotEmpty } from '../../shared/empty.util';
@@ -30,7 +30,8 @@ export const addToResponseCacheAndCompleteAction = (request: RestRequest, respon
 @Injectable()
 export class RequestEffects {
 
-  @Effect() execute = this.actions$.ofType(RequestActionTypes.EXECUTE).pipe(
+  @Effect() execute = this.actions$.pipe(
+    ofType(RequestActionTypes.EXECUTE),
     flatMap((action: RequestExecuteAction) => {
       return this.requestService.getByUUID(action.payload).pipe(
         take(1)
@@ -46,7 +47,7 @@ export class RequestEffects {
       return this.restApi.request(request.method, request.href, body, request.options).pipe(
         map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)),
         addToResponseCacheAndCompleteAction(request, this.responseCache, this.EnvConfig),
-        catchError((error: RequestError) => Observable.of(new ErrorResponse(error)).pipe(
+        catchError((error: RequestError) => observableOf(new ErrorResponse(error)).pipe(
           addToResponseCacheAndCompleteAction(request, this.responseCache, this.EnvConfig)
         ))
       );

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

@@ -1,10 +1,9 @@
-import { Store } from '@ngrx/store';
+import * as ngrx from '@ngrx/store';
-import { cold, hot } from 'jasmine-marbles';
+import { ActionsSubject, Store } from '@ngrx/store';
-import { Observable } from 'rxjs/Observable';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import 'rxjs/add/observable/of'
+import { of as observableOf } from 'rxjs';
 import { getMockObjectCacheService } from '../../shared/mocks/mock-object-cache.service';
 import { getMockResponseCacheService } from '../../shared/mocks/mock-response-cache.service';
-import { getMockStore } from '../../shared/mocks/mock-store';
 import { defaultUUID, getMockUUIDService } from '../../shared/mocks/mock-uuid.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { ResponseCacheService } from '../cache/response-cache.service';
@@ -18,11 +17,15 @@ import {
   OptionsRequest,
   PatchRequest,
   PostRequest,
-  PutRequest, RestRequest
+  PutRequest,
+  RestRequest
 } from './request.models';
 import { RequestService } from './request.service';
+import { TestScheduler } from 'rxjs/testing';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 
 describe('RequestService', () => {
+  let scheduler: TestScheduler;
   let service: RequestService;
   let serviceAsAny: any;
   let objectCache: ObjectCacheService;
@@ -39,19 +42,26 @@ describe('RequestService', () => {
   const testOptionsRequest = new OptionsRequest(testUUID, testHref);
   const testHeadRequest = new HeadRequest(testUUID, testHref);
   const testPatchRequest = new PatchRequest(testUUID, testHref);
-
+  let selectSpy;
   beforeEach(() => {
+    scheduler = getTestScheduler();
+
     objectCache = getMockObjectCacheService();
     (objectCache.hasBySelfLink as any).and.returnValue(false);
 
     responseCache = getMockResponseCacheService();
     (responseCache.has as any).and.returnValue(false);
-    (responseCache.get as any).and.returnValue(Observable.of(undefined));
+    (responseCache.get as any).and.returnValue(observableOf(undefined));
 
     uuidService = getMockUUIDService();
 
-    store = getMockStore<CoreState>();
+    store = new Store<CoreState>(new BehaviorSubject({}), new ActionsSubject(), null);
-    (store.select as any).and.returnValue(Observable.of(undefined));
+    selectSpy = spyOnProperty(ngrx, 'select')
+    selectSpy.and.callFake(() => {
+      return () => {
+        return () => cold('a', { a: undefined });
+      };
+    });
 
     service = new RequestService(
       objectCache,
@@ -74,7 +84,7 @@ describe('RequestService', () => {
   describe('isPending', () => {
     describe('before the request is configured', () => {
       beforeEach(() => {
-        spyOn(service, 'getByHref').and.returnValue(Observable.of(undefined));
+        spyOn(service, 'getByHref').and.returnValue(observableOf(undefined));
       });
 
       it('should return false', () => {
@@ -87,7 +97,7 @@ describe('RequestService', () => {
 
     describe('when the request has been configured but hasn\'t reached the store yet', () => {
       beforeEach(() => {
-        spyOn(service, 'getByHref').and.returnValue(Observable.of(undefined));
+        spyOn(service, 'getByHref').and.returnValue(observableOf(undefined));
         serviceAsAny.requestsOnTheirWayToTheStore = [testHref];
       });
 
@@ -101,7 +111,7 @@ describe('RequestService', () => {
 
     describe('when the request has reached the store, before the server responds', () => {
       beforeEach(() => {
-        spyOn(service, 'getByHref').and.returnValue(Observable.of({
+        spyOn(service, 'getByHref').and.returnValue(observableOf({
           completed: false
         }))
       });
@@ -116,7 +126,7 @@ describe('RequestService', () => {
 
     describe('after the server responds', () => {
       beforeEach(() => {
-        spyOn(service, 'getByHref').and.returnValues(Observable.of({
+        spyOn(service, 'getByHref').and.returnValues(observableOf({
           completed: true
         }));
       });
@@ -134,11 +144,15 @@ describe('RequestService', () => {
   describe('getByUUID', () => {
     describe('if the request with the specified UUID exists in the store', () => {
       beforeEach(() => {
-        (store.select as any).and.returnValues(hot('a', {
+        selectSpy.and.callFake(() => {
-          a: {
+          return () => {
-            completed: true
+            return () => hot('a', {
-          }
+              a: {
-        }));
+                completed: true
+              }
+            });
+          };
+        });
       });
 
       it('should return an Observable of the RequestEntry', () => {
@@ -155,9 +169,11 @@ describe('RequestService', () => {
 
     describe('if the request with the specified UUID doesn\'t exist in the store', () => {
       beforeEach(() => {
-        (store.select as any).and.returnValues(hot('a', {
+        selectSpy.and.callFake(() => {
-          a: undefined
+          return () => {
-        }));
+            return () => hot('a', { a: undefined });
+          };
+        });
       });
 
       it('should return an Observable of undefined', () => {
@@ -175,9 +191,11 @@ describe('RequestService', () => {
   describe('getByHref', () => {
     describe('when the request with the specified href exists in the store', () => {
       beforeEach(() => {
-        (store.select as any).and.returnValues(hot('a', {
+        selectSpy.and.callFake(() => {
-          a: testUUID
+          return () => {
-        }));
+            return () => hot('a', { a: testUUID });
+          };
+        });
         spyOn(service, 'getByUUID').and.returnValue(cold('b', {
           b: {
             completed: true
@@ -199,9 +217,11 @@ describe('RequestService', () => {
 
     describe('when the request with the specified href doesn\'t exist in the store', () => {
       beforeEach(() => {
-        (store.select as any).and.returnValues(hot('a', {
+        selectSpy.and.callFake(() => {
-          a: undefined
+          return () => {
-        }));
+            return () => hot('a', { a: undefined });
+          };
+        });
         spyOn(service, 'getByUUID').and.returnValue(cold('b', {
           b: undefined
         }));
@@ -242,7 +262,8 @@ describe('RequestService', () => {
         });
 
         it('should dispatch the request', () => {
-          service.configure(request);
+          scheduler.schedule(() => service.configure(request));
+          scheduler.flush();
           expect(serviceAsAny.dispatchRequest).toHaveBeenCalledWith(request);
         });
       });
@@ -302,7 +323,7 @@ describe('RequestService', () => {
 
         describe('and it\'s a DSOSuccessResponse', () => {
           beforeEach(() => {
-            (responseCache.get as any).and.returnValues(Observable.of({
+            (responseCache.get as any).and.returnValues(observableOf({
                 response: {
                   isSuccessful: true,
                   resourceSelfLinks: [
@@ -335,7 +356,7 @@ describe('RequestService', () => {
           beforeEach(() => {
             (objectCache.hasBySelfLink as any).and.returnValues(false);
             (responseCache.has as any).and.returnValues(true);
-            (responseCache.get as any).and.returnValues(Observable.of({
+            (responseCache.get as any).and.returnValues(observableOf({
                 response: {
                   isSuccessful: true
                 }
@@ -377,6 +398,10 @@ describe('RequestService', () => {
   });
 
   describe('dispatchRequest', () => {
+    beforeEach(() => {
+      spyOn(store, 'dispatch');
+    });
+
     it('should dispatch a RequestConfigureAction', () => {
       const request = testGetRequest;
       serviceAsAny.dispatchRequest(request);
@@ -431,7 +456,7 @@ describe('RequestService', () => {
 
     describe('when the request is added to the store', () => {
       beforeEach(() => {
-        spyOn(service, 'getByHref').and.returnValue(Observable.of({
+        spyOn(service, 'getByHref').and.returnValue(observableOf({
           request,
           requestPending: false,
           responsePending: true,
@@ -440,6 +465,11 @@ describe('RequestService', () => {
       });
 
       it('should stop tracking the request', () => {
+        selectSpy.and.callFake(() => {
+          return () => {
+            return () => observableOf({ request });
+          };
+        });
         serviceAsAny.trackRequestsOnTheirWayToTheStore(request);
         expect(service.getByHref).toHaveBeenCalledWith(request.href);
         expect(serviceAsAny.requestsOnTheirWayToTheStore.includes(request.href)).toBeFalsy();