Merge remote-tracking branch '4Science-bitbucket/main' into CST-5307

2025-10-07 01:54:15 +00:00 · 2022-04-22 11:25:12 +02:00
parent 88c324cb5a 3a9d4fad95
commit 9509d6d901
278 changed files with 5439 additions and 7158 deletions
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -2,10 +2,16 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries

+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist

-> 0.5%
-last 2 versions
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
 Firefox ESR
-not IE 9-11 # For IE 9-11 support, remove 'not'.
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,222 @@
+{
+  "root": true,
+  "plugins": [
+    "@typescript-eslint",
+    "@angular-eslint/eslint-plugin",
+    "eslint-plugin-import",
+    "eslint-plugin-jsdoc",
+    "eslint-plugin-deprecation",
+    "eslint-plugin-unused-imports"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "./tsconfig.json",
+          "./cypress/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking",
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "max-classes-per-file": [
+          "error",
+          1
+        ],
+        "comma-dangle": [
+          "off",
+          "always-multiline"
+        ],
+        "eol-last": [
+          "error",
+          "always"
+        ],
+        "no-console": [
+          "error",
+          {
+            "allow": [
+              "log",
+              "warn",
+              "dir",
+              "timeLog",
+              "assert",
+              "clear",
+              "count",
+              "countReset",
+              "group",
+              "groupEnd",
+              "table",
+              "debug",
+              "info",
+              "dirxml",
+              "error",
+              "groupCollapsed",
+              "Console",
+              "profile",
+              "profileEnd",
+              "timeStamp",
+              "context"
+            ]
+          }
+        ],
+        "curly": "error",
+        "brace-style": [
+          "error",
+          "1tbs",
+          {
+            "allowSingleLine": true
+          }
+        ],
+        "eqeqeq": [
+          "error",
+          "always",
+          {
+            "null": "ignore"
+          }
+        ],
+        "radix": "error",
+        "guard-for-in": "error",
+        "no-bitwise": "error",
+        "no-restricted-imports": "error",
+        "no-caller": "error",
+        "no-debugger": "error",
+        "no-redeclare": "error",
+        "no-eval": "error",
+        "no-fallthrough": "error",
+        "no-trailing-spaces": "error",
+        "space-infix-ops": "error",
+        "keyword-spacing": "error",
+        "no-var": "error",
+        "no-unused-expressions": [
+          "error",
+          {
+            "allowTernary": true
+          }
+        ],
+        "prefer-const": "off",            // todo: re-enable & fix errors (more strict than it used to be in TSLint)
+        "prefer-spread": "off",
+        "no-underscore-dangle": "off",
+
+        // todo: disabled rules from eslint:recommended, consider re-enabling & fixing
+        "no-prototype-builtins": "off",
+        "no-useless-escape": "off",
+        "no-case-declarations": "off",
+        "no-extra-boolean-cast": "off",
+
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "ds",
+            "style": "camelCase"
+          }
+        ],
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "ds",
+            "style": "kebab-case"
+          }
+        ],
+        "@angular-eslint/pipe-prefix": [
+          "error",
+          {
+            "prefixes": [
+              "ds"
+            ]
+          }
+        ],
+        "@angular-eslint/no-attribute-decorator": "error",
+        "@angular-eslint/no-forward-ref": "error",
+        "@angular-eslint/no-output-native": "warn",
+        "@angular-eslint/no-output-on-prefix": "warn",
+        "@angular-eslint/no-conflicting-lifecycle": "warn",
+
+        "@typescript-eslint/no-inferrable-types":[
+          "error",
+          {
+            "ignoreParameters": true
+          }
+        ],
+        "@typescript-eslint/quotes": [
+          "error",
+          "single",
+          {
+            "avoidEscape": true,
+            "allowTemplateLiterals": true
+          }
+        ],
+        "@typescript-eslint/semi": "error",
+        "@typescript-eslint/no-shadow": "error",
+        "@typescript-eslint/dot-notation": "error",
+        "@typescript-eslint/consistent-type-definitions": "error",
+        "@typescript-eslint/prefer-function-type": "error",
+        "@typescript-eslint/naming-convention": [
+          "error",
+          {
+            "selector": "property",
+            "format": null
+          }
+        ],
+        "@typescript-eslint/member-ordering": [
+          "error",
+          {
+            "default": [
+              "static-field",
+              "instance-field",
+              "static-method",
+              "instance-method"
+            ]
+          }
+        ],
+        "@typescript-eslint/type-annotation-spacing": "error",
+        "@typescript-eslint/unified-signatures": "error",
+        "@typescript-eslint/ban-types": "warn",  // todo: deal with {} type issues & re-enable
+        "@typescript-eslint/no-floating-promises": "warn",
+        "@typescript-eslint/no-misused-promises": "warn",
+        "@typescript-eslint/restrict-plus-operands": "warn",
+        "@typescript-eslint/unbound-method": "off",
+        "@typescript-eslint/ban-ts-comment": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-unnecessary-type-assertion": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unsafe-assignment": "off",
+        "@typescript-eslint/no-unsafe-member-access": "off",
+        "@typescript-eslint/no-unsafe-call": "off",
+        "@typescript-eslint/no-unsafe-argument": "off",
+        "@typescript-eslint/no-unsafe-return": "off",
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/require-await": "off",
+
+        "deprecation/deprecation": "warn",
+
+        "import/order": "off",
+        "import/no-deprecated": "warn"
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {
+        // todo: re-enable & fix errors
+        "@angular-eslint/template/no-negated-async": "off",
+        "@angular-eslint/template/eqeqeq": "off"
+      }
+    }
+  ]
+}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
        run: yarn install --frozen-lockfile

      - name: Run lint
-        run: yarn run lint
+        run: yarn run lint --quiet

      - name: Run build
        run: yarn run build:prod
@@ -128,6 +128,14 @@ jobs:
          name: e2e-test-screenshots
          path: cypress/screenshots

+      - name: Stop app (in case it stays up after e2e tests)
+        run: |
+          app_pid=$(lsof -t -i:4000)
+          if [[ ! -z $app_pid ]]; then
+            echo "App was still up! (PID: $app_pid)"
+            kill -9 $app_pid
+          fi
+
      # Start up the app with SSR enabled (run in background)
      - name: Start app in SSR (server-side rendering) mode
        run: |
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.angular/cache
 /__build__
 /__server_build__
 /node_modules
--- a/angular.json
+++ b/angular.json
@@ -17,7 +17,6 @@
        "build": {
          "builder": "@angular-builders/custom-webpack:browser",
          "options": {
-            "extractCss": true,
            "preserveSymlinks": true,
            "customWebpackConfig": {
              "path": "./webpack/webpack.browser.ts",
@@ -68,6 +67,14 @@
            "scripts": []
          },
          "configurations": {
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            },
            "production": {
              "fileReplacements": [
                {
@@ -77,7 +84,6 @@
              ],
              "optimization": true,
              "outputHashing": "all",
-              "extractCss": true,
              "namedChunks": false,
              "aot": true,
              "extractLicenses": true,
@@ -105,6 +111,9 @@
            "port": 4000
          },
          "configurations": {
+            "development": {
+              "browserTarget": "dspace-angular:build:development"
+            },
            "production": {
              "browserTarget": "dspace-angular:build:production"
            }
@@ -158,19 +167,6 @@
            }
          }
        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "cypress/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
        "e2e": {
          "builder": "@cypress/schematic:cypress",
          "options": {
@@ -198,6 +194,10 @@
            "tsConfig": "tsconfig.server.json"
          },
          "configurations": {
+            "development": {
+              "sourceMap": true,
+              "optimization": false
+            },
            "production": {
              "sourceMap": false,
              "optimization": true,
@@ -254,12 +254,22 @@
            "watch": true,
            "headless": false
          }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
+          }
        }
      }
    }
  },
  "defaultProject": "dspace-angular",
  "cli": {
-    "analytics": false
+    "analytics": false,
+    "defaultCollection": "@angular-eslint/schematics"
  }
-}
+}
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -22,7 +22,7 @@ module.exports = function (config) {
      reports: ['html', 'lcovonly', 'text-summary'],
      fixWebpackSourcePaths: true
    },
