in progress

@overflow/discovery/component/discovery/discovery.component.html

@@ -1,15 +1,20 @@
-<h1>Discovery</h1>
+<div class="ui-g">
+  <div class="ui-g-12 ui-md-3">
+      <of-discovery-search-config (discoverySearchStartClick)="onDiscoveryStart()"></of-discovery-search-config>
+  </div>
+  <div class="ui-g-12 ui-md-9">
+    bb
+  </div>
+</div>
+
 <!-- <div class="ui-g-12">
   <p-panel [showHeader]="false" >Temp Area</p-panel>
 </div> -->
 
-<div class="ui-g">
+<!-- <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]="selectedProbeHost"
-          [probeHosts]="probeHosts"></of-probe-selector> -->
       </p-accordionTab>
       <p-accordionTab header="Discovery Search Config Area" >
         <of-discovery-search-config
@@ -27,4 +32,4 @@
       <of-discovery-search-result [probe]="selectedProbe"></of-discovery-search-result>
     </p-panel>
   </div>
-</div>
+</div> -->

@overflow/discovery/component/discovery/discovery.component.ts

@@ -1,6 +1,5 @@
 import {
-  AfterContentInit, Component, Input,
+  Component, Input,
-  OnInit
 } from '@angular/core';
 import { Probe, ProbeHost } from '@overflow/commons-typescript/model/probe';
 
@@ -8,48 +7,14 @@ import { Probe, ProbeHost } from '@overflow/commons-typescript/model/probe';
   selector: 'of-discovery',
   templateUrl: './discovery.component.html',
 })
