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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
geek 2018-03-13 19:19:53 +09:00
commit 7ceddf5096
2 changed files with 58 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/packages/sensor/component/list/list.component.html
View File

@ -19,7 +19,7 @@
<!-- target 별 sensor list --> <!-- target 별 sensor list -->
<div fxFlex="80%" class="example-container mat-elevation-z8"> <div fxFlex="80%" class="example-container mat-elevation-z8">
<!-- <div fxLayout="row" > <div fxLayout="row" >
<div fxFlex="20">aaaaaaaaaaaaaaaaaaa</div> <div fxFlex="20">aaaaaaaaaaaaaaaaaaa</div>
<div fxFlex="80"> <div fxFlex="80">
@ -48,7 +48,7 @@
<mat-row *matRowDef="let row; columns: displayedColumns;" (click)="handleRowClick(row)"></mat-row> <mat-row *matRowDef="let row; columns: displayedColumns;" (click)="handleRowClick(row)"></mat-row>
</mat-table> </mat-table>
</div> </div>
</div> --> </div>
</div> </div>

74
src/packages/sensor/component/list/list.component.ts
View File

@ -4,6 +4,14 @@ import { AfterContentInit } from '@angular/core/src/metadata/lifecycle_hooks';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { Sensor } from '../../model'; import { Sensor } from '../../model';
import { Store, select } from '@ngrx/store';
import * as SensorStore from '../../store';
import { RPCError } from 'packages/core/rpc/error';
import * as ReadAllByDomainStore from '../../store/readallbydomain';
import { ReadAllByMemberSelector } from '../../store';
import { Domain } from '../../../domain/model';
@Component({ @Component({
selector: 'of-sensor-list', selector: 'of-sensor-list',
@ -12,6 +20,8 @@ import { Sensor } from '../../model';
}) })
export class ListComponent implements OnInit, AfterContentInit { export class ListComponent implements OnInit, AfterContentInit {
sensorList$ = this.store.pipe(select(ReadAllByMemberSelector.select('sensorList')));
displayedColumns = ['crawler', 'type', 'name', 'sensors']; displayedColumns = ['crawler', 'type', 'name', 'sensors'];
dataSource: MatTableDataSource<Sensor>; dataSource: MatTableDataSource<Sensor>;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
@ -22,27 +32,55 @@ export class ListComponent implements OnInit, AfterContentInit {
*/ */
ngAfterContentInit() { ngAfterContentInit() {
// temporary data // temporary data
const data: Sensor[] = new Array(); // const data: Sensor[] = new Array();
for (let i = 0; i < 3; i++) { // for (let i = 0; i < 3; i++) {
const t: Sensor = { // const t: Sensor = {
id: i, // id: i,
target: { // target: {
id: 1, // id: 1,
displayName: '192.168.1.1', // displayName: '192.168.1.1',
}, // },
crawler: { // crawler: {
id: 1, // id: 1,
name: 'WMI' // name: 'WMI'
}, // },
}; // };
data.push(t); // data.push(t);
} // }
this.dataSource = new MatTableDataSource(data); this.store.select(ReadAllByMemberSelector.select('domain')).subscribe(
this.dataSource.sort = this.sort; (domain: Domain) => {
this.store.dispatch(new ReadAllByDomainStore.ReadAllByDomain(domain));
},
(error) => {
console.log(error);
}
);
// const domain: Domain = {
// id: 1
// };
// this.store.dispatch(new ReadAllByDomainStore.ReadAllByDomain(domain));
this.sensorList$.subscribe(
(probes: Sensor[]) => {
console.log(probes);
this.dataSource = new MatTableDataSource(probes);
this.dataSource.sort = this.sort;
},
(error: RPCError) => {
console.log(error.message);
}
);
// this.dataSource = new MatTableDataSource(data);
// this.dataSource.sort = this.sort;
} }
constructor(private router: Router) { } constructor(private router: Router,
private store: Store<ReadAllByDomainStore.State>) { }
ngOnInit() { ngOnInit() {
} }