From 884fbcd36d7aa11ff178e8e511552f7487bf8d9c Mon Sep 17 00:00:00 2001
From: insanity <insanity@loafle.com>
Date: Thu, 20 Sep 2018 19:46:10 +0900
Subject: [PATCH] ...

---
 @overflow/model/ping/result.ts                |  1 +
 src/app/app.component.html                    |  2 ++
 src/app/app.component.ts                      |  3 +-
 src/app/pages/home/home-page.component.html   |  6 ++++
 src/app/pages/home/home-page.component.ts     |  5 +++
 src/app/pages/pages.component.ts              |  1 +
 .../component/host-detail.component.html      |  4 +--
 .../component/host-detail.component.ts        | 13 +++++--
 .../component/service-detail.component.html   | 34 ++++++++++++-------
 .../component/service-detail.component.ts     |  5 +--
 src/index.html                                |  2 +-
 11 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/@overflow/model/ping/result.ts b/@overflow/model/ping/result.ts
index e104a7f..51cf7e6 100644
--- a/@overflow/model/ping/result.ts
+++ b/@overflow/model/ping/result.ts
@@ -4,4 +4,5 @@ import { PingSummary } from './summary';
 export interface PingResult {
   responses: Map<number, PingResponse>;
   summary: PingSummary;
+  raw?: string[];
 }
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 925d7b2..0e25a29 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,3 +1,5 @@
+<p-blockUI [blocked]="block"></p-blockUI>
+
 <div id="app-container">
   <div id="app-chrome" class="focused">
     <app-title-bar *ngIf="showTitleBar"></app-title-bar>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 2c9420b..9a95840 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -15,6 +15,7 @@ import { MenuEvent } from '../commons/type';
 export class AppComponent implements OnInit, OnDestroy {
   title = 'scanner-app';
   showTitleBar: boolean;
+  block: boolean;
 
   menuSubscription: Subscription;
   displayAbout: boolean;
@@ -25,10 +26,10 @@ export class AppComponent implements OnInit, OnDestroy {
   public constructor(
     private changeDetector: ChangeDetectorRef,
     private electronProxyService: ElectronProxyService,
-    private probeService: ProbeService,
   ) {
     // this.showTitleBar = !__LINUX__;
     this.showTitleBar = false;
+    this.block = false;
   }
 
   ngOnInit(): void {
diff --git a/src/app/pages/home/home-page.component.html b/src/app/pages/home/home-page.component.html
index 7a3fd5f..36e86bf 100644
--- a/src/app/pages/home/home-page.component.html
+++ b/src/app/pages/home/home-page.component.html
@@ -95,6 +95,12 @@
 <p-blockUI id="discovery-blockUI" [target]="discoveryContainer" [blocked]="discoveryRequestID !== null">
 </p-blockUI>
 
+<p-dialog header="Stopping..." [(visible)]="stopping" [modal]="true" [responsive]="false" [width]="300" [minWidth]="200"
+  [minY]="70" [closeOnEscape]="false" [closable]="false" [hidden]="true">
+
+</p-dialog>
+
+
 <!-- <div class="ui-fluid">
     <div class="ui-g">
         <div class="ui-g-12">
diff --git a/src/app/pages/home/home-page.component.ts b/src/app/pages/home/home-page.component.ts
index ed8e25e..c005487 100644
--- a/src/app/pages/home/home-page.component.ts
+++ b/src/app/pages/home/home-page.component.ts
@@ -37,6 +37,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
 
   blockedPanel = false;
   displaySidebar = false;
+  stopping = false;
 
   blockedDocument = false;
 
@@ -118,6 +119,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
         this.startDiscovery();
       } else {
         if (null !== this.discoveryRequestID) {
+          this.stopping = true;
           this.probeService.send('DiscoveryService.DiscoverStop', requesterID, this.discoveryRequestID);
         }
       }
@@ -637,6 +639,8 @@ export class HomePageComponent implements OnInit, OnDestroy {
   public DiscoveryStop(stopDate: Date) {
     console.log('DiscoveryStop', stopDate);
 
+    this.discoveryConfigService.setStarted(false);
+
     this.discoveryRequestID = null;
 
     const _millisecond = Math.abs(stopDate.getTime() - this.discoveryStartDate.getTime());
@@ -678,6 +682,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
     this.resultMsg.push(hostCount + '');
     this.resultMsg.push(serviceCount + '');
     this.resultMsg.push(hours + ':' + minutes + ':' + seconds);
+    this.stopping = false;
   }
 
   /**
diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts
index b2d80c6..2bda4fc 100644
--- a/src/app/pages/pages.component.ts
+++ b/src/app/pages/pages.component.ts
@@ -4,6 +4,7 @@ import {
 import { Router } from '@angular/router';
 import { DiscoverHost, Zone } from '@overflow/model/discovery';
 import { DiscoveryConfigService } from '../../commons/service/discovery-config.service';
+import { Subject } from 'rxjs';
 
 enum MenuOrientation {
   STATIC,
diff --git a/src/commons/component/host-detail.component.html b/src/commons/component/host-detail.component.html
index aa61312..82c5fa6 100644
--- a/src/commons/component/host-detail.component.html
+++ b/src/commons/component/host-detail.component.html
@@ -93,8 +93,8 @@
       <br />
       <p-progressSpinner *ngIf="pingWaiting"></p-progressSpinner>
 
-      <textarea style="width: 100%; height: 200px; background-color: black; color:#fff;" *ngIf="!pingWaiting && pingResult"
-        pInputTextarea autoResize="autoResize" [(ngModel)]="pingResult.raw"></textarea>
+      <textarea style="width: 100%; height: 250px; background-color: black; color:#fff;" *ngIf="!pingWaiting && pingResult"
+        pInputTextarea autoResize="autoResize" [(ngModel)]="pingResultRaw"></textarea>
 
     </p-tabPanel>
   </p-tabView>
diff --git a/src/commons/component/host-detail.component.ts b/src/commons/component/host-detail.component.ts
index 912f292..5b4b719 100644
--- a/src/commons/component/host-detail.component.ts
+++ b/src/commons/component/host-detail.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 
 import { of } from 'rxjs';
 import { map, catchError, take } from 'rxjs/operators';
@@ -14,8 +14,7 @@ import { ProbeService } from '../service/probe.service';
   templateUrl: './host-detail.component.html',
   styleUrls: ['./host-detail.component.scss'],
 })
-export class HostDetailComponent {
-
+export class HostDetailComponent implements OnChanges {
   @Input() host: Host;
 
   pingWaiting: boolean;
@@ -25,6 +24,7 @@ export class HostDetailComponent {
   deadline: number;
 
   pingResult: PingResult;
+  pingResultRaw: string;
 
   constructor(
     private probeService: ProbeService,
@@ -35,6 +35,11 @@ export class HostDetailComponent {
     this.deadline = 1;
   }
 
+  ngOnChanges(simpleChanges: SimpleChanges): void {
+    this.pingResult = null;
+  }
+
+
   doPing() {
     this.pingWaiting = true;
 
@@ -48,8 +53,10 @@ export class HostDetailComponent {
       .call<PingResult>('PingService.PingHost', this.host, option)
       .pipe(
         map((pingResult: PingResult) => {
+          console.log(pingResult);
           if (pingResult) {
             this.pingResult = pingResult;
+            this.pingResultRaw = pingResult.raw.join('');
           }
           this.pingWaiting = false;
         }),
diff --git a/src/commons/component/service-detail.component.html b/src/commons/component/service-detail.component.html
index fad9294..8975987 100644
--- a/src/commons/component/service-detail.component.html
+++ b/src/commons/component/service-detail.component.html
@@ -59,7 +59,7 @@
       </ul>
     </p-tabPanel>
 
-    <p-tabPanel header="Health">
+    <p-tabPanel header="Health" *ngIf="service.port.metaPortType.key === 'TCP'">
 
       <div class="ui-g-10 ui-g-offset-2">Count :
         <input type="number" pInputText [(ngModel)]="count" min="1" max="50">
@@ -71,20 +71,28 @@
         <input type="number" pInputText [(ngModel)]="deadline" min="1" max="10">
       </div>
 
-      <button type="button" pButton label="Ping" (click)="doPing()" class="ui-button-secondary ui-pingbn-position"></button>
+      <button type="button" pButton label="Ping" (click)="doPing()" class="ui-button-secondary"></button>
       <p-progressSpinner *ngIf="pingWaiting"></p-progressSpinner>
-      <div *ngIf="!pingWaiting && pingResult">
-        <ul>
-          <li *ngFor="let key of pingResult.responses | objectKeys">
-            <span *ngIf="pingResult.responses[key].error else value">
+      <p-table [value]="pingResult.responses | objectKeys" *ngIf="!pingWaiting && pingResult">
+        <ng-template pTemplate="header">
+          <tr>
+            <th style="width: 3.25em">No.</th>
+            <th>Response Time (ms)</th>
+          </tr>
+        </ng-template>
+        <ng-template pTemplate="body" let-key let-i="rowIndex">
+          <tr>
+            <td>
+              {{i + 1}}
+            </td>
+            <td>
+              {{pingResult.responses[key].time}}
               {{pingResult.responses[key].error}}
-            </span>
-            <ng-template #value>
-              Response time {{key}} : {{pingResult.responses[key].time}}ms
-            </ng-template>
-          </li>
-        </ul>
-      </div>
+            </td>
+          </tr>
+        </ng-template>
+      </p-table>
+
     </p-tabPanel>
 
   </p-tabView>
diff --git a/src/commons/component/service-detail.component.ts b/src/commons/component/service-detail.component.ts
index 56ded61..6c6fbfe 100644
--- a/src/commons/component/service-detail.component.ts
+++ b/src/commons/component/service-detail.component.ts
@@ -15,11 +15,13 @@ export class ServiceDetailComponent {
   @Input() service: Service;
   pingWaiting: boolean;
   pingResult: PingResult;
+  pingResultStr: string;
 
   count: number;
   interval: number;
   deadline: number;
 
+
   constructor(
     private probeService: ProbeService
   ) {
@@ -45,8 +47,8 @@ export class ServiceDetailComponent {
           console.log(pingResult);
           if (pingResult) {
             this.pingResult = pingResult;
+            this.pingWaiting = false;
           }
-          this.pingWaiting = false;
         }),
         catchError(error => {
           console.log(error);
@@ -58,5 +60,4 @@ export class ServiceDetailComponent {
       )
       .subscribe();
   }
-
 }
diff --git a/src/index.html b/src/index.html
index 951ed71..1d399e7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="utf-8">
-  <title>ElectronApp</title>
+  <title>overFlow</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">