From bab2dbfb9436aede49d05d32b1751afff73b6fa6 Mon Sep 17 00:00:00 2001
From: insanity <insanity@loafle.com>
Date: Wed, 12 Sep 2018 20:18:38 +0900
Subject: [PATCH] test

---
 @overflow/model/discovery/Zone.ts             |  2 +
 src/app/pages/home/home-page.component.ts     | 42 ++++++++++++++++++-
 .../component/host-detail.component.html      |  9 +++-
 .../component/host-detail.component.ts        |  3 --
 .../component/zone-detail.component.html      | 12 ++++--
 .../component/zone-detail.component.ts        |  2 -
 6 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/@overflow/model/discovery/Zone.ts b/@overflow/model/discovery/Zone.ts
index 2e15c1e..54c587b 100644
--- a/@overflow/model/discovery/Zone.ts
+++ b/@overflow/model/discovery/Zone.ts
@@ -11,4 +11,6 @@ export interface Zone {
   meta?: Map<string, Map<string, string>>;
   discoveredBy?: string[];
   discoveredDate?: Date;
+
+  hostList?: Host[];
 }
diff --git a/src/app/pages/home/home-page.component.ts b/src/app/pages/home/home-page.component.ts
index 79958d3..a574c16 100644
--- a/src/app/pages/home/home-page.component.ts
+++ b/src/app/pages/home/home-page.component.ts
@@ -5,7 +5,6 @@ import { Component, OnInit, OnDestroy, ViewChild, ElementRef, ChangeDetectorRef
 import { ProbeService, requesterID } from '../../../commons/service/probe.service';
 
 import { Zone, Host, Port, Service, DiscoverHost } from '@overflow/model/discovery';
-import { toMetaIPType, MetaIPTypeEnum } from '@overflow/model/meta';
 
 import { RPCSubscriber } from '@overflow/commons/ui/decorator/RPCSubscriber';
 import { DiscoveryConfigService } from '../../../commons/service/discovery-config.service';
@@ -45,6 +44,9 @@ export class HomePageComponent implements OnInit, OnDestroy {
   private links: Link[];
   public simulation: d3.Simulation<Node, Link> | undefined;
 
+  hosts: Host[];
+  ports: Port[];
+
   constructor(
     private changeDetector: ChangeDetectorRef,
     private probeService: ProbeService,
@@ -52,6 +54,8 @@ export class HomePageComponent implements OnInit, OnDestroy {
   ) {
     this.nodes = [];
     this.links = [];
+    this.hosts = [];
+    this.ports = [];
   }
 
   ngOnInit() {
@@ -245,8 +249,30 @@ export class HomePageComponent implements OnInit, OnDestroy {
 
   onTargetClick(node: Node) {
     console.log(node);
-
     this.displaySidebar = true;
+
+    switch (node.group) {
+      case 'zone':
+        var zone: Zone = node.target;
+        zone.hostList = [];
+        this.hosts.forEach(host => {
+          if (host.zone.network === zone.network) {
+            zone.hostList.push(host);
+          }
+        });
+        break;
+      case 'host':
+        var host: Host = node.target;
+        host.portList = [];
+        this.ports.forEach(port => {
+          if (port.host.address === host.address) {
+            host.portList.push(port);
+          }
+        });
+        break;
+      default:
+        break;
+    }
     this.selectedNode = node;
   }
 
@@ -307,6 +333,17 @@ export class HomePageComponent implements OnInit, OnDestroy {
   @RPCSubscriber({ method: 'DiscoveryService.DiscoveredHost' })
   public DiscoveredHost(host: Host) {
     console.log('DiscoveredHost', host);
+    var dup = false;
+    this.hosts.forEach((item) => {
+      if (item.address === host.address) {
+        dup = true;
+        return;
+      }
+    });
+    if (!dup) {
+      this.hosts.push(host);
+    }
+
     const hostId = `${host.address}`;
     const zoneNode = this.getNode('192.168.1.0/24');
 
@@ -334,6 +371,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
   @RPCSubscriber({ method: 'DiscoveryService.DiscoveredPort' })
   public DiscoveredPort(port: Port) {
     console.log('DiscoveredPort', port);
+    this.ports.push(port);
   }
 
   /**
diff --git a/src/commons/component/host-detail.component.html b/src/commons/component/host-detail.component.html
index 3e3be3a..15e6ea5 100644
--- a/src/commons/component/host-detail.component.html
+++ b/src/commons/component/host-detail.component.html
@@ -65,6 +65,11 @@
     </p-tabPanel>
 
     <p-tabPanel header="Ports" *ngIf="host.portList">
-      <p-listbox [options]="ports" [(ngModel)]="selectedPort" optionLabel="name"></p-listbox>
+      <ul class="key-value">
+        <li *ngFor="let port of host.portList">
+          <span class="meta-value">{{port.portNumber}} ({{port.metaPortType.key}})</span>
+        </li>
+      </ul>
     </p-tabPanel>
-  </p-tabView>
\ No newline at end of file
+  </p-tabView>
+</div>
\ No newline at end of file
diff --git a/src/commons/component/host-detail.component.ts b/src/commons/component/host-detail.component.ts
index 8e7177f..7719a92 100644
--- a/src/commons/component/host-detail.component.ts
+++ b/src/commons/component/host-detail.component.ts
@@ -10,9 +10,6 @@ import { Host, Port } from '@overflow/model/discovery';
 export class HostDetailComponent {
 
   @Input() host: Host;
-  ports: Port[];
-  selectedPort: Port;
-  discoveredBy: string;
 
   constructor(
   ) {
diff --git a/src/commons/component/zone-detail.component.html b/src/commons/component/zone-detail.component.html
index 0142e36..d40f9dc 100644
--- a/src/commons/component/zone-detail.component.html
+++ b/src/commons/component/zone-detail.component.html
@@ -45,10 +45,14 @@
 
       </ul>
 
-    </p-tabPanel>
-    <p-tabPanel header="Host">
-      <p-listbox [options]="hosts" [(ngModel)]="selectedHost" optionLabel="name"></p-listbox>
-    </p-tabPanel>
+      <p-tabPanel header="Hosts">
+        <ul class="key-value">
+          <li *ngFor="let host of zone.hostList">
+            <span class="meta-value">{{host.address}}</span> <span *ngIf="host.name" class="meta-value">
+              ({{host.name}})</span>
+          </li>
+        </ul>
+      </p-tabPanel>
   </p-tabView>
 
 </div>
\ No newline at end of file
diff --git a/src/commons/component/zone-detail.component.ts b/src/commons/component/zone-detail.component.ts
index 6c96099..faa5fd2 100644
--- a/src/commons/component/zone-detail.component.ts
+++ b/src/commons/component/zone-detail.component.ts
@@ -12,8 +12,6 @@ export class ZoneDetailComponent implements OnInit {
 
   @Input() zone: Zone;
   ipRange: string;
-  hosts: Host[];
-  selectedHost: Host;
 
   constructor(
   ) {