diff --git a/@overflow/discovery/component/discovery/discovery.component.html b/@overflow/discovery/component/discovery/discovery.component.html index 9545643..9f0e5c1 100644 --- a/@overflow/discovery/component/discovery/discovery.component.html +++ b/@overflow/discovery/component/discovery/discovery.component.html @@ -6,7 +6,7 @@
- + @@ -16,7 +16,7 @@
- +
diff --git a/@overflow/discovery/component/discovery/discovery.component.ts b/@overflow/discovery/component/discovery/discovery.component.ts index 410f270..487f8be 100644 --- a/@overflow/discovery/component/discovery/discovery.component.ts +++ b/@overflow/discovery/component/discovery/discovery.component.ts @@ -2,6 +2,7 @@ import { AfterContentInit, Component, OnInit } from '@angular/core'; +import {Probe} from '@overflow/commons-typescript/model/probe'; @Component({ selector: 'of-discovery', @@ -10,6 +11,7 @@ import { export class DiscoveryComponent implements OnInit, AfterContentInit { private tabIdx: number; + selectedProbe: Probe; constructor( ) { @@ -36,4 +38,9 @@ export class DiscoveryComponent implements OnInit, AfterContentInit { onDiscoveryStart() { console.log('dddddddddddddd'); } + + onSelectedProbe(probe) { + console.log(probe); + this.selectedProbe = probe; + } } diff --git a/@overflow/discovery/component/discovery/search-config/search-config.component.html b/@overflow/discovery/component/discovery/search-config/search-config.component.html index d34b4cb..d546eb4 100644 --- a/@overflow/discovery/component/discovery/search-config/search-config.component.html +++ b/@overflow/discovery/component/discovery/search-config/search-config.component.html @@ -4,8 +4,12 @@
-
-
+
+ +
+
+ +
@@ -45,6 +49,15 @@
+
+
+ +
+
+ +
+
+
Start Port : - diff --git a/@overflow/discovery/component/discovery/search-config/search-config.component.ts b/@overflow/discovery/component/discovery/search-config/search-config.component.ts index cc34ea6..24b6c5c 100644 --- a/@overflow/discovery/component/discovery/search-config/search-config.component.ts +++ b/@overflow/discovery/component/discovery/search-config/search-config.component.ts @@ -14,16 +14,19 @@ import { export class SearchConfigComponent implements OnInit, AfterContentInit { @Output() discoverySearchStartClick = new EventEmitter(); + @Output() selectProbe = new EventEmitter(); discoveryFormGroup: FormGroup; - private ipVesion: string; - private startIP: string; - private endIP: string; - private excludeIP: string; - private startPort: string; - private endPort: string; - private excludePort: string; + ipVesion: number; + portType: number; + + startIP: string; + endIP: string; + excludeIP: string; + startPort: string; + endPort: string; + excludePort: string; constructor( private formBuilder: FormBuilder, @@ -31,7 +34,8 @@ export class SearchConfigComponent implements OnInit, AfterContentInit { } ngOnInit() { - this.ipVesion = '0'; + this.ipVesion = 0; + this.portType = 0; this.initForm(); } @@ -48,7 +52,8 @@ export class SearchConfigComponent implements OnInit, AfterContentInit { this.discoverySearchStartClick.emit(); } - onProbeSelect(event) { - + onProbeSelect(probe) { + console.log(probe); + this.selectProbe.emit(probe); } } diff --git a/@overflow/discovery/component/discovery/search-filter/search-filter.component.html b/@overflow/discovery/component/discovery/search-filter/search-filter.component.html index 34de10b..5e10c33 100644 --- a/@overflow/discovery/component/discovery/search-filter/search-filter.component.html +++ b/@overflow/discovery/component/discovery/search-filter/search-filter.component.html @@ -1,15 +1,29 @@
- Start IP Address : - - - End IP Address : - + Start IP Adress + +
+ + . + + . + + . + +
- Start Port : - - - End Port : - + End IP Adress + +
+ + . + + . + + . + +
diff --git a/@overflow/discovery/component/discovery/search-result/search-result.component.html b/@overflow/discovery/component/discovery/search-result/search-result.component.html index 8735173..64d4e1a 100644 --- a/@overflow/discovery/component/discovery/search-result/search-result.component.html +++ b/@overflow/discovery/component/discovery/search-result/search-result.component.html @@ -1,4 +1,36 @@ -
- discovery Search Filter List Print +
+
+ +
+
+ Name + + {{probe.displayName}} + +
+
+ +
+ +
+
+
+ Description + + {{probe.description}} + +
+
+
+ Key + {{probe.probeKey}} +
+
+ +
+
+ +
+
diff --git a/@overflow/discovery/component/discovery/search-result/search-result.component.ts b/@overflow/discovery/component/discovery/search-result/search-result.component.ts index b907350..d75bd4a 100644 --- a/@overflow/discovery/component/discovery/search-result/search-result.component.ts +++ b/@overflow/discovery/component/discovery/search-result/search-result.component.ts @@ -1,7 +1,8 @@ import { - AfterContentInit, Component, + AfterContentInit, Component, Input, OnInit } from '@angular/core'; +import { Probe } from '@overflow/commons-typescript/model/probe'; @Component({ selector: 'of-discovery-search-result', @@ -9,6 +10,7 @@ import { }) export class SearchResultComponent implements OnInit, AfterContentInit { + @Input() probe: Probe; constructor( ) { diff --git a/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html b/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html index c4b990d..5b466ff 100644 --- a/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html +++ b/@overflow/discovery/component/setting/probe-selector/probe-selector.component.html @@ -1,4 +1,9 @@
- -
\ No newline at end of file + + +