Merge branch 'master' of https://git.loafle.net/overflow/overflow-webapp

src/packages/infra/component/map/map.component.html

@@ -32,7 +32,7 @@
 
     <mat-card-content *ngFor="let service of infra.services">
       <mat-grid-list cols="6" rowHeight="9:1">
-        <mat-grid-tile [rowspan]="2" matTooltip="showServiceInfo(service)" style="background-color: lightcoral">
+        <mat-grid-tile [rowspan]="2"  style="background-color: lightcoral">
           {{service.vendor.name}}
         </mat-grid-tile>
         <mat-grid-tile [colspan]="3" style="background-color: lightblue">

src/packages/infra/component/map/map.component.ts

@@ -58,7 +58,8 @@ export class MapComponent implements OnInit, AfterContentInit {
       const host: InfraHost = {
         id: 1,
         target: {
-          id: 1
+          id: 1,
+          displayName: String('host' + i)
         },
         infraType: {
           name: 'HOST'
@@ -71,7 +72,8 @@ export class MapComponent implements OnInit, AfterContentInit {
         const service: InfraService = {
           id: 2,
           target: {
-            id: 1
+            id: 1,
+            displayName: String('service' + i)
           },
           infraType: {
             name: 'OS_SERVICE'
@@ -160,7 +162,7 @@ export class MapComponent implements OnInit, AfterContentInit {
       (domain: Domain) => {
         const pageParams: PageParams = {
           pageNo: this.page + '',
-          countPerPage: '9999999',
+          countPerPage: '10',
           sortCol: 'id',
           sortDirection: 'descending'
         };

src/packages/sensor/component/list/list.component.html

@@ -18,7 +18,7 @@
     </div>
 
     <div fxFlex="80%" class="example-container mat-elevation-z8">
-      <div fxLayout="row">
+      <div>
         <mat-table #table [dataSource]="dataSource" matSort>
 
           <ng-container matColumnDef="target">

src/packages/sensor/component/list/list.component.ts

@@ -74,7 +74,7 @@ export class ListComponent implements OnInit, AfterContentInit {
   }
 
   handleRowClick(obj: Sensor) {
-    // this.router.navigate(['target', obj.id]);
+    this.router.navigate(['target', obj.id]);
   }
 
   addSensor() {

src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.html

@@ -5,12 +5,6 @@
       <mat-card-subtitle>Crawler 인증</mat-card-subtitle>
     </mat-card-header>
 
-
-
-    <!-- case 4: // BOOLEAN_TYPE
-    break;
-  case 5: // SELECT_TYPE
-   -->
     <mat-card-content>
       <perfect-scrollbar style="height: 150px">
         <div *ngFor="let inputItem of inputItems">

src/packages/sensor/component/setting/setting-etc/setting-etc.component.html

@@ -25,8 +25,32 @@
     </mat-grid-tile>
 
     <mat-grid-tile [colspan]="2" [rowspan]="3" style="background-color: lightpink">
-        Threshold and noti
-    </mat-grid-tile>
 
+      <!-- (change)="handleNotificationOn(item)" -->
+      <mat-list #items style="width: 70%">
+        <mat-list-item *ngFor="let item of selectedItems">
+          <h4 mat-line>{{item.displayName}}</h4>
+          <mat-slide-toggle [(ngModel)]="notiOn">[Notification]</mat-slide-toggle>
+          <!-- <p mat-line> {{item.key}} </p> -->
+          <h4 mat-line>
+            <!-- <div *ngIf="opened.indexOf(item.id) >= 0"> -->
+            <div *ngIf="notiOn">
+              <form>
+                <mat-form-field>
+                  <input matInput placeholder="Min" value="">
+                </mat-form-field>
+                ~
+                <mat-form-field>
+                  <input matInput placeholder="Max" value="">
+                </mat-form-field>
+              </form>
+            </div>
+          </h4>
+        </mat-list-item>
+      </mat-list>
+
+
+    </mat-grid-tile>
   </mat-grid-list>
+
 </div>

src/packages/sensor/component/setting/setting-etc/setting-etc.component.ts

@@ -1,6 +1,9 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { Router } from '@angular/router';
-import { MetaCrawler } from '../../../../meta/crawler/model/MetaCrawler';
+import { MetaCrawler } from 'packages/meta/crawler/model/MetaCrawler';
+import { MetaSensorDisplayItem } from '../../../../meta/sensor-display-item/model/MetaSensorDisplayItem';
+import { Target } from 'packages/target/model';
+import { MatSnackBar } from '@angular/material';
 
 
 @Component({
@@ -10,9 +13,9 @@ import { MetaCrawler } from '../../../../meta/crawler/model/MetaCrawler';
 })
 export class SettingETCComponent implements OnInit {
 
-  @Input() selectedTarget;
+  @Input() selectedTarget: Target;
   @Input() selectedCrawler: MetaCrawler;
-  @Input() selectedItems;
+  @Input() selectedItems: MetaSensorDisplayItem[];
 
   intervals = [
     '600 sec',
@@ -21,8 +24,12 @@ export class SettingETCComponent implements OnInit {
   ];
 
   targetInfo;
+  opened = [];
 
-  constructor(private router: Router) { }
+  constructor(
+    private router: Router,
+    private snackBar: MatSnackBar
+  ) { }
 
   ngOnInit() {
     this.targetInfo = [
@@ -44,4 +51,12 @@ export class SettingETCComponent implements OnInit {
       },
     ];
   }
+
+  onChange(e: any) {
+    this.opened = e;
+  }
+
+  handleTitleClick(e: Event) {
+    e.preventDefault();
+  }
 }

src/packages/sensor/component/setting/setting.component.html

@@ -32,6 +32,6 @@
     <button mat-raised-button *ngIf="step === 2" (click)="onPrev()">Prev</button>
 
     <button mat-raised-button color="primary" (click)="onNext()" *ngIf="step === 1" [disabled]="!nextable">Next</button>
-    <button mat-raised-button color="primary" [mat-dialog-close]="true" *ngIf="step === 2">Done</button>
+    <button mat-raised-button color="primary" (click)="onDone()" [mat-dialog-close]="true" *ngIf="step === 2">Done</button>
   </div>
 </div>

src/packages/sensor/component/setting/setting.component.ts

@@ -80,7 +80,6 @@ export class SettingComponent implements OnInit, DoCheck {
     for (const displayItem of Array.from(this.selectedSensorDisplayItems)) {
       this.keyListStore.dispatch(new SensorItemKeyListStore.ReadAllByDisplayItem(displayItem));
     }
-
     // Sensor SensorService.registSensorConfig(Sensor sensor, List<SensorItem> sensorItemList, String etcJson)
   }
 

src/packages/sensor/component/setting/target-selector/target-selector.component.ts

@@ -19,14 +19,15 @@ export class TargetSelectorComponent implements OnInit {
 
   ngOnInit() {
     this.targets = new Array();
-    this.targets.push(this.target);
+    if (this.target === null) {
-    // for (let i = 0; i < 10; i++) {
+      this.getTargetList();
-    //   const t: Target = {
+    } else {
-    //     id: i,
+      this.targets.push(this.target);
-    //     displayName: 'Target' + i,
+    }
-    //   };
+  }
-    //   this.targets.push(t);
+
-    // }
+  getTargetList() {
+    console.log('go get infraService.readAllByDomain');
   }
 
   targetSelected(t: Target) {