-export class DiscoveryComponent implements OnInit, AfterContentInit {
+export class DiscoveryComponent  {
-
-  @Input() probeHostID: number;
 
   private tabIdx: number;
-  selectedProbeHost: ProbeHost;
+  @Input() selectedProbe: ProbeHost;
 
   constructor(
   ) {
   }
 
-  ngOnInit() {
-    // if (this.probeHostID) {
-    //   this.selectedProbeHost = this.probeHosts.find(probeHost => probeHost.id === this.probeHostID);
-    // }
-  }
 
-  ngAfterContentInit() {
-  }
-
-  onTabClose(event) {
-
-  }
-
-  OnTabOpen(event) {
-    this.tabIdx = event.index;
-  }
-
-  onFilterResultOpen() {
-
-  }
-
-  onDiscoveryStart() {
-    console.log('dddddddddddddd');
-  }
-
-  onSelectedProbe(probe) {
-    console.log(probe);
-    // this.selectedProbe = probe;
-  }
-
-  onProbeSelect(probe) {
-    console.log(probe);
-  }
 }

@overflow/discovery/component/discovery/search-config/search-config.component.ts

@@ -14,7 +14,7 @@ import {
 export class SearchConfigComponent implements OnInit, AfterContentInit {
 
   @Output() discoverySearchStartClick = new EventEmitter();
-  @Output() selectProbe = new EventEmitter();
+  @Output() selectedProbe = new EventEmitter();
 
   includeServices = [];
 

@overflow/discovery/component/discovery/search-result/search-result.component.ts

@@ -10,7 +10,7 @@ import { Probe } from '@overflow/commons-typescript/model/probe';
 })
 export class SearchResultComponent implements OnInit, AfterContentInit {
 
-  @Input() probe: Probe;
+  @Input() selectedProbe: Probe;
 
   constructor(
   ) {

@overflow/discovery/container/discovery/discovery-container.component.html

@@ -1,2 +1,2 @@
-<of-probe-selector-container [probeHostID]="probeHostID"></of-probe-selector-container>
+<of-probe-selector-container [probeHostID]="probeHostID" (select)="selectedProbe = $event"></of-probe-selector-container>
-<of-discovery [probeHostID]="probeHostID"></of-discovery>
+<of-discovery [selectedProbe]="selectedProbe"></of-discovery>

@overflow/discovery/container/discovery/discovery-container.component.ts

@@ -2,6 +2,7 @@ import {
   Component,
   Input,
 } from '@angular/core';
+import { ProbeHost } from '@overflow/commons-typescript/model/probe';
 
 @Component({
   selector: 'of-discovery-container',
@@ -10,10 +11,10 @@ import {
 export class DiscoveryContainerComponent {
 
   @Input() probeHostID;
+  selectedProbe: ProbeHost;
 
   constructor(
   ) {
   }
 
-
 }

@overflow/probe/component/selector/selector.component.html

@@ -1 +1,5 @@
-<p-dropdown *ngIf="probeHosts.length > 0" [options]="options" [(ngModel)]="selected" optionLabel="displayName" placeholder="Select a Probe"></p-dropdown>
+<div *ngIf="probeHostID else dropdown"></div>
+<ng-template #dropdown>
+  <p-dropdown *ngIf="options.length > 0" [options]="options" [(ngModel)]="selected" optionLabel="displayName" placeholder="Select a Probe"
+    (onChange)="onSelect($event.data)"></p-dropdown>
+</ng-template>

@overflow/probe/component/selector/selector.component.ts

@@ -1,11 +1,11 @@
-import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, Input, Output, EventEmitter, OnChanges, SimpleChanges, OnInit } from '@angular/core';
 import { ProbeHost, Probe } from '@overflow/commons-typescript/model/probe';
 
 @Component({
   selector: 'of-probe-selector',
   templateUrl: './selector.component.html',
 })
-export class ProbeSelectorComponent implements OnChanges {
+export class ProbeSelectorComponent implements OnInit, OnChanges {
 
   @Output() select = new EventEmitter<ProbeHost>();
   @Input() probeHosts: ProbeHost[];
@@ -16,6 +16,10 @@ export class ProbeSelectorComponent implements OnChanges {
   constructor() {
   }
 
+  ngOnInit() {
+    this.onPreselected();
+  }
+
   ngOnChanges(changes: SimpleChanges): void {
     this.options = [];
     for (const ph of this.probeHosts) {
@@ -23,7 +27,16 @@ export class ProbeSelectorComponent implements OnChanges {
     }
   }
 
-  onProbeSelect(event) {
+  onPreselected() {
-    this.select.emit(event.data);
+    if (this.probeHostID) {
+      const preselected: ProbeHost = this.probeHosts.find(probeHost => probeHost.id === this.probeHostID);
+      this.select.emit(preselected);
     }
+  }
+
+  onSelect(probe: Probe) {
+    const optionselected = this.probeHosts.find(probeHost => probeHost.id === probe.id);
+    this.select.emit(optionselected);
+  }
+
 }

@overflow/probe/container/probe-selector-container.component.html

@@ -1 +1 @@
-<of-probe-selector (select)="onSelect($event)" [probeHosts]="probeHosts$ | async" [probeHostID]="probeHostID"></of-probe-selector>
+<of-probe-selector (select)="select.emit($event)" [probeHosts]="probeHosts$ | async" [probeHostID]="probeHostID"></of-probe-selector>

@overflow/probe/container/probe-selector-container.component.ts

@@ -3,7 +3,7 @@ import { ProbeHost, Probe } from '@overflow/commons-typescript/model/probe';
 import { Observable } from 'rxjs';
 import { Store, select } from '@ngrx/store';
 import * as ProbeEntityStore from '@overflow/probe/store/entity/probe';
-import { ProbeListContainerSelector } from '@overflow/probe/store';
+import { ProbeSelectorContainerSelector } from '@overflow/probe/store';
 import { AuthContainerSelector } from '@overflow/shared/auth/store';
 import { DomainMember } from '@overflow/commons-typescript/model/domain';
 
@@ -23,17 +23,11 @@ export class ProbeSelectorContainerComponent implements OnInit {
     }
 
     ngOnInit() {
-        this.probeHosts$ = this.store.pipe(select(ProbeListContainerSelector.selectAll));
+        this.probeHosts$ = this.store.pipe(select(ProbeSelectorContainerSelector.selectAll));
         this.store.select(AuthContainerSelector.selectDomainMember).subscribe(
             (domainMember: DomainMember) => {
                 this.store.dispatch(new ProbeEntityStore.ReadAllByDomainID(domainMember.domain.id));
             }
         );
     }
-
-    onSelect(probeHost: ProbeHost) {
-        alert(probeHost.probe.displayName);
-        // this.select.emit(probeHost);
-    }
-
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "member-webapp-prototype",
+  "name": "member-webapp",
   "version": "0.0.0",
   "license": "COMMERCIAL",
   "description": "Webapp for overflow",