diff --git a/src/packages/infra/component/map/map.component.html b/src/packages/infra/component/map/map.component.html index 3363837..2607589 100644 --- a/src/packages/infra/component/map/map.component.html +++ b/src/packages/infra/component/map/map.component.html @@ -32,7 +32,7 @@ - + {{service.vendor.name}} diff --git a/src/packages/infra/component/map/map.component.ts b/src/packages/infra/component/map/map.component.ts index a3c9666..8654e9e 100644 --- a/src/packages/infra/component/map/map.component.ts +++ b/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' }; diff --git a/src/packages/sensor/component/list/list.component.html b/src/packages/sensor/component/list/list.component.html index 63ec7ec..f522367 100644 --- a/src/packages/sensor/component/list/list.component.html +++ b/src/packages/sensor/component/list/list.component.html @@ -18,7 +18,7 @@
-
+
diff --git a/src/packages/sensor/component/list/list.component.ts b/src/packages/sensor/component/list/list.component.ts index c5ba1cd..be5715c 100644 --- a/src/packages/sensor/component/list/list.component.ts +++ b/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() { diff --git a/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.html b/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.html index ffc5eac..dfb3fb7 100644 --- a/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.html +++ b/src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.html @@ -5,12 +5,6 @@ Crawler 인증 - - -
diff --git a/src/packages/sensor/component/setting/setting-etc/setting-etc.component.html b/src/packages/sensor/component/setting/setting-etc/setting-etc.component.html index cea1315..819e4d3 100644 --- a/src/packages/sensor/component/setting/setting-etc/setting-etc.component.html +++ b/src/packages/sensor/component/setting/setting-etc/setting-etc.component.html @@ -25,8 +25,32 @@ - Threshold and noti - + + + +

{{item.displayName}}

+ [Notification] + +

+ +
+
+ + + + ~ + + + +
+
+

+
+
+ + + +
\ No newline at end of file diff --git a/src/packages/sensor/component/setting/setting-etc/setting-etc.component.ts b/src/packages/sensor/component/setting/setting-etc/setting-etc.component.ts index b3f990d..c68eba9 100644 --- a/src/packages/sensor/component/setting/setting-etc/setting-etc.component.ts +++ b/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(); + } } diff --git a/src/packages/sensor/component/setting/setting.component.html b/src/packages/sensor/component/setting/setting.component.html index fa65809..13b4447 100644 --- a/src/packages/sensor/component/setting/setting.component.html +++ b/src/packages/sensor/component/setting/setting.component.html @@ -32,6 +32,6 @@ - +
\ No newline at end of file diff --git a/src/packages/sensor/component/setting/setting.component.ts b/src/packages/sensor/component/setting/setting.component.ts index ce8f7af..fb50683 100644 --- a/src/packages/sensor/component/setting/setting.component.ts +++ b/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 sensorItemList, String etcJson) } diff --git a/src/packages/sensor/component/setting/target-selector/target-selector.component.ts b/src/packages/sensor/component/setting/target-selector/target-selector.component.ts index 1746647..798dbad 100644 --- a/src/packages/sensor/component/setting/target-selector/target-selector.component.ts +++ b/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); - // for (let i = 0; i < 10; i++) { - // const t: Target = { - // id: i, - // displayName: 'Target' + i, - // }; - // this.targets.push(t); - // } + if (this.target === null) { + this.getTargetList(); + } else { + this.targets.push(this.target); + } + } + + getTargetList() { + console.log('go get infraService.readAllByDomain'); } targetSelected(t: Target) {