From c58c5d98b180d03baeb190239e2ef1eea6979dba Mon Sep 17 00:00:00 2001 From: geek Date: Fri, 25 May 2018 20:17:42 +0900 Subject: [PATCH] ing --- .../discovery/discovery-container.component.html | 2 +- .../discovery/discovery-container.component.ts | 10 +++++----- @overflow/discovery/discovery.module.ts | 5 ++++- src/app/pages/discovery/discovery-page.component.html | 3 ++- src/app/pages/discovery/discovery-page.component.ts | 6 ++++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/@overflow/discovery/container/discovery/discovery-container.component.html b/@overflow/discovery/container/discovery/discovery-container.component.html index 8b13789..2a56852 100644 --- a/@overflow/discovery/container/discovery/discovery-container.component.html +++ b/@overflow/discovery/container/discovery/discovery-container.component.html @@ -1 +1 @@ - + diff --git a/@overflow/discovery/container/discovery/discovery-container.component.ts b/@overflow/discovery/container/discovery/discovery-container.component.ts index 257669e..7218e90 100644 --- a/@overflow/discovery/container/discovery/discovery-container.component.ts +++ b/@overflow/discovery/container/discovery/discovery-container.component.ts @@ -1,9 +1,8 @@ import { - AfterContentInit, Component, + AfterContentInit, Component, Input, OnInit } from '@angular/core'; import { select, StateObservable } from '@ngrx/store'; -import { ListSelector } from '../../../probe/store'; import { ActivatedRoute } from '@angular/router'; @Component({ @@ -17,13 +16,14 @@ export class DiscoveryContainerComponent implements OnInit, AfterContentInit { // discovery start // discovery stop // get service list - probes$: StateObservable; + @Input() hostID; constructor( private activatedRoute: ActivatedRoute, ) { - // this.returnURL = this.activatedRoute.snapshot.queryParams['probe'] || null; - // this.probes$ = listStore.pipe(select(ListSelector.select('probes'))); + if (this.hostID > 0 && this.hostID !== undefined ) { + console.log('ddddddddddddddddddddddddddddddddddddddd'); + } } ngOnInit() { diff --git a/@overflow/discovery/discovery.module.ts b/@overflow/discovery/discovery.module.ts index 68abde6..7bbff37 100644 --- a/@overflow/discovery/discovery.module.ts +++ b/@overflow/discovery/discovery.module.ts @@ -10,6 +10,7 @@ import { COMPONENTS } from './component'; import { SERVICES } from './service'; import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module'; import { KeyValueModule } from '@overflow/commons/component/key-value/key-value.module'; +import { CONTAINER_COMPONENTS } from './container'; @NgModule({ imports: [ @@ -23,10 +24,12 @@ import { KeyValueModule } from '@overflow/commons/component/key-value/key-value. KeyValueModule ], declarations: [ - COMPONENTS + COMPONENTS, + CONTAINER_COMPONENTS ], exports: [ COMPONENTS, + CONTAINER_COMPONENTS ], providers: [ SERVICES, diff --git a/src/app/pages/discovery/discovery-page.component.html b/src/app/pages/discovery/discovery-page.component.html index 28b4a80..07af687 100644 --- a/src/app/pages/discovery/discovery-page.component.html +++ b/src/app/pages/discovery/discovery-page.component.html @@ -2,7 +2,8 @@
- + +
diff --git a/src/app/pages/discovery/discovery-page.component.ts b/src/app/pages/discovery/discovery-page.component.ts index 0fbf1c3..c13da36 100644 --- a/src/app/pages/discovery/discovery-page.component.ts +++ b/src/app/pages/discovery/discovery-page.component.ts @@ -7,14 +7,16 @@ import { ActivatedRoute } from '@angular/router'; }) export class DiscoveryPageComponent implements OnInit { + hostId: number; + constructor( private route: ActivatedRoute ) { } ngOnInit() { this.route.params.subscribe((params: any) => { - const probeHostID = params['probeHostID']; - console.log('probeHostID : ' + probeHostID); + this.hostId = params['probeHostID']; + // console.log('probeHostID : ' + probeHostID); }); } }