-    reporters: ['mocha', 'kjhtml'],
+    reporters: ['mocha', 'kjhtml', 'coverage-istanbul'],
    mochaReporter: {
      ignoreSkipped: true,
      output: 'autowatch'
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
    "start:dev": "nodemon --exec \"cross-env NODE_ENV=development yarn run serve\"",
    "start:prod": "yarn run build:prod && cross-env NODE_ENV=production yarn run serve:ssr",
    "start:mirador:prod": "yarn run build:mirador && yarn run start:prod",
-    "serve": "ts-node --project ./tsconfig.ts-node.json scripts/serve.ts",
+    "serve": "ng serve -c development",
    "serve:ssr": "node dist/server/main",
    "analyze": "webpack-bundle-analyzer dist/browser/stats.json",
-    "build": "ng build",
+    "build": "ng build -c development",
    "build:stats": "ng build --stats-json",
    "build:prod": "yarn run build:ssr",
    "build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
@@ -47,32 +47,35 @@
  "private": true,
  "resolutions": {
    "minimist": "^1.2.5",
-    "webdriver-manager": "^12.1.8"
+    "webdriver-manager": "^12.1.8",
+    "ts-node": "10.2.1"
  },
  "dependencies": {
-    "@angular/animations": "~11.2.14",
-    "@angular/cdk": "^11.2.13",
-    "@angular/common": "~11.2.14",
-    "@angular/compiler": "~11.2.14",
-    "@angular/core": "~11.2.14",
-    "@angular/forms": "~11.2.14",
-    "@angular/localize": "11.2.14",
-    "@angular/platform-browser": "~11.2.14",
-    "@angular/platform-browser-dynamic": "~11.2.14",
-    "@angular/platform-server": "~11.2.14",
-    "@angular/router": "~11.2.14",
-    "@kolkov/ngx-gallery": "^1.2.3",
-    "@ng-bootstrap/ng-bootstrap": "9.1.3",
-    "@ng-dynamic-forms/core": "^13.0.0",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "^13.0.0",
-    "@ngrx/effects": "^11.1.1",
-    "@ngrx/router-store": "^11.1.1",
-    "@ngrx/store": "^11.1.1",
-    "@nguniversal/express-engine": "11.2.1",
+    "@angular/animations": "~13.2.6",
+    "@angular/cdk": "^13.2.6",
+    "@angular/common": "~13.2.6",
+    "@angular/compiler": "~13.2.6",
+    "@angular/core": "~13.2.6",
+    "@angular/forms": "~13.2.6",
+    "@angular/localize": "13.2.6",
+    "@angular/platform-browser": "~13.2.6",
+    "@angular/platform-browser-dynamic": "~13.2.6",
+    "@angular/platform-server": "~13.2.6",
+    "@angular/router": "~13.2.6",
+    "@babel/runtime": "^7.17.2",
+    "@kolkov/ngx-gallery": "^2.0.1",
+    "@material-ui/core": "^4.11.0",
+    "@material-ui/icons": "^4.9.1",
+    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+    "@ng-dynamic-forms/core": "^14.0.1",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "^14.0.1",
+    "@ngrx/effects": "^13.0.2",
+    "@ngrx/router-store": "^13.0.2",
+    "@ngrx/store": "^13.0.2",
+    "@nguniversal/express-engine": "^13.0.2",
    "@ngx-translate/core": "^13.0.0",
    "@nicky-lenaers/ngx-scroll-to": "^9.0.0",
    "angular-idle-preload": "3.0.0",
-    "angular2-text-mask": "9.0.0",
    "angulartics2": "^10.0.0",
    "bootstrap": "4.3.1",
    "caniuse-lite": "^1.0.30001165",
@@ -102,7 +105,7 @@
    "mirador-share-plugin": "^0.11.0",
    "moment": "^2.29.1",
    "morgan": "^1.10.0",
-    "ng-mocks": "11.11.2",
+    "ng-mocks": "^13.1.1",
    "ng2-file-upload": "1.4.0",
    "ng2-nouislider": "^1.8.3",
    "ngx-infinite-scroll": "^10.0.1",
@@ -111,7 +114,9 @@
    "ngx-sortablejs": "^11.1.0",
    "nouislider": "^14.6.3",
    "pem": "1.14.4",
-    "postcss-cli": "^8.3.0",
+    "postcss-cli": "^9.1.0",
+    "prop-types": "^15.7.2",
+    "react-copy-to-clipboard": "^5.0.1",
    "reflect-metadata": "^0.1.13",
    "rxjs": "^6.6.3",
    "sortablejs": "1.13.0",
@@ -119,20 +124,25 @@
    "url-parse": "^1.5.6",
    "uuid": "^8.3.2",
    "webfontloader": "1.6.28",
-    "zone.js": "^0.10.3",
+    "zone.js": "~0.11.5",
    "ngx-ui-switch": "^11.0.1"
  },
  "devDependencies": {
-    "@angular-builders/custom-webpack": "10.0.1",
-    "@angular-devkit/build-angular": "~0.1102.15",
-    "@angular/cli": "~11.2.15",
-    "@angular/compiler-cli": "~11.2.14",
-    "@angular/language-service": "~11.2.14",
+    "@angular-builders/custom-webpack": "~13.1.0",
+    "@angular-devkit/build-angular": "~13.2.6",
+    "@angular-eslint/builder": "13.1.0",
+    "@angular-eslint/eslint-plugin": "13.1.0",
+    "@angular-eslint/eslint-plugin-template": "13.1.0",
+    "@angular-eslint/schematics": "13.1.0",
+    "@angular-eslint/template-parser": "13.1.0",
+    "@angular/cli": "~13.2.6",
+    "@angular/compiler-cli": "~13.2.6",
+    "@angular/language-service": "~13.2.6",
    "@cypress/schematic": "^1.5.0",
    "@fortawesome/fontawesome-free": "^5.5.0",
-    "@ngrx/store-devtools": "^11.1.1",
-    "@ngtools/webpack": "10.2.3",
-    "@nguniversal/builders": "~11.2.1",
+    "@ngrx/store-devtools": "^13.0.2",
+    "@ngtools/webpack": "^13.2.6",
+    "@nguniversal/builders": "^13.0.2",
    "@types/deep-freeze": "0.1.2",
    "@types/express": "^4.17.9",
    "@types/file-saver": "^2.0.1",
@@ -141,22 +151,28 @@
    "@types/js-cookie": "2.2.6",
    "@types/lodash": "^4.14.165",
    "@types/node": "^14.14.9",
+    "@typescript-eslint/eslint-plugin": "5.11.0",
+    "@typescript-eslint/parser": "5.11.0",
    "axe-core": "^4.3.3",
-    "codelyzer": "^6.0.0",
    "compression-webpack-plugin": "^3.0.1",
    "copy-webpack-plugin": "^6.4.1",
    "cross-env": "^7.0.3",
-    "css-loader": "3.4.0",
-    "cssnano": "^4.1.10",
+    "css-loader": "^6.2.0",
+    "css-minimizer-webpack-plugin": "^3.4.1",
+    "cssnano": "^5.0.6",
    "cypress": "9.5.1",
    "cypress-axe": "^0.13.0",
    "debug-loader": "^0.0.1",
    "deep-freeze": "0.0.1",
    "dotenv": "^8.2.0",
+    "eslint": "^8.2.0",
+    "eslint-plugin-deprecation": "^1.3.2",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsdoc": "^38.0.6",
+    "eslint-plugin-unused-imports": "^2.0.0",
    "fork-ts-checker-webpack-plugin": "^6.0.3",
    "html-loader": "^1.3.2",
-    "html-webpack-plugin": "^4.5.0",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "^3.8.0",
    "jasmine-marbles": "0.6.0",
    "jasmine-spec-reporter": "~5.0.0",
    "karma": "^6.3.14",
@@ -165,12 +181,13 @@
    "karma-jasmine": "~4.0.0",
    "karma-jasmine-html-reporter": "^1.5.0",
    "karma-mocha-reporter": "2.2.5",
+    "ngx-mask": "^12.0.0",
    "nodemon": "^2.0.15",
-    "optimize-css-assets-webpack-plugin": "^5.0.4",
-    "postcss-apply": "0.11.0",
-    "postcss-import": "^12.0.1",
-    "postcss-loader": "^3.0.0",
-    "postcss-preset-env": "6.7.0",
+    "postcss": "^8.1",
+    "postcss-apply": "0.12.0",
+    "postcss-import": "^14.0.0",
+    "postcss-loader": "^4.0.3",
+    "postcss-preset-env": "^7.4.2",
    "postcss-responsive-type": "1.0.0",
    "protractor": "^7.0.0",
    "protractor-istanbul-plugin": "2.0.0",
@@ -179,15 +196,15 @@
    "react-dom": "^16.14.0",
    "rimraf": "^3.0.2",
    "rxjs-spy": "^7.5.3",
+    "sass": "~1.32.6",
+    "sass-loader": "^12.6.0",
    "sass-resources-loader": "^2.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "string-replace-loader": "^2.3.0",
+    "string-replace-loader": "^3.1.0",
    "terser-webpack-plugin": "^2.3.1",
    "ts-loader": "^5.2.0",
    "ts-node": "^8.10.2",
-    "tslint": "^6.1.3",
-    "typescript": "~4.0.5",
-    "webpack": "^4.44.2",
+    "typescript": "~4.5.5",
+    "webpack": "^5.69.1",
    "webpack-bundle-analyzer": "^4.4.0",
    "webpack-cli": "^4.2.0",
    "webpack-dev-server": "^4.5.0"
--- a/scripts/test-rest.ts
+++ b/scripts/test-rest.ts
@@ -3,7 +3,7 @@ import * as https from 'https';

 import { AppConfig } from '../src/config/app-config.interface';
 import { buildAppConfig } from '../src/config/config.server';
- 
+
 const appConfig: AppConfig = buildAppConfig();

 /**
--- a/server.ts
+++ b/server.ts
@@ -15,7 +15,7 @@
 * import for `ngExpressEngine`.
 */

-import 'zone.js/dist/zone-node';
+import 'zone.js/node';
 import 'reflect-metadata';
 import 'rxjs';

--- a/src/app/access-control/epeople-registry/epeople-registry.actions.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { type } from '../../shared/ngrx/type';
@@ -16,7 +17,6 @@ export const EPeopleRegistryActionTypes = {
  CANCEL_EDIT_EPERSON: type('dspace/epeople-registry/CANCEL_EDIT_EPERSON'),
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * Used to edit an EPerson in the EPeople registry
 */
@@ -37,7 +37,6 @@ export class EPeopleRegistryCancelEPersonAction implements Action {
  type = EPeopleRegistryActionTypes.CANCEL_EDIT_EPERSON;
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * Export a type alias of all actions in this action group
--- a/src/app/access-control/group-registry/group-registry.actions.ts
+++ b/src/app/access-control/group-registry/group-registry.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { Group } from '../../core/eperson/models/group.model';
 import { type } from '../../shared/ngrx/type';
@@ -16,7 +17,6 @@ export const GroupRegistryActionTypes = {
  CANCEL_EDIT_GROUP: type('dspace/epeople-registry/CANCEL_EDIT_GROUP'),
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * Used to edit a Group in the Group registry
 */
@@ -37,7 +37,6 @@ export class GroupRegistryCancelGroupAction implements Action {
  type = GroupRegistryActionTypes.CANCEL_EDIT_GROUP;
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * Export a type alias of all actions in this action group
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
@@ -17,7 +18,6 @@ export const BitstreamFormatsRegistryActionTypes = {
  DESELECT_ALL_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_ALL_FORMAT')
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * Used to select a single bitstream format in the bitstream format registry
 */
@@ -51,7 +51,6 @@ export class BitstreamFormatsRegistryDeselectAllAction implements Action {
  type = BitstreamFormatsRegistryActionTypes.DESELECT_ALL_FORMAT;
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * Export a type alias of all actions in this action group
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../../shared/ngrx/type';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
@@ -26,7 +27,6 @@ export const MetadataRegistryActionTypes = {
  DESELECT_ALL_FIELD: type('dspace/metadata-registry/DESELECT_ALL_FIELD')
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * Used to edit a metadata schema in the metadata registry
 */
@@ -133,7 +133,6 @@ export class MetadataRegistryDeselectAllFieldAction implements Action {
  type = MetadataRegistryActionTypes.DESELECT_ALL_FIELD;
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * Export a type alias of all actions in this action group
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -52,7 +52,7 @@ describe('MetadataRegistryComponent', () => {
    }
  ];
  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
  const registryServiceStub = {
    getMetadataSchemas: () => mockSchemas,
    getActiveMetadataSchema: () => observableOf(undefined),
@@ -66,7 +66,7 @@ describe('MetadataRegistryComponent', () => {
    },
    clearMetadataSchemaRequests: () => observableOf(undefined)
  };
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */

  paginationService = new PaginationServiceStub();

--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -17,7 +17,7 @@ describe('MetadataSchemaFormComponent', () => {
  let fixture: ComponentFixture<MetadataSchemaFormComponent>;
  let registryService: RegistryService;

-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
  const registryServiceStub = {
    getActiveMetadataSchema: () => observableOf(undefined),
    createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
@@ -33,7 +33,7 @@ describe('MetadataSchemaFormComponent', () => {
      };
    }
  };
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */

  beforeEach(waitForAsync(() => {
    TestBed.configureTestingModule({
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -24,7 +24,7 @@ describe('MetadataFieldFormComponent', () => {
    prefix: 'fake'
  });

-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
  const registryServiceStub = {
    getActiveMetadataField: () => observableOf(undefined),
    createMetadataField: (field: MetadataField) => observableOf(field),
@@ -43,7 +43,7 @@ describe('MetadataFieldFormComponent', () => {
      };
    }
  };
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */

  beforeEach(waitForAsync(() => {
    TestBed.configureTestingModule({
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -106,7 +106,7 @@ describe('MetadataSchemaComponent', () => {
    }
  ];
  const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
  const registryServiceStub = {
    getMetadataSchemas: () => mockSchemas,
    getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockFieldsList.filter((value) => value.id === 3 || value.id === 4))),
@@ -122,7 +122,7 @@ describe('MetadataSchemaComponent', () => {
    },
    clearMetadataFieldRequests: () => observableOf(undefined)
  };
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
  const schemaNameParam = 'mock';
  const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
    params: observableOf({
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
@@ -1,28 +1,30 @@
-<a [ngClass]="{'btn-sm': small}" class="btn btn-secondary my-1 move-link" [routerLink]="[getMoveRoute()]" [title]="'admin.search.item.move' | translate">
-  <i class="fa fa-arrow-circle-right"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
-</a>
+<div class="space-children-mr my-1">
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary move-link" [routerLink]="[getMoveRoute()]" [title]="'admin.search.item.move' | translate">
+    <i class="fa fa-arrow-circle-right"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
+  </a>

-<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isDiscoverable" class="btn btn-secondary my-1 private-link" [routerLink]="[getPrivateRoute()]" [title]="'admin.search.item.make-private' | translate">
+  <a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isDiscoverable" class="btn btn-secondary private-link" [routerLink]="[getPrivateRoute()]" [title]="'admin.search.item.make-private' | translate">
    <i class="fa fa-eye-slash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
-</a>
+  </a>

-<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isDiscoverable" class="btn btn-secondary my-1 public-link" [routerLink]="[getPublicRoute()]" [title]="'admin.search.item.make-public' | translate">
+  <a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isDiscoverable" class="btn btn-secondary public-link" [routerLink]="[getPublicRoute()]" [title]="'admin.search.item.make-public' | translate">
    <i class="fa fa-eye"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
-</a>
+  </a>

-<a [ngClass]="{'btn-sm': small}" class="btn btn-secondary my-1 edit-link" [routerLink]="[getEditRoute()]" [title]="'admin.search.item.edit' | translate">
-  <i class="fa fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
-</a>
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary edit-link" [routerLink]="[getEditRoute()]" [title]="'admin.search.item.edit' | translate">
+    <i class="fa fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
+  </a>

-<a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isWithdrawn" class="btn btn-warning t my-1 withdraw-link" [routerLink]="[getWithdrawRoute()]" [title]="'admin.search.item.withdraw' | translate">
-  <i class="fa fa-ban"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
-</a>
+  <a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isWithdrawn" class="btn btn-warning t withdraw-link" [routerLink]="[getWithdrawRoute()]" [title]="'admin.search.item.withdraw' | translate">
+    <i class="fa fa-ban"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
+  </a>

-<a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isWithdrawn" class="btn btn-warning my-1 reinstate-link" [routerLink]="[getReinstateRoute()]" [title]="'admin.search.item.reinstate' | translate">
-  <i class="fa fa-undo"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
-</a>
+  <a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isWithdrawn" class="btn btn-warning reinstate-link" [routerLink]="[getReinstateRoute()]" [title]="'admin.search.item.reinstate' | translate">
+    <i class="fa fa-undo"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
+  </a>

-<a [ngClass]="{'btn-sm': small}" class="btn btn-danger my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.search.item.delete' | translate">
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-danger delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.search.item.delete' | translate">
    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
-</a>
+  </a>
+</div>

--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -12,7 +12,7 @@ import { Router } from '@angular/router';
 * Represents a non-expandable section in the admin sidebar
 */
@Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
  selector: 'li[ds-admin-sidebar-section]',
  templateUrl: './admin-sidebar-section.component.html',
  styleUrls: ['./admin-sidebar-section.component.scss'],
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -15,7 +15,7 @@ import { Router } from '@angular/router';
 * Represents a expandable section in the sidebar
 */
@Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
  selector: 'li[ds-expandable-admin-sidebar-section]',
  templateUrl: './expandable-admin-sidebar-section.component.html',
  styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html
@@ -1,7 +1,8 @@
-<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
+<div class="space-children-mr">
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
-</a>
-
-<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackRoute()]" [title]="'admin.workflow.item.send-back' | translate">
+  </a>
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackRoute()]" [title]="'admin.workflow.item.send-back' | translate">
    <i class="fa fa-hand-point-left"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.send-back" | translate}}</span>
-</a>
+  </a>
+</div>
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -59,6 +59,7 @@ import { PageInternalServerErrorComponent } from './page-internal-server-error/p
 import { ThemedAdminSidebarComponent } from './admin/admin-sidebar/themed-admin-sidebar.component';

 import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
+import { NgxMaskModule } from 'ngx-mask';

 export function getConfig() {
  return environment;
@@ -90,6 +91,7 @@ const IMPORTS = [
  ScrollToModule.forRoot(),
  NgbModule,
  TranslateModule.forRoot(),
+  NgxMaskModule.forRoot(),
  EffectsModule.forRoot(appEffects),
  StoreModule.forRoot(appReducers, storeModuleConfig),
  StoreRouterConnectingModule.forRoot(),
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -127,10 +127,10 @@ export class BrowseByMetadataPageComponent implements OnInit {
          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
        })
      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
-          this.browseId = params.id || this.defaultBrowseId;
+          this.browseId = params.id || this.defaultBrowseId;
          this.authority = params.authority;
-          this.value = +params.value || params.value || '';
-          this.startsWith = +params.startsWith || params.startsWith;
+          this.value = +params.value || params.value || '';
+          this.startsWith = +params.startsWith || params.startsWith;
          const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId);
          if (isNotEmpty(this.value)) {
            this.updatePageWithItems(searchOptions, this.value, this.authority);
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
@@ -45,7 +45,7 @@ export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
          return [Object.assign({}, routeParams, queryParams),currentPage,currentSort];
        })
      ).subscribe(([params, currentPage, currentSort]: [Params, PaginationComponentOptions, SortOptions]) => {
-        this.browseId = params.id || this.defaultBrowseId;
+        this.browseId = params.id || this.defaultBrowseId;
        this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId), undefined, undefined);
        this.updateParent(params.scope);
      }));
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -110,15 +110,15 @@ describe('CollectionItemMapperComponent', () => {
  };
  const searchServiceStub = Object.assign(new SearchServiceStub(), {
    search: () => observableOf(emptyList),
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
    clearDiscoveryRequests: () => {}
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
  });
  const collectionDataServiceStub = {
    getMappedItems: () => observableOf(emptyList),
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
    clearMappedItemsRequests: () => {}
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
  };
  const routeServiceStub = {
    getRouteParameterValue: () => {
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -34,7 +34,7 @@
                          [title]="'collection.page.news'">
                  </ds-comcol-page-content>
                </header>
-                <div class="pl-2">
+                <div class="pl-2 space-children-mr">
                  <ds-dso-page-edit-button *ngIf="isCollectionAdmin$ | async"  [pageRoute]="collectionPageRoute$ | async" [dso]="collection" [tooltipMsg]="'collection.page.edit'"></ds-dso-page-edit-button>
                </div>
              </div>
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -5,11 +5,11 @@
                <h2 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h2>
                <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dso.name } }}</p>
                <div class="form-group row">
-                  <div class="col text-right">
+                  <div class="col text-right space-children-mr">
                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
                      <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                    </button>
-                    <button class="btn btn-danger mr-2" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                    <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
                      <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
                      <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                    </button>
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,6 +1,6 @@
 <div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
  <label>{{ 'collection.edit.template.label' | translate}}</label>
-  <div class="button-row">
+  <div class="button-row space-children-mr">
    <button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
      <i class="fas fa-plus"></i>
      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -1,5 +1,5 @@
 <div *ngVar="(contentSource$ |async) as contentSource">
-    <div class="container-fluid" *ngIf="shouldShow">
+    <div class="container-fluid space-children-mr" *ngIf="shouldShow">
        <h4>{{ 'collection.source.controls.head' | translate }}</h4>
        <div>
            <span class="font-weight-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
@@ -51,4 +51,4 @@


    </div>
-</div>
+</div>
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-    <div class="d-inline-block float-right">
+    <div class="d-inline-block float-right space-children-mr">
        <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
                [disabled]="!(hasChanges() | async)"
                (click)="discard()"><i
@@ -43,7 +43,7 @@
 <div class="container mt-2" *ngIf="(contentSource?.harvestType !== harvestTypeNone)">
    <div class="row">
        <div class="col-12">
-            <div class="d-inline-block float-right ml-1">
+            <div class="d-inline-block float-right ml-1 space-children-mr">
                <button class=" btn btn-danger" *ngIf="!(isReinstatable() | async)"
                        [disabled]="!(hasChanges() | async)"
                        (click)="discard()"><i
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { createSelector, Store } from '@ngrx/store';

@@ -108,7 +109,6 @@ export const MAX_COMCOLS_PER_PAGE = 20;
 * Service class for the community list, responsible for the creating of the flat list used by communityList dataSource
 *  and connection to the store to retrieve and save the state of the community list
 */
-// tslint:disable-next-line:max-classes-per-file
@Injectable()
 export class CommunityListService {

--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -8,7 +8,7 @@
        <span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
      </button>
      <div class="align-middle pt-2">
-        <a *ngIf="node!==loadingNode" [routerLink]="" (click)="getNextPage(node)"
+        <a *ngIf="node!==loadingNode" [routerLink]="[]" (click)="getNextPage(node)"
           class="btn btn-outline-primary btn-sm" role="button">
           <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
        </a>
--- a/src/app/community-list-page/community-list/themed-community-list.component.ts
+++ b/src/app/community-list-page/community-list/themed-community-list.component.ts
@@ -7,7 +7,8 @@ import { Component } from '@angular/core';
  selector: 'ds-themed-community-list',
  styleUrls: [],
  templateUrl: '../../shared/theme-support/themed.component.html',
-})export class ThemedCommunityListComponent extends ThemedComponent<CommunityListComponent> {
+})
+export class ThemedCommunityListComponent extends ThemedComponent<CommunityListComponent> {
  protected getComponentName(): string {
    return 'CommunityListComponent';
  }
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -20,7 +20,7 @@
            [title]="'community.page.news'">
          </ds-comcol-page-content>
        </header>
-        <div class="pl-2">
+        <div class="pl-2 space-children-mr">
          <ds-dso-page-edit-button *ngIf="isCommunityAdmin$ | async" [pageRoute]="communityPageRoute$ | async" [dso]="communityPayload" [tooltipMsg]="'community.page.edit'"></ds-dso-page-edit-button>
        </div>
      </div>
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -5,11 +5,11 @@
                <h2 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h2>
                <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dso.name } }}</p>
                <div class="form-group row">
-                    <div class="col text-right">
+                    <div class="col text-right space-children-mr">
                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
                            <i class="fas fa-times"></i> {{'community.delete.cancel' | translate}}
                        </button>
-                        <button class="btn btn-danger mr-2" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                        <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'community.delete.processing' | translate}}</span>
                            <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}</span>
                        </button>
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 // import @ngrx
 import { Action } from '@ngrx/store';
 // import type function
@@ -39,7 +40,6 @@ export const AuthActionTypes = {
  UNSET_USER_AS_IDLE: type('dspace/auth/UNSET_USER_AS_IDLE')
 };

-/* tslint:disable:max-classes-per-file */

 /**
 * Authenticate.
@@ -411,7 +411,6 @@ export class SetUserAsIdleAction implements Action {
 export class UnsetUserAsIdleAction implements Action {
  public type: string = AuthActionTypes.UNSET_USER_AS_IDLE;
 }
-/* tslint:enable:max-classes-per-file */

 /**
 * Actions type.
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -1,4 +1,4 @@
-import { fakeAsync, flush, TestBed } from '@angular/core/testing';
+import { fakeAsync, TestBed, tick } from '@angular/core/testing';

 import { provideMockActions } from '@ngrx/effects/testing';
 import { Store, StoreModule } from '@ngrx/store';
@@ -396,44 +396,43 @@ describe('AuthEffects', () => {
    });

    describe('when auth loaded is false', () => {
-      it('should not call removeToken method', (done) => {
+      it('should not call removeToken method', fakeAsync(() => {
        store.overrideSelector(isAuthenticatedLoaded, false);
-        actions = hot('--a-|', { a: { type: StoreActionTypes.REHYDRATE } });
+        actions = observableOf({ type: StoreActionTypes.REHYDRATE });
        spyOn(authServiceStub, 'removeToken');

        authEffects.clearInvalidTokenOnRehydrate$.subscribe(() => {
-          expect(authServiceStub.removeToken).not.toHaveBeenCalled();
-
+          expect(false).toBeTrue();  // subscribe to trigger taps, fail if the effect emits (we don't expect it to)
        });
-
-        done();
-      });
+        tick(1000);
+        expect(authServiceStub.removeToken).not.toHaveBeenCalled();
+      }));
    });

    describe('when auth loaded is true', () => {
-      it('should call removeToken method', fakeAsync(() => {
+      it('should call removeToken method', (done) => {
+        spyOn(console, 'log').and.callThrough();
+
        store.overrideSelector(isAuthenticatedLoaded, true);
-        actions = hot('--a-|', { a: { type: StoreActionTypes.REHYDRATE } });
+        actions = observableOf({ type: StoreActionTypes.REHYDRATE });
        spyOn(authServiceStub, 'removeToken');

        authEffects.clearInvalidTokenOnRehydrate$.subscribe(() => {
          expect(authServiceStub.removeToken).toHaveBeenCalled();
-          flush();
+          done();
        });
-
-      }));
+      });
    });
  });

  describe('invalidateAuthorizationsRequestCache$', () => {
    it('should call invalidateAuthorizationsRequestCache method in response to a REHYDRATE action', (done) => {
-      actions = hot('--a-|', { a: { type: StoreActionTypes.REHYDRATE } });
+      actions = observableOf({ type: StoreActionTypes.REHYDRATE });

      authEffects.invalidateAuthorizationsRequestCache$.subscribe(() => {
        expect((authEffects as  any).authorizationsService.invalidateAuthorizationsRequestCache).toHaveBeenCalled();
+        done();
      });
-
-      done();
    });
  });
 });
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -10,7 +10,7 @@ import {
 } from 'rxjs';
 import { catchError, filter, map, observeOn, switchMap, take, tap } from 'rxjs/operators';
 // import @ngrx
-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action, select, Store } from '@ngrx/store';

 // import services
@@ -67,8 +67,7 @@ export class AuthEffects {
   * Authenticate user.
   * @method authenticate
   */
-  @Effect()
-  public authenticate$: Observable<Action> = this.actions$.pipe(
+  public authenticate$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.AUTHENTICATE),
    switchMap((action: AuthenticateAction) => {
      return this.authService.authenticate(action.payload.email, action.payload.password).pipe(
@@ -77,26 +76,23 @@ export class AuthEffects {
        catchError((error) => observableOf(new AuthenticationErrorAction(error)))
      );
    })
-  );
+  ));

-  @Effect()
-  public authenticateSuccess$: Observable<Action> = this.actions$.pipe(
+  public authenticateSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.AUTHENTICATE_SUCCESS),
    map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload))
-  );
+  ));

-  @Effect()
-  public authenticated$: Observable<Action> = this.actions$.pipe(
+  public authenticated$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.AUTHENTICATED),
    switchMap((action: AuthenticatedAction) => {
      return this.authService.authenticatedUser(action.payload).pipe(
        map((userHref: string) => new AuthenticatedSuccessAction((userHref !== null), action.payload, userHref)),
        catchError((error) => observableOf(new AuthenticatedErrorAction(error))),);
    })
-  );
+  ));

