overflow_backup_2018_0455/overflow-webapp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sensor configuration

Browse Source
This commit is contained in:
insanity 2018-03-21 19:39:40 +09:00
parent 0b667270ec
commit 89bbf5dee9
8 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/packages/infra/component/map/map.component.ts
View File

@ -62,7 +62,6 @@ export class MapComponent implements OnInit, AfterContentInit {
addSensor(infra: Infra) {
const targetId = infra.target.id;
console.log(targetId);
const dialogRef = this.dialog.open(SettingComponent, {
width: '80%',

3
src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.ts
View File

@ -29,9 +29,6 @@ export class CrawlerAuthComponent implements OnInit, OnChanges {
this.inputItems$.subscribe(
(list: MetaCrawlerInputItem[]) => {
if (list !== null) {
console.log('###Auth Inputs###');
console.log(list);
console.log('###################');
this.inputItems = list;
this.generateAuthComponent();
}

4
src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.html
View File

@ -9,11 +9,11 @@
<perfect-scrollbar style="height: 150px">
<mat-radio-group class="radio-group">
<mat-radio-button class="radio-button" *ngFor="let crawler of crawlers" value={{crawler.id}} (change)="crawlerSelected(crawler)">
<mat-radio-button class="radio-button" *ngFor="let crawler of crawlers" value={{crawler.id}} (change)="crawlerSelected(crawler)" [checked]="crawler.id === selectedCrawlerId">
{{crawler.name}}
</mat-radio-button>
</mat-radio-group>
</perfect-scrollbar>
</mat-card-content>
</mat-card>

6
src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.ts
View File

@ -17,13 +17,10 @@ import { MetaCrawler } from 'packages/meta/crawler/model/MetaCrawler';
export class CrawlerSelectorComponent implements OnInit, OnChanges, AfterContentInit {
crawlers$ = this.listStore.pipe(select(ReadAllCrawlerSelector.select('metaCrawlerList')));
@Input() selectedTarget: Target;
crawlers: MetaCrawler[];
@Output() crawlerSelectEvent = new EventEmitter<MetaCrawler>();
constructor(
private router: Router,
private listStore: Store<ListStore.State>,
@ -47,9 +44,6 @@ export class CrawlerSelectorComponent implements OnInit, OnChanges, AfterContent
}
ngOnChanges() {
// if (this.selectedTarget) {
// console.log('Getting valid crawlers for ' + this.selectedTarget.displayName);
// }
}
crawlerSelected(crawler: MetaCrawler) {

3
src/packages/sensor/component/setting/sensor-item-selector/sensor-item-selector.component.html
View File

@ -12,12 +12,13 @@
<ng-template #treeNodeFullTemplate let-node let-index="index" let-templates="templates">
<div class="tree-node">
<tree-node-expander [node]="node" ></tree-node-expander>
<mat-checkbox [checked]="node.data.default" (change)="checkItem(node)"></mat-checkbox>
<mat-checkbox [checked]="node.isActive" (change)="checkItem(node)"></mat-checkbox>
<div
class="node-content-wrapper"
[class.node-content-wrapper-active]="node.isActive"
[class.node-content-wrapper-focused]="node.isFocused"
(click)="checkItem(node)">
<mat-chip *ngIf="node.data.default" color="primary" (click)="checkItem(node)" >Recommend!</mat-chip>
<span [class]="node.data.className" [class.title]="true">{{ node.data.title }} {{node.data.key}}</span>
</div>

42
src/packages/sensor/component/setting/sensor-item-selector/sensor-item-selector.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit, OnChanges, Input, Output, EventEmitter, ViewChild, AfterViewInit } from '@angular/core';
import { Component, OnInit, OnChanges, Input, Output, EventEmitter, ViewChild, AfterViewInit, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Store, select } from '@ngrx/store';
import { RPCError } from 'packages/core/rpc/error';
@ -14,14 +14,13 @@ import { ITreeOptions } from 'angular-tree-component';
templateUrl: './sensor-item-selector.component.html',
styleUrls: ['./sensor-item-selector.component.scss']
})
export class SensorItemSelectorComponent implements OnInit, AfterViewInit, OnChanges {
export class SensorItemSelectorComponent implements OnInit, OnChanges {
@Input() selectedCrawler: MetaCrawler;
@Output() selectedItems = new EventEmitter<MetaSensorDisplayItem[]>();
@Output() itemSelectEvent = new EventEmitter<Set<MetaSensorDisplayItem>>();
items$ = this.listStore.pipe(select(ReadAllSensorDisplayItemByCrawlerSelector.select('list')));
sensorDisplayItems: MetaSensorDisplayItem[];
@ViewChild('tree') tree;
nodes;
checkedSet: Set<MetaSensorDisplayItem>;
constructor(
private router: Router,
@ -29,13 +28,10 @@ export class SensorItemSelectorComponent implements OnInit, AfterViewInit, OnCha
) { }
ngOnInit() {
this.checkedSet = new Set();
this.items$.subscribe(
(list: MetaSensorDisplayItem[]) => {
if (list !== null) {
console.log('###Display Items###');
console.log(list);
console.log('###################');
this.sensorDisplayItems = list;
this.generateTreeNode(list);
}
},
@ -45,9 +41,6 @@ export class SensorItemSelectorComponent implements OnInit, AfterViewInit, OnCha
);
}
ngAfterViewInit() {
}
ngOnChanges() {
this.listStore.dispatch(new ListStore.ReadAllByCrawler(this.selectedCrawler));
}
@ -62,20 +55,21 @@ export class SensorItemSelectorComponent implements OnInit, AfterViewInit, OnCha
const node = {
title: item.itemType.name,
children: childrenNode,
isExpanded: true
};
this.nodes.push(node);
} else {
categoryNode.children.push(this.getChildNode(item));
}
}
this.itemSelectEvent.emit(this.checkedSet);
}
getChildNode(item) {
const childNode = {
title: item.displayName,
key: ' - ' + item.key,
default: item.default
default: item.default,
displayItem: item
};
return childNode;
}
@ -92,16 +86,16 @@ export class SensorItemSelectorComponent implements OnInit, AfterViewInit, OnCha
checkItem(node) {
node.toggleActivated(true);
console.log(node);
// if (node.isActive) {
// if (this.checkedSet.has(node.data) === false) {
// this.checkedSet.add(node.data);
// }
// } else {
// if (this.checkedSet.has(node.data)) {
// this.checkedSet.delete(node.data);
// }
// }
if (node.isActive) {
if (this.checkedSet.has(node.data.displayItem) === false) {
this.checkedSet.add(node.data.displayItem);
}
} else {
if (this.checkedSet.has(node.data.displayItem)) {
this.checkedSet.delete(node.data.displayItem);
}
}
this.itemSelectEvent.emit(this.checkedSet);
}
onTreeDataLoad(tree) {

2
src/packages/sensor/component/setting/setting.component.html
View File

@ -1,5 +1,5 @@
<div>
<div *ngIf="step === 1">
<div [hidden]="step !== 1">
<mat-grid-list cols="2" rowHeight="5:1">
<mat-grid-tile [colspan]="1" [rowspan]="3" style="background-color: lightblue">

32
src/packages/sensor/component/setting/setting.component.ts
View File

@ -1,9 +1,9 @@
import { Component, OnInit, Input, Inject } from '@angular/core';
import { AfterContentInit } from '@angular/core/src/metadata/lifecycle_hooks';
import { Target } from '../../../target/model';
import { MAT_DIALOG_DATA } from '@angular/material';
import { Infra } from '../../../infra/model';
import { MetaCrawler } from '../../../meta/crawler/model/MetaCrawler';
import { MetaSensorDisplayItem } from '../../../meta/sensor-display-item/model/MetaSensorDisplayItem';
@Component({
@ -11,10 +11,11 @@ import { MetaCrawler } from '../../../meta/crawler/model/MetaCrawler';
templateUrl: './setting.component.html',
styleUrls: ['./setting.component.scss']
})
export class SettingComponent implements OnInit, AfterContentInit {
export class SettingComponent implements OnInit {
selectedTarget: Target = null;
selectedCrawler: MetaCrawler = null;
selectedSensorDisplayItems: Set<MetaSensorDisplayItem> = null;
step = 1;
constructor(
@ -25,16 +26,30 @@ export class SettingComponent implements OnInit, AfterContentInit {
}
}
ngOnInit() {
}
ngAfterContentInit() {
onNext() {
const valid = this.validateSelection();
if (valid !== null) {
alert(valid);
return;
}
this.step += 1;
}
onNext() {
this.step += 1;
validateSelection() {
let message = null;
if (this.selectedTarget === null) {
message = 'Target is not selected.';
}
if (this.selectedCrawler === null) {
message = 'Crawler is not selected.';
}
if (this.selectedSensorDisplayItems === null || this.selectedSensorDisplayItems.size === 0) {
message = 'SensorItem is not selected.';
}
return message;
}
onPrev() {
@ -51,4 +66,7 @@ export class SettingComponent implements OnInit, AfterContentInit {
handleCrawlerSelection(c: MetaCrawler) {
this.selectedCrawler = c;
}
handleItemSelection(itemSet: Set<MetaSensorDisplayItem>) {
this.selectedSensorDisplayItems = itemSet;
}
}