<h4>Producers</h4>
<div class="table-container">
- <mat-table #producersTable [dataSource]="producersDataSource" fixedLayout
+ <mat-table id="producersTable" [dataSource]="producersDataSource" fixedLayout
matSort (matSortChange)="sortProducers($event)"
class="ei-coordinator-table mat-elevation-z8">
<ng-container matColumnDef="id">
<div (click)="stopSort($event)">
<form style="display: flex" [formGroup]="producersFormControl">
<mat-form-field>
- <input matInput formControlName="ei_producer_id">
+ <input id="producerIdFilter" matInput formControlName="ei_producer_id">
<mat-placeholder>Producer ID</mat-placeholder>
</mat-form-field>
</form>
<div (click)="stopSort($event)">
<form style="display: flex" [formGroup]="producersFormControl">
<mat-form-field>
- <input matInput formControlName="ei_producer_types">
+ <input id="producerTypesFilter" matInput formControlName="ei_producer_types">
<mat-placeholder>Producer types</mat-placeholder>
</mat-form-field>
</form>
</div>
</mat-header-cell>
- <mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerTypes(eiProducer)}} </mat-cell>
+ <mat-cell *matCellDef="let eiProducer"> {{this.getProducerTypes(eiProducer)}} </mat-cell>
</ng-container>
<ng-container matColumnDef="status">
<div (click)="stopSort($event)">
<form style="display: flex" [formGroup]="producersFormControl">
<mat-form-field>
- <input matInput formControlName="status">
+ <input id="producerStatusFilter" matInput formControlName="status">
<mat-placeholder>Producer status</mat-placeholder>
</mat-form-field>
</form>
</div>
</mat-header-cell>
- <mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerStatus(eiProducer)}} </mat-cell>
+ <mat-cell *matCellDef="let eiProducer"> {{this.getProducerStatus(eiProducer)}} </mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="['id', 'types', 'status']"></mat-header-row>
<mat-row *matRowDef="let row; columns: ['id', 'types', 'status'];"></mat-row>
-
</mat-table>
</div>
<h4>Jobs</h4>
<div class="table-container">
- <mat-table [dataSource]="jobsDataSource" fixedLayout
+ <mat-table id="jobsTable" [dataSource]="jobsDataSource" fixedLayout
matSort (matSortChange)="sortJobs($event)"
class="ei-coordinator-table mat-elevation-z8">
<ng-container matColumnDef="id">
<div (click)="stopSort($event)">
<form style="display: flex" [formGroup]="jobsFormControl">
<mat-form-field>
- <input matInput formControlName="id">
+ <input id="jobIdFilter" matInput formControlName="id">
<mat-placeholder>Job ID</mat-placeholder>
</mat-form-field>
</form>
</div>
</mat-header-cell>
- <mat-cell *matCellDef="let eiJob"> {{this.getDisplayName(eiJob)}} </mat-cell>
+ <mat-cell *matCellDef="let eiJob"> {{eiJob.ei_job_identity}} </mat-cell>
</ng-container>
<ng-container matColumnDef="typeId">
<mat-header-cell *matHeaderCellDef mat-sort-header>
<div (click)="stopSort($event)">
<form style="display: flex" [formGroup]="jobsFormControl">
<mat-form-field>
- <input matInput formControlName="typeId">
+ <input id="jobTypeIdFilter" matInput formControlName="typeId">
<mat-placeholder>Type ID</mat-placeholder>
</mat-form-field>
</form>
</div>
</mat-header-cell>
- <mat-cell *matCellDef="let eiJob">{{this.getEITypeId(eiJob)}} </mat-cell>
+ <mat-cell *matCellDef="let eiJob">{{this.getJobTypeId(eiJob)}} </mat-cell>
</ng-container>
<ng-container matColumnDef="owner">
<mat-header-cell *matHeaderCellDef mat-sort-header>
<div (click)="stopSort($event)">
<form style="display: flex" [formGroup]="jobsFormControl">
<mat-form-field>
- <input matInput formControlName="owner">
+ <input id="jobOwnerFilter" matInput formControlName="owner">
<mat-placeholder>Owner</mat-placeholder>
</mat-form-field>
</form>
</div>
</mat-header-cell>
- <mat-cell *matCellDef="let eiJob">{{eiJob.owner}} </mat-cell>
+ <mat-cell *matCellDef="let eiJob">{{this.getJobOwner(eiJob)}} </mat-cell>
</ng-container>
<ng-container matColumnDef="targetUri">
<mat-header-cell *matHeaderCellDef mat-sort-header>
<div (click)="stopSort($event)">
<form style="display: flex" [formGroup]="jobsFormControl">
<mat-form-field>
- <input matInput formControlName="targetUri">
+ <input id="jobTargetUriFilter" matInput formControlName="targetUri">
<mat-placeholder>Target URI</mat-placeholder>
</mat-form-field>
</form>
</div>
</mat-header-cell>
- <mat-cell *matCellDef="let eiJob"> {{this.getTargetUri(eiJob)}} </mat-cell>
+ <mat-cell *matCellDef="let eiJob"> {{eiJob.target_uri}} </mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="['id', 'typeId', 'owner', 'targetUri']"></mat-header-row>
<mat-row *matRowDef="let row; columns: ['id', 'typeId', 'owner', 'targetUri'];"></mat-row>
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import {HarnessLoader} from '@angular/cdk/testing';
import { MatIconModule } from '@angular/material/icon';
+import { MatInputHarness } from '@angular/material/input/testing'
import { MatTableModule } from '@angular/material/table';
+import { MatTableHarness } from '@angular/material/table/testing';
+import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
import { EICoordinatorComponent } from './ei-coordinator.component';
import { EIJobDataSource } from './ei-job.datasource';
import { EIProducerDataSource } from './ei-producer.datasource';
import { UiService } from '../services/ui/ui.service';
+import { EIJob, EIProducer } from '../interfaces/ei.types';
describe('EICoordinatorComponent', () => {
let component: EICoordinatorComponent;
let fixture: ComponentFixture<EICoordinatorComponent>;
+ let loader: HarnessLoader;
+ let producerDataSourceSpy: jasmine.SpyObj<EIProducerDataSource>;
+ let jobDataSourceSpy: jasmine.SpyObj<EIJobDataSource>;
- beforeEach(async(() => {
- const jobDataSourceSpy = jasmine.createSpyObj('EIJobDataSource', [ 'loadJobs', 'eiJobs' ]);
- const producerDataSourceSpy = jasmine.createSpyObj('EIProducerDataSource', [ 'loadProducers', 'eiProducers' ]);
+ const producer1 = {
+ ei_producer_id: 'producer1',
+ ei_producer_types: [ 'type1', 'type2' ],
+ status: 'ENABLED'
+ } as EIProducer;
+ const producer2 = {
+ ei_producer_id: 'producer2',
+ ei_producer_types: [ 'type2', 'type3' ],
+ status: 'DISABLED'
+ } as EIProducer;
- jobDataSourceSpy.eiJobs.and.returnValue([]);
+ const job1 = {
+ ei_job_identity: 'job1',
+ ei_type_identity: 'type1',
+ owner: 'owner1',
+ target_uri: 'http://one'
+ } as EIJob;
+ const job2 = {
+ ei_job_identity: 'job2',
+ ei_type_identity: 'type2',
+ owner: 'owner2',
+ target_uri: 'http://two'
+ } as EIJob;
- producerDataSourceSpy.eiProducers.and.returnValue([]);
+ beforeEach(async () => {
+ producerDataSourceSpy = jasmine.createSpyObj('EIProducerDataSource', [ 'loadProducers', 'eiProducers' ]);
+ jobDataSourceSpy = jasmine.createSpyObj('EIJobDataSource', [ 'loadJobs', 'eiJobs' ]);
- TestBed.configureTestingModule({
+ await TestBed.configureTestingModule({
imports: [
MatIconModule,
MatTableModule,
]
})
.compileComponents();
- }));
- beforeEach(() => {
fixture = TestBed.createComponent(EICoordinatorComponent);
component = fixture.componentInstance;
fixture.detectChanges();
+ loader = TestbedHarnessEnvironment.loader(fixture);
});
it('should create', () => {
expect(component).toBeTruthy();
});
+
+ describe('#content', () => {
+ it('should contain refresh button with coorect icon', () => {
+ const button = fixture.debugElement.nativeElement.querySelector('#refreshButton');
+ expect(button).toBeTruthy();
+ expect(button.innerHTML).toContain('refresh');
+ });
+
+ it('should contain producers table with correct columns', async () => {
+ let producersTable = await loader.getHarness(MatTableHarness.with({selector: '#producersTable'}));
+ let headerRow = (await producersTable.getHeaderRows())[0];
+ let headers = await headerRow.getCellTextByColumnName();
+
+ expect(headers).toEqual({id: 'Producer ID', types: 'Producer types', status: 'Producer status'});
+ });
+
+ it('should contain jobs table with correct columns', async () => {
+ let producersTable = await loader.getHarness(MatTableHarness.with({selector: '#jobsTable'}));
+ let headerRow = (await producersTable.getHeaderRows())[0];
+ let headers = await headerRow.getCellTextByColumnName();
+
+ expect(headers).toEqual({id: 'Job ID', typeId: 'Type ID', owner: 'Owner', targetUri: 'Target URI'});
+ });
+
+ it('should set correct dark mode from UIService', () => {
+ const uiService: UiService = TestBed.inject(UiService);
+ expect(component.darkMode).toBeTruthy();
+
+ uiService.darkModeState.next(false);
+ fixture.detectChanges();
+ expect(component.darkMode).toBeFalsy();
+
+ });
+ });
+
+ describe('#producersTable', () => {
+ const expectedProducer1Row = { id: 'producer1', types: 'type1,type2', status: 'ENABLED' };
+ beforeEach(() => {
+ const producers: EIProducer[] =[ producer1, producer2 ];
+ producerDataSourceSpy.eiProducers.and.returnValue(producers);
+ });
+
+ it('should contain data after initialization', async () => {
+ component.ngOnInit();
+ const expectedProducerRows = [
+ expectedProducer1Row,
+ {id: 'producer2', types: 'type2,type3', status: 'DISABLED'}
+ ];
+ let producersTable = await loader.getHarness(MatTableHarness.with({selector: '#producersTable'}));
+ let producerRows = await producersTable.getRows();
+ expect(producerRows.length).toEqual(2);
+ producerRows.forEach(row => {
+ row.getCellTextByColumnName().then(values => {
+ expect(expectedProducerRows).toContain(jasmine.objectContaining(values));
+ });
+ });
+ });
+
+ describe('should display default values for non required properties', () => {
+ it('producer defaults', async () => {
+ const producerMissingProperties = {
+ ei_producer_id: 'producer1'
+ } as EIProducer;
+ const producers: EIProducer[] =[ producerMissingProperties ];
+ producerDataSourceSpy.eiProducers.and.returnValue(producers);
+ component.ngOnInit();
+
+ const expectedProducerRow = { id: 'producer1', types: '< No types >', status: '< No status >' };
+ let producersTable = await loader.getHarness(MatTableHarness.with({selector: '#producersTable'}));
+ let producerRows = await producersTable.getRows();
+ expect(await producerRows[0].getCellTextByColumnName()).toEqual(expectedProducerRow);
+ });
+
+ it('job defaults', async () => {
+ const jobMissingProperties = {
+ ei_job_identity: 'job1',
+ target_uri: 'http://one'
+ } as EIJob;
+ const jobs: EIJob[] =[ jobMissingProperties ];
+ jobDataSourceSpy.eiJobs.and.returnValue(jobs);
+ component.ngOnInit();
+
+ const expectedJobRow = { id: 'job1', typeId: '< No type >', owner: '< No owner >', targetUri: 'http://one' };
+ let jobsTable = await loader.getHarness(MatTableHarness.with({selector: '#jobsTable'}));
+ let jobRows = await jobsTable.getRows();
+ expect(await jobRows[0].getCellTextByColumnName()).toEqual(expectedJobRow);
+ });
+ });
+
+ it('filtering', async () => {
+ component.ngOnInit();
+ let producersTable = await loader.getHarness(MatTableHarness.with({selector: '#producersTable'}));
+
+ let idFilterInput = await loader.getHarness(MatInputHarness.with({selector: '#producerIdFilter'}));
+ await idFilterInput.setValue("1");
+ let producerRows = await producersTable.getRows();
+ expect(producerRows.length).toEqual(1);
+ expect(await producerRows[0].getCellTextByColumnName()).toEqual(expectedProducer1Row);
+
+ idFilterInput.setValue('');
+ let typesFilterInput = await loader.getHarness(MatInputHarness.with({selector: '#producerTypesFilter'}));
+ await typesFilterInput.setValue("1");
+ producerRows = await producersTable.getRows();
+ expect(producerRows.length).toEqual(1);
+ expect(await producerRows[0].getCellTextByColumnName()).toEqual(expectedProducer1Row);
+ await typesFilterInput.setValue("2");
+ producerRows = await producersTable.getRows();
+ expect(producerRows.length).toEqual(2);
+
+ typesFilterInput.setValue('');
+ let statusFilterInput = await loader.getHarness(MatInputHarness.with({selector: '#producerStatusFilter'}));
+ await statusFilterInput.setValue("enabled");
+ producerRows = await producersTable.getRows();
+ expect(producerRows.length).toEqual(1);
+ expect(await producerRows[0].getCellTextByColumnName()).toEqual(expectedProducer1Row);
+ });
+ });
+
+ describe('#jobsTable', () => {
+ const expectedJob1Row = { id: 'job1', typeId: 'type1', owner: 'owner1', targetUri: 'http://one' };
+ beforeEach(() => {
+ const jobs: EIJob[] =[ job1, job2 ];
+ jobDataSourceSpy.eiJobs.and.returnValue(jobs);
+ });
+
+ it('should contain data after initialization', async () => {
+ component.ngOnInit();
+ const expectedJobRows = [
+ expectedJob1Row,
+ { id: 'job2', typeId: 'type2', owner: 'owner2', targetUri: 'http://two' }
+ ];
+ let jobsTable = await loader.getHarness(MatTableHarness.with({selector: '#jobsTable'}));
+ let jobRows = await jobsTable.getRows();
+ expect(jobRows.length).toEqual(2);
+ jobRows.forEach(row => {
+ row.getCellTextByColumnName().then(values => {
+ expect(expectedJobRows).toContain(jasmine.objectContaining(values));
+ });
+ });
+ });
+
+ it('filtering', async () => {
+ component.ngOnInit();
+ let jobsTable = await loader.getHarness(MatTableHarness.with({selector: '#jobsTable'}));
+
+ let idFilterInput = await loader.getHarness(MatInputHarness.with({selector: '#jobIdFilter'}));
+ await idFilterInput.setValue("1");
+ let jobRows = await jobsTable.getRows();
+ expect(jobRows.length).toEqual(1);
+ expect(await jobRows[0].getCellTextByColumnName()).toEqual(expectedJob1Row);
+
+ idFilterInput.setValue('');
+ let typeIdFilterInput = await loader.getHarness(MatInputHarness.with({selector: '#jobTypeIdFilter'}));
+ await typeIdFilterInput.setValue("1");
+ jobRows = await jobsTable.getRows();
+ expect(jobRows.length).toEqual(1);
+
+ typeIdFilterInput.setValue('');
+ let ownerFilterInput = await loader.getHarness(MatInputHarness.with({selector: '#jobOwnerFilter'}));
+ await ownerFilterInput.setValue("1");
+ jobRows = await jobsTable.getRows();
+ expect(jobRows.length).toEqual(1);
+ expect(await jobRows[0].getCellTextByColumnName()).toEqual(expectedJob1Row);
+
+ ownerFilterInput.setValue('');
+ let targetUriFilterInput = await loader.getHarness(MatInputHarness.with({selector: '#jobTargetUriFilter'}));
+ await targetUriFilterInput.setValue("one");
+ jobRows = await jobsTable.getRows();
+ expect(jobRows.length).toEqual(1);
+ expect(await jobRows[0].getCellTextByColumnName()).toEqual(expectedJob1Row);
+ });
+ });
});
*/
import { Component, OnInit } from '@angular/core';
import { Sort } from '@angular/material/sort';
-import { animate, state, style, transition, trigger } from '@angular/animations';
import { FormBuilder, FormGroup, AbstractControl } from '@angular/forms';
import { MatTableDataSource, MatTable } from '@angular/material/table';
-import { BehaviorSubject, Observable } from 'rxjs';
-
import { EIJob, EIProducer } from '../interfaces/ei.types';
import { EIJobDataSource } from './ei-job.datasource';
import { EIProducerDataSource } from './ei-producer.datasource';
import { UiService } from '../services/ui/ui.service';
-class EIJobInfo {
- constructor(public eiJob: EIJob) { }
-
- isExpanded: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-}
-
@Component({
selector: 'nrcp-ei-coordinator',
templateUrl: './ei-coordinator.component.html',
- styleUrls: ['./ei-coordinator.component.scss'],
- animations: [
- trigger('detailExpand', [
- state('collapsed, void', style({ height: '0px', minHeight: '0', display: 'none' })),
- state('expanded', style({ height: '*' })),
- transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
- transition('expanded <=> void', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
- ]),
- ],
+ styleUrls: ['./ei-coordinator.component.scss']
})
export class EICoordinatorComponent implements OnInit {
- eiJobInfo = new Map<string, EIJobInfo>();
darkMode: boolean;
searchString: string;
formGroup: FormGroup;
this.eiJobsDataSource.loadJobs();
this.eiProducersDataSource.loadProducers();
this.jobsDataSource = new MatTableDataSource(this.eiJobsDataSource.eiJobs());
- this.producersDataSource = new MatTableDataSource(this.eiProducersDataSource.eiProducers());
+ const prods = this.eiProducersDataSource.eiProducers();
+ this.producersDataSource = new MatTableDataSource(prods);
this.jobsFormControl.valueChanges.subscribe(value => {
const filter = {...value, id: value.id.trim().toLowerCase()} as string;
this.jobsDataSource.filterPredicate = ((data: EIJob, filter) => {
return this.isDataIncluding(data.ei_job_identity, filter.id)
- && this.isDataIncluding(data.target_uri, filter.target_uri)
+ && this.isDataIncluding(data.target_uri, filter.targetUri)
&& this.isDataIncluding(data.owner, filter.owner)
&& this.isDataIncluding(data.ei_type_identity, filter.typeId);
- }) as (EIJob, string) => boolean;
+ }) as (data: EIJob, filter: any) => boolean;
this.producersDataSource.filterPredicate = ((data, filter) => {
return this.isDataIncluding(data.ei_producer_id, filter.ei_producer_id)
&& this.isDataIncluding(data.ei_producer_types.join(','), filter.ei_producer_types)
&& this.isDataIncluding(data.status, filter.status);
- }) as (EIProducer, string) => boolean;
+ }) as (data: EIProducer, filter: any) => boolean;
this.ui.darkModeState.subscribe((isDark) => {
this.darkMode = isDark;
return !filter || data.toLowerCase().includes(filter);
}
- getEIJobInfo(eiJob: EIJob): EIJobInfo {
- let info: EIJobInfo = this.eiJobInfo.get(eiJob.ei_job_data);
- if (!info) {
- info = new EIJobInfo(eiJob);
- this.eiJobInfo.set(eiJob.ei_job_data, info);
- }
- return info;
- }
-
- getDisplayName(eiJob: EIJob): string {
- if (eiJob.ei_job_identity) {
- return eiJob.ei_job_identity;
- }
- return '< No id >';
- }
-
- getEITypeId(eiJob: EIJob): string {
+ getJobTypeId(eiJob: EIJob): string {
if (eiJob.ei_type_identity) {
return eiJob.ei_type_identity;
}
return '< No type >';
}
- getTargetUri(eiJob: EIJob): string {
- if (eiJob.target_uri) {
- return eiJob.target_uri;
- }
- return '< No target URI >';
- }
-
- isInstancesShown(eiJob: EIJob): boolean {
- return this.getEIJobInfo(eiJob).isExpanded.getValue();
- }
-
- getExpandedObserver(eiJob: EIJob): Observable<boolean> {
- return this.getEIJobInfo(eiJob).isExpanded.asObservable();
- }
-
- getEIProducerId(eiProducer: EIProducer): string {
- if (eiProducer.ei_producer_id) {
- return eiProducer.ei_producer_id;
+ getJobOwner(eiJob: EIJob): string {
+ if (eiJob.owner) {
+ return eiJob.owner;
}
- return '< No id>';
+ return '< No owner >';
}
- getEIProducerTypes(eiProducer: EIProducer): string[] {
+ getProducerTypes(eiProducer: EIProducer): string[] {
if (eiProducer.ei_producer_types) {
return eiProducer.ei_producer_types;
}
return ['< No types >'];
}
- getEIProducerStatus(eiProducer: EIProducer): string {
+ getProducerStatus(eiProducer: EIProducer): string {
if (eiProducer.status) {
return eiProducer.status;
}
Code Review / portal / nonrtric-controlpanel.git / commitdiff