angular 6 upgrade

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

@@ -12,7 +12,7 @@ export class PaginatedSearchOptions extends SearchOptions {
   pagination?: PaginationComponentOptions;
   sort?: SortOptions;
 
-  constructor(options: {scope?: string, query?: string, dsoType?: DSpaceObjectType, filters?: SearchFilter[], pagination?: PaginationComponentOptions, sort?: SortOptions}) {
+  constructor(options: {scope?: string, query?: string, dsoType?: DSpaceObjectType, filters?: SearchFilter[], fixedFilter?: any, pagination?: PaginationComponentOptions, sort?: SortOptions}) {
     super(options);
     this.pagination = options.pagination;
     this.sort = options.sort;

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

@@ -58,7 +58,6 @@ export class SearchFixedFilterService {
         map((response: FilteredDiscoveryQueryResponse) =>
           response.filterQuery
         ));
-
       return filterQuery;
     }
     return observableOf(undefined);

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

@@ -22,56 +22,55 @@ import { SearchConfigurationService } from './search-service/search-configuratio
 import { RemoteData } from '../core/data/remote-data';
 import { RouteService } from '../shared/services/route.service';
 
-describe('SearchPageComponent', () => {
+let comp: SearchPageComponent;
-  let comp: SearchPageComponent;
+let fixture: ComponentFixture<SearchPageComponent>;
-  let fixture: ComponentFixture<SearchPageComponent>;
+let searchServiceObject: SearchService;
-  let searchServiceObject: SearchService;
+const store: Store<SearchPageComponent> = jasmine.createSpyObj('store', {
-  const store: Store<SearchPageComponent> = jasmine.createSpyObj('store', {
   /* tslint:disable:no-empty */
   dispatch: {},
   /* tslint:enable:no-empty */
   select: observableOf(true)
-  });
+});
-  const pagination: PaginationComponentOptions = new PaginationComponentOptions();
+const pagination: PaginationComponentOptions = new PaginationComponentOptions();
-  pagination.id = 'search-results-pagination';
+pagination.id = 'search-results-pagination';
-  pagination.currentPage = 1;
+pagination.currentPage = 1;
-  pagination.pageSize = 10;
+pagination.pageSize = 10;
-  const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
+const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
-  const mockResults = observableOf(new RemoteData(false, false, true, null, ['test', 'data']));
+const mockResults = observableOf(new RemoteData(false, false, true, null, ['test', 'data']));
-  const searchServiceStub = jasmine.createSpyObj('SearchService', {
+const searchServiceStub = jasmine.createSpyObj('SearchService', {
   search: mockResults,
   getSearchLink: '/search',
   getScopes: observableOf(['test-scope'])
-  });
+});
-  const queryParam = 'test query';
+const queryParam = 'test query';
-  const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
+const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
-  const fixedFilter = 'fixed filter';
+const fixedFilter = 'fixed filter';
-  const paginatedSearchOptions = {
+const paginatedSearchOptions = {
   query: queryParam,
   scope: scopeParam,
   fixedFilter: fixedFilter,
   pagination,
   sort
-  };
+};
-  const activatedRouteStub = {
+const activatedRouteStub = {
   queryParams: observableOf({
     query: queryParam,
     scope: scopeParam
   })
-  };
+};
-  const sidebarService = {
+const sidebarService = {
   isCollapsed: observableOf(true),
   collapse: () => this.isCollapsed = observableOf(true),
   expand: () => this.isCollapsed = observableOf(false)
-  };
+};
 
-  const routeServiceStub = {
+const routeServiceStub = {
   getRouteParameterValue: () => {
     return observableOf('');
   }
-  };
+};
 
-  export function configureSearchComponentTestingModule(compType) {
+export function configureSearchComponentTestingModule(compType) {
   TestBed.configureTestingModule({
     imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, NgbCollapseModule.forRoot()],
     declarations: [compType],
@@ -123,9 +122,9 @@ describe('SearchPageComponent', () => {
   }).overrideComponent(compType, {
     set: { changeDetection: ChangeDetectionStrategy.Default }
   }).compileComponents();
-  }
+}
 
-  describe('SearchPageComponent', () => {
+describe('SearchPageComponent', () => {
 
   beforeEach(async(() => {
     configureSearchComponentTestingModule(SearchPageComponent);
@@ -201,4 +200,4 @@ describe('SearchPageComponent', () => {
     });
 
   });
-  })
+});

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

@@ -204,7 +204,7 @@ describe('MetadataService', () => {
       undefined,
       MockItem
     ));
-  }
+  };
 
   const mockType = (mockItem: Item, type: string): Item => {
     const typedMockItem = Object.assign(new Item(), mockItem) as Item;
@@ -215,7 +215,7 @@ describe('MetadataService', () => {
       }
     }
     return typedMockItem;
-  }
+  };
 
   const mockPublisher = (mockItem: Item): Item => {
     const publishedMockItem = Object.assign(new Item(), mockItem) as Item;

src/app/shared/entities/switcher/entity-type-switcher.component.spec.ts

@@ -1,15 +1,15 @@
 import { EntityTypeSwitcherComponent } from './entity-type-switcher.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Observable } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { Item } from '../../../core/shared/item.model';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { RemoteData } from '../../../core/data/remote-data';
 import * as decorator from '../entity-type-decorator';
-import { ElementViewMode } from '../../view-mode';
 import { getComponentByEntityType } from '../entity-type-decorator';
-import { of as observableOf } from 'rxjs';
+import { ElementViewMode } from '../../view-mode';
+import createSpy = jasmine.createSpy;
 
 const relationType = 'type';
 const mockItem: Item = Object.assign(new Item(), {
@@ -44,7 +44,7 @@ describe('EntityTypeSwitcherComponent', () => {
     comp = fixture.componentInstance;
     comp.object = mockItem;
     comp.viewMode = viewMode;
-    spyOn(decorator, 'getComponentByEntityType').and.returnValue('component');
+    spyOnProperty(decorator, 'getComponentByEntityType').and.returnValue(createSpy('getComponentByEntityType'))
   }));
 
   describe('when calling getComponent', () => {

src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts

@@ -1,18 +1,16 @@
 import { Item } from '../../../../core/shared/item.model';
-import { Observable } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component';
-import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { createRelationshipsObservable } from '../../../../+item-page/simple/entity-types/shared/entity.component.spec';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { of as observableOf } from 'rxjs';
 
 const mockItem: Item = Object.assign(new Item(), {
   bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),