diff --git a/src/packages/discovery/component/setting.1/filter/filter.component.html b/src/packages/discovery/component/setting.1/filter/filter.component.html new file mode 100644 index 0000000..51eb2cb --- /dev/null +++ b/src/packages/discovery/component/setting.1/filter/filter.component.html @@ -0,0 +1,66 @@ +
+
+
+
+ +
+
+ +
+
+ + + + +
+
+ + + + +
+
+ + +
+
+ +
+
+
+ TCP   + +
+
+ UDP   + +
+
+
+ +
+
+ + + + +
+ +
+ + + + +
+
+ +
+
+ +
+ + + +
+
+
\ No newline at end of file diff --git a/src/packages/discovery/component/setting.1/filter/filter.component.ts b/src/packages/discovery/component/setting.1/filter/filter.component.ts new file mode 100644 index 0000000..d101bbb --- /dev/null +++ b/src/packages/discovery/component/setting.1/filter/filter.component.ts @@ -0,0 +1,116 @@ +import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy, OnChanges, SimpleChanges } from '@angular/core'; +import * as CIDR from 'ip-cidr'; +import { Probe } from '@overflow/commons-typescript/model/probe'; +import { DiscoverZone, DiscoverPort, DiscoverService } from '@overflow/commons-typescript/model/discovery'; + +@Component({ + selector: 'of-discovery-filter', + templateUrl: './filter.component.html', +}) +export class FilterComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges { + + @Input() probe: Probe; + @Input() requestStart: boolean; + @Output() discoveryRequested = new EventEmitter(); + + private startIP: string; + private endIP: string; + private startPort: string; + private endPort: string; + private includeServices = []; + + private hostChecked = true; + private portChecked = true; + private serviceChecked = true; + private tcpChecked = true; + private udpChecked = true; + + constructor( + ) { + } + + ngOnInit() { + } + + ngAfterContentInit() { + } + + ngOnDestroy() { + } + + hostRange() { + if (!this.probe || this.probe === undefined) { + return; + } + const cidr = new CIDR(this.probe.cidr); + if (!cidr.isValid()) { + alert('Invalid cidr : ' + this.probe.cidr); + return; + } + this.startIP = cidr.addressStart.address; + this.endIP = cidr.addressEnd.address; + } + + portRange() { + this.startPort = '1'; + this.endPort = '1024'; + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes['probe']) { + this.hostRange(); + this.portRange(); + } + if (changes['requestStart'] && this.requestStart) { + this.onStart(); + } + } + + onPortCheckChange(serviceCheckbox, checked) { + if (!checked) { + serviceCheckbox.checked = false; + this.serviceChecked = false; + } + } + + onServiceCheckChange(portCheckbox, checked) { + if (checked) { + portCheckbox.checked = true; + this.portChecked = true; + } + } + + onStart() { + let discoverPort: DiscoverPort = null; + let discoverService: DiscoverService = null; + + if (this.serviceChecked) { + const services = new Array(); + for (const service of this.includeServices) { + services.push(service.description); // FIXME to const name + } + discoverService = { + includeServices: services, + }; + } + if (this.portChecked) { + discoverPort = { + firstScanRange: Number(this.startPort), + lastScanRange: Number(this.endPort), + includeTCP: this.tcpChecked, + includeUDP: this.udpChecked, + excludePorts: null, + discoverService: discoverService + }; + } + const discoverZone: DiscoverZone = { + discoverHost: { + firstScanRangev4: this.startIP, + lastScanRangev4: this.endIP, + discoverPort: discoverPort + }, + }; + + this.discoveryRequested.emit(discoverZone); + } +} diff --git a/src/packages/discovery/component/setting.1/filter/service-selector/service-selector.component.html b/src/packages/discovery/component/setting.1/filter/service-selector/service-selector.component.html new file mode 100644 index 0000000..8a0623a --- /dev/null +++ b/src/packages/discovery/component/setting.1/filter/service-selector/service-selector.component.html @@ -0,0 +1,10 @@ +
+ + +
+
{{crawler.description}}
+
+ + +
diff --git a/src/packages/discovery/component/setting.1/filter/service-selector/service-selector.component.ts b/src/packages/discovery/component/setting.1/filter/service-selector/service-selector.component.ts new file mode 100644 index 0000000..54d07bb --- /dev/null +++ b/src/packages/discovery/component/setting.1/filter/service-selector/service-selector.component.ts @@ -0,0 +1,52 @@ +import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core'; +import { Store, select, StateObservable } from '@ngrx/store'; +import { RPCClientError } from '@loafer/ng-rpc/protocol'; +import * as ListStore from 'packages/meta/crawler/store/list'; +import { ReadAllCrawlerSelector } from 'packages/meta/crawler/store'; +import { MetaCrawler } from '@overflow/commons-typescript/model/meta'; +import { Subscription } from 'rxjs/Subscription'; + +@Component({ + selector: 'of-service-selector', + templateUrl: './service-selector.component.html', +}) +export class ServiceSelectorComponent implements OnInit, AfterContentInit, OnDestroy { + + crawlersSubscription$: Subscription; + crawlers$: StateObservable; + crawlers: MetaCrawler[]; + @Output() crawlerSelected = new EventEmitter(); + @Input() includeServices; + + @Input() disabled: boolean; + + constructor( + private listStore: Store, + ) { + this.crawlers$ = listStore.pipe(select(ReadAllCrawlerSelector.select('metaCrawlerList'))); + } + + ngOnInit() { + this.crawlersSubscription$ = this.crawlers$.subscribe( + (list: MetaCrawler[]) => { + if (list !== null) { + this.crawlers = []; + this.includeServices = list; + } + }, + (error: RPCClientError) => { + console.log(error); + } + ); + } + + ngAfterContentInit() { + this.listStore.dispatch(new ListStore.ReadAll()); + } + + ngOnDestroy() { + if (this.crawlersSubscription$) { + this.crawlersSubscription$.unsubscribe(); + } + } +} diff --git a/src/packages/discovery/component/setting.1/probe-selector/probe-selector.component.html b/src/packages/discovery/component/setting.1/probe-selector/probe-selector.component.html new file mode 100644 index 0000000..c4b990d --- /dev/null +++ b/src/packages/discovery/component/setting.1/probe-selector/probe-selector.component.html @@ -0,0 +1,4 @@ +
+ +
\ No newline at end of file diff --git a/src/packages/discovery/component/setting.1/probe-selector/probe-selector.component.ts b/src/packages/discovery/component/setting.1/probe-selector/probe-selector.component.ts new file mode 100644 index 0000000..b838f40 --- /dev/null +++ b/src/packages/discovery/component/setting.1/probe-selector/probe-selector.component.ts @@ -0,0 +1,82 @@ +import { + Component, OnInit, Input, AfterContentInit, Output, + EventEmitter, OnDestroy, OnChanges, SimpleChanges, ViewChild +} from '@angular/core'; +import { Store, select, StateObservable } from '@ngrx/store'; +import { RPCClientError } from '@loafer/ng-rpc/protocol'; +import * as ListStore from 'packages/probe/store/list'; +import { ListSelector } from 'packages/probe/store'; +import { Subscription } from 'rxjs/Subscription'; +import { Probe } from '@overflow/commons-typescript/model/probe'; +import { AuthSelector } from 'packages/member/store'; +import { Domain } from '@overflow/commons-typescript/model/domain'; +import { Dropdown } from 'primeng/primeng'; + +@Component({ + selector: 'of-probe-selector', + templateUrl: './probe-selector.component.html', +}) +export class ProbeSelectorComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges { + + @Input() visible: boolean; + @Input() preProbe: Probe; + probesSubscription$: Subscription; + probes$: StateObservable; + probes: Probe[]; + + selected: Probe; + + @Output() probeSelected = new EventEmitter(); + + constructor( + private listStore: Store, + ) { + this.probes$ = listStore.pipe(select(ListSelector.select('probes'))); + } + + ngOnInit() { + this.probesSubscription$ = this.probes$.subscribe( + (list: Probe[]) => { + if (list !== null) { + this.probes = list; + } + }, + (error: RPCClientError) => { + console.log(error.response.message); + } + ); + } + + ngAfterContentInit() { + this.getProbes(); + } + + ngOnDestroy() { + if (this.probesSubscription$) { + this.probesSubscription$.unsubscribe(); + } + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes['visible']) { + this.selected = null; + this.getProbes(); + } + } + + getProbes() { + this.listStore.select(AuthSelector.select('domain')).subscribe( + (domain: Domain) => { + this.listStore.dispatch(new ListStore.ReadAllByDomain(domain)); + }, + (error) => { + console.log(error); + } + ); + } + + onProbeSelect(event) { + this.selected = event.value; + this.probeSelected.emit(this.selected); + } +} diff --git a/src/packages/discovery/component/setting.1/result/result.component.html b/src/packages/discovery/component/setting.1/result/result.component.html new file mode 100644 index 0000000..f09b77c --- /dev/null +++ b/src/packages/discovery/component/setting.1/result/result.component.html @@ -0,0 +1,11 @@ +
+
+ +
+ + + + + + +
diff --git a/src/packages/discovery/component/setting.1/result/result.component.ts b/src/packages/discovery/component/setting.1/result/result.component.ts new file mode 100644 index 0000000..a9bbfec --- /dev/null +++ b/src/packages/discovery/component/setting.1/result/result.component.ts @@ -0,0 +1,191 @@ +import { Component, OnInit, Input, AfterContentInit, Output, EventEmitter, OnDestroy } from '@angular/core'; +import { Store, select, StateObservable } from '@ngrx/store'; +import { RPCClientError } from '@loafer/ng-rpc/protocol'; +import { Subscription } from 'rxjs/Subscription'; +import { TreeNode } from 'primeng/primeng'; + +import * as DiscoveredStore from 'packages/discovery/store/setting'; +import { SettingSelector, DiscoverSelector } from 'packages/discovery/store'; +import * as DiscoverStore from 'packages/discovery/store/discover'; +import * as RegistStore from 'packages/discovery/store/regist'; + +import { Zone } from '@overflow/commons-typescript/model/discovery'; +import { Host } from '@overflow/commons-typescript/model/discovery'; +import { Port } from '@overflow/commons-typescript/model/discovery'; +import { Service } from '@overflow/commons-typescript/model/discovery'; + +@Component({ + selector: 'of-discovery-result', + templateUrl: './result.component.html', +}) +export class ResultComponent implements OnInit, AfterContentInit, OnDestroy { + + treeNodes = []; + selectedNodes = []; + zones: Map = null; + checkedSet = new Set(); + + resultSubscription$: Subscription; + result$: any; + startedSubscription$: Subscription; + started$: any; + endedSubscription$: Subscription; + ended$: any; + + inProgress = false; + + + selectedDiscoveryResult: TreeNode[]; + + constructor( + private discoverdStore: Store, + private discoverStore: Store, + private registStore: Store, + ) { + this.result$ = discoverStore.pipe(select(DiscoverSelector.select('zones'))); + this.started$ = discoverStore.pipe(select(DiscoverSelector.select('isStart'))); + this.ended$ = discoverStore.pipe(select(DiscoverSelector.select('isEnd'))); + } + + ngOnInit() { + alert('init'); + this.resultSubscription$ = this.result$.subscribe( + (zones: Map) => { + if (zones !== undefined && zones !== null) { + console.log(zones); + this.treeNodes = this.convertTreeViewZone(zones); + this.zones = zones; + } + }, + (error: RPCClientError) => { + console.log(error.response.message); + } + ); + this.startedSubscription$ = this.started$.subscribe( + (isStart: boolean) => { + if (isStart !== undefined && isStart !== null && isStart) { + this.inProgress = true; + console.log('##Discovery has started.##'); + } + }, + (error: RPCClientError) => { + console.log(error.response.message); + } + ); + this.endedSubscription$ = this.ended$.subscribe( + (isEnd: boolean) => { + if (isEnd !== undefined && isEnd !== null && isEnd) { + console.log('##Discovery has done.##'); + } + }, + (error: RPCClientError) => { + console.log(error.response.message); + } + ); + } + + ngAfterContentInit() { + } + + ngOnDestroy() { + if (this.startedSubscription$) { + this.startedSubscription$.unsubscribe(); + } + if (this.endedSubscription$) { + this.endedSubscription$.unsubscribe(); + } + if (this.resultSubscription$) { + this.resultSubscription$.unsubscribe(); + } + } + + save() { + } + + convertTreeViewZone(zones: Map) { + + if (zones === undefined || zones === null) { + return; + } + + const treeNodes: any[] = []; + + zones.forEach((value: Zone, key: string, map) => { + const jZone: any = { + label: 'Zone - ' + value.iface, + // className: 'cn' + value.ip, + expandedIcon: 'fa-folder-open', + collapsedIcon: 'fa-folder', + }; + jZone.obj = value; + jZone.children = this.convertViewHost(value.hosts); + treeNodes.push(jZone); + }); + + return treeNodes; + } + + convertViewHost(hosts): any[] { + if (hosts === undefined || hosts === null) { + return null; + } + const hostNodes: any[] = []; + + hosts.forEach((host, hostKey) => { + + const jHost: any = { + label: 'Host - ' + host.ipv4, + // className: 'cn' + host.ip + expandedIcon: 'fa-folder-open', + collapsedIcon: 'fa-folder', + }; + jHost.obj = host; + jHost.children = this.convertViewPort(host.ports); + hostNodes.push(jHost); + + }); + + return hostNodes; + + } + + convertViewPort(ports): any[] { + if (ports === undefined || ports === null || ports.size < 0) { + return null; + } + const portChildren: any[] = []; + ports.forEach((port, portKey) => { + const jPort: any = { + label: 'Port - ' + port.portNumber, + // className: 'cn' + port.portNumber, + expandedIcon: 'fa-folder-open', + collapsedIcon: 'fa-folder', + }; + jPort.obj = port; + jPort.children = this.convertViewService(port.services); + portChildren.push(jPort); + }); + + return portChildren; + } + + convertViewService(services): any[] { + if (services === undefined || services === null || services.size <= 0) { + return null; + } + const serviceChildren: any[] = []; + services.forEach((service, serviceKey) => { + const jService: any = { + label: 'Service - ' + service.serviceName, + // className: 'cn' + service.serviceName, + }; + jService.obj = service; + + serviceChildren.push(jService); + }); + + return serviceChildren; + } + + +} diff --git a/src/packages/discovery/component/setting.1/setting.component.html b/src/packages/discovery/component/setting.1/setting.component.html new file mode 100644 index 0000000..55844b4 --- /dev/null +++ b/src/packages/discovery/component/setting.1/setting.component.html @@ -0,0 +1,30 @@ +
+
+ +
+ +
+ + + + + + + +
+ + +
+
+ + + + +
+ + +
+ +
\ No newline at end of file diff --git a/src/packages/discovery/component/setting/setting.component.spec.ts b/src/packages/discovery/component/setting.1/setting.component.spec.ts similarity index 100% rename from src/packages/discovery/component/setting/setting.component.spec.ts rename to src/packages/discovery/component/setting.1/setting.component.spec.ts diff --git a/src/packages/discovery/component/setting.1/setting.component.ts b/src/packages/discovery/component/setting.1/setting.component.ts new file mode 100644 index 0000000..bd9c26a --- /dev/null +++ b/src/packages/discovery/component/setting.1/setting.component.ts @@ -0,0 +1,93 @@ +import { Component, OnInit, AfterContentInit, Output, EventEmitter, + Input, OnDestroy, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; +import { Store, select, StateObservable } from '@ngrx/store'; +import { RPCClientError } from '@loafer/ng-rpc/protocol'; +import { + DiscoveryStartInfo, + DiscoverZone, + Zone, + DiscoverPort, + DiscoverService +} from '@overflow/commons-typescript/model/discovery'; +import * as CIDR from 'ip-cidr'; +import * as DiscoveredStore from '../../store/setting'; +import { SettingSelector, DiscoverSelector } from '../../store'; +import * as DiscoverStore from '../../store/discover'; +import * as RegistStore from '../../store/regist'; +import { Host } from '@overflow/commons-typescript/model/discovery'; +import { Port } from '@overflow/commons-typescript/model/discovery'; +import { Service } from '@overflow/commons-typescript/model/discovery'; +import * as ProbeDetailStore from 'packages/probe/store'; +import { Probe } from '@overflow/commons-typescript/model/probe'; +import { TreeNode } from 'primeng/primeng'; +import { ListSelector as ProbeListSelector } from 'packages/probe/store'; +import * as ProbeListStore from 'packages/probe/store/list'; +import { AuthSelector } from 'packages/member/store'; +import { Domain } from '@overflow/commons-typescript/model/domain'; +import { Subscription } from 'rxjs/Subscription'; +import { ResultComponent } from './result/result.component'; + +@Component({ + selector: 'of-discovery-setting', + templateUrl: './setting.component.html', +}) +export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges { + + @Input() visible: boolean; + @Input() probe: Probe; + @Output() close = new EventEmitter(); + private requestStart = false; + private started = false; + + private selectedProbe: Probe; + private height: number; + + @ViewChild('resultComponent') resultComponent: ResultComponent; + + constructor( + private discoverStore: Store, + ) { + } + + ngOnInit() { + this.height = window.innerHeight * 0.9; + } + + ngAfterContentInit() { + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes['probe'] && this.probe) { + this.selectedProbe = this.probe; + } + } + + ngOnDestroy() { + } + + onProbeSelect(probe: Probe) { + this.selectedProbe = probe; + } + + onDiscoveryStart(discoverZone: DiscoverZone) { + this.discoverStore.dispatch(new DiscoverStore.DiscoverZone( + { probeID: this.selectedProbe.probeKey, discoverZone: discoverZone })); + + setTimeout(() => { + this.started = true; + this.requestStart = false; + }); + } + + onCancel() { + this.selectedProbe = null; + this.started = false; + this.close.emit(); + } + + onSave() { + this.resultComponent.ngOnInit(); + this.resultComponent.save(); + } + +} diff --git a/src/packages/discovery/component/setting/probe-selector/probe-selector.component.ts b/src/packages/discovery/component/setting/probe-selector/probe-selector.component.ts index b838f40..83432c9 100644 --- a/src/packages/discovery/component/setting/probe-selector/probe-selector.component.ts +++ b/src/packages/discovery/component/setting/probe-selector/probe-selector.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, Input, AfterContentInit, Output, - EventEmitter, OnDestroy, OnChanges, SimpleChanges, ViewChild + EventEmitter, OnDestroy, ViewChild } from '@angular/core'; import { Store, select, StateObservable } from '@ngrx/store'; import { RPCClientError } from '@loafer/ng-rpc/protocol'; @@ -16,14 +16,12 @@ import { Dropdown } from 'primeng/primeng'; selector: 'of-probe-selector', templateUrl: './probe-selector.component.html', }) -export class ProbeSelectorComponent implements OnInit, AfterContentInit, OnDestroy, OnChanges { +export class ProbeSelectorComponent implements OnInit, AfterContentInit, OnDestroy { - @Input() visible: boolean; @Input() preProbe: Probe; probesSubscription$: Subscription; probes$: StateObservable; probes: Probe[]; - selected: Probe; @Output() probeSelected = new EventEmitter(); @@ -55,13 +53,8 @@ export class ProbeSelectorComponent implements OnInit, AfterContentInit, OnDestr if (this.probesSubscription$) { this.probesSubscription$.unsubscribe(); } - } - - ngOnChanges(changes: SimpleChanges): void { - if (changes['visible']) { - this.selected = null; - this.getProbes(); - } + this.selected = null; + this.probes = null; } getProbes() { diff --git a/src/packages/discovery/component/setting/result/result.component.html b/src/packages/discovery/component/setting/result/result.component.html index 30e94dd..f09b77c 100644 --- a/src/packages/discovery/component/setting/result/result.component.html +++ b/src/packages/discovery/component/setting/result/result.component.html @@ -9,10 +9,3 @@ - -
-
- - -
-
\ No newline at end of file diff --git a/src/packages/discovery/component/setting/result/result.component.ts b/src/packages/discovery/component/setting/result/result.component.ts index 28775bd..9e741b7 100644 --- a/src/packages/discovery/component/setting/result/result.component.ts +++ b/src/packages/discovery/component/setting/result/result.component.ts @@ -20,8 +20,6 @@ import { Service } from '@overflow/commons-typescript/model/discovery'; }) export class ResultComponent implements OnInit, AfterContentInit, OnDestroy { - @Output() close = new EventEmitter(); - treeNodes = []; selectedNodes = []; zones: Map = null; @@ -50,7 +48,6 @@ export class ResultComponent implements OnInit, AfterContentInit, OnDestroy { } ngOnInit() { - this.resultSubscription$ = this.result$.subscribe( (zones: Map) => { if (zones !== undefined && zones !== null) { @@ -101,8 +98,7 @@ export class ResultComponent implements OnInit, AfterContentInit, OnDestroy { } } - onCancel() { - this.close.emit(); + save() { } convertTreeViewZone(zones: Map) { diff --git a/src/packages/discovery/component/setting/setting.component.html b/src/packages/discovery/component/setting/setting.component.html index 085609b..7c8d856 100644 --- a/src/packages/discovery/component/setting/setting.component.html +++ b/src/packages/discovery/component/setting/setting.component.html @@ -1,21 +1,30 @@ -
- -
- -
- - - - - - - +
- - +
-
- - - \ No newline at end of file +
+ + + + + + + +
+ + +
+
+ + + + +
+ + +
+ +
\ No newline at end of file diff --git a/src/packages/discovery/component/setting/setting.component.ts b/src/packages/discovery/component/setting/setting.component.ts index e8bd1ac..59d7f1d 100644 --- a/src/packages/discovery/component/setting/setting.component.ts +++ b/src/packages/discovery/component/setting/setting.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit, AfterContentInit, Output, EventEmitter, Input, OnDestroy, OnChanges, SimpleChanges } from '@angular/core'; +import { Component, OnInit, AfterContentInit, Output, EventEmitter, + Input, OnDestroy, OnChanges, SimpleChanges, ViewChild } from '@angular/core'; import { Store, select, StateObservable } from '@ngrx/store'; import { RPCClientError } from '@loafer/ng-rpc/protocol'; import { @@ -24,6 +25,9 @@ import * as ProbeListStore from 'packages/probe/store/list'; import { AuthSelector } from 'packages/member/store'; import { Domain } from '@overflow/commons-typescript/model/domain'; import { Subscription } from 'rxjs/Subscription'; +import { ResultComponent } from './result/result.component'; +import { ProbeSelectorComponent } from './probe-selector/probe-selector.component'; +import { FilterComponent } from './filter/filter.component'; @Component({ selector: 'of-discovery-setting', @@ -40,25 +44,65 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On private selectedProbe: Probe; private height: number; + @ViewChild('probeSelectorComponent') probeSelectorComponent: ProbeSelectorComponent; + @ViewChild('filterComponent') filterComponent: FilterComponent; + @ViewChild('resultComponent') resultComponent: ResultComponent; + constructor( private discoverStore: Store, ) { } ngOnInit() { - this.height = window.innerHeight; + this.selectedProbe = this.probe; + this.height = window.innerHeight * 0.9; } ngAfterContentInit() { } ngOnChanges(changes: SimpleChanges): void { - if (changes['probe'] && this.probe) { - this.selectedProbe = this.probe; + if (changes['visible']) { + const change = changes['visible']; + if (!change.previousValue && change.currentValue) { + this.initAll(); + } else if (change.previousValue && !change.currentValue) { + this.destroyAll(); + } } } ngOnDestroy() { + this.selectedProbe = null; + this.started = false; + this.close.emit(); + this.requestStart = false; + } + + initAll() { + this.ngOnInit(); + if (this.probeSelectorComponent) { + this.probeSelectorComponent.ngOnInit(); + } + if (this.filterComponent) { + this.filterComponent.ngOnInit(); + } + if (this.resultComponent) { + this.resultComponent.ngOnInit(); + } + } + + destroyAll() { + this.ngOnDestroy(); + if (this.probeSelectorComponent) { + this.probeSelectorComponent.ngOnDestroy(); + } + if (this.filterComponent) { + this.filterComponent.ngOnDestroy(); + } + if (this.resultComponent) { + this.resultComponent.ngOnDestroy(); + } } onProbeSelect(probe: Probe) { @@ -66,6 +110,7 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On } onDiscoveryStart(discoverZone: DiscoverZone) { + console.log('DiscoveryStart requested'); this.discoverStore.dispatch(new DiscoverStore.DiscoverZone( { probeID: this.selectedProbe.probeKey, discoverZone: discoverZone })); @@ -76,9 +121,11 @@ export class SettingComponent implements OnInit, AfterContentInit, OnDestroy, On } onCancel() { - this.selectedProbe = null; - this.started = false; - this.close.emit(); + this.destroyAll(); + } + + onSave() { + this.resultComponent.save(); } }