-  @Effect()
-  public authenticatedSuccess$: Observable<Action> = this.actions$.pipe(
+  public authenticatedSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.AUTHENTICATED_SUCCESS),
    tap((action: AuthenticatedSuccessAction) => this.authService.storeToken(action.payload.authToken)),
    switchMap((action: AuthenticatedSuccessAction) => this.authService.getRedirectUrl().pipe(
@@ -110,26 +106,23 @@ export class AuthEffects {
        return new RetrieveAuthenticatedEpersonAction(action.payload.userHref);
      }
    })
-  );
+  ));

-  @Effect({ dispatch: false })
-  public redirectAfterLoginSuccess$: Observable<Action> = this.actions$.pipe(
+  public redirectAfterLoginSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.REDIRECT_AFTER_LOGIN_SUCCESS),
    tap((action: RedirectAfterLoginSuccessAction) => {
      this.authService.clearRedirectUrl();
      this.authService.navigateToRedirectUrl(action.payload);
    })
-  );
+  ), { dispatch: false });

  // It means "reacts to this action but don't send another"
-  @Effect({ dispatch: false })
-  public authenticatedError$: Observable<Action> = this.actions$.pipe(
+  public authenticatedError$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.AUTHENTICATED_ERROR),
    tap((action: LogOutSuccessAction) => this.authService.removeToken())
