111638: Clean up process-overview component

Removed all unused code & reduced the tests to the minimum necessary
without removing testcases.
This commit is contained in:
Andreas Awouters
2024-02-05 16:51:23 +01:00
parent 8e11777e5b
commit 545b17fc9e
2 changed files with 11 additions and 130 deletions

View File

@@ -3,86 +3,27 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { VarDirective } from '../../shared/utils/var.directive'; import { VarDirective } from '../../shared/utils/var.directive';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA, TemplateRef } from '@angular/core';
import { ProcessDataService } from '../../core/data/processes/process-data.service'; import { ProcessDataService } from '../../core/data/processes/process-data.service';
import { Process } from '../processes/process.model';
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
import { EPerson } from '../../core/eperson/models/eperson.model';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { ProcessStatus } from '../processes/process-status.model';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
import { createPaginatedList } from '../../shared/testing/utils.test';
import { PaginationService } from '../../core/pagination/pagination.service';
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
import { DatePipe } from '@angular/common';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { ProcessBulkDeleteService } from './process-bulk-delete.service'; import { ProcessBulkDeleteService } from './process-bulk-delete.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { ProcessOverviewService } from './process-overview.service';
describe('ProcessOverviewComponent', () => { describe('ProcessOverviewComponent', () => {
let component: ProcessOverviewComponent; let component: ProcessOverviewComponent;
let fixture: ComponentFixture<ProcessOverviewComponent>; let fixture: ComponentFixture<ProcessOverviewComponent>;
let processService: ProcessDataService; let processService: ProcessDataService;
let ePersonService: EPersonDataService;
let paginationService;
let processes: Process[];
let ePerson: EPerson;
let processBulkDeleteService; let processBulkDeleteService;
let modalService; let modalService;
const pipe = new DatePipe('en-US');
function init() { function init() {
processes = [ processService = jasmine.createSpyObj('processOverviewService', {
Object.assign(new Process(), { timeStarted: '2024-02-05 16:43:32',
processId: 1,
scriptName: 'script-name',
startTime: '2020-03-19 00:30:00',
endTime: '2020-03-19 23:30:00',
processStatus: ProcessStatus.COMPLETED
}),
Object.assign(new Process(), {
processId: 2,
scriptName: 'script-name',
startTime: '2020-03-20 00:30:00',
endTime: '2020-03-20 23:30:00',
processStatus: ProcessStatus.FAILED
}),
Object.assign(new Process(), {
processId: 3,
scriptName: 'another-script-name',
startTime: '2020-03-21 00:30:00',
endTime: '2020-03-21 23:30:00',
processStatus: ProcessStatus.RUNNING
})
];
ePerson = Object.assign(new EPerson(), {
metadata: {
'eperson.firstname': [
{
value: 'John',
language: null
}
],
'eperson.lastname': [
{
value: 'Doe',
language: null
}
]
}
}); });
processService = jasmine.createSpyObj('processService', {
findAll: createSuccessfulRemoteDataObject$(createPaginatedList(processes))
});
ePersonService = jasmine.createSpyObj('ePersonService', {
findById: createSuccessfulRemoteDataObject$(ePerson)
});
paginationService = new PaginationServiceStub();
processBulkDeleteService = jasmine.createSpyObj('processBulkDeleteService', { processBulkDeleteService = jasmine.createSpyObj('processBulkDeleteService', {
clearAllProcesses: {}, clearAllProcesses: {},
@@ -96,11 +37,7 @@ describe('ProcessOverviewComponent', () => {
}); });
(processBulkDeleteService.isToBeDeleted as jasmine.Spy).and.callFake((id) => { (processBulkDeleteService.isToBeDeleted as jasmine.Spy).and.callFake((id) => {
if (id === 2) { return id === 2;
return true;
} else {
return false;
}
}); });
modalService = jasmine.createSpyObj('modalService', { modalService = jasmine.createSpyObj('modalService', {
@@ -114,9 +51,7 @@ describe('ProcessOverviewComponent', () => {
declarations: [ProcessOverviewComponent, VarDirective], declarations: [ProcessOverviewComponent, VarDirective],
imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
providers: [ providers: [
{ provide: ProcessDataService, useValue: processService }, { provide: ProcessOverviewService, useValue: processService },
{ provide: EPersonDataService, useValue: ePersonService },
{ provide: PaginationService, useValue: paginationService },
{ provide: ProcessBulkDeleteService, useValue: processBulkDeleteService }, { provide: ProcessBulkDeleteService, useValue: processBulkDeleteService },
{ provide: NgbModal, useValue: modalService }, { provide: NgbModal, useValue: modalService },
], ],
@@ -165,7 +100,7 @@ describe('ProcessOverviewComponent', () => {
describe('openDeleteModal', () => { describe('openDeleteModal', () => {
it('should open the modal', () => { it('should open the modal', () => {
component.openDeleteModal({}); component.openDeleteModal({} as TemplateRef<any>);
expect(modalService.open).toHaveBeenCalledWith({}); expect(modalService.open).toHaveBeenCalledWith({});
}); });
}); });
@@ -173,13 +108,11 @@ describe('ProcessOverviewComponent', () => {
describe('deleteSelected', () => { describe('deleteSelected', () => {
it('should call the deleteSelectedProcesses method on the processBulkDeleteService and close the modal when processing is done', () => { it('should call the deleteSelectedProcesses method on the processBulkDeleteService and close the modal when processing is done', () => {
spyOn(component, 'closeModal'); spyOn(component, 'closeModal');
spyOn(component, 'setProcesses');
component.deleteSelected(); component.deleteSelected();
expect(processBulkDeleteService.deleteSelectedProcesses).toHaveBeenCalled(); expect(processBulkDeleteService.deleteSelectedProcesses).toHaveBeenCalled();
expect(component.closeModal).toHaveBeenCalled(); expect(component.closeModal).toHaveBeenCalled();
expect(component.setProcesses).toHaveBeenCalled();
}); });
}); });
}); });

View File

@@ -1,18 +1,8 @@
import { Component, OnDestroy, OnInit } from '@angular/core'; import { Component, OnDestroy, OnInit, TemplateRef } from '@angular/core';
import { Observable, Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { RemoteData } from '../../core/data/remote-data';
import { PaginatedList } from '../../core/data/paginated-list.model';
import { Process } from '../processes/process.model';
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
import { switchMap } from 'rxjs/operators';
import { ProcessDataService } from '../../core/data/processes/process-data.service';
import { PaginationService } from '../../core/pagination/pagination.service';
import { FindListOptions } from '../../core/data/find-list-options.model';
import { ProcessBulkDeleteService } from './process-bulk-delete.service'; import { ProcessBulkDeleteService } from './process-bulk-delete.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { hasValue } from '../../shared/empty.util'; import { hasValue } from '../../shared/empty.util';
import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
import { ProcessOverviewService, ProcessSortField } from './process-overview.service'; import { ProcessOverviewService, ProcessSortField } from './process-overview.service';
import { ProcessStatus } from '../processes/process-status.model'; import { ProcessStatus } from '../processes/process-status.model';
@@ -29,62 +19,21 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
protected readonly ProcessStatus = ProcessStatus; protected readonly ProcessStatus = ProcessStatus;
protected readonly ProcessSortField = ProcessSortField; protected readonly ProcessSortField = ProcessSortField;
/**
* List of all processes
*/
processesRD$: Observable<RemoteData<PaginatedList<Process>>>;
/**
* The current pagination configuration for the page used by the FindAll method
*/
config: FindListOptions = Object.assign(new FindListOptions(), {
elementsPerPage: 20
});
/**
* The current pagination configuration for the page
*/
pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
id: 'po',
pageSize: 20
});
/**
* Date format to use for start and end time of processes
*/
dateFormat = 'yyyy-MM-dd HH:mm:ss';
processesToDelete: string[] = [];
private modalRef: any; private modalRef: any;
isProcessingSub: Subscription; isProcessingSub: Subscription;
constructor(protected processService: ProcessDataService, constructor(protected processOverviewService: ProcessOverviewService,
protected processOverviewService: ProcessOverviewService,
protected paginationService: PaginationService,
protected ePersonService: EPersonDataService,
protected modalService: NgbModal, protected modalService: NgbModal,
public processBulkDeleteService: ProcessBulkDeleteService, public processBulkDeleteService: ProcessBulkDeleteService,
protected dsoNameService: DSONameService,
) { ) {
} }
ngOnInit(): void { ngOnInit(): void {
this.setProcesses();
this.processBulkDeleteService.clearAllProcesses(); this.processBulkDeleteService.clearAllProcesses();
} }
/**
* Send a request to fetch all processes for the current page
*/
setProcesses() {
this.processesRD$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
switchMap((config) => this.processService.findAll(config, true, false))
);
}
ngOnDestroy(): void { ngOnDestroy(): void {
this.paginationService.clearPagination(this.pageConfig.id);
if (hasValue(this.isProcessingSub)) { if (hasValue(this.isProcessingSub)) {
this.isProcessingSub.unsubscribe(); this.isProcessingSub.unsubscribe();
} }
@@ -94,7 +43,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
* Open a given modal. * Open a given modal.
* @param content - the modal content. * @param content - the modal content.
*/ */
openDeleteModal(content) { openDeleteModal(content: TemplateRef<any>) {
this.modalRef = this.modalService.open(content); this.modalRef = this.modalService.open(content);
} }
@@ -120,7 +69,6 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
.subscribe((isProcessing) => { .subscribe((isProcessing) => {
if (!isProcessing) { if (!isProcessing) {
this.closeModal(); this.closeModal();
this.setProcesses();
} }
}); });
} }