This commit is contained in:
insanity
2018-05-28 18:58:13 +09:00
parent 312ea95f07
commit 14a4acb784
35 changed files with 159 additions and 269 deletions

View File

@@ -2,14 +2,14 @@
<!-- <div class="ui-g-12">
<p-panel [showHeader]="false" >Temp Area</p-panel>
</div> -->
<div class="ui-g">
<div class="ui-g-12 ui-md-3">
<p-accordion (onClose)="onTabClose($event)" (onOpen)="OnTabOpen($event)">
<p-accordionTab header="Probe Select Area" [selected]="true">
<of-probe-selector
[preProbe]="probeHosts"
(probeSelected)="onSelectedProbe($event)"
></of-probe-selector>
<!-- <of-probe-selector
[preProbe]="selectedProbeHost"
[probeHosts]="probeHosts"></of-probe-selector> -->
</p-accordionTab>
<p-accordionTab header="Discovery Search Config Area" >
<of-discovery-search-config

View File

@@ -2,7 +2,7 @@ import {
AfterContentInit, Component, Input,
OnInit
} from '@angular/core';
import {Probe} from '@overflow/commons-typescript/model/probe';
import { Probe, ProbeHost } from '@overflow/commons-typescript/model/probe';
@Component({
selector: 'of-discovery',
@@ -10,16 +10,19 @@ import {Probe} from '@overflow/commons-typescript/model/probe';
})
export class DiscoveryComponent implements OnInit, AfterContentInit {
@Input() probeHosts;
@Input() probeHostID: number;
private tabIdx: number;
selectedProbe: Probe;
selectedProbeHost: ProbeHost;
constructor(
) {
}
ngOnInit() {
// if (this.probeHostID) {
// this.selectedProbeHost = this.probeHosts.find(probeHost => probeHost.id === this.probeHostID);
// }
}
ngAfterContentInit() {
@@ -43,7 +46,7 @@ export class DiscoveryComponent implements OnInit, AfterContentInit {
onSelectedProbe(probe) {
console.log(probe);
this.selectedProbe = probe;
// this.selectedProbe = probe;
}
onProbeSelect(probe) {

View File

@@ -1,9 +0,0 @@
<div *ngIf="!preProbe">
<p-dropdown #dropdown [options]="probes"
optionLabel="displayName"
placeholder="Select a Probe"
[(ngModel)]="selected"
(onChange)="onProbeSelect($event)"
[style]="{'width':'100%'}">
</p-dropdown>
</div>

View File

@@ -1,59 +0,0 @@
import {
Component, OnInit, Input, AfterContentInit, Output,
EventEmitter, OnDestroy, ViewChild
} from '@angular/core';
import { Subscription } from 'rxjs/Subscription';
import {Probe, ProbeHost} from '@overflow/commons-typescript/model/probe';
@Component({
selector: 'of-probe-selector',
templateUrl: './probe-selector.component.html',
})
export class ProbeSelectorComponent implements OnInit, AfterContentInit, OnDestroy {
@Input() preProbe: ProbeHost;
probes: Probe[];
selected: Probe;
@Output() probeSelected = new EventEmitter<Probe>();
constructor(
) {
}
ngOnInit() {
}
ngAfterContentInit() {
this.getProbes();
}
ngOnDestroy() {
this.selected = null;
this.probes = null;
}
getProbes() {
}
onProbeSelect(event) {
this.selected = event.value;
this.probeSelected.emit(this.selected);
}
registerOnChange(fn: any): void {
}
registerOnTouched(fn: any): void {
}
setDisabledState(isDisabled: boolean): void {
}
writeValue(obj: any): void {
}
}

View File

@@ -1,4 +1,3 @@
import { ProbeSelectorComponent } from './discovery/probe-selector/probe-selector.component';
import { ServiceSelectorComponent } from './discovery/service-selector/service-selector.component';
import { DiscoveryComponent } from './discovery/discovery.component';
import { SearchConfigComponent } from './discovery/search-config/search-config.component';
@@ -8,7 +7,6 @@ import { IpInputComponent } from './discovery/search-config/ip-input.component';
export const COMPONENTS = [
ServiceSelectorComponent,
ProbeSelectorComponent,
DiscoveryComponent,
SearchConfigComponent,
SearchFilterComponent,