-  );
+  ), { dispatch: false });

-  @Effect()
-  public retrieveAuthenticatedEperson$: Observable<Action> = this.actions$.pipe(
+  public retrieveAuthenticatedEperson$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON),
    switchMap((action: RetrieveAuthenticatedEpersonAction) => {
      const impersonatedUserID = this.authService.getImpersonateID();
@@ -143,20 +136,18 @@ export class AuthEffects {
        map((user: EPerson) => new RetrieveAuthenticatedEpersonSuccessAction(user.id)),
        catchError((error) => observableOf(new RetrieveAuthenticatedEpersonErrorAction(error))));
    })
-  );
+  ));

-  @Effect()
-  public checkToken$: Observable<Action> = this.actions$.pipe(ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN),
+  public checkToken$: Observable<Action> = createEffect(() => this.actions$.pipe(ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN),
    switchMap(() => {
      return this.authService.hasValidAuthenticationToken().pipe(
        map((token: AuthTokenInfo) => new AuthenticatedAction(token)),
        catchError((error) => observableOf(new CheckAuthenticationTokenCookieAction()))
      );
    })
-  );
+  ));

-  @Effect()
-  public checkTokenCookie$: Observable<Action> = this.actions$.pipe(
+  public checkTokenCookie$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE),
    switchMap(() => {
      return this.authService.checkAuthenticationCookie().pipe(
@@ -171,10 +162,9 @@ export class AuthEffects {
        catchError((error) => observableOf(new AuthenticatedErrorAction(error)))
      );
    })
-  );
+  ));

-  @Effect()
-  public retrieveToken$: Observable<Action> = this.actions$.pipe(
+  public retrieveToken$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.RETRIEVE_TOKEN),
    switchMap((action: AuthenticateAction) => {
      return this.authService.refreshAuthenticationToken(null).pipe(
@@ -183,55 +173,51 @@ export class AuthEffects {
        catchError((error) => observableOf(new AuthenticationErrorAction(error)))
      );
    })
-  );
+  ));

-  @Effect()
-  public refreshToken$: Observable<Action> = this.actions$.pipe(ofType(AuthActionTypes.REFRESH_TOKEN),
+  public refreshToken$: Observable<Action> = createEffect(() => this.actions$.pipe(ofType(AuthActionTypes.REFRESH_TOKEN),
    switchMap((action: RefreshTokenAction) => {
      return this.authService.refreshAuthenticationToken(action.payload).pipe(
        map((token: AuthTokenInfo) => new RefreshTokenSuccessAction(token)),
        catchError((error) => observableOf(new RefreshTokenErrorAction()))
      );
    })
-  );
+  ));

  // It means "reacts to this action but don't send another"
-  @Effect({ dispatch: false })
-  public refreshTokenSuccess$: Observable<Action> = this.actions$.pipe(
+  public refreshTokenSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
    ofType(AuthActionTypes.REFRESH_TOKEN_SUCCESS),
    tap((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload))
-  );
+  ), { dispatch: false });

  /**
   * When the store is rehydrated in the browser,
   * clear a possible invalid token or authentication errors
   */
-  @Effect({ dispatch: false })
-  public clearInvalidTokenOnRehydrate$: Observable<any> = this.actions$.pipe(
+  public clearInvalidTokenOnRehydrate$: Observable<any> = createEffect(() => this.actions$.pipe(
    ofType(StoreActionTypes.REHYDRATE),
    switchMap(() => {
      const isLoaded$ = this.store.pipe(select(isAuthenticatedLoaded));
      const authenticated$ = this.store.pipe(select(isAuthenticated));
-      return observableCombineLatest(isLoaded$, authenticated$).pipe(
+      return observableCombineLatest([isLoaded$, authenticated$]).pipe(
        take(1),
        filter(([loaded, authenticated]) => loaded && !authenticated),
        tap(() => this.authService.removeToken()),
        tap(() => this.authService.resetAuthenticationError())
      );
-    }));
+    })), { dispatch: false });

  /**
   * When the store is rehydrated in the browser, invalidate all cache hits regarding the
   * authorizations endpoint, to be sure to have consistent responses after a login with external idp
   *
   */
-  @Effect({ dispatch: false }) invalidateAuthorizationsRequestCache$ = this.actions$
+   invalidateAuthorizationsRequestCache$ = createEffect(() => this.actions$
    .pipe(ofType(StoreActionTypes.REHYDRATE),
      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache())
-    );
+    ), { dispatch: false });

-  @Effect()
-  public logOut$: Observable<Action> = this.actions$
+  public logOut$: Observable<Action> = createEffect(() => this.actions$
    .pipe(
      ofType(AuthActionTypes.LOG_OUT),
      switchMap(() => {
@@ -241,26 +227,23 @@ export class AuthEffects {
          catchError((error) => observableOf(new LogOutErrorAction(error)))
        );
      })
-    );
+    ));

-  @Effect({ dispatch: false })
-  public logOutSuccess$: Observable<Action> = this.actions$
+  public logOutSuccess$: Observable<Action> = createEffect(() => this.actions$
    .pipe(ofType(AuthActionTypes.LOG_OUT_SUCCESS),
      tap(() => this.authService.removeToken()),
      tap(() => this.authService.clearRedirectUrl()),
      tap(() => this.authService.refreshAfterLogout())
-    );
+    ), { dispatch: false });

-  @Effect({ dispatch: false })
-  public redirectToLoginTokenExpired$: Observable<Action> = this.actions$
+  public redirectToLoginTokenExpired$: Observable<Action> = createEffect(() => this.actions$
    .pipe(
      ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED),
      tap(() => this.authService.removeToken()),
      tap(() => this.authService.redirectToLoginWhenTokenExpired())
-    );
+    ), { dispatch: false });

-  @Effect()
-  public retrieveMethods$: Observable<Action> = this.actions$
+  public retrieveMethods$: Observable<Action> = createEffect(() => this.actions$
    .pipe(
      ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS),
      switchMap((action: RetrieveAuthMethodsAction) => {
@@ -270,7 +253,7 @@ export class AuthEffects {
            catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))
          );
      })
-    );
+    ));

  /**
   * For any action that is not in {@link IDLE_TIMER_IGNORE_TYPES} that comes in => Start the idleness timer
@@ -278,8 +261,7 @@ export class AuthEffects {
   * => Return the action to set the user as idle ({@link SetUserAsIdleAction})
   * @method trackIdleness
   */
