....
This commit is contained in:
parent
a7f7e34f70
commit
0d17ff7db8
|
@ -26,45 +26,28 @@ export class ListComponent implements OnInit, AfterContentInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngAfterContentInit() {
|
ngAfterContentInit() {
|
||||||
|
this.store.select(AuthSelector.select('domain')).subscribe(
|
||||||
|
(domain: Domain) => {
|
||||||
|
this.store.dispatch(new ListStore.ReadAllByDomain(domain));
|
||||||
|
},
|
||||||
|
(error) => {
|
||||||
|
console.log(error);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
// this.store.select(AuthSelector.select('domain')).subscribe(
|
this.probes$.subscribe(
|
||||||
// (domain: Domain) => {
|
(probes: Probe[]) => {
|
||||||
// this.store.dispatch(new ListStore.ReadAllByDomain(domain));
|
console.log(probes);
|
||||||
// },
|
this.probes = probes;
|
||||||
// (error) => {
|
},
|
||||||
// console.log(error);
|
(error: RPCClientError) => {
|
||||||
// }
|
console.log(error.response.message);
|
||||||
// );
|
}
|
||||||
|
);
|
||||||
// this.probes$.subscribe(
|
|
||||||
// (probes: Probe[]) => {
|
|
||||||
// console.log(probes);
|
|
||||||
// },
|
|
||||||
// (error: RPCClientError) => {
|
|
||||||
// console.log(error.response.message);
|
|
||||||
// }
|
|
||||||
// );
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {}
|
||||||
// Temporary data
|
|
||||||
this.probes = new Array();
|
|
||||||
for (let i = 0; i < 10; i++) {
|
|
||||||
const p: Probe = {
|
|
||||||
id: i,
|
|
||||||
createDate: new Date(),
|
|
||||||
description: 'Description' + i,
|
|
||||||
displayName: 'DisplayName' + i,
|
|
||||||
cidr: 'CIDR' + i,
|
|
||||||
authorizeDate: new Date(),
|
|
||||||
authorizeMember: {
|
|
||||||
name: 'MemberName' + i,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
this.probes.push(p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onRowSelect(event) {
|
onRowSelect(event) {
|
||||||
this.router.navigate(['probe', event.data.id, 'info']);
|
this.router.navigate(['probe', event.data.id, 'info']);
|
||||||
|
|
|
@ -6,12 +6,9 @@ import { CrawlerSelectorComponent } from './setting/crawler-selector/crawler-sel
|
||||||
import { CrawlerAuthComponent } from './setting/crawler-auth/crawler-auth.component';
|
import { CrawlerAuthComponent } from './setting/crawler-auth/crawler-auth.component';
|
||||||
import { SensorItemSelectorComponent } from './setting/sensor-item-selector/sensor-item-selector.component';
|
import { SensorItemSelectorComponent } from './setting/sensor-item-selector/sensor-item-selector.component';
|
||||||
import { SettingETCComponent } from './setting/setting-etc/setting-etc.component';
|
import { SettingETCComponent } from './setting/setting-etc/setting-etc.component';
|
||||||
// import { SettingResultComponent } from './setting-result/setting-result.component';
|
|
||||||
// import { FilterComponent } from './list/filter/filter.component';
|
// import { FilterComponent } from './list/filter/filter.component';
|
||||||
// import { ListComponent } from './list/list.component';
|
|
||||||
// import { DetailComponent } from './detail/detail.component';
|
// import { DetailComponent } from './detail/detail.component';
|
||||||
// import { TargetSelectorComponent } from './setting/target-selector/target-selector.component';
|
// import { TargetSelectorComponent } from './setting/target-selector/target-selector.component';
|
||||||
// import { SettingETCComponent } from './setting/setting-etc/setting-etc.component';
|
|
||||||
// import { NameTagComponent } from './name-tag/name-tag.component';
|
// import { NameTagComponent } from './name-tag/name-tag.component';
|
||||||
|
|
||||||
export const COMPONENTS = [
|
export const COMPONENTS = [
|
||||||
|
@ -21,7 +18,6 @@ export const COMPONENTS = [
|
||||||
CrawlerAuthComponent,
|
CrawlerAuthComponent,
|
||||||
SensorItemSelectorComponent,
|
SensorItemSelectorComponent,
|
||||||
SettingETCComponent,
|
SettingETCComponent,
|
||||||
// SettingResultComponent,
|
|
||||||
ListComponent,
|
ListComponent,
|
||||||
// FilterComponent,
|
// FilterComponent,
|
||||||
// DetailComponent,
|
// DetailComponent,
|
||||||
|
|
|
@ -1,90 +0,0 @@
|
||||||
<div fxLayout="row" fxLayoutWrap fxLayoutAlign="center">
|
|
||||||
|
|
||||||
<mat-card class="example-card">
|
|
||||||
<mat-card-content>
|
|
||||||
<mat-form-field class="example-full-width" fxLayoutAlign="center">
|
|
||||||
<input matInput placeholder="Name" value="Sensor 000000">
|
|
||||||
</mat-form-field>
|
|
||||||
<div class="example-selected-value">주기 : {{selectInterval}} 초</div>
|
|
||||||
<mat-radio-group class="example-radio-group" [(ngModel)]="selectInterval">
|
|
||||||
<mat-radio-button class="example-radio-button" *ngFor="let interval of intervals" [value]="interval">
|
|
||||||
{{interval}} 초
|
|
||||||
</mat-radio-button>
|
|
||||||
</mat-radio-group>
|
|
||||||
|
|
||||||
</mat-card-content>
|
|
||||||
</mat-card>
|
|
||||||
|
|
||||||
<mat-card class="example-card">
|
|
||||||
<mat-card-content>
|
|
||||||
<div>
|
|
||||||
IP : 192.168.1.209
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
MAC : 1111111111
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
OS : Windows 7
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
WMI Crawler
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</mat-card-content>
|
|
||||||
</mat-card>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div fxLayout="row" fxLayoutWrap fxLayoutAlign="center">
|
|
||||||
<mat-card class="example-card2">
|
|
||||||
<mat-card-content>
|
|
||||||
|
|
||||||
<mat-grid-list cols="4" rowHeight="8:1" *ngFor="let sir of sensorItemResultList">
|
|
||||||
<mat-grid-tile>{{sir.sensorItemName}}</mat-grid-tile>
|
|
||||||
<mat-grid-tile>{{sir.sensorItemUnit}}</mat-grid-tile>
|
|
||||||
<mat-grid-tile>{{sir.sensorItemKey}}</mat-grid-tile>
|
|
||||||
<mat-grid-tile>
|
|
||||||
<button mat-button>Save</button><button mat-button>Cancel</button>
|
|
||||||
</mat-grid-tile>
|
|
||||||
</mat-grid-list>
|
|
||||||
|
|
||||||
<!-- <mat-grid-list cols="4" rowHeight="8:1">
|
|
||||||
<mat-grid-tile>CPU Total Usage</mat-grid-tile>
|
|
||||||
<mat-grid-tile>(%)</mat-grid-tile>
|
|
||||||
<mat-grid-tile>wmi.cpu.usage.total</mat-grid-tile>
|
|
||||||
<mat-grid-tile><button mat-button>Save</button><button mat-button>Cancel</button></mat-grid-tile>
|
|
||||||
</mat-grid-list>
|
|
||||||
<mat-grid-list cols="1" rowHeight="8:1">
|
|
||||||
<mat-grid-tile>
|
|
||||||
<mat-form-field class="example-full-width22">
|
|
||||||
<input matInput placeholder="min" value="">
|
|
||||||
</mat-form-field>
|
|
||||||
|
|
||||||
<mat-form-field class="example-full-width22">
|
|
||||||
<input matInput placeholder="max" value="">
|
|
||||||
</mat-form-field>
|
|
||||||
|
|
||||||
<mat-checkbox>local push</mat-checkbox>
|
|
||||||
|
|
||||||
<mat-checkbox>email</mat-checkbox>
|
|
||||||
|
|
||||||
<mat-checkbox>sms</mat-checkbox>
|
|
||||||
</mat-grid-tile>
|
|
||||||
|
|
||||||
</mat-grid-list>
|
|
||||||
<mat-grid-list cols="4" rowHeight="8:1">
|
|
||||||
<mat-grid-tile>CPU Free Usage</mat-grid-tile>
|
|
||||||
<mat-grid-tile>(kb)</mat-grid-tile>
|
|
||||||
<mat-grid-tile>wmi.cpu.usage.free</mat-grid-tile>
|
|
||||||
<mat-grid-tile><button mat-button>Add Notification</button></mat-grid-tile>
|
|
||||||
</mat-grid-list>
|
|
||||||
<mat-grid-list cols="4" rowHeight="8:1">
|
|
||||||
<mat-grid-tile>CPU Free Usage</mat-grid-tile>
|
|
||||||
<mat-grid-tile>(kb)</mat-grid-tile>
|
|
||||||
<mat-grid-tile>wmi.cpu.usage.free</mat-grid-tile>
|
|
||||||
<mat-grid-tile><button mat-button>Add Notification</button></mat-grid-tile>
|
|
||||||
</mat-grid-list> -->
|
|
||||||
</mat-card-content>
|
|
||||||
</mat-card>
|
|
||||||
</div>
|
|
|
@ -1,25 +0,0 @@
|
||||||
.example-card {
|
|
||||||
width: 400px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.example-card2 {
|
|
||||||
width: 600px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.example-radio-group {
|
|
||||||
display: inline-flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.example-radio-button {
|
|
||||||
margin: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.example-selected-value {
|
|
||||||
margin: 15px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.example-full-width22 {
|
|
||||||
width: 10%;
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
|
||||||
|
|
||||||
import { SettingResultComponent } from './setting-result.component';
|
|
||||||
|
|
||||||
describe('SettingResultComponent', () => {
|
|
||||||
let component: SettingResultComponent;
|
|
||||||
let fixture: ComponentFixture<SettingResultComponent>;
|
|
||||||
|
|
||||||
beforeEach(async(() => {
|
|
||||||
TestBed.configureTestingModule({
|
|
||||||
declarations: [ SettingResultComponent ]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
}));
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fixture = TestBed.createComponent(SettingResultComponent);
|
|
||||||
component = fixture.componentInstance;
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create', () => {
|
|
||||||
expect(component).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -1,71 +0,0 @@
|
||||||
import { Component, OnInit } from '@angular/core';
|
|
||||||
import { AfterContentInit } from '@angular/core/src/metadata/lifecycle_hooks';
|
|
||||||
import {FormsModule} from '@angular/forms';
|
|
||||||
|
|
||||||
export class SensorItemResult {
|
|
||||||
id?: number;
|
|
||||||
sensorItemName?: String;
|
|
||||||
sensorItemUnit?: String;
|
|
||||||
sensorKeyName?: String;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'of-sensor-setting-result',
|
|
||||||
templateUrl: './setting-result.component.html',
|
|
||||||
styleUrls: ['./setting-result.component.scss']
|
|
||||||
})
|
|
||||||
export class SettingResultComponent implements OnInit, AfterContentInit {
|
|
||||||
|
|
||||||
selectInterval: string;
|
|
||||||
sensorItemResultList: Array<SensorItemResult>;
|
|
||||||
optionList: Array<number>;
|
|
||||||
|
|
||||||
constructor() { }
|
|
||||||
|
|
||||||
intervals = [
|
|
||||||
'600',
|
|
||||||
'400',
|
|
||||||
'200',
|
|
||||||
];
|
|
||||||
|
|
||||||
ngAfterContentInit() {
|
|
||||||
|
|
||||||
this.sensorItemResultList = new Array();
|
|
||||||
this.optionList = new Array();
|
|
||||||
|
|
||||||
const ctu: SensorItemResult = {
|
|
||||||
id: 1,
|
|
||||||
sensorItemName: 'CPU Total Usage',
|
|
||||||
sensorItemUnit: '%',
|
|
||||||
sensorKeyName: 'wmi.cpu.usage.total'
|
|
||||||
};
|
|
||||||
|
|
||||||
const cfu: SensorItemResult = {
|
|
||||||
id: 2,
|
|
||||||
sensorItemName: 'CPU Free Usage',
|
|
||||||
sensorItemUnit: 'kb',
|
|
||||||
sensorKeyName: 'wmi.cpu.usage.free'
|
|
||||||
};
|
|
||||||
|
|
||||||
const mtu: SensorItemResult = {
|
|
||||||
id: 3,
|
|
||||||
sensorItemName: 'Mem Total Usage',
|
|
||||||
sensorItemUnit: '%',
|
|
||||||
sensorKeyName: 'wmi.mem.usage.total'
|
|
||||||
};
|
|
||||||
|
|
||||||
this.sensorItemResultList.push(ctu);
|
|
||||||
this.sensorItemResultList.push(cfu);
|
|
||||||
this.sensorItemResultList.push(mtu);
|
|
||||||
|
|
||||||
for ( let indexI = 0; indexI < this.sensorItemResultList.length; ++indexI) {
|
|
||||||
this.optionList.push(this.sensorItemResultList[indexI].id);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,23 +1,34 @@
|
||||||
<p-accordion [multiple]="false" [activeIndex]="step" (onOpen)="onTabOpen($event)">
|
<div *ngIf="page === 1; else etc">
|
||||||
<p-accordionTab header="{{getTitle(0)}}" [disabled]="preTarget">
|
<p-accordion [multiple]="false" [activeIndex]="step" (onOpen)="onTabOpen($event)">
|
||||||
<of-target-selector [visible]="visible" [preTarget]="preTarget" (targetSelected)="onTargetSelect($event)"></of-target-selector>
|
<p-accordionTab header="{{getTitle(0)}}" [disabled]="preTarget">
|
||||||
</p-accordionTab>
|
<of-target-selector [visible]="visible" [preTarget]="preTarget" (targetSelected)="onTargetSelect($event)"></of-target-selector>
|
||||||
<p-accordionTab header="{{getTitle(1)}}">
|
</p-accordionTab>
|
||||||
<of-crawler-selector [target]="selectedTarget" (crawlerSelected)="onCrawlerSelect($event)"></of-crawler-selector>
|
<p-accordionTab header="{{getTitle(1)}}">
|
||||||
</p-accordionTab>
|
<of-crawler-selector [target]="selectedTarget" (crawlerSelected)="onCrawlerSelect($event)"></of-crawler-selector>
|
||||||
<p-accordionTab header="{{getTitle(2)}}">
|
</p-accordionTab>
|
||||||
<of-crawler-auth [crawler]="selectedCrawler" (credentialPassed)="onCredentialPass($event)"></of-crawler-auth>
|
<p-accordionTab header="{{getTitle(2)}}">
|
||||||
</p-accordionTab>
|
<of-crawler-auth [crawler]="selectedCrawler" (credentialPassed)="onCredentialPass($event)"></of-crawler-auth>
|
||||||
<p-accordionTab header="{{getTitle(3)}}">
|
</p-accordionTab>
|
||||||
<of-sensor-item-selector [target]="selectedTarget" [crawler]="selectedCrawler" (sensorItemsSelected)="onItemsSelect($event)"></of-sensor-item-selector>
|
<p-accordionTab header="{{getTitle(3)}}">
|
||||||
</p-accordionTab>
|
<of-sensor-item-selector [target]="selectedTarget" [crawler]="selectedCrawler" (sensorItemsSelected)="onItemsSelect($event)"></of-sensor-item-selector>
|
||||||
</p-accordion>
|
</p-accordionTab>
|
||||||
|
</p-accordion>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ng-template #etc>
|
||||||
|
<of-sensor-setting-etc></of-sensor-setting-etc>
|
||||||
|
</ng-template>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button pButton class="ui-button-danger" type="button" label="Cancel" icon="ui-icon-close" (click)="onCancel()"></button>
|
<button pButton *ngIf="page === 1" class="ui-button-danger" type="button" label="Cancel" icon="ui-icon-close" (click)="onCancel()"></button>
|
||||||
<button pButton [disabled]="!nextable" type="button" label="Next" icon="fa-check" (click)="onNext()"></button>
|
<button pButton *ngIf="page === 2" class="ui-button-danger" type="button" label="Prev" icon="ui-icon-close" (click)="onPrev()"></button>
|
||||||
|
|
||||||
|
<button pButton *ngIf="page === 1" [disabled]="!nextable" type="button" label="Next" icon="fa-check" (click)="onNext()"></button>
|
||||||
|
<button pButton *ngIf="page === 2" type="button" label="Done" icon="fa-check" (click)="onDone()"></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <div [hidden]="step !== 1">
|
<!-- <div [hidden]="step !== 1">
|
||||||
<div class="ui-g">
|
<div class="ui-g">
|
||||||
<div class="ui-g-6">
|
<div class="ui-g-6">
|
||||||
|
|
|
@ -29,6 +29,7 @@ export class SettingComponent implements OnInit, DoCheck, OnChanges {
|
||||||
selectedSensorDisplayItems: MetaSensorDisplayItem[];
|
selectedSensorDisplayItems: MetaSensorDisplayItem[];
|
||||||
itemNodes: TreeNode[];
|
itemNodes: TreeNode[];
|
||||||
step = 0;
|
step = 0;
|
||||||
|
page = 1;
|
||||||
|
|
||||||
sensorItemKeys$ = this.keyListStore.pipe(select(ReadSensorItemKeySelector.select('list')));
|
sensorItemKeys$ = this.keyListStore.pipe(select(ReadSensorItemKeySelector.select('list')));
|
||||||
|
|
||||||
|
@ -75,6 +76,7 @@ export class SettingComponent implements OnInit, DoCheck, OnChanges {
|
||||||
}
|
}
|
||||||
|
|
||||||
onCancel() {
|
onCancel() {
|
||||||
|
this.page = 1;
|
||||||
this.step = 0;
|
this.step = 0;
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
this.nextable = false;
|
this.nextable = false;
|
||||||
|
@ -86,11 +88,11 @@ export class SettingComponent implements OnInit, DoCheck, OnChanges {
|
||||||
}
|
}
|
||||||
|
|
||||||
onNext() {
|
onNext() {
|
||||||
this.step += 1;
|
this.page += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
onPrev() {
|
onPrev() {
|
||||||
this.step -= 1;
|
this.page -= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
onDone() {
|
onDone() {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user