Merged in CST-12498 (pull request #1037)

CST-12498 fix tests errors and lint errors

Approved-by: Stefano Maffei

src/app/admin/admin-ldn-services/ldn-service-form-edit/ldn-service-form-edit.component.spec.ts

@@ -28,6 +28,7 @@ describe('LdnServiceFormEditComponent', () => {
 
   const translateServiceStub = {
     get: () => of('translated-text'),
+    instant: () => 'translated-text',
     onLangChange: new EventEmitter(),
     onTranslationChange: new EventEmitter(),
     onDefaultLangChange: new EventEmitter()

src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts

@@ -25,12 +25,14 @@ describe('LdnServiceFormComponent', () => {
   let notificationsService: any;
 
   const itemFiltersRdPL$ = createSuccessfulRemoteDataObject$(createPaginatedList([new Itemfilter()]));
+
   const translateServiceStub = {
     get: () => of('translated-text'),
+    instant: () => 'translated-text',
     onLangChange: new EventEmitter(),
     onTranslationChange: new EventEmitter(),
     onDefaultLangChange: new EventEmitter()
-  };
+};
 
   beforeEach(async () => {
     ldnItemfiltersService = jasmine.createSpyObj('ldnItemfiltersService', {

src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts

@@ -2,11 +2,11 @@ import {LdnService} from '../ldn-services-model/ldn-services.model';
 import {LDN_SERVICE} from '../ldn-services-model/ldn-service.resource-type';
 import {RemoteData} from '../../../core/data/remote-data';
 import {PaginatedList} from '../../../core/data/paginated-list.model';
-import {Observable, of} from "rxjs";
+import {Observable, of} from 'rxjs';
-import {createSuccessfulRemoteDataObject$} from "../../../shared/remote-data.utils";
+import {createSuccessfulRemoteDataObject$} from '../../../shared/remote-data.utils';
 
 export const mockLdnService: LdnService = {
-  uuid: "1",
+  uuid: '1',
   enabled: false,
   score: 0,
   id: 1,
@@ -40,7 +40,7 @@ export const mockLdnService: LdnService = {
     },
   },
   get self(): string {
-    return "";
+    return '';
   },
 };
 
@@ -48,7 +48,7 @@ export const mockLdnServiceRD$ = createSuccessfulRemoteDataObject$(mockLdnServic
 
 
 export const mockLdnServices: LdnService[] = [{
-  uuid: "1",
+  uuid: '1',
   enabled: false,
   score: 0,
   id: 1,
@@ -82,10 +82,10 @@ export const mockLdnServices: LdnService[] = [{
     },
   },
   get self(): string {
-    return "";
+    return '';
   },
 }, {
-  uuid: "2",
+  uuid: '2',
   enabled: false,
   score: 0,
   id: 2,
@@ -119,8 +119,8 @@ export const mockLdnServices: LdnService[] = [{
     },
   },
   get self(): string {
-    return "";
+    return '';
   },
 }
-]
+];
 export const mockLdnServicesRD$: Observable<RemoteData<PaginatedList<LdnService>>> = of((mockLdnServices as unknown) as RemoteData<PaginatedList<LdnService>>);

src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts

@@ -8,12 +8,12 @@ import {LdnServicesService} from '../ldn-services-data/ldn-services-data.service
 import {PaginationService} from '../../../core/pagination/pagination.service';
 import {PaginationServiceStub} from '../../../shared/testing/pagination-service.stub';
 import {of} from 'rxjs';
-import {LdnService} from "../ldn-services-model/ldn-services.model";
+import {LdnService} from '../ldn-services-model/ldn-services.model';
-import {PaginatedList} from "../../../core/data/paginated-list.model";
+import {PaginatedList} from '../../../core/data/paginated-list.model';
-import {RemoteData} from "../../../core/data/remote-data";
+import {RemoteData} from '../../../core/data/remote-data';
 import {LdnServicesOverviewComponent} from './ldn-services-directory.component';
-import {createSuccessfulRemoteDataObject$} from "../../../shared/remote-data.utils";
+import {createSuccessfulRemoteDataObject$} from '../../../shared/remote-data.utils';
-import {createPaginatedList} from "../../../shared/testing/utils.test";
+import {createPaginatedList} from '../../../shared/testing/utils.test';
 
 describe('LdnServicesOverviewComponent', () => {
   let component: LdnServicesOverviewComponent;
@@ -33,7 +33,7 @@ describe('LdnServicesOverviewComponent', () => {
 
   beforeEach(async () => {
     paginationService = new PaginationServiceStub();
-    ldnServicesService = jasmine.createSpyObj('LdnServicesService', ['findAll', 'delete', 'patch'])
+    ldnServicesService = jasmine.createSpyObj('LdnServicesService', ['findAll', 'delete', 'patch']);
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [LdnServicesOverviewComponent],
@@ -89,7 +89,7 @@ describe('LdnServicesOverviewComponent', () => {
         {id: 2, name: 'Service 2', description: 'Description 2', enabled: false},
         {id: 3, name: 'Service 3', description: 'Description 3', enabled: true}]);
 
-      const mockLdnServicesRD = createPaginatedList(testData)
+      const mockLdnServicesRD = createPaginatedList(testData);
       component.ldnServicesRD$ = createSuccessfulRemoteDataObject$(mockLdnServicesRD);
       fixture.detectChanges();
 

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

@@ -25,7 +25,6 @@ import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheEntry } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';