-  @Effect()
-  public trackIdleness$: Observable<Action> = this.actions$.pipe(
+  public trackIdleness$: Observable<Action> = createEffect(() => this.actions$.pipe(
    filter((action: Action) => !IDLE_TIMER_IGNORE_TYPES.includes(action.type)),
    // Using switchMap the effect will stop subscribing to the previous timer if a new action comes
    // in, and start a new timer
@@ -290,7 +272,7 @@ export class AuthEffects {
    // Re-enter the zone to dispatch the action
    observeOn(new EnterZoneScheduler(this.zone, queueScheduler)),
    map(() => new SetUserAsIdleAction()),
-  );
+  ));

  /**
   * @constructor
--- a/src/app/core/auth/auth.interceptor.spec.ts
+++ b/src/app/core/auth/auth.interceptor.spec.ts
@@ -20,9 +20,9 @@ describe(`AuthInterceptor`, () => {

  const authServiceStub = new AuthServiceStub();
  const store: Store<TruncatablesState> = jasmine.createSpyObj('store', {
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
    dispatch: {},
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
    select: observableOf(true)
  });

--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -144,7 +144,7 @@ export class AuthInterceptor implements HttpInterceptor {
      const regex = /(\w+ (\w+=((".*?")|[^,]*)(, )?)*)/g;
      const realms = completeWWWauthenticateHeader.match(regex);

-      // tslint:disable-next-line:forin
+      // eslint-disable-next-line guard-for-in
      for (const j in realms) {

        const splittedRealm = realms[j].split(', ');
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -112,7 +112,7 @@ export class AuthService {
        if (hasValue(rd.payload) && rd.payload.authenticated) {
          return rd.payload;
        } else {
-          throw(new Error('Invalid email or password'));
+          throw (new Error('Invalid email or password'));
        }
      }));

@@ -166,7 +166,7 @@ export class AuthService {
        if (hasValue(status) && status.authenticated) {
          return status._links.eperson.href;
        } else {
-          throw(new Error('Not authenticated'));
+          throw (new Error('Not authenticated'));
        }
      }));
  }
@@ -249,7 +249,7 @@ export class AuthService {
        if (hasValue(status) && status.authenticated) {
          return status.token;
        } else {
-          throw(new Error('Not authenticated'));
+          throw (new Error('Not authenticated'));
        }
      }));
  }
@@ -288,7 +288,7 @@ export class AuthService {
        if (hasValue(status) && !status.authenticated) {
          return true;
        } else {
-          throw(new Error('auth.errors.invalid-user'));
+          throw (new Error('auth.errors.invalid-user'));
        }
      }));
  }
--- a/src/app/core/auth/selectors.ts
+++ b/src/app/core/auth/selectors.ts
@@ -8,6 +8,8 @@ import { createSelector } from '@ngrx/store';
 */
 import { AuthState } from './auth.reducer';
 import { AppState } from '../../app.reducer';
+import { CoreState } from '../core.reducers';
+import { coreSelector } from '../core.selectors';

 /**
 * Returns the user state.
@@ -15,7 +17,7 @@ import { AppState } from '../../app.reducer';
 * @param {AppState} state Top level state.
 * @return {AuthState}
 */
-export const getAuthState = (state: any) => state.core.auth;
+export const getAuthState = createSelector(coreSelector, (state: CoreState) => state.auth);

 /**
 * Returns true if the user is authenticated.
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -36,7 +36,7 @@ export class ServerAuthService extends AuthService {
        if (hasValue(status) && status.authenticated) {
          return status._links.eperson.href;
        } else {
-          throw(new Error('Not authenticated'));
+          throw (new Error('Not authenticated'));
        }
      }));
  }
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { dataService } from '../cache/builders/build-decorators';
 import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
@@ -18,7 +19,6 @@ import { RemoteData } from '../data/remote-data';
 import { FindListOptions } from '../data/request.models';
 import { PaginatedList } from '../data/paginated-list.model';

-/* tslint:disable:max-classes-per-file */

 class DataServiceImpl extends DataService<BrowseDefinition> {
  protected linkPath = 'browses';
@@ -123,4 +123,3 @@ export class BrowseDefinitionDataService {
  }
 }

-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/cache/builders/build-decorators.spec.ts
+++ b/src/app/core/cache/builders/build-decorators.spec.ts
@@ -1,9 +1,9 @@
+/* eslint-disable max-classes-per-file */
 import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
 import { dataService, getDataServiceFor, getLinkDefinition, link, } from './build-decorators';

-/* tslint:disable:max-classes-per-file */
 class TestService {
 }

@@ -80,4 +80,3 @@ describe('build decorators', () => {
    });
  });
 });
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
@@ -12,7 +13,6 @@ import { isEmpty } from 'rxjs/operators';
 const TEST_MODEL = new ResourceType('testmodel');
 let result: any;

-/* tslint:disable:max-classes-per-file */
 class TestModel implements HALResource {
  static type = TEST_MODEL;

@@ -251,4 +251,3 @@ describe('LinkService', () => {
  });

 });
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/cache/object-cache.actions.ts
+++ b/src/app/core/cache/object-cache.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';

 import { type } from '../../shared/ngrx/type';
@@ -15,7 +16,6 @@ export const ObjectCacheActionTypes = {
  APPLY_PATCH: type('dspace/core/cache/object/APPLY_PATCH')
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * An ngrx action to add an object to the cache
 */
@@ -126,7 +126,6 @@ export class ApplyPatchObjectCacheAction implements Action {
  }
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * A type to encompass all ObjectCacheActions
--- a/src/app/core/cache/object-cache.effects.ts
+++ b/src/app/core/cache/object-cache.effects.ts
@@ -1,6 +1,6 @@
 import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';

 import { StoreActionTypes } from '../../store.actions';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
@@ -16,10 +16,10 @@ export class ObjectCacheEffects {
   * This assumes that the server cached everything a negligible
   * time ago, and will likely need to be revisited later
   */
-  @Effect() fixTimestampsOnRehydrate = this.actions$
+   fixTimestampsOnRehydrate = createEffect(() => this.actions$
    .pipe(ofType(StoreActionTypes.REHYDRATE),
      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime()))
-    );
+    ));

  constructor(private actions$: Actions) {
  }
--- a/src/app/core/cache/object-cache.reducer.spec.ts
+++ b/src/app/core/cache/object-cache.reducer.spec.ts
@@ -105,10 +105,10 @@ describe('objectCacheReducer', () => {
    const action = new AddToObjectCacheAction(objectToCache, timeCompleted, msToLive, requestUUID, altLink1);
    const newState = objectCacheReducer(testState, action);

-    /* tslint:disable:no-string-literal */
+    /* eslint-disable @typescript-eslint/dot-notation */
    expect(newState[selfLink1].data['foo']).toBe('baz');
    expect(newState[selfLink1].data['somethingElse']).toBe(true);
-    /* tslint:enable:no-string-literal */
+    /* eslint-enable @typescript-eslint/dot-notation */
  });

  it('should perform the ADD action without affecting the previous state', () => {
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { HALLink } from '../shared/hal-link.model';
 import { HALResource } from '../shared/hal-resource.model';
 import {
@@ -49,7 +50,6 @@ export const getResourceTypeValueFor = (type: any): string => {
  }
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * An interface to represent objects that can be cached
 *
@@ -110,7 +110,6 @@ export class ObjectCacheEntry implements CacheEntry {
  alternativeLinks: string[];
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * The ObjectCache State
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { RequestError } from '../data/request.models';
 import { PageInfo } from '../shared/page-info.model';
 import { ConfigObject } from '../config/models/config.model';
@@ -5,7 +6,6 @@ import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALLink } from '../shared/hal-link.model';
 import { UnCacheableObject } from '../shared/uncacheable-object.model';

-/* tslint:disable:max-classes-per-file */
 export class RestResponse {
  public toCache = true;
  public timeCompleted: number;
@@ -140,4 +140,3 @@ export class FilteredDiscoveryQueryResponse extends RestResponse {
    super(true, statusCode, statusText);
  }
 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/cache/server-sync-buffer.actions.ts
+++ b/src/app/core/cache/server-sync-buffer.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';

 import { type } from '../../shared/ngrx/type';
@@ -12,7 +13,6 @@ export const ServerSyncBufferActionTypes = {
  EMPTY: type('dspace/core/cache/syncbuffer/EMPTY'),
 };

-/* tslint:disable:max-classes-per-file */

 /**
 * An ngrx action to add a new cached object to the server sync buffer
@@ -71,7 +71,6 @@ export class EmptySSBAction implements Action {
  }
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * A type to encompass all ServerSyncBufferActions
--- a/src/app/core/cache/server-sync-buffer.effects.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.spec.ts
@@ -83,7 +83,7 @@ describe('ServerSyncBufferEffects', () => {
    });

    it('should return a COMMIT action in response to an ADD action', () => {
-      // tslint:disable-next-line:no-shadowed-variable
+      // eslint-disable-next-line @typescript-eslint/no-shadow
      testScheduler.run(({ hot, expectObservable }) => {
        actions = hot('a', {
          a: {
--- a/src/app/core/cache/server-sync-buffer.effects.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.ts
@@ -1,6 +1,6 @@
 import { delay, exhaustMap, map, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { coreSelector } from '../core.selectors';
 import {
  AddToSSBAction,
@@ -32,7 +32,7 @@ export class ServerSyncBufferEffects {
   * Then dispatch a CommitSSBAction
   * When the delay is running, no new AddToSSBActions are processed in this effect
   */
-  @Effect() setTimeoutForServerSync = this.actions$
+   setTimeoutForServerSync = createEffect(() => this.actions$
    .pipe(
      ofType(ServerSyncBufferActionTypes.ADD),
      exhaustMap((action: AddToSSBAction) => {
@@ -42,7 +42,7 @@ export class ServerSyncBufferEffects {
          delay(timeoutInSeconds * 1000),
        );
      })
-    );
+    ));

  /**
   * When a CommitSSBAction is dispatched
@@ -50,7 +50,7 @@ export class ServerSyncBufferEffects {
   * When the list of actions is not empty, also dispatch an EmptySSBAction
   * When the list is empty dispatch a NO_ACTION placeholder action
   */
-  @Effect() commitServerSyncBuffer = this.actions$
+   commitServerSyncBuffer = createEffect(() => this.actions$
    .pipe(
      ofType(ServerSyncBufferActionTypes.COMMIT),
      switchMap((action: CommitSSBAction) => {
@@ -86,7 +86,7 @@ export class ServerSyncBufferEffects {
          })
        );
      })
-    );
+    ));

  /**
   * private method to create an ApplyPatchObjectCacheAction based on a cache entry
--- a/src/app/core/config/config.service.ts
+++ b/src/app/core/config/config.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Observable } from 'rxjs';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -31,7 +32,6 @@ class DataServiceImpl extends DataService<ConfigObject> {
  }
 }

-// tslint:disable-next-line:max-classes-per-file
 export abstract class ConfigService {
  /**
   * A private DataService instance to delegate specific methods to.
--- a/src/app/core/data/base-response-parsing.service.spec.ts
+++ b/src/app/core/data/base-response-parsing.service.spec.ts
@@ -1,10 +1,10 @@
+/* eslint-disable max-classes-per-file */
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { GetRequest, RestRequest } from './request.models';
 import { DSpaceObject } from '../shared/dspace-object.model';

-/* tslint:disable:max-classes-per-file */
 class TestService extends BaseResponseParsingService {
  toCache = true;

@@ -101,4 +101,3 @@ describe('BaseResponseParsingService', () => {
    });
  });
 });
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { CacheableObject } from '../cache/object-cache.reducer';
@@ -10,7 +11,6 @@ import { getClassForType } from '../cache/builders/build-decorators';
 import { RestRequest } from './request.models';
 import { environment } from '../../../environments/environment';

