diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts index ae801c7586..afb50c8351 100644 --- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts @@ -101,7 +101,7 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent { - beforeEach(async(() => { - mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null) + beforeEach(fakeAsync(() => { + mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null); mockClaimedTaskDataService = new ClaimedTaskDataService(null, null, null, null, null, null, null, null); TestBed.configureTestingModule({ imports: [ @@ -118,7 +118,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { spyOn(component, 'initObjects'); }); - it('should call initReloadAnchor and initObjects on init', async(() => { + it('should call initReloadAnchor and initObjects on init', fakeAsync(() => { component.ngOnInit(); fixture.detectChanges(); @@ -130,7 +130,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { })); - }) + }); describe('on action execution fail', () => { @@ -158,7 +158,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { component.startActionExecution().subscribe( (result) => { expect(notificationsServiceStub.error).toHaveBeenCalled(); done(); - }) + }); }); it('should not call reloadObject', (done) => { @@ -166,7 +166,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { component.startActionExecution().subscribe( (result) => { expect(component.reloadObjectExecution).not.toHaveBeenCalled(); done(); - }) + }); }); @@ -175,7 +175,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { component.startActionExecution().subscribe( (result) => { expect(component.processCompleted.emit).not.toHaveBeenCalled(); done(); - }) + }); }); @@ -206,7 +206,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { component.startActionExecution().subscribe( (result) => { expect(component.reloadObjectExecution).toHaveBeenCalled(); done(); - }) + }); }); it('should convert the reloaded object', (done) => { @@ -214,7 +214,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { component.startActionExecution().subscribe( (result) => { expect(component.convertReloadedObject).toHaveBeenCalled(); done(); - }) + }); }); it('should emit the reloaded object in case of success', (done) => { @@ -222,7 +222,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { component.startActionExecution().subscribe( (result) => { expect(component.processCompleted.emit).toHaveBeenCalledWith({result: true, reloadedObject: result as any}); done(); - }) + }); }); }); @@ -252,7 +252,7 @@ describe('MyDSpaceReloadableActionsComponent', () => { component.startActionExecution().subscribe( (result) => { expect(component.reload).toHaveBeenCalled(); done(); - }) + }); }); }); diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts index 74e3c6748b..bce1f1a467 100644 --- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts +++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core'; -import { waitForAsync, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { Router } from '@angular/router'; import { By } from '@angular/platform-browser'; @@ -75,7 +75,7 @@ mockObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkfl describe('PoolTaskActionsComponent', () => { beforeEach(waitForAsync(() => { - mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null) + mockDataService = new PoolTaskDataService(null, null, null, null, null, null, null, null); mockClaimedTaskDataService = new ClaimedTaskDataService(null, null, null, null, null, null, null, null); TestBed.configureTestingModule({ imports: [ @@ -160,7 +160,7 @@ describe('PoolTaskActionsComponent', () => { expect(notificationsServiceStub.success).toHaveBeenCalled(); done(); - }) + }); })); diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts index f36883b05f..19f257f512 100644 --- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts +++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts @@ -1,4 +1,4 @@ -import {Component, Injector, Input, OnDestroy} from '@angular/core'; +import { Component, Injector, Input, OnDestroy } from '@angular/core'; import { Router } from '@angular/router'; import { Observable } from 'rxjs'; @@ -92,7 +92,7 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent return this.objectDataService.getPoolTaskEndpointById(this.object.id) .pipe(switchMap((poolTaskHref) => { return this.claimedTaskService.claimTask(this.object.id, poolTaskHref); - })) + })); } reloadObjectExecution(): Observable | DSpaceObject> { @@ -111,12 +111,12 @@ export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent )) .subscribe((item: Item) => { this.itemUuid = item.uuid; - }) + }); } ngOnDestroy() { this.subs.forEach((sub) => sub.unsubscribe()); - console.log('Destroy of PoolTaskActionsComponent', this.object) + console.log('Destroy of PoolTaskActionsComponent', this.object); } } diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts index 28a906f2fe..9fc27d65bf 100644 --- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts +++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts @@ -162,7 +162,9 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnDestroy * Fetch the component depending on the item's relationship type, view mode and context * @returns {GenericConstructor} */ - getComponent(object, viewMode: ViewMode, context: Context): GenericConstructor { - return getListableObjectComponent(object.getRenderTypes(), viewMode, context); + getComponent(renderTypes: (string | GenericConstructor)[], + viewMode: ViewMode, + context: Context): GenericConstructor { + return getListableObjectComponent(renderTypes, viewMode, context); } } diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts index 1f5d7e0f7c..f5f19fc041 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts @@ -105,7 +105,7 @@ describe('PoolSearchResultDetailElementComponent', () => { spyOn(component.reloadedObject, 'emit').and.callThrough(); const actionPayload: any = { reloadedObject: {}}; const actionsComponents = fixture.debugElement.query(By.css('ds-pool-task-actions')); - actionsComponents.triggerEventHandler('processCompleted', actionPayload) + actionsComponents.triggerEventHandler('processCompleted', actionPayload); tick(); expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts index 07ffe28360..5dad421f68 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { of as observableOf } from 'rxjs'; @@ -104,7 +104,7 @@ describe('ClaimedSearchResultListElementComponent', () => { const actionPayload: any = { reloadedObject: {}}; const actionsComponent = fixture.debugElement.query(By.css('ds-claimed-task-actions')); - actionsComponent.triggerEventHandler('processCompleted', actionPayload) + actionsComponent.triggerEventHandler('processCompleted', actionPayload); tick(); expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts index 0d02a80976..e2017e8748 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts @@ -80,7 +80,7 @@ describe('ItemMyDSpaceResultListElementComponent', () => { const actionPayload: any = { reloadedObject: {}}; const actionsComponent = fixture.debugElement.query(By.css('ds-item-actions')); - actionsComponent.triggerEventHandler('processCompleted', actionPayload) + actionsComponent.triggerEventHandler('processCompleted', actionPayload); tick(); expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts index a474d866cd..e55b45aed7 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core'; +import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { waitForAsync, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -103,7 +103,7 @@ describe('PoolSearchResultListElementComponent', () => { spyOn(component.reloadedObject, 'emit').and.callThrough(); const actionPayload: any = { reloadedObject: {}}; const actionsComponents = fixture.debugElement.query(By.css('ds-pool-task-actions')); - actionsComponents.triggerEventHandler('processCompleted', actionPayload) + actionsComponents.triggerEventHandler('processCompleted', actionPayload); tick(); expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts index 1de3f42264..3743a9bd22 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts @@ -101,7 +101,7 @@ describe('WorkflowItemSearchResultListElementComponent', () => { const actionPayload: any = { reloadedObject: {}}; const actionsComponent = fixture.debugElement.query(By.css('ds-workflowitem-actions')); - actionsComponent.triggerEventHandler('processCompleted', actionPayload) + actionsComponent.triggerEventHandler('processCompleted', actionPayload); tick(); expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts index ee1be01fe4..b1f2a2aeb9 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts @@ -101,7 +101,7 @@ describe('WorkspaceItemSearchResultListElementComponent', () => { const actionPayload: any = { reloadedObject: {}}; const actionsComponent = fixture.debugElement.query(By.css('ds-workspaceitem-actions')); - actionsComponent.triggerEventHandler('processCompleted', actionPayload) + actionsComponent.triggerEventHandler('processCompleted', actionPayload); tick(); expect(component.reloadedObject.emit).toHaveBeenCalledWith(actionPayload.reloadedObject);