This commit is contained in:
crusader 2018-05-31 17:37:38 +09:00
parent b525f40063
commit 55f09d332d
2 changed files with 6 additions and 8 deletions

View File

@ -4,7 +4,7 @@
<of-block-progressbar [target]="content" [pending]="pending$ | async"></of-block-progressbar>
<p-panel #content [showHeader]="false" class="block-panel">
<p-table #dt [value]="noauthProbes$ | async" selectionMode="single" dataKey="id">
<p-table #dt [value]="noauthProbes" selectionMode="single" dataKey="id">
<ng-template pTemplate="header">
<tr>
<th style="width: 3.25em" pResizableColumn></th>

View File

@ -17,7 +17,6 @@ import { NoAuthProbeConnectingSelector } from '../store';
providers: [ConfirmationService]
})
export class NoAuthProbeListComponent implements OnInit, OnDestroy {
noauthProbes$: Observable<NoAuthProbe[]>;
pending$: Observable<boolean>;
error$: Observable<any>;
@ -42,7 +41,7 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
this.noAuthProbeService.readAllByDomainID(domainMember.domain.id)
.pipe(
map((noauthProbes: NoAuthProbe[]) => {
this.setNoauthProbes$(noauthProbes);
this.setNoauthProbes(noauthProbes);
}),
catchError(error => {
this.setError$(error);
@ -68,7 +67,7 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
}
});
this.setNoauthProbes$(noauthProbes);
this.setNoauthProbes(noauthProbes);
}
),
).subscribe();
@ -123,7 +122,7 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
this.pending$ = of(true);
}),
map((noauthProbes: NoAuthProbe[]) => {
this.setNoauthProbes$(noauthProbes);
this.setNoauthProbes(noauthProbes);
}),
catchError(error => {
this.setError$(error);
@ -140,7 +139,7 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
this.pending$ = of(true);
}),
map((noauthProbes: NoAuthProbe[]) => {
this.setNoauthProbes$(noauthProbes);
this.setNoauthProbes(noauthProbes);
}),
catchError(error => {
this.setError$(error);
@ -157,7 +156,7 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
});
}
private setNoauthProbes$(noauthProbes: NoAuthProbe[]): void {
private setNoauthProbes(noauthProbes: NoAuthProbe[]): void {
if (null === noauthProbes) {
return;
}
@ -165,7 +164,6 @@ export class NoAuthProbeListComponent implements OnInit, OnDestroy {
noauthProbe.descriptions = JSON.parse(noauthProbe.description);
});
this.noauthProbes = noauthProbes;
this.noauthProbes$ = of(noauthProbes);
}
private setError$(error: any): void {