-/* tslint:disable:max-classes-per-file */

 /**
 * Return true if halObj has a value for `_links.self`
@@ -180,4 +180,3 @@ export abstract class BaseResponseParsingService {
    return statusCode >= 200 && statusCode < 300;
  }
 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -49,7 +49,7 @@ class TestService extends ComColDataService<any> {
  }
 }

-// tslint:disable:no-shadowed-variable
+/* eslint-disable @typescript-eslint/no-shadow */
 describe('ComColDataService', () => {
  let service: TestService;
  let requestService: RequestService;
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
@@ -15,7 +16,6 @@ import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';

-/* tslint:disable:max-classes-per-file */
 class DataServiceImpl extends DataService<ConfigurationProperty> {
  protected linkPath = 'properties';

@@ -60,4 +60,3 @@ export class ConfigurationDataService {
    return this.dataService.findById(name);
  }
 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
 import { compare, Operation } from 'fast-json-patch';
@@ -26,7 +27,6 @@ import { RequestEntryState } from './request.reducer';

 const endpoint = 'https://rest.api/core';

-/* tslint:disable:max-classes-per-file */
 class TestService extends DataService<any> {

  constructor(
@@ -833,4 +833,3 @@ describe('DataService', () => {
    });
  });
 });
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
@@ -18,7 +19,6 @@ import { RequestService } from './request.service';
 import { FindListOptions } from './request.models';
 import { PaginatedList } from './paginated-list.model';

-/* tslint:disable:max-classes-per-file */
 class DataServiceImpl extends DataService<DSpaceObject> {
  protected linkPath = 'dso';

@@ -104,4 +104,3 @@ export class DSpaceObjectDataService {
  }

 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/dspace-rest-response-parsing.service.ts
+++ b/src/app/core/data/dspace-rest-response-parsing.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { CacheableObject } from '../cache/object-cache.reducer';
@@ -18,7 +19,6 @@ import { RestRequestMethod } from './rest-request-method';
 import { getUrlWithoutEmbedParams, getEmbedSizeParams } from '../index/index.selectors';
 import { URLCombiner } from '../url-combiner/url-combiner';

-/* tslint:disable:max-classes-per-file */

 /**
 * Return true if obj has a value for `_links.self`
@@ -271,4 +271,3 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
    return statusCode >= 200 && statusCode < 300;
  }
 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/eperson-registration.service.spec.ts
+++ b/src/app/core/data/eperson-registration.service.spec.ts
@@ -100,7 +100,7 @@ describe('EpersonRegistrationService', () => {
      }));
    });

-    // tslint:disable:no-shadowed-variable
+    /* eslint-disable @typescript-eslint/no-shadow */
    it('should use cached responses and /registrations/search/findByToken?', () => {
      testScheduler.run(({ cold, expectObservable }) => {
        rdbService.buildSingle.and.returnValue(cold('a', { a: rd }));
--- a/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
+++ b/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
@@ -16,7 +16,8 @@ export class FilteredDiscoveryPageResponseParsingService extends BaseResponsePar
  toCache = false;
  constructor(
    protected objectCache: ObjectCacheService,
-  ) { super();
+  ) {
+    super();
  }

  /**
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { DataService } from './data.service';
 import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -20,7 +21,6 @@ import { ITEM_TYPE } from '../shared/item-relationships/item-type.resource-type'
 import { LICENSE } from '../shared/license.resource-type';
 import { CacheableObject } from '../cache/object-cache.reducer';

-/* tslint:disable:max-classes-per-file */
 class DataServiceImpl extends DataService<any> {
  // linkPath isn't used if we're only searching by href.
  protected linkPath = undefined;
--- a/src/app/core/data/item-template-data.service.ts
+++ b/src/app/core/data/item-template-data.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { ItemDataService } from './item-data.service';
 import { UpdateDataService } from './update-data.service';
@@ -24,7 +25,6 @@ import { hasValue } from '../../shared/empty.util';
 import { Operation } from 'fast-json-patch';
 import { getFirstCompletedRemoteData } from '../shared/operators';

-/* tslint:disable:max-classes-per-file */
 /**
 * A custom implementation of the ItemDataService, but for collection item templates
 * Makes sure to change the endpoint before sending out CRUD requests for the item template
@@ -228,4 +228,3 @@ export class ItemTemplateDataService implements UpdateDataService<Item> {
    return this.dataService.getCollectionEndpoint(collectionID);
  }
 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/object-updates/object-updates.actions.ts
+++ b/src/app/core/data/object-updates/object-updates.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import {type} from '../../../shared/ngrx/type';
 import {Action} from '@ngrx/store';
 import {Identifiable} from './object-updates.reducer';
@@ -21,7 +22,6 @@ export const ObjectUpdatesActionTypes = {
  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD')
 };

-/* tslint:disable:max-classes-per-file */

 /**
 * Enum that represents the different types of updates that can be performed on a field in the ObjectUpdates store
@@ -283,7 +283,6 @@ export class RemoveFieldUpdateAction implements Action {
  }
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * A type to encompass all ObjectUpdatesActions
--- a/src/app/core/data/object-updates/object-updates.effects.ts
+++ b/src/app/core/data/object-updates/object-updates.effects.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
  DiscardObjectUpdatesAction,
  ObjectUpdatesAction,
@@ -52,7 +52,7 @@ export class ObjectUpdatesEffects {
  /**
   * Effect that makes sure all last fired ObjectUpdatesActions are stored in the map of this service, with the url as their key
   */
-  @Effect({ dispatch: false }) mapLastActions$ = this.actions$
+   mapLastActions$ = createEffect(() => this.actions$
    .pipe(
      ofType(...Object.values(ObjectUpdatesActionTypes)),
      map((action: ObjectUpdatesAction) => {
@@ -64,12 +64,12 @@ export class ObjectUpdatesEffects {
          this.actionMap$[url].next(action);
        }
      })
-    );
+    ), { dispatch: false });

  /**
   * Effect that makes sure all last fired NotificationActions are stored in the notification map of this service, with the id as their key
   */
-  @Effect({ dispatch: false }) mapLastNotificationActions$ = this.actions$
+   mapLastNotificationActions$ = createEffect(() => this.actions$
    .pipe(
      ofType(...Object.values(NotificationsActionTypes)),
      map((action: RemoveNotificationAction) => {
@@ -80,7 +80,7 @@ export class ObjectUpdatesEffects {
          this.notificationActionMap$[id].next(action);
        }
      )
-    );
+    ), { dispatch: false });

  /**
   * Effect that checks whether the removeAction's notification timeout ends before a user triggers another ObjectUpdatesAction
@@ -88,7 +88,7 @@ export class ObjectUpdatesEffects {
   * When a REINSTATE action is fired during the timeout, a NO_ACTION action will be returned
   * When any other ObjectUpdatesAction is fired during the timeout, a RemoteObjectUpdatesAction will be returned
   */
-  @Effect() removeAfterDiscardOrReinstateOnUndo$ = this.actions$
+   removeAfterDiscardOrReinstateOnUndo$ = createEffect(() => this.actions$
    .pipe(
      ofType(ObjectUpdatesActionTypes.DISCARD),
      switchMap((action: DiscardObjectUpdatesAction) => {
@@ -134,7 +134,7 @@ export class ObjectUpdatesEffects {
          );
        }
      )
-    );
+    ));

  constructor(private actions$: Actions,
              private notificationsService: NotificationsService) {
--- a/src/app/core/data/relationship-type.service.spec.ts
+++ b/src/app/core/data/relationship-type.service.spec.ts
@@ -65,11 +65,11 @@ describe('RelationshipTypeService', () => {
    buildList = createSuccessfulRemoteDataObject(createPaginatedList([relationshipType1, relationshipType2]));
    rdbService = getMockRemoteDataBuildService(undefined, observableOf(buildList));
    objectCache = Object.assign({
-      /* tslint:disable:no-empty */
+      /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
      remove: () => {
      },
      hasBySelfLinkObservable: () => observableOf(false)
-      /* tslint:enable:no-empty */
+      /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
    }) as ObjectCacheService;

    itemService = undefined;
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -107,12 +107,12 @@ describe('RelationshipService', () => {
    'https://rest.api/core/publication/relationships': relationships$
  });
  const objectCache = Object.assign({
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
    remove: () => {
    },
    hasBySelfLinkObservable: () => observableOf(false),
    hasByHref$: () => observableOf(false)
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
  }) as ObjectCacheService;

  const itemService = jasmine.createSpyObj('itemService', {
--- a/src/app/core/data/request.actions.ts
+++ b/src/app/core/data/request.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../shared/ngrx/type';
 import { RestRequest } from './request.models';
@@ -17,7 +18,6 @@ export const RequestActionTypes = {
  REMOVE: type('dspace/core/data/request/REMOVE')
 };

-/* tslint:disable:max-classes-per-file */
 export abstract class RequestUpdateAction implements Action {
  abstract type: string;
  lastUpdated: number;
@@ -185,7 +185,6 @@ export class RequestRemoveAction implements Action {
  }
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * A type to encompass all RequestActions
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -1,6 +1,6 @@
 import { Injectable, Injector } from '@angular/core';

-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { catchError, filter, map, mergeMap, take } from 'rxjs/operators';

 import { hasValue, isNotEmpty } from '../../shared/empty.util';
@@ -24,7 +24,7 @@ import { ParsedResponse } from '../cache/response.models';
@Injectable()
 export class RequestEffects {

-  @Effect() execute = this.actions$.pipe(
+   execute = createEffect(() => this.actions$.pipe(
    ofType(RequestActionTypes.EXECUTE),
    mergeMap((action: RequestExecuteAction) => {
      return this.requestService.getByUUID(action.payload).pipe(
@@ -53,7 +53,7 @@ export class RequestEffects {
        })
      );
    })
-  );
+  ));

  /**
   * When the store is rehydrated in the browser, set all cache
@@ -63,10 +63,10 @@ export class RequestEffects {
   * This assumes that the server cached everything a negligible
   * time ago, and will likely need to be revisited later
   */
-  @Effect() fixTimestampsOnRehydrate = this.actions$
+   fixTimestampsOnRehydrate = createEffect(() => this.actions$
    .pipe(ofType(StoreActionTypes.REHYDRATE),
      map(() => new ResetResponseTimestampsAction(new Date().getTime()))
-    );
+    ));

  constructor(
    private actions$: Actions,
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { SortOptions } from '../cache/models/sort-options.model';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from './parsing.service';
@@ -11,7 +12,6 @@ import { ContentSourceResponseParsingService } from './content-source-response-p
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { environment } from '../../../environments/environment';

-/* tslint:disable:max-classes-per-file */

 // uuid and handle requests have separate endpoints
 export enum IdentifierType {
@@ -280,4 +280,3 @@ export class RequestError extends Error {
  statusCode: number;
  statusText: string;
 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import {
  RequestAction,
  RequestActionTypes,
@@ -112,7 +113,6 @@ export class ResponseState {
  unCacheableObject?: UnCacheableObject;
 }

-// tslint:disable-next-line:max-classes-per-file
 export class RequestEntry {
  request: RestRequest;
  state: RequestEntryState;
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { DataService } from './data.service';
 import { Root } from './root.model';
 import { Injectable } from '@angular/core';
@@ -12,7 +13,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { Observable } from 'rxjs';
+import { Observable, of as observableOf } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { FindListOptions } from './request.models';
@@ -20,9 +21,7 @@ import { PaginatedList } from './paginated-list.model';
 import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { catchError, map } from 'rxjs/operators';
-import { of } from 'rxjs/internal/observable/of';

-/* tslint:disable:max-classes-per-file */

 /**
 * A private DataService implementation to delegate specific methods to.
@@ -75,7 +74,7 @@ export class RootDataService {
    return this.restService.get(this.halService.getRootHref()).pipe(
      catchError((err ) => {
        console.error(err);
-        return of(false);
+        return observableOf(false);
      }),
      map((res: RawRestResponse) => res.statusCode === 200)
    );
@@ -132,4 +131,3 @@ export class RootDataService {
    this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
  }
 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/history/history.actions.ts
+++ b/src/app/core/history/history.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';

 import { type } from '../../shared/ngrx/type';
@@ -7,7 +8,6 @@ export const HistoryActionTypes = {
  GET_HISTORY: type('dspace/history/GET_HISTORY')
 };

-/* tslint:disable:max-classes-per-file */

 export class AddUrlToHistoryAction implements Action {
  type = HistoryActionTypes.ADD_TO_HISTORY;
@@ -20,7 +20,6 @@ export class AddUrlToHistoryAction implements Action {
  }
 }

-/* tslint:enable:max-classes-per-file */

 export type HistoryAction
  = AddUrlToHistoryAction;
--- a/src/app/core/history/history.reducer.ts
+++ b/src/app/core/history/history.reducer.ts
@@ -3,6 +3,7 @@ import { AddUrlToHistoryAction, HistoryAction, HistoryActionTypes } from './hist
 /**
 * The auth state.
 */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface HistoryState extends Array<string> {

 }
--- a/src/app/core/index/index.actions.ts
+++ b/src/app/core/index/index.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';

 import { type } from '../../shared/ngrx/type';
@@ -12,7 +13,6 @@ export const IndexActionTypes = {
  REMOVE_BY_SUBSTRING: type('dspace/core/index/REMOVE_BY_SUBSTRING')
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * An ngrx action to add a value to the index
 */
@@ -86,7 +86,6 @@ export class RemoveFromIndexBySubstringAction implements Action {
  }

 }
-/* tslint:enable:max-classes-per-file */

 /**
 * A type to encompass all HrefIndexActions
--- a/src/app/core/index/index.effects.ts
+++ b/src/app/core/index/index.effects.ts
@@ -1,6 +1,6 @@
 import { filter, map, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';

 import {
  AddToObjectCacheAction,
@@ -24,7 +24,7 @@ import { NoOpAction } from '../../shared/ngrx/no-op.action';
@Injectable()
 export class UUIDIndexEffects {

-  @Effect() addObject$ = this.actions$
+   addObject$ = createEffect(() => this.actions$
    .pipe(
      ofType(ObjectCacheActionTypes.ADD),
      filter((action: AddToObjectCacheAction) => hasValue(action.payload.objectToCache.uuid)),
@@ -35,13 +35,13 @@ export class UUIDIndexEffects {
          action.payload.objectToCache._links.self.href
        );
      })
-    );
+    ));

  /**
   * Adds an alternative link to an object to the ALTERNATIVE_OBJECT_LINK index
   * When the self link of the objectToCache is not the same as the alternativeLink
   */
-  @Effect() addAlternativeObjectLink$ = this.actions$
+   addAlternativeObjectLink$ = createEffect(() => this.actions$
    .pipe(
      ofType(ObjectCacheActionTypes.ADD),
      map((action: AddToObjectCacheAction) => {
@@ -57,9 +57,9 @@ export class UUIDIndexEffects {
          return new NoOpAction();
        }
      })
-    );
+    ));

-  @Effect() removeObject$ = this.actions$
+   removeObject$ = createEffect(() => this.actions$
    .pipe(
      ofType(ObjectCacheActionTypes.REMOVE),
      map((action: RemoveFromObjectCacheAction) => {
@@ -68,9 +68,9 @@ export class UUIDIndexEffects {
          action.payload
        );
      })
-    );
+    ));

-  @Effect() addRequest$ = this.actions$
+   addRequest$ = createEffect(() => this.actions$
    .pipe(
      ofType(RequestActionTypes.CONFIGURE),
      filter((action: RequestConfigureAction) => action.payload.method === RestRequestMethod.GET),
@@ -95,7 +95,7 @@ export class UUIDIndexEffects {
        )];
        return actions;
      })
-    );
+    ));

  constructor(private actions$: Actions, private store: Store<CoreState>) {

--- a/src/app/core/json-patch/json-patch-operations.actions.ts
+++ b/src/app/core/json-patch/json-patch-operations.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';

 import { type } from '../../shared/ngrx/type';
@@ -23,7 +24,6 @@ export const JsonPatchOperationsActionTypes = {
  DELETE_PENDING_JSON_PATCH_OPERATIONS: type('dspace/core/patch/DELETE_PENDING_JSON_PATCH_OPERATIONS'),
 };

-/* tslint:disable:max-classes-per-file */

 /**
 * An ngrx action to commit the current transaction
@@ -269,7 +269,6 @@ export class DeletePendingJsonPatchOperationsAction implements Action {
  type = JsonPatchOperationsActionTypes.DELETE_PENDING_JSON_PATCH_OPERATIONS;
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * Export a type alias of all actions in this action group
--- a/src/app/core/json-patch/json-patch-operations.effects.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.effects.spec.ts
@@ -14,9 +14,9 @@ describe('JsonPatchOperationsEffects test suite', () => {
  let jsonPatchOperationsEffects: JsonPatchOperationsEffects;
  let actions: Observable<any>;
  const store: Store<JsonPatchOperationsState> = jasmine.createSpyObj('store', {
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
    dispatch: {},
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
    select: observableOf(true)
  });
  const testJsonPatchResourceType = 'testResourceType';
--- a/src/app/core/json-patch/json-patch-operations.effects.ts
+++ b/src/app/core/json-patch/json-patch-operations.effects.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';

 import { map } from 'rxjs/operators';
-import { Effect, Actions, ofType } from '@ngrx/effects';
+import { createEffect, Actions, ofType } from '@ngrx/effects';

 import {
  CommitPatchOperationsAction, FlushPatchOperationsAction,
@@ -17,11 +17,11 @@ export class JsonPatchOperationsEffects {
  /**
   * Dispatches a FlushPatchOperationsAction for every dispatched CommitPatchOperationsAction
   */
-  @Effect() commit$ = this.actions$.pipe(
+   commit$ = createEffect(() => this.actions$.pipe(
    ofType(JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS),
    map((action: CommitPatchOperationsAction) => {
      return new FlushPatchOperationsAction(action.payload.resourceType, action.payload.resourceId);
-    }));
+    })));

  constructor(private actions$: Actions) {}

--- a/src/app/core/metadata/meta-tag.actions.ts
+++ b/src/app/core/metadata/meta-tag.actions.ts
@@ -1,7 +1,7 @@
+/* eslint-disable max-classes-per-file */
 import { type } from '../../shared/ngrx/type';
 import { Action } from '@ngrx/store';

-// tslint:disable:max-classes-per-file
 export const MetaTagTypes = {
  ADD: type('dspace/meta-tag/ADD'),
  CLEAR: type('dspace/meta-tag/CLEAR')
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -3,7 +3,7 @@ import { Meta, Title } from '@angular/platform-browser';
 import { NavigationEnd, Router } from '@angular/router';

 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of } from 'rxjs';
+import { Observable, of as observableOf, of } from 'rxjs';

 import { RemoteData } from '../data/remote-data';
 import { Item } from '../shared/item.model';
@@ -23,6 +23,7 @@ import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { HardRedirectService } from '../services/hard-redirect.service';
 import { getMockStore } from '@ngrx/store/testing';
 import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';

 describe('MetadataService', () => {
  let metadataService: MetadataService;
@@ -38,6 +39,7 @@ describe('MetadataService', () => {
  let rootService: RootDataService;
  let translateService: TranslateService;
  let hardRedirectService: HardRedirectService;
+  let authorizationService: AuthorizationDataService;

  let router: Router;
  let store;
@@ -76,6 +78,9 @@ describe('MetadataService', () => {
    hardRedirectService = jasmine.createSpyObj( {
      getCurrentOrigin: 'https://request.org',
    });
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true)
+    });

    // @ts-ignore
    store = getMockStore({ initialState });
@@ -92,7 +97,8 @@ describe('MetadataService', () => {
      undefined,
      rootService,
      store,
-      hardRedirectService
+      hardRedirectService,
+      authorizationService
    );
  });

@@ -300,6 +306,24 @@ describe('MetadataService', () => {
      });
    }));

+    describe('bitstream not download allowed', () => {
+      it('should not have citation_pdf_url', fakeAsync(() => {
+        (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$([MockBitstream3]));
+        (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+
+        (metadataService as any).processRouteChange({
+          data: {
+            value: {
+              dso: createSuccessfulRemoteDataObject(ItemMock),
+            }
+          }
+        });
+        tick();
+        expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_pdf_url' }));
+      }));
+
+    });
+
    describe('no primary Bitstream', () => {
      it('should link to first and only Bitstream regardless of format', fakeAsync(() => {
        (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$([MockBitstream3]));
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -18,7 +18,11 @@ import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getDownloadableBitstream
+} from '../shared/operators';
 import { RootDataService } from '../data/root-data.service';
 import { getBitstreamDownloadRoute } from '../../app-routing-paths';
 import { BundleDataService } from '../data/bundle-data.service';
@@ -32,6 +36,7 @@ import { createSelector, select, Store } from '@ngrx/store';
 import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
 import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core.reducers';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';

 /**
 * The base selector function to select the metaTag section in the store
@@ -82,6 +87,7 @@ export class MetadataService {
    private rootService: RootDataService,
    private store: Store<CoreState>,
    private hardRedirectService: HardRedirectService,
+    private authorizationService: AuthorizationDataService
  ) {
  }

@@ -296,7 +302,6 @@ export class MetadataService {
      ).pipe(
        getFirstSucceededRemoteDataPayload(),
        switchMap((bundle: Bundle) =>
-
          // First try the primary bitstream
          bundle.primaryBitstream.pipe(
            getFirstCompletedRemoteData(),
@@ -307,13 +312,14 @@ export class MetadataService {
                return null;
              }
            }),
+            getDownloadableBitstream(this.authorizationService),
            // return the bundle as well so we can use it again if there's no primary bitstream
            map((bitstream: Bitstream) => [bundle, bitstream])
          )
        ),
        switchMap(([bundle, primaryBitstream]: [Bundle, Bitstream]) => {
          if (hasValue(primaryBitstream)) {
-            // If there was a primary bitstream, emit its link
+            // If there was a downloadable primary bitstream, emit its link
            return [getBitstreamDownloadRoute(primaryBitstream)];
          } else {
            // Otherwise consider the regular bitstreams in the bundle
@@ -321,8 +327,8 @@ export class MetadataService {
              getFirstCompletedRemoteData(),
              switchMap((bitstreamRd: RemoteData<PaginatedList<Bitstream>>) => {
                if (hasValue(bitstreamRd.payload) && bitstreamRd.payload.totalElements === 1) {
-                  // If there's only one bitstream in the bundle, emit its link
-                  return [getBitstreamDownloadRoute(bitstreamRd.payload.page[0])];
+                  // If there's only one bitstream in the bundle, emit its link if its downloadable
+                  return this.getBitLinkIfDownloadable(bitstreamRd.payload.page[0], bitstreamRd);
                } else {
                  // Otherwise check all bitstreams to see if one matches the format whitelist
                  return this.getFirstAllowedFormatBitstreamLink(bitstreamRd);
@@ -342,6 +348,20 @@ export class MetadataService {
    }
  }

+  getBitLinkIfDownloadable(bitstream: Bitstream, bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
+    return observableOf(bitstream).pipe(
+      getDownloadableBitstream(this.authorizationService),
+      switchMap((bit: Bitstream) => {
+        if (hasValue(bit)) {
+          return [getBitstreamDownloadRoute(bit)];
+        } else {
+          // Otherwise check all bitstreams to see if one matches the format whitelist
+          return this.getFirstAllowedFormatBitstreamLink(bitstreamRd);
+        }
+      })
+    );
+  }
+
  /**
   * For Items with more than one Bitstream (and no primary Bitstream), link to the first Bitstream with a MIME type
   * included in {@linkcode CITATION_PDF_URL_MIMETYPES}
@@ -388,9 +408,14 @@ export class MetadataService {
        // for the link at the end
        map((format: BitstreamFormat) => [bitstream, format])
      )),
-      // Filter out only pairs with whitelisted formats
-      filter(([, format]: [Bitstream, BitstreamFormat]) =>
-        hasValue(format) && this.CITATION_PDF_URL_MIMETYPES.includes(format.mimetype)),
+      // Check if bitstream downloadable
+      switchMap(([bitstream, format]: [Bitstream, BitstreamFormat]) => observableOf(bitstream).pipe(
+        getDownloadableBitstream(this.authorizationService),
+        map((bit: Bitstream) => [bit, format])
+      )),
+      // Filter out only pairs with whitelisted formats and non-null bitstreams, null from download check
+      filter(([bitstream, format]: [Bitstream, BitstreamFormat]) =>
+        hasValue(format) && hasValue(bitstream) && this.CITATION_PDF_URL_MIMETYPES.includes(format.mimetype)),
      // We only need 1
      take(1),
      // Emit the link of the match
--- a/src/app/core/resource-policy/resource-policy.service.ts
+++ b/src/app/core/resource-policy/resource-policy.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';

@@ -28,7 +29,6 @@ import { map } from 'rxjs/operators';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';

-/* tslint:disable:max-classes-per-file */

 /**
 * A private DataService implementation to delegate specific methods to.
@@ -222,4 +222,3 @@ export class ResourcePolicyService {
  }

 }
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/router/router.actions.ts
+++ b/src/app/core/router/router.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../shared/ngrx/type';

@@ -8,7 +9,6 @@ export const RouterActionTypes = {
  ROUTE_UPDATE: type('dspace/core/router/ROUTE_UPDATE'),
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * An ngrx action to be fired when the route is updated
 * Note that, contrary to the router-store.ROUTER_NAVIGATION action,
@@ -19,4 +19,3 @@ export class RouteUpdateAction implements Action {
  type = RouterActionTypes.ROUTE_UPDATE;
 }

-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/router/router.effects.ts
+++ b/src/app/core/router/router.effects.ts
@@ -1,6 +1,6 @@
 import { filter, map, pairwise } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
 import * as fromRouter from '@ngrx/router-store';
 import { RouterNavigationAction } from '@ngrx/router-store';
 import { Router } from '@angular/router';
@@ -12,7 +12,7 @@ export class RouterEffects {
   * Effect that fires a new RouteUpdateAction when then path of route is changed
   * @type {Observable<RouteUpdateAction>}
   */
-  @Effect() routeChange$ = this.actions$
+   routeChange$ = createEffect(() => this.actions$
    .pipe(
      ofType(fromRouter.ROUTER_NAVIGATION),
      pairwise(),
@@ -23,7 +23,7 @@ export class RouterEffects {
        })),
      filter((actions: string[]) => actions[0] !== actions[1]),
      map(() => new RouteUpdateAction())
-    );
+    ));

  constructor(private actions$: Actions, private router: Router) {
  }
--- a/src/app/core/services/route.actions.ts
+++ b/src/app/core/services/route.actions.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 import { type } from '../../shared/ngrx/type';
 import { Params } from '@angular/router';
@@ -15,7 +16,6 @@ export const RouteActionTypes = {
  RESET: type('dspace/core/route/RESET'),
 };

-/* tslint:disable:max-classes-per-file */
 /**
 * An ngrx action to set the query parameters
 */
@@ -151,7 +151,6 @@ export class ResetRouteStateAction implements Action {
  type = RouteActionTypes.RESET;
 }

-/* tslint:enable:max-classes-per-file */

 /**
 * A type to encompass all RouteActions
--- a/src/app/core/services/route.effects.ts
+++ b/src/app/core/services/route.effects.ts
@@ -1,6 +1,6 @@
 import { map, tap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { ResetRouteStateAction, RouteActionTypes } from './route.actions';
 import { RouterActionTypes } from '../router/router.actions';
 import { RouteService } from './route.service';
@@ -11,17 +11,17 @@ export class RouteEffects {
   * Effect that resets the route state on reroute
   * @type {Observable<ResetRouteStateAction>}
   */
-  @Effect() routeChange$ = this.actions$
+   routeChange$ = createEffect(() => this.actions$
    .pipe(
      ofType(RouterActionTypes.ROUTE_UPDATE),
      map(() => new ResetRouteStateAction()),
-    );
+    ));

-  @Effect({dispatch: false }) afterResetChange$ = this.actions$
+   afterResetChange$ = createEffect(() => this.actions$
    .pipe(
      ofType(RouteActionTypes.RESET),
      tap(() => this.service.setCurrentRouteInfo()),
-    );
+    ), {dispatch: false });

  constructor(private actions$: Actions, private service: RouteService) {
  }
--- a/src/app/core/shared/NoContent.model.ts
+++ b/src/app/core/shared/NoContent.model.ts
@@ -1,4 +1,5 @@
 /**
 * Represents the payload of a purposefully empty rest response
 */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface NoContent {}
--- a/src/app/core/shared/generic-constructor.ts
+++ b/src/app/core/shared/generic-constructor.ts
@@ -3,6 +3,4 @@
 * more details:
 * https://github.com/Microsoft/TypeScript/issues/204#issuecomment-257722306
 */
-/* tslint:disable:interface-over-type-literal */
 export type GenericConstructor<T> = new (...args: any[]) => T ;
-/* tslint:enable:interface-over-type-literal */
--- a/src/app/core/shared/metadata.models.ts
+++ b/src/app/core/shared/metadata.models.ts
@@ -1,7 +1,7 @@
+/* eslint-disable max-classes-per-file */
 import { v4 as uuidv4 } from 'uuid';
 import { autoserialize, Serialize, Deserialize } from 'cerialize';
 import { hasValue } from '../../shared/empty.util';
-/* tslint:disable:max-classes-per-file */

 export const VIRTUAL_METADATA_PREFIX = 'virtual::';

@@ -138,4 +138,3 @@ export const MetadataMapSerializer = {
    return metadataMap;
  }
 };
-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/shared/operators.spec.ts
+++ b/src/app/core/shared/operators.spec.ts
@@ -20,7 +20,7 @@ import {
  createSuccessfulRemoteDataObject
 } from '../../shared/remote-data.utils';

-// tslint:disable:no-shadowed-variable
+/* eslint-disable @typescript-eslint/no-shadow */

 describe('Core Module - RxJS Operators', () => {
  let scheduler: TestScheduler;
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -1,5 +1,5 @@
 import { Router, UrlTree } from '@angular/router';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import {
  debounceTime,
  filter,
@@ -27,6 +27,9 @@ import { getForbiddenRoute, getPageNotFoundRoute } from '../../app-routing-paths
 import { getEndUserAgreementPath } from '../../info/info-routing-paths';
 import { AuthService } from '../auth/auth.service';
 import { InjectionToken } from '@angular/core';
+import { Bitstream } from './bitstream.model';
+import { FeatureID } from '../data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';

 export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) => (source: Observable<T>) => Observable<T>>('debounceTime', {
  providedIn: 'root',
@@ -355,3 +358,21 @@ export const metadataFieldsToString = () =>
        return fieldSchemaArray.map((fieldSchema: { field: MetadataField, schema: MetadataSchema }) => fieldSchema.schema.prefix + '.' + fieldSchema.field.toString());
      })
    );
+
+/**
+ * Operator to check if the given bitstream is downloadable
+ */
+export const getDownloadableBitstream = (authService: AuthorizationDataService) =>
+  (source: Observable<Bitstream>): Observable<Bitstream | null> =>
+    source.pipe(
+      switchMap((bit: Bitstream) => {
+        if (hasValue(bit)) {
+          return authService.isAuthorized(FeatureID.CanDownload, bit.self).pipe(
+            map((canDownload: boolean) => {
+              return canDownload ? bit : null;
+            }));
+        } else {
+          return observableOf(null);
+        }
+      })
+    );
--- a/src/app/core/shared/search/search-filter.service.spec.ts
+++ b/src/app/core/shared/search/search-filter.service.spec.ts
@@ -30,14 +30,14 @@ describe('SearchFilterService', () => {
  const value1 = 'random value';
  // const value2 = 'another value';
  const store: Store<SearchFiltersState> = jasmine.createSpyObj('store', {
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
    dispatch: {},
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
    select: observableOf(true)
  });

  const routeServiceStub: any = {
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
    hasQueryParamWithValue: (param: string, value: string) => {
    },
    hasQueryParam: (param: string) => {
@@ -56,7 +56,7 @@ describe('SearchFilterService', () => {
    },
    getRouteParameterValue: (param: string) => {
    }
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
  };
  const activatedRoute: any = new ActivatedRouteStub();
  const searchServiceStub: any = {
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -75,10 +75,10 @@ describe('SearchService', () => {
    let routeService;

    const halService = {
-      /* tslint:disable:no-empty */
+      /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
      getEndpoint: () => {
      }
-      /* tslint:enable:no-empty */
+      /* eslint-enable no-empty,@typescript-eslint/no-empty-function */

    };

@@ -170,10 +170,10 @@ describe('SearchService', () => {
      beforeEach(() => {
        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
        spyOn((searchService as any).rdb, 'buildFromHref').and.callThrough();
-        /* tslint:disable:no-empty */
+        /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
        searchService.search(searchOptions).subscribe((t) => {
        }); // subscribe to make sure all methods are called
-        /* tslint:enable:no-empty */
+        /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
      });

      it('should call getEndpoint on the halService', () => {
@@ -194,10 +194,10 @@ describe('SearchService', () => {
      beforeEach(() => {
        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
        spyOn((searchService as any).rdb, 'buildFromHref').and.callThrough();
-        /* tslint:disable:no-empty */
+        /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
        searchService.getConfig(null).subscribe((t) => {
        }); // subscribe to make sure all methods are called
-        /* tslint:enable:no-empty */
+        /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
      });

      it('should call getEndpoint on the halService', () => {
@@ -219,10 +219,10 @@ describe('SearchService', () => {
      const requestUrl = endPoint + '?scope=' + scope;
      beforeEach(() => {
        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
-        /* tslint:disable:no-empty */
+        /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
        searchService.getConfig(scope).subscribe((t) => {
        }); // subscribe to make sure all methods are called
-        /* tslint:enable:no-empty */
+        /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
      });

      it('should call getEndpoint on the halService', () => {
@@ -243,10 +243,10 @@ describe('SearchService', () => {
      beforeEach(() => {
        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
        spyOn((searchService as any).rdb, 'buildFromHref').and.callThrough();
-        /* tslint:disable:no-empty */
+        /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
        searchService.getSearchConfigurationFor(null).subscribe((t) => {
        }); // subscribe to make sure all methods are called
-        /* tslint:enable:no-empty */
+        /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
      });

      it('should call getEndpoint on the halService', () => {
@@ -268,10 +268,10 @@ describe('SearchService', () => {
      const requestUrl = endPoint + '?scope=' + scope;
      beforeEach(() => {
        spyOn((searchService as any).halService, 'getEndpoint').and.returnValue(observableOf(endPoint));
-        /* tslint:disable:no-empty */
+        /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
        searchService.getSearchConfigurationFor(scope).subscribe((t) => {
        }); // subscribe to make sure all methods are called
-        /* tslint:enable:no-empty */
+        /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
      });

      it('should call getEndpoint on the halService', () => {
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
@@ -44,7 +45,6 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { HttpClient } from '@angular/common/http';
 import { DSOChangeAnalyzer } from '../../data/dso-change-analyzer.service';

-/* tslint:disable:max-classes-per-file */
 /**
 * A class that lets us delegate some methods to DataService
 */
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';

@@ -34,7 +35,6 @@ import { VocabularyOptions } from './models/vocabulary-options.model';
 import { PageInfo } from '../../shared/page-info.model';
 import { HrefOnlyDataService } from '../../data/href-only-data.service';

-/* tslint:disable:max-classes-per-file */

 /**
 * A private DataService implementation to delegate specific methods to.
@@ -386,4 +386,3 @@ export class VocabularyService {
  }
 }

-/* tslint:enable:max-classes-per-file */
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-classes-per-file */
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';

@@ -25,7 +26,6 @@ import { of } from 'rxjs';

 const LINK_NAME = 'test';

-/* tslint:disable:max-classes-per-file */
 class TestTask extends TaskObject {
 }

@@ -52,7 +52,6 @@ class DummyChangeAnalyzer implements ChangeAnalyzer<TestTask> {

 }

-/* tslint:enable:max-classes-per-file */

 describe('TasksService', () => {
  let scheduler: TestScheduler;
--- a/Show More
+++ b/Show More