Code Review
/
portal
/
nonrtric-controlpanel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Make ei-coordinator tests work
[portal/nonrtric-controlpanel.git]
/
webapp-frontend
/
src
/
app
/
ei-coordinator
/
ei-producer.datasource.ts
diff --git
a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
index
bd7f276
..
255c555
100644
(file)
--- a/
webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
+++ b/
webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
@@
-18,26
+18,24
@@
* ========================LICENSE_END===================================
*/
* ========================LICENSE_END===================================
*/
-import { HttpErrorResponse } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Injectable } from '@angular/core';
-import { MatTableDataSource } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { of } from 'rxjs/observable/of';
-import { catchError, finalize, tap } from 'rxjs/operators';
import { EIProducer } from '../interfaces/ei.types';
import { EIService } from '../services/ei/ei.service';
import { EIProducer } from '../interfaces/ei.types';
import { EIService } from '../services/ei/ei.service';
-import { NotificationService } from '../services/ui/notification.service';
@Injectable({
providedIn: 'root'
})
@Injectable({
providedIn: 'root'
})
-export class EIProducerDataSource
extends MatTableDataSource<EIProducer>
{
+export class EIProducerDataSource {
- producerSubject = new BehaviorSubject<EIProducer[]>([]);
+ private producerSubject = new BehaviorSubject<EIProducer[]>([]);
+
+ public eiProducers(): EIProducer[] {
+ return this.producerSubject.value;
+ }
private loadingSubject = new BehaviorSubject<boolean>(false);
private loadingSubject = new BehaviorSubject<boolean>(false);
@@
-46,22
+44,13
@@
export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
public rowCount = 1; // hide footer during intial load
constructor(
public rowCount = 1; // hide footer during intial load
constructor(
- private eiSvc: EIService,
- private notificationService: NotificationService) {
- super();
+ private eiSvc: EIService) {
}
}
- loadProducers()
: Observable<EIProducer[]>
{
+ loadProducers() {
this.loadingSubject.next(true);
let producers: Array<EIProducer> = [];
this.eiSvc.getProducerIds()
this.loadingSubject.next(true);
let producers: Array<EIProducer> = [];
this.eiSvc.getProducerIds()
- .pipe(
- catchError((her: HttpErrorResponse) => {
- this.notificationService.error('Failed to get producers: ' + her.error);
- return of([]);
- }),
- finalize(() => this.loadingSubject.next(false))
- )
.subscribe((prodIds: string[]) => {
console.log("ProducerIds: " + prodIds);
prodIds.forEach(id => {
.subscribe((prodIds: string[]) => {
console.log("ProducerIds: " + prodIds);
prodIds.forEach(id => {
@@
-78,7
+67,6
@@
export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
});
this.rowCount = this.producerSubject.value.length;
});
});
this.rowCount = this.producerSubject.value.length;
});
- return of(producers);
}
private addProducerToSubject(producer: EIProducer) {
}
private addProducerToSubject(producer: EIProducer) {
@@
-86,13
+74,4
@@
export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
const updatedValue = [...currentValue, producer];
this.producerSubject.next(updatedValue);
}
const updatedValue = [...currentValue, producer];
this.producerSubject.next(updatedValue);
}
-
- connect(): BehaviorSubject<EIProducer[]> {
- return this.producerSubject;
- }
-
- disconnect(): void {
- this.producerSubject.complete();
- this.loadingSubject.complete();
- }
-}
+}
\ No newline at end of file