87968: Automatic migration from TSLint to ESLint

Via `ng g @angular-eslint/schematics:convert-tslint-to-eslint`

package.json

@@ -153,7 +153,6 @@
     "@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",
@@ -199,7 +198,6 @@
     "terser-webpack-plugin": "^2.3.1",
     "ts-loader": "^5.2.0",
     "ts-node": "^8.10.2",
-    "tslint": "^6.1.3",
     "typescript": "~4.5.5",
     "webpack": "^5.69.1",
     "webpack-bundle-analyzer": "^4.4.0",

src/app/access-control/epeople-registry/epeople-registry.actions.ts

@@ -16,7 +16,7 @@ export const EPeopleRegistryActionTypes = {
   CANCEL_EDIT_EPERSON: type('dspace/epeople-registry/CANCEL_EDIT_EPERSON'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * Used to edit an EPerson in the EPeople registry
  */
@@ -37,7 +37,7 @@ export class EPeopleRegistryCancelEPersonAction implements Action {
   type = EPeopleRegistryActionTypes.CANCEL_EDIT_EPERSON;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * Export a type alias of all actions in this action group

src/app/access-control/group-registry/group-registry.actions.ts

@@ -16,7 +16,7 @@ export const GroupRegistryActionTypes = {
   CANCEL_EDIT_GROUP: type('dspace/epeople-registry/CANCEL_EDIT_GROUP'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * Used to edit a Group in the Group registry
  */
@@ -37,7 +37,7 @@ export class GroupRegistryCancelGroupAction implements Action {
   type = GroupRegistryActionTypes.CANCEL_EDIT_GROUP;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * Export a type alias of all actions in this action group

src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts

@@ -17,7 +17,7 @@ export const BitstreamFormatsRegistryActionTypes = {
   DESELECT_ALL_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_ALL_FORMAT')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * Used to select a single bitstream format in the bitstream format registry
  */
@@ -51,7 +51,7 @@ export class BitstreamFormatsRegistryDeselectAllAction implements Action {
   type = BitstreamFormatsRegistryActionTypes.DESELECT_ALL_FORMAT;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * Export a type alias of all actions in this action group

src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts

@@ -26,7 +26,7 @@ export const MetadataRegistryActionTypes = {
   DESELECT_ALL_FIELD: type('dspace/metadata-registry/DESELECT_ALL_FIELD')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * Used to edit a metadata schema in the metadata registry
  */
@@ -133,7 +133,7 @@ export class MetadataRegistryDeselectAllFieldAction implements Action {
   type = MetadataRegistryActionTypes.DESELECT_ALL_FIELD;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * Export a type alias of all actions in this action group

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();
 

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({

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({

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({

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'],

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'],

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: () => {

src/app/community-list-page/community-list-service.ts

@@ -108,7 +108,7 @@ 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
+// eslint-disable-next-line max-classes-per-file
 @Injectable()
 export class CommunityListService {
 

src/app/core/auth/auth.actions.ts

@@ -39,7 +39,7 @@ export const AuthActionTypes = {
   UNSET_USER_AS_IDLE: type('dspace/auth/UNSET_USER_AS_IDLE')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 /**
  * Authenticate.
@@ -411,7 +411,7 @@ export class SetUserAsIdleAction implements Action {
 export class UnsetUserAsIdleAction implements Action {
   public type: string = AuthActionTypes.UNSET_USER_AS_IDLE;
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * Actions type.

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)
   });
 

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(', ');

src/app/core/browse/browse-definition-data.service.ts

@@ -18,7 +18,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 
 class DataServiceImpl extends DataService<BrowseDefinition> {
   protected linkPath = 'browses';
@@ -123,4 +123,4 @@ export class BrowseDefinitionDataService {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/cache/builders/build-decorators.spec.ts

@@ -3,7 +3,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 class TestService {
 }
 
@@ -80,4 +80,4 @@ describe('build decorators', () => {
     });
   });
 });
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/cache/builders/link.service.spec.ts

@@ -12,7 +12,7 @@ import { isEmpty } from 'rxjs/operators';
 const TEST_MODEL = new ResourceType('testmodel');
 let result: any;
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 class TestModel implements HALResource {
   static type = TEST_MODEL;
 
@@ -251,4 +251,4 @@ describe('LinkService', () => {
   });
 
 });
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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

@@ -15,7 +15,7 @@ export const ObjectCacheActionTypes = {
   APPLY_PATCH: type('dspace/core/cache/object/APPLY_PATCH')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * An ngrx action to add an object to the cache
  */
@@ -126,7 +126,7 @@ export class ApplyPatchObjectCacheAction implements Action {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all ObjectCacheActions

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', () => {

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

@@ -49,7 +49,7 @@ export const getResourceTypeValueFor = (type: any): string => {
   }
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * An interface to represent objects that can be cached
  *
@@ -110,7 +110,7 @@ export class ObjectCacheEntry implements CacheEntry {
   alternativeLinks: string[];
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * The ObjectCache State

src/app/core/cache/response.models.ts

@@ -5,7 +5,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 export class RestResponse {
   public toCache = true;
   public timeCompleted: number;
@@ -140,4 +140,4 @@ export class FilteredDiscoveryQueryResponse extends RestResponse {
     super(true, statusCode, statusText);
   }
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/cache/server-sync-buffer.actions.ts

@@ -12,7 +12,7 @@ export const ServerSyncBufferActionTypes = {
   EMPTY: type('dspace/core/cache/syncbuffer/EMPTY'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 /**
  * An ngrx action to add a new cached object to the server sync buffer
@@ -71,7 +71,7 @@ export class EmptySSBAction implements Action {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all ServerSyncBufferActions

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: {

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

@@ -31,7 +31,7 @@ class DataServiceImpl extends DataService<ConfigObject> {
   }
 }
 
-// tslint:disable-next-line:max-classes-per-file
+// eslint-disable-next-line max-classes-per-file
 export abstract class ConfigService {
   /**
    * A private DataService instance to delegate specific methods to.

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

@@ -4,7 +4,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 class TestService extends BaseResponseParsingService {
   toCache = true;
 
@@ -101,4 +101,4 @@ describe('BaseResponseParsingService', () => {
     });
   });
 });
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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

@@ -10,7 +10,7 @@ import { getClassForType } from '../cache/builders/build-decorators';
 import { RestRequest } from './request.models';
 import { environment } from '../../../environments/environment';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 /**
  * Return true if halObj has a value for `_links.self`
@@ -180,4 +180,4 @@ export abstract class BaseResponseParsingService {
     return statusCode >= 200 && statusCode < 300;
   }
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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;

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

@@ -15,7 +15,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 class DataServiceImpl extends DataService<ConfigurationProperty> {
   protected linkPath = 'properties';
 
@@ -60,4 +60,4 @@ export class ConfigurationDataService {
     return this.dataService.findById(name);
   }
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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

@@ -26,7 +26,7 @@ import { RequestEntryState } from './request.reducer';
 
 const endpoint = 'https://rest.api/core';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 class TestService extends DataService<any> {
 
   constructor(
@@ -833,4 +833,4 @@ describe('DataService', () => {
     });
   });
 });
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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

@@ -18,7 +18,7 @@ import { RequestService } from './request.service';
 import { FindListOptions } from './request.models';
 import { PaginatedList } from './paginated-list.model';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 class DataServiceImpl extends DataService<DSpaceObject> {
   protected linkPath = 'dso';
 
@@ -104,4 +104,4 @@ export class DSpaceObjectDataService {
   }
 
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/data/dspace-rest-response-parsing.service.ts

@@ -18,7 +18,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 
 /**
  * Return true if obj has a value for `_links.self`
@@ -271,4 +271,4 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
     return statusCode >= 200 && statusCode < 300;
   }
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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 }));

src/app/core/data/href-only-data.service.ts

@@ -20,7 +20,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 class DataServiceImpl extends DataService<any> {
   // linkPath isn't used if we're only searching by href.
   protected linkPath = undefined;

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

@@ -24,7 +24,7 @@ import { hasValue } from '../../shared/empty.util';
 import { Operation } from 'fast-json-patch';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-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,4 @@ export class ItemTemplateDataService implements UpdateDataService<Item> {
     return this.dataService.getCollectionEndpoint(collectionID);
   }
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/data/object-updates/object-updates.actions.ts

@@ -21,7 +21,7 @@ export const ObjectUpdatesActionTypes = {
   REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-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,7 @@ export class RemoveFieldUpdateAction implements Action {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all ObjectUpdatesActions

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;

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', {

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

@@ -17,7 +17,7 @@ export const RequestActionTypes = {
   REMOVE: type('dspace/core/data/request/REMOVE')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 export abstract class RequestUpdateAction implements Action {
   abstract type: string;
   lastUpdated: number;
@@ -185,7 +185,7 @@ export class RequestRemoveAction implements Action {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all RequestActions

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

@@ -11,7 +11,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 
 // uuid and handle requests have separate endpoints
 export enum IdentifierType {
@@ -280,4 +280,4 @@ export class RequestError extends Error {
   statusCode: number;
   statusText: string;
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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

@@ -112,7 +112,7 @@ export class ResponseState {
   unCacheableObject?: UnCacheableObject;
 }
 
-// tslint:disable-next-line:max-classes-per-file
+// eslint-disable-next-line max-classes-per-file
 export class RequestEntry {
   request: RestRequest;
   state: RequestEntryState;

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

@@ -21,7 +21,7 @@ import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { catchError, map } from 'rxjs/operators';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 /**
  * A private DataService implementation to delegate specific methods to.
@@ -131,4 +131,4 @@ export class RootDataService {
     this.requestService.setStaleByHrefSubstring(this.halService.getRootHref());
   }
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/history/history.actions.ts

@@ -7,7 +7,7 @@ export const HistoryActionTypes = {
   GET_HISTORY: type('dspace/history/GET_HISTORY')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 export class AddUrlToHistoryAction implements Action {
   type = HistoryActionTypes.ADD_TO_HISTORY;
@@ -20,7 +20,7 @@ export class AddUrlToHistoryAction implements Action {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 export type HistoryAction
   = AddUrlToHistoryAction;

src/app/core/index/index.actions.ts

@@ -12,7 +12,7 @@ export const IndexActionTypes = {
   REMOVE_BY_SUBSTRING: type('dspace/core/index/REMOVE_BY_SUBSTRING')
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * An ngrx action to add a value to the index
  */
@@ -86,7 +86,7 @@ export class RemoveFromIndexBySubstringAction implements Action {
   }
 
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all HrefIndexActions

src/app/core/json-patch/json-patch-operations.actions.ts

@@ -23,7 +23,7 @@ export const JsonPatchOperationsActionTypes = {
   DELETE_PENDING_JSON_PATCH_OPERATIONS: type('dspace/core/patch/DELETE_PENDING_JSON_PATCH_OPERATIONS'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 /**
  * An ngrx action to commit the current transaction
@@ -269,7 +269,7 @@ export class DeletePendingJsonPatchOperationsAction implements Action {
   type = JsonPatchOperationsActionTypes.DELETE_PENDING_JSON_PATCH_OPERATIONS;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * Export a type alias of all actions in this action group

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';

src/app/core/metadata/meta-tag.actions.ts

@@ -1,7 +1,7 @@
 import { type } from '../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
 
-// tslint:disable:max-classes-per-file
+/* eslint-disable max-classes-per-file */
 export const MetaTagTypes = {
   ADD: type('dspace/meta-tag/ADD'),
   CLEAR: type('dspace/meta-tag/CLEAR')

src/app/core/resource-policy/resource-policy.service.ts

@@ -28,7 +28,7 @@ import { map } from 'rxjs/operators';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 /**
  * A private DataService implementation to delegate specific methods to.
@@ -222,4 +222,4 @@ export class ResourcePolicyService {
   }
 
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/router/router.actions.ts

@@ -8,7 +8,7 @@ export const RouterActionTypes = {
   ROUTE_UPDATE: type('dspace/core/router/ROUTE_UPDATE'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-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,4 @@ export class RouteUpdateAction implements Action {
   type = RouterActionTypes.ROUTE_UPDATE;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/core/services/route.actions.ts

@@ -15,7 +15,7 @@ export const RouteActionTypes = {
   RESET: type('dspace/core/route/RESET'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * An ngrx action to set the query parameters
  */
@@ -151,7 +151,7 @@ export class ResetRouteStateAction implements Action {
   type = RouteActionTypes.RESET;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all RouteActions

src/app/core/shared/generic-constructor.ts

@@ -3,6 +3,6 @@
  * more details:
  * https://github.com/Microsoft/TypeScript/issues/204#issuecomment-257722306
  */
-/* tslint:disable:interface-over-type-literal */
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
 export type GenericConstructor<T> = new (...args: any[]) => T ;
-/* tslint:enable:interface-over-type-literal */
+/* eslint-enable @typescript-eslint/consistent-type-definitions */

src/app/core/shared/metadata.models.ts

@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from 'uuid';
 import { autoserialize, Serialize, Deserialize } from 'cerialize';
 import { hasValue } from '../../shared/empty.util';
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 export const VIRTUAL_METADATA_PREFIX = 'virtual::';
 
@@ -138,4 +138,4 @@ export const MetadataMapSerializer = {
     return metadataMap;
   }
 };
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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;

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 = {

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', () => {

src/app/core/shared/search/search.service.ts

@@ -44,7 +44,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 /**
  * A class that lets us delegate some methods to DataService
  */

src/app/core/submission/vocabularies/vocabulary.service.ts

@@ -34,7 +34,7 @@ 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 */
+/* eslint-disable max-classes-per-file */
 
 /**
  * A private DataService implementation to delegate specific methods to.
@@ -386,4 +386,4 @@ export class VocabularyService {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

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

@@ -25,7 +25,7 @@ import { of } from 'rxjs';
 
 const LINK_NAME = 'test';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 class TestTask extends TaskObject {
 }
 
@@ -52,7 +52,7 @@ class DummyChangeAnalyzer implements ChangeAnalyzer<TestTask> {
 
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 describe('TasksService', () => {
   let scheduler: TestScheduler;

src/app/core/utilities/equals.decorators.ts

@@ -41,7 +41,7 @@ export function excludeFromEquals(object: any, propertyName: string): any {
   excludedFromEquals.set(object.constructor, [...list, propertyName]);
 }
 
-// tslint:disable-next-line:ban-types
+// eslint-disable-next-line @typescript-eslint/ban-types
 export function getExcludedFromEqualsFor(constructor: Function): string[] {
   return excludedFromEquals.get(constructor) || [];
 }
@@ -64,7 +64,7 @@ export function fieldsForEquals(...fields: string[]): any {
   };
 }
 
-// tslint:disable-next-line:ban-types
+// eslint-disable-next-line @typescript-eslint/ban-types
 export function getFieldsForEquals(constructor: Function, field: string): string[] {
   const fieldMap = fieldsForEqualsMap.get(constructor) || new Map();
   return fieldMap.get(field);

src/app/core/utilities/equatable.spec.ts

@@ -14,7 +14,7 @@ class Dog extends EquatableObject<Dog> {
   public favouriteToy: { name: string, colour: string };
 }
 
-// tslint:disable-next-line:max-classes-per-file
+// eslint-disable-next-line max-classes-per-file
 class Owner extends EquatableObject<Owner> {
   @excludeFromEquals
   favouriteFood: string;

src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts

@@ -10,7 +10,7 @@ import { InputSuggestionsComponent } from '../../../../../../shared/input-sugges
     {
       provide: NG_VALUE_ACCESSOR,
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
-      // tslint:disable-next-line:no-forward-ref
+      // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => OrgUnitInputSuggestionsComponent),
       multi: true
     }

src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts

@@ -10,7 +10,7 @@ import { InputSuggestionsComponent } from '../../../../../../shared/input-sugges
     {
       provide: NG_VALUE_ACCESSOR,
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
-      // tslint:disable-next-line:no-forward-ref
+      // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => PersonInputSuggestionsComponent),
       multi: true
     }

src/app/item-page/edit-item-page/edit-item-page.component.spec.ts

@@ -19,7 +19,7 @@ describe('ItemPageComponent', () => {
     }
   }
 
-  // tslint:disable-next-line:max-classes-per-file
+  // eslint-disable-next-line max-classes-per-file
   class AcceptNoneGuard implements CanActivate {
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
       console.log('BLA');

src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts

@@ -195,7 +195,7 @@ describe('ItemBitstreamsComponent', () => {
     const event = {
       fromIndex: 0,
       toIndex: 50,
-      // tslint:disable-next-line:no-empty
+      // eslint-disable-next-line no-empty,@typescript-eslint/no-empty-function
       finish: () => {
       }
     };
@@ -210,7 +210,7 @@ describe('ItemBitstreamsComponent', () => {
       comp.dropBitstream(bundle, {
         fromIndex: 0,
         toIndex: 50,
-        // tslint:disable-next-line:no-empty
+        // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
         finish: () => {
           done();
         }

src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts

@@ -84,18 +84,18 @@ describe('ItemCollectionMapperComponent', () => {
     removeMappingFromCollection: () => createSuccessfulRemoteDataObject$({}),
     getMappedCollectionsEndpoint: () => observableOf('rest/api/mappedCollectionsEndpoint'),
     getMappedCollections: () => observableOf(mockCollectionsRD),
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     clearMappedCollectionsRequests: () => {}
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   };
   const collectionDataServiceStub = {
     findAllByHref: () => observableOf(mockCollectionsRD)
   };
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(mockCollectionsRD),
-    /* 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 activatedRouteStub = {
     parent: {

src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts

@@ -17,7 +17,7 @@ import { InputSuggestion } from '../../../../shared/input-suggestions/input-sugg
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
 
 @Component({
-  // tslint:disable-next-line:component-selector
+  // eslint-disable-next-line @angular-eslint/component-selector
   selector: '[ds-edit-in-place-field]',
   styleUrls: ['./edit-in-place-field.component.scss'],
   templateUrl: './edit-in-place-field.component.html',

src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts

@@ -15,7 +15,7 @@ import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
-  // tslint:disable-next-line:component-selector
+  // eslint-disable-next-line @angular-eslint/component-selector
   selector: 'ds-edit-relationship',
   styleUrls: ['./edit-relationship.component.scss'],
   templateUrl: './edit-relationship.component.html',

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

@@ -3,7 +3,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.component';
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 @Component({
     selector: 'ds-component-without-content',
     template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
@@ -34,7 +34,7 @@ class TextContentComponent {
   @Input() hideIfNoTextContent = true;
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 describe('MetadataFieldWrapperComponent', () => {
   let component: MetadataFieldWrapperComponent;

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

@@ -41,10 +41,10 @@ const mockWithdrawnItem: Item = Object.assign(new Item(), {
 });
 
 const metadataServiceStub = {
-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   processRemoteData: () => {
   }
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };
 
 describe('FullItemPageComponent', () => {

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

@@ -43,10 +43,10 @@ describe('ItemPageComponent', () => {
   let authorizationDataService: AuthorizationDataService;
 
   const mockMetadataService = {
-    /* tslint:disable:no-empty */
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     processRemoteData: () => {
     }
-    /* tslint:enable:no-empty */
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
     data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })

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

@@ -17,9 +17,9 @@ describe('LoginPageComponent', () => {
   });
 
   const store: Store<LoginPageComponent> = 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)
   });
 

src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts

@@ -94,7 +94,7 @@ describe('CollectionSelectorComponent', () => {
     })
   ];
 
-  // tslint:disable-next-line: max-classes-per-file
+  // eslint-disable-next-line max-classes-per-file
   const collectionDataServiceMock = {
     getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
       return hot( 'a|', {

src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts

@@ -11,7 +11,7 @@ import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator'
  * Represents an expandable section in the navbar
  */
 @Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-expandable-navbar-section]',
   templateUrl: './expandable-navbar-section.component.html',
   styleUrls: ['./expandable-navbar-section.component.scss'],

src/app/navbar/navbar-section/navbar-section.component.ts

@@ -8,7 +8,7 @@ import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator'
  * Represents a non-expandable section in the navbar
  */
 @Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-navbar-section]',
   templateUrl: './navbar-section.component.html',
   styleUrls: ['./navbar-section.component.scss']

src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts

@@ -62,9 +62,9 @@ describe('ComColFormComponent', () => {
   });
   const notificationsService = new NotificationsServiceStub();
 
-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   const locationStub = jasmine.createSpyObj('location', ['back']);
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
   const requestServiceStub = jasmine.createSpyObj('requestService', {
     removeByHrefSubstring: {}

src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts

@@ -140,10 +140,10 @@ describe('CreateComColPageComponent', () => {
               url: ''
             },
             queue: [],
-            /* tslint:disable:no-empty */
+            /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
             }
-            /* tslint:enable:no-empty */
+            /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
           }
         };
       });
@@ -185,10 +185,10 @@ describe('CreateComColPageComponent', () => {
             queue: [
               {}
             ],
-            /* tslint:disable:no-empty */
+            /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
             }
-            /* tslint:enable:no-empty */
+            /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
           }
         };
       });

src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts

@@ -144,10 +144,10 @@ describe('DeleteComColPageComponent', () => {
             url: ''
           },
           queue: [],
-          /* tslint:disable:no-empty */
+          /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
           uploadAll: () => {
           }
-          /* tslint:enable:no-empty */
+          /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
         }
       };
     });

src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts

@@ -113,10 +113,10 @@ describe('ComColMetadataComponent', () => {
               url: ''
             },
             queue: [],
-            /* tslint:disable:no-empty */
+            /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
             }
-            /* tslint:enable:no-empty */
+            /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
           },
           deleteLogo: false,
         };
@@ -166,10 +166,10 @@ describe('ComColMetadataComponent', () => {
             queue: [
               {}
             ],
-            /* tslint:disable:no-empty */
+            /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
             }
-            /* tslint:enable:no-empty */
+            /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
           }
         };
       });

src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts

@@ -9,7 +9,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { By } from '@angular/platform-browser';
 import { createPaginatedList } from '../testing/utils.test';
 
-// tslint:disable-next-line:pipe-prefix
+// eslint-disable-next-line @angular-eslint/pipe-prefix
 @Pipe({ name: 'translate' })
 class MockTranslatePipe implements PipeTransform {
   transform(value: string): string {

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts

@@ -224,7 +224,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
 
       const ngZone = TestBed.inject(NgZone);
 
-      // tslint:disable-next-line:ban-types
+      // eslint-disable-next-line @typescript-eslint/ban-types
       spyOn(ngZone, 'runOutsideAngular').and.callFake((fn: Function) => fn());
       component = fixture.componentInstance;
       debugElement = fixture.debugElement;

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts

@@ -192,7 +192,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
 })
 export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnInit, OnChanges, OnDestroy {
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
-  // tslint:disable-next-line:no-input-rename
+  // eslint-disable-next-line @angular-eslint/no-input-rename
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
 
   @Input() formId: string;
@@ -218,12 +218,12 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
    */
   private subs: Subscription[] = [];
 
-  /* tslint:disable:no-output-rename */
+  /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
-  /* tslint:enable:no-output-rename */
+  /* eslint-enable @angular-eslint/no-output-rename */
   @ViewChild('componentViewContainer', { read: ViewContainerRef, static: true }) componentViewContainerRef: ViewContainerRef;
 
   private showErrorMessagesPreviousStage: boolean;

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts

@@ -31,11 +31,11 @@ export class DsDynamicFormComponent extends DynamicFormComponent {
   @Input() formModel: DynamicFormControlModel[];
   @Input() formLayout: DynamicFormLayout;
 
-  /* tslint:disable:no-output-rename */
+  /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
-  /* tslint:enable:no-output-rename */
+  /* eslint-enable @angular-eslint/no-output-rename */
 
   @Output() ngbEvent: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
 

src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts

@@ -22,7 +22,7 @@ import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.
 import { SubmissionService } from '../../../../../submission/submission.service';
 import { SubmissionObjectEntry } from '../../../../../submission/objects/submission-objects.reducer';
 
-// tslint:disable:max-classes-per-file
+/* eslint-disable max-classes-per-file */
 /**
  * Abstract class that defines objects that can be reordered
  */
@@ -218,4 +218,4 @@ export class ExistingMetadataListElementComponent implements OnInit, OnChanges,
 
 }
 
-// tslint:enable:max-classes-per-file
+/* eslint-enable max-classes-per-file */

src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts

@@ -14,7 +14,7 @@ import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
 import { SubmissionService } from '../../../../../submission/submission.service';
 
-// tslint:disable:max-classes-per-file
+/* eslint-disable max-classes-per-file */
 /**
  * Abstract class that defines objects that can be reordered
  */
@@ -120,4 +120,4 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
 
 }
 
-// tslint:enable:max-classes-per-file
+/* eslint-enable max-classes-per-file */

src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts

@@ -28,13 +28,13 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   @Input() model: DynamicRowArrayModel;// DynamicRow?
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
 
-  /* tslint:disable:no-output-rename */
+  /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlCustomEvent> = new EventEmitter();
 
-  /* tslint:enable:no-output-rename */
+  /* eslint-enable @angular-eslint/no-output-rename */
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,

src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts

@@ -24,12 +24,12 @@ export class DsDynamicFormGroupComponent extends DynamicFormControlComponent {
   @Input() model: DynamicFormGroupModel;
   @Input() templates: QueryList<DynamicTemplateDirective> | DynamicTemplateDirective[] | undefined;
 
-  /* tslint:disable:no-output-rename */
+  /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlCustomEvent> = new EventEmitter();
-  /* tslint:enable:no-output-rename */
+  /* eslint-enable @angular-eslint/no-output-rename */
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService) {

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts

@@ -34,7 +34,7 @@ export let ONEBOX_TEST_GROUP;
 
 export let ONEBOX_TEST_MODEL_CONFIG;
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 // Mock class for NgbModalRef
 export class MockNgbModalRef {
@@ -463,4 +463,4 @@ class TestComponent {
 
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */

src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts

@@ -23,13 +23,13 @@ import {
 } from '../../../../../testing/dynamic-form-mock-services';
 
 function createKeyUpEvent(key: number) {
-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   const event = {
     keyCode: key, preventDefault: () => {
     }, stopPropagation: () => {
     }
   };
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   spyOn(event, 'preventDefault');
   spyOn(event, 'stopPropagation');
   return event;

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts

@@ -123,7 +123,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
         { provide: RemoteDataBuildService, useValue: rdbService },
         {
           provide: Store, useValue: {
-            // tslint:disable-next-line:no-empty
+            // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
             dispatch: () => {
             }
           }

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts

@@ -302,7 +302,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     Object.values(this.subMap).forEach((subscription) => subscription.unsubscribe());
   }
 
-  /* tslint:disable:no-empty */
+  /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   /**
    * Called when discard button is clicked, emit discard event to parent to conclude functionality
    */
@@ -314,6 +314,6 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
    */
   submitEv(): void {
   }
-  /* tslint:enable:no-empty */
+  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
 }

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts

@@ -9,7 +9,7 @@ export const NameVariantActionTypes = {
   REMOVE_NAME_VARIANT: type('dspace/name-variant/REMOVE_NAME_VARIANT'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * Abstract class for actions that happen to name variants
  */
@@ -51,7 +51,7 @@ export class RemoveNameVariantAction extends NameVariantListAction {
     super(listID, itemID);
   }
 }
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all RelationshipActions

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts

@@ -13,7 +13,7 @@ export const RelationshipActionTypes = {
   UPDATE_RELATIONSHIP: type('dspace/relationship/UPDATE_RELATIONSHIP'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 /**
  * An ngrx action to create a new relationship
  */
@@ -132,7 +132,7 @@ export class RemoveRelationshipAction implements Action {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * A type to encompass all RelationshipActions

src/app/shared/form/form.actions.ts

@@ -21,7 +21,7 @@ export const FormActionTypes = {
   FORM_CLEAR_ERRORS: type('dspace/form/FORM_CLEAR_ERRORS'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 export class FormInitAction implements Action {
   type = FormActionTypes.FORM_INIT;
   payload: {
@@ -160,7 +160,7 @@ export class FormClearErrorsAction implements Action {
   }
 }
 
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */
 
 /**
  * Export a type alias of all actions in this action group

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

@@ -71,12 +71,12 @@ export class FormComponent implements OnDestroy, OnInit {
   @Input() formGroup: FormGroup;
   @Input() formLayout = null as DynamicFormLayout;
 
-  /* tslint:disable:no-output-rename */
+  /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
-  /* tslint:enable:no-output-rename */
+  /* eslint-enable @angular-eslint/no-output-rename */
   @Output() addArrayItem: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output() removeArrayItem: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
 

src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts

@@ -14,7 +14,7 @@ import { hasValue } from '../../empty.util';
     {
       provide: NG_VALUE_ACCESSOR,
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
-      // tslint:disable-next-line:no-forward-ref
+      // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => DsoInputSuggestionsComponent),
       multi: true
     }

src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts

@@ -11,7 +11,7 @@ import { InputSuggestion } from '../input-suggestions.model';
     {
       provide: NG_VALUE_ACCESSOR,
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
-      // tslint:disable-next-line:no-forward-ref
+      // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => FilterInputSuggestionsComponent),
       multi: true
     }

src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts

@@ -14,7 +14,7 @@ import { InputSuggestion } from '../input-suggestions.model';
     {
       provide: NG_VALUE_ACCESSOR,
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
-      // tslint:disable-next-line:no-forward-ref
+      // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => ValidationSuggestionsComponent),
       multi: true
     }

src/app/shared/lang-switch/lang-switch.component.spec.ts

@@ -14,9 +14,9 @@ import { LocaleService } from '../../core/locale/locale.service';
 // The translation module is instantiated with these bogus messages that we aren't using anyway.
 
 // Double quotes are mandatory in JSON, so de-activating the tslint rule checking for single quotes here.
-/* tslint:disable:quotemark */
+/* eslint-disable @typescript-eslint/quotes */
 // JSON for the language files has double quotes around all literals
-/* tslint:disable:object-literal-key-quotes */
+/* eslint-disable quote-props */
 class CustomLoader implements TranslateLoader {
   getTranslation(lang: string): Observable<any> {
     return of({
@@ -29,8 +29,8 @@ class CustomLoader implements TranslateLoader {
   }
 }
 
-/* tslint:enable:quotemark */
+/* eslint-enable @typescript-eslint/quotes */
-/* tslint:enable:object-literal-key-quotes */
+/* eslint-enable quote-props */
 
 let localService: any;
 

src/app/shared/menu/menu.actions.ts

@@ -28,7 +28,7 @@ export const MenuActionTypes = {
   TOGGLE_ACTIVE_SECTION: type('dspace/menu-section/TOGGLE_ACTIVE_SECTION'),
 };
 
-/* tslint:disable:max-classes-per-file */
+/* eslint-disable max-classes-per-file */
 
 // MENU STATE ACTIONS
 /**
@@ -225,4 +225,4 @@ export type MenuAction =
   | ToggleActiveMenuSectionAction
   | CollapseMenuPreviewAction
   | ExpandMenuPreviewAction;
-/* tslint:enable:max-classes-per-file */
+/* eslint-enable max-classes-per-file */