From ccf9ff53a8e67f3ff5a95a0fd2a64bdabef09a19 Mon Sep 17 00:00:00 2001 From: insanity Date: Fri, 1 Jun 2018 11:47:37 +0900 Subject: [PATCH] discovery --- .../component/discovery.component.ts | 9 ++++---- .../component/request-summary.component.html | 23 ++++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/@overflow/discovery/component/discovery.component.ts b/@overflow/discovery/component/discovery.component.ts index 13d9dc4..db30700 100644 --- a/@overflow/discovery/component/discovery.component.ts +++ b/@overflow/discovery/component/discovery.component.ts @@ -15,7 +15,7 @@ import { DiscoverySubscriber, DiscoveryNotify } from '../subscriber/discovery.su templateUrl: './discovery.component.html', animations: Anim }) -export class DiscoveryComponent { +export class DiscoveryComponent { @Input() probeHostID; pending$: Observable; @@ -24,6 +24,7 @@ export class DiscoveryComponent { selectedProbe: ProbeHost; requested: boolean; + discoverZone: DiscoverZone; constructor( @@ -35,9 +36,7 @@ export class DiscoveryComponent { onRequestDiscovery(dz: DiscoverZone) { this.requested = true; - - this.requested = true; - + this.discoverZone = dz; this.discoverySubscriber.observable().pipe( tap(() => { this.discoveryService.discoverZone(this.selectedProbe.probe.probeKey, dz); @@ -80,13 +79,13 @@ export class DiscoveryComponent { } }), catchError(error => { - return of(); }), ).subscribe(); } onRequestDiscoveryStop() { + this.discoverZone = null; this.requested = false; } } diff --git a/@overflow/discovery/component/request-summary.component.html b/@overflow/discovery/component/request-summary.component.html index f79671f..6ece8a4 100644 --- a/@overflow/discovery/component/request-summary.component.html +++ b/@overflow/discovery/component/request-summary.component.html @@ -1,9 +1,16 @@
- - - TCP - UDP -
- {{service}} -
-
+ + + TCP + UDP + +
+ +
+ {{service}} +
+
+ + +
+ \ No newline at end of file