sensor list complete

@overflow/infra/component/map/map.component.ts

@@ -14,7 +14,7 @@ import { Infra, InfraHost, InfraService } from '@overflow/commons-typescript/mod
 import { Domain } from '@overflow/commons-typescript/model/domain';
 import { AuthSelector } from '@overflow/member/store';
 
-import { sensorListSelector } from '@overflow/sensor/store';
+// import { sensorListSelector } from '@overflow/sensor/store';
 
 import * as SensorListStore from '@overflow/sensor/store/list';
 import { Sensor } from '@overflow/commons-typescript/model/sensor';
@@ -35,7 +35,7 @@ export class MapComponent implements OnInit, AfterContentInit {
   infraTree: TreeNode[] = [];
 
   infras$ = this.listStore.pipe(select(ListSelector.select('page')));
-  sensors$ = this.sensorListStore.pipe(select(sensorListSelector.select('page')));
+  // sensors$ = this.sensorListStore.pipe(select(sensorListSelector.select('page')));
   display = false;
   loading = false;
   renameProbeVisible = false;

@overflow/probe/component/index.ts

@@ -1,13 +1,6 @@
 import { ProbeDetailComponent } from './detail/detail.component';
 import { ProbeListComponent } from './list/list.component';
 import { ProbeDownloadComponent } from './download/download.component';
-import { ProbeListContainerComponent } from '../container/probe-list-container';
-import { ProbeDetailContainerComponent } from '../container/probe-detail-container';
-
-export const CONTAINERS = [
-  ProbeListContainerComponent,
-  ProbeDetailContainerComponent,
-];
 
 export const COMPONENTS = [
   ProbeListComponent,

@overflow/probe/container/index.ts

@@ -0,0 +1,7 @@
+import { ProbeListContainerComponent } from '../container/probe-list-container.component';
+import { ProbeDetailContainerComponent } from '../container/probe-detail-container.component';
+
+export const CONTAINER_COMPONENTS = [
+  ProbeListContainerComponent,
+  ProbeDetailContainerComponent,
+];

@overflow/probe/container/probe-detail-container.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, AfterViewInit, Output, EventEmitter, AfterContentInit, OnChanges, SimpleChanges } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ProbeHost, Probe } from '@overflow/commons-typescript/model/probe';
 import { Store, select } from '@ngrx/store';
@@ -8,7 +8,7 @@ import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'of-probe-detail-container',
-  templateUrl: './probe-detail-container.html',
+  templateUrl: './probe-detail-container.component.html',
 })
 export class ProbeDetailContainerComponent implements OnInit, OnChanges {
 

@overflow/probe/container/probe-list-container.component.ts

@@ -2,14 +2,14 @@ import { Component, EventEmitter, Output, OnInit } from '@angular/core';
 import { ProbeHost } from '@overflow/commons-typescript/model/probe';
 import { Observable } from 'rxjs';
 import { Store, select } from '@ngrx/store';
-import * as ProbeStore from '../store/entity/probe';
+import * as ProbeEntityStore from '../store/entity/probe';
 import { ProbeEntitySelector, ProbeListContainerSelector } from '../store';
 import { AuthSelector } from '@overflow/member/store';
 import { Domain } from '@overflow/commons-typescript/model/domain';
 
 @Component({
     selector: 'of-probe-list-container',
-    templateUrl: './probe-list-container.html',
+    templateUrl: './probe-list-container.component.html',
 })
 export class ProbeListContainerComponent implements OnInit {
 
@@ -17,7 +17,9 @@ export class ProbeListContainerComponent implements OnInit {
     pending$: Observable<boolean>;
     @Output() select = new EventEmitter();
 
-    constructor(private store: Store<ProbeStore.State>) {
+    constructor(
+        private store: Store<ProbeEntityStore.State>,
+    ) {
         this.probeHosts$ = store.pipe(select(ProbeEntitySelector.selectAll));
         this.pending$ = store.pipe(select(ProbeListContainerSelector.selectPending));
     }
@@ -25,7 +27,7 @@ export class ProbeListContainerComponent implements OnInit {
     ngOnInit() {
         this.store.select(AuthSelector.select('domain')).subscribe(
             (domain: Domain) => {
-                this.store.dispatch(new ProbeStore.ReadAllByDomainID(domain.id));
+                this.store.dispatch(new ProbeEntityStore.ReadAllByDomainID(domain.id));
             },
             (error) => {
                 console.log(error);

@overflow/probe/probe.module.ts

@@ -1,7 +1,8 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { COMPONENTS, CONTAINERS } from './component';
+import { COMPONENTS } from './component';
+import { CONTAINER_COMPONENTS } from './container';
 import { ProbeStoreModule } from './probe-store.module';
 import { SERVICES } from './service';
 import { PrimeNGModules } from '../commons/prime-ng/prime-ng.module';
@@ -21,11 +22,11 @@ import { KeyValueModule } from '@overflow/commons/component/key-value/key-value.
     MetaCrawlerModule
   ],
   declarations: [
-    CONTAINERS,
+    CONTAINER_COMPONENTS,
     COMPONENTS,
   ],
   exports: [
-    CONTAINERS,
+    CONTAINER_COMPONENTS,
     COMPONENTS,
   ],
   providers: [

@overflow/sensor/component/detail/detail.component.html

@@ -53,7 +53,3 @@
     <p-confirmDialog header="Confirmation" icon="fa ui-icon-warning" width="425"></p-confirmDialog>
 </div>
 
-
-<p-dialog [modal]="true" [width]="800" [(visible)]="sensorSettingDisplay" [showHeader]="true" [closeOnEscape]="false">
-    <of-sensor-setting [visible]="sensorSettingDisplay" (close)="onSensorSettingClose()"></of-sensor-setting>
-</p-dialog>

@overflow/sensor/component/detail/detail.component.ts

@@ -4,7 +4,7 @@ import { ConfirmationService } from 'primeng/primeng';
 import { Store, select } from '@ngrx/store';
 import { RPCClientError } from '@loafer/ng-rpc';
 import * as DetailStore from '../../store/detail';
-import { sensorSelector } from '../../store';
+// import { sensorSelector } from '../../store';
 import { Sensor } from '@overflow/commons-typescript/model/sensor';
 import { Subscription } from 'rxjs/Subscription';
 
@@ -13,71 +13,71 @@ import { Subscription } from 'rxjs/Subscription';
   templateUrl: './detail.component.html',
   providers: [ConfirmationService]
 })
-export class DetailComponent implements OnInit, AfterContentInit, OnDestroy {
+export class DetailComponent {
 
-  sensorSubscription$: Subscription;
+  // sensorSubscription$: Subscription;
-  sensor$ = this.detailStore.pipe(select(sensorSelector.select('sensor')));
+  // sensor$ = this.detailStore.pipe(select(sensorSelector.select('sensor')));
-  sensor: Sensor;
+  // sensor: Sensor;
-  sensorSettingDisplay: boolean;
+  // sensorSettingDisplay: boolean;
 
-  constructor(
+  // constructor(
-    private route: ActivatedRoute,
+  //   private route: ActivatedRoute,
-    private router: Router,
+  //   private router: Router,
-    private confirmationService: ConfirmationService,
+  //   private confirmationService: ConfirmationService,
-    private detailStore: Store<DetailStore.State>,
+  //   private detailStore: Store<DetailStore.State>,
-  ) {
+  // ) {
-    this.sensorSettingDisplay = false;
+  //   this.sensorSettingDisplay = false;
-  }
+  // }
 
-  ngOnInit() {
+  // ngOnInit() {
-    this.sensorSubscription$ = this.sensor$.subscribe(
+  //   this.sensorSubscription$ = this.sensor$.subscribe(
-      (sensor: Sensor) => {
+  //     (sensor: Sensor) => {
-        console.log(sensor);
+  //       console.log(sensor);
-        this.sensor = sensor;
+  //       this.sensor = sensor;
-      },
+  //     },
-      (error: RPCClientError) => {
+  //     (error: RPCClientError) => {
-        console.log(error.response.message);
+  //       console.log(error.response.message);
-      }
+  //     }
-    );
+  //   );
-  }
+  // }
 
-  ngAfterContentInit() {
+  // ngAfterContentInit() {
-    const sensorId = this.route.snapshot.paramMap.get('id');
+  //   const sensorId = this.route.snapshot.paramMap.get('id');
-    this.detailStore.dispatch(
+  //   this.detailStore.dispatch(
-      new DetailStore.Read(
+  //     new DetailStore.Read(
-        { id: sensorId }
+  //       { id: sensorId }
-      )
+  //     )
-    );
+  //   );
-  }
+  // }
 
-  ngOnDestroy() {
+  // ngOnDestroy() {
-    if (this.sensorSubscription$) {
+  //   if (this.sensorSubscription$) {
-      this.sensorSubscription$.unsubscribe();
+  //     this.sensorSubscription$.unsubscribe();
-    }
+  //   }
-  }
+  // }
 
-  onStartOrStop() { }
+  // onStartOrStop() { }
 
-  onEdit() {
+  // onEdit() {
-    this.sensorSettingDisplay = true;
+  //   this.sensorSettingDisplay = true;
-  }
+  // }
 
-  onRemove() {
+  // onRemove() {
-    this.confirmationService.confirm({
+  //   this.confirmationService.confirm({
-      header: 'Are you sure to remove this Sensor?',
+  //     header: 'Are you sure to remove this Sensor?',
-      icon: 'fa fa-trash',
+  //     icon: 'fa fa-trash',
-      message: 'All the related data will be deleted. ',
+  //     message: 'All the related data will be deleted. ',
-      accept: () => {
+  //     accept: () => {
-        alert('으앙 안돼 지우지마ㅠㅠ');
+  //       alert('으앙 안돼 지우지마ㅠㅠ');
-      },
+  //     },
-      reject: () => {
+  //     reject: () => {
-      }
+  //     }
-    });
+  //   });
-  }
+  // }
 
-  onTargetClick(target) {
+  // onTargetClick(target) {
-    // this.router.navigate(['sensors'], { queryParams: { target: target.id } });
+  //   // this.router.navigate(['sensors'], { queryParams: { target: target.id } });
-    this.router.navigate(['target', target.id, 'info']);
+  //   this.router.navigate(['target', target.id, 'info']);
-  }
+  // }
 }
 

@overflow/sensor/component/index.ts

@@ -1,6 +1,5 @@
-import { ListComponent } from './list/list.component';
+import { SensorListComponent } from './list/list.component';
 
-import { SettingComponent } from './setting/setting.component';
 import { TargetSelectorComponent } from './setting/target-selector/target-selector.component';
 import { CrawlerSelectorComponent } from './setting/crawler-selector/crawler-selector.component';
 import { CrawlerAuthComponent } from './setting/crawler-auth/crawler-auth.component';
@@ -11,13 +10,12 @@ import { DetailComponent } from './detail/detail.component';
 // import { TargetSelectorComponent } from './setting/target-selector/target-selector.component';
 
 export const COMPONENTS = [
-  SettingComponent,
   TargetSelectorComponent,
   CrawlerSelectorComponent,
   CrawlerAuthComponent,
   SensorItemSelectorComponent,
   SettingETCComponent,
-  ListComponent,
+  SensorListComponent,
   DetailComponent,
   //   FilterComponent,
   //   SettingETCComponent,

@overflow/sensor/component/list/list.component.html

@@ -1,11 +1,12 @@
 <h1>Sensors</h1>
 
-<div class="ui-g">
+<!-- <div class="ui-g">
     <div class="ui-g-12">
         <p-panel [showHeader]="false" *ngIf="paramTarget">
             <div class="ui-key-value">
                 <span>Status</span>
-                    <span class="ng-star-inserted"><i class="fa ui-icon-stop ui-status-icon ui-status-success"></i>Up</span>
+                <span class="ng-star-inserted">
+                    <i class="fa ui-icon-stop ui-status-icon ui-status-success"></i>Up</span>
             </div>
             <of-key-value [key]="'Alias'" [value]="paramTarget.target.displayName" class="ui-key-value"></of-key-value>
             <of-key-value [key]="'Description'" [value]="paramTarget.target.description" class="ui-key-value"></of-key-value>
@@ -14,16 +15,12 @@
             <of-key-value [key]="'Sensors'" [value]="'todo: count'" class="ui-key-value"></of-key-value>
         </p-panel>
     </div>
-    </div>
+</div> -->
 
-<div class="ui-g">
+<div *ngIf="page" class="ui-g">
     <div class="ui-g-12">
         <div class="ui-g">
             <div class="ui-g-12 ui-md-5 ui-g-nopad">
-                <p-dialog [modal]="true" [width]="800" [(visible)]="sensorSettingDisplay" [showHeader]="false" [closeOnEscape]="false">
-                    <of-sensor-setting [visible]="sensorSettingDisplay" [preTarget]="target" (close)="onSensorSettingClose()"></of-sensor-setting>
-                </p-dialog>
-            
                 <button type="button" label="Add Sensor" icon="ui-icon-add" pButton class="ui-button-large ui-button-width-fit" (click)="onAddSensor()"></button>
             </div>
             <div class="ui-g-12 ui-md-7 ui-g-nopad">
@@ -72,8 +69,8 @@
             <ng-template let-item pTemplate="item">
                 <div class="clearfix ui-sensors ui-bottom-border-1">
                     <div class="ui-g-12 ui-md-3 ui-lg-3 ui-sensor">
-                        <i class="fa ui-icon-devices ui-icon-lg"></i><br>
+                        <i class="fa ui-icon-devices ui-icon-lg"></i>
-                        {{item.target.id}} - {{item.target.displayName}}
+                        <br> {{item.target.id}} - {{item.target.displayName}}
                     </div>
                     <div class="ui-g-12 ui-md-9 ui-lg-9 ui-sensors-details">
                         <div class="ui-g">

@overflow/sensor/component/list/list.component.ts

@@ -1,98 +1,31 @@
-import { Component, OnInit, AfterViewInit, ViewChild, AfterContentInit, OnDestroy } from '@angular/core';
+import { Component, Input, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
 import { Sensor } from '@overflow/commons-typescript/model/sensor';
-import { Store, select } from '@ngrx/store';
+import { Page } from '@overflow/commons-typescript/model/commons/Page';
-import * as SensorStore from '../../store';
-import { RPCClientError } from '@loafer/ng-rpc';
-import * as ListStore from '../../store/list';
-import { sensorListSelector } from '../../store';
-import { Domain } from '@overflow/commons-typescript/model/domain';
-import { AuthSelector } from '@overflow/member/store';
-// import { Page, PageParams } from 'app/commons/model';
-import { Target } from '@overflow/commons-typescript/model/target';
-import { SettingComponent } from '../setting/setting.component';
-import { SelectItem } from 'primeng/primeng';
-
-import { Infra } from '@overflow/commons-typescript/model/infra';
-import * as InfraDetailStore from '@overflow/infra/store/detail';
-import { DetailSelector as InfraDetailSelector } from '@overflow/infra/store';
-import { Subscription } from 'rxjs/Subscription';
-
 
 @Component({
   selector: 'of-sensor-list',
   templateUrl: './list.component.html',
 })
-export class ListComponent implements OnInit, AfterContentInit, OnDestroy {
+export class SensorListComponent implements OnChanges {
 
-  sensorsSubscription$: Subscription;
+  @Input() page: Page<Sensor>;
-  sensorList$ = this.store.pipe(select(sensorListSelector.select('page')));
-  PAGE_SIZE = '99999';
-  totalLength = 0;
-  sensorSettingDisplay = false;
 
-  sensors: Sensor[];
+  totalLength;
-  target: Target = null;
   targetSensor;
 
-  // filter
-  targetOptions: SelectItem[];
-  filteredName: string;
-  selectedTargets: string[] = [];
-  selectedStatus: string[] = [];
-
   constructor(
-    private router: Router,
-    private route: ActivatedRoute,
-    private store: Store<ListStore.State>,
   ) { }
 
-  ngOnInit() {
+  ngOnChanges(changes: SimpleChanges): void {
-
+    this.generateSensorMap();
-    // this.sensorsSubscription$ = this.sensorList$.subscribe(
-    //   (page: Page) => {
-    //     if (page != null) {
-    //       this.sensors = page.content;
-    //       this.generateSensorMap();
-    //     }
-    //   },
-    //   (error: RPCClientError) => {
-    //     console.log(error.response.message);
-    //   }
-    // );
-  }
-
-  ngAfterContentInit() {
-    this.getSensors(0);
-  }
-
-  ngOnDestroy() {
-    if (this.sensorsSubscription$) {
-      this.sensorsSubscription$.unsubscribe();
-    }
-  }
-
-
-  getSensors(pageIndex: number) {
-    // this.store.select(AuthSelector.select('domain')).subscribe(
-    //   (domain: Domain) => {
-    //     const pageParams: PageParams = {
-    //       pageNo: pageIndex + '',
-    //       countPerPage: this.PAGE_SIZE,
-    //       sortCol: 'id',
-    //       sortDirection: 'descending'
-    //     };
-    //     this.store.dispatch(new ListStore.ReadAllByDomain({ domain, pageParams }));
-    //   },
-    //   (error) => {
-    //     console.log(error);
-    //   }
-    // );
   }
 
   generateSensorMap() {
+    if (!this.page) {
+      return;
+    }
     const tempList = [];
-    for (const sensor of this.sensors) {
+    for (const sensor of this.page.content) {
       const targetNode = this.existTarget(sensor, tempList);
       if (targetNode === null) {
         const sensorsNode = [];
@@ -109,20 +42,6 @@ export class ListComponent implements OnInit, AfterContentInit, OnDestroy {
     }
     this.totalLength = tempList.length;
     this.targetSensor = tempList;
-
-    this.generateTargetFilter();
-  }
-
-
-  generateTargetFilter() {
-    if (this.targetOptions) {
-      return;
-    }
-    const tempList = [];
-    for (const data of this.targetSensor) {
-      tempList.push({ label: data.target.displayName, value: data.target.id });
-    }
-    this.targetOptions = tempList;
   }
 
   existTarget(sensor: Sensor, tempList) {
@@ -135,29 +54,40 @@ export class ListComponent implements OnInit, AfterContentInit, OnDestroy {
     return targetNode;
   }
 
-  onAddSensor() {
+  // generateTargetFilter() {
-    this.target = null;
+  //   if (this.targetOptions) {
-    this.sensorSettingDisplay = true;
+  //     return;
-  }
+  //   }
+  //   const tempList = [];
+  //   for (const data of this.targetSensor) {
+  //     tempList.push({ label: data.target.displayName, value: data.target.id });
+  //   }
+  //   this.targetOptions = tempList;
+  // }
 
-  onAddSensorWithTarget(target: Target) {
+  // onAddSensor() {
-    this.target = target;
+  //   this.target = null;
-    this.sensorSettingDisplay = true;
+  //   this.sensorSettingDisplay = true;
-  }
+  // }
 
-  onSensorSettingClose() {
+  // onAddSensorWithTarget(target: Target) {
-    this.sensorSettingDisplay = false;
+  //   this.target = target;
-  }
+  //   this.sensorSettingDisplay = true;
-  onSensorClick(sensor) {
+  // }
-    this.router.navigate(['sensor', sensor.id, 'info']);
-  }
 
-  onSearch() {
+  // onSensorSettingClose() {
-    console.log(this.filteredName);
+  //   this.sensorSettingDisplay = false;
-    console.log(this.selectedTargets);
+  // }
-    console.log(this.selectedStatus);
+  // onSensorClick(sensor) {
-    alert('서버-검색 기능 구현 필요');
+  //   this.router.navigate(['sensor', sensor.id, 'info']);
-  }
+  // }
+
+  // onSearch() {
+  //   console.log(this.filteredName);
+  //   console.log(this.selectedTargets);
+  //   console.log(this.selectedStatus);
+  //   alert('서버-검색 기능 구현 필요');
+  // }
 
 }
 

@overflow/sensor/container/index.ts

@@ -1,5 +1,5 @@
-import { SensorListContainerComponent } from './sensor-list-container';
+import { SensorListContainerComponent } from './sensor-list-container.component';
-import { SensorDetailContainerComponent } from './sensor-detail-container';
+import { SensorDetailContainerComponent } from './sensor-detail-container.component';
 
 export const CONTAINER_COMPONENTS = [
     SensorListContainerComponent,

@overflow/sensor/container/sensor-detail-container.component.ts

@@ -6,7 +6,7 @@ import { Store, select } from '@ngrx/store';
 
 @Component({
   selector: 'of-sensor-detail-container',
-  templateUrl: './sensor-detail-container.html',
+  templateUrl: './sensor-detail-container.component.html',
 })
 export class SensorDetailContainerComponent {
 

@overflow/sensor/container/sensor-list-container.component.html

@@ -0,0 +1 @@
+<of-sensor-list [page]="page$ | async"></of-sensor-list>

@overflow/sensor/container/sensor-list-container.component.ts

@@ -0,0 +1,41 @@
+import { Component, EventEmitter, Output, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
+import { Store, select } from '@ngrx/store';
+import { Sensor } from '@overflow/commons-typescript/model/sensor';
+import * as SensorEntityStore from '../store/entity/sensor';
+import { SensorEntitySelector, SensorPageSelector } from '../store';
+import { AuthSelector } from '../../member/store';
+import { Domain } from '@overflow/commons-typescript/model/domain';
+import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
+import { Page } from '@overflow/commons-typescript/model/commons/Page';
+
+@Component({
+    selector: 'of-sensor-list-container',
+    templateUrl: './sensor-list-container.component.html',
+})
+export class SensorListContainerComponent implements OnInit {
+
+    page$: Observable<Page<Sensor>>;
+    @Output() select = new EventEmitter<Sensor>();
+
+    constructor(private store: Store<SensorEntityStore.State>) {
+        this.page$ = store.pipe(select(SensorPageSelector));
+    }
+
+    ngOnInit() {
+        this.store.select(AuthSelector.select('domain')).subscribe(
+            (domain: Domain) => {
+                const pageParams: PageParams = {
+                    pageNo: 0,
+                    countPerPage: 10,
+                    sortCol: 'id',
+                    sortDirection: 'descending',
+                };
+                this.store.dispatch(new SensorEntityStore.ReadAllByDomainID({domainID : domain.id, pageParams}));
+            },
+            (error) => {
+                console.log(error);
+            }
+        );
+    }
+}

@overflow/sensor/container/sensor-list-container.html

@@ -1 +0,0 @@
-<of-sensor-list></of-sensor-list>

@overflow/sensor/container/sensor-list-container.ts

@@ -1,16 +0,0 @@
-import { Component, EventEmitter, Output } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Store, select } from '@ngrx/store';
-import { Sensor } from '@overflow/commons-typescript/model/sensor';
-// import * as ProbeStore from '../store/entity/probe';
-// import { ProbeEntitySelector, ProbeListContainerSelector } from '../store';
-
-@Component({
-    selector: 'of-sensor-list-container',
-    templateUrl: './sensor-list-container.html',
-})
-export class SensorListContainerComponent {
-
-    @Output() select = new EventEmitter<Sensor>();
-
-}

@overflow/sensor/service/sensor.service.ts

@@ -10,6 +10,8 @@ import { SensorItem } from '@overflow/commons-typescript/model/sensor-item';
 import { Sensor } from '@overflow/commons-typescript/model/sensor';
 import { Domain } from '@overflow/commons-typescript/model/domain';
 import { Target } from '@overflow/commons-typescript/model/target';
+import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
+import { Page } from '@overflow/commons-typescript/model/commons/Page';
 
 
 @Injectable()
@@ -21,9 +23,9 @@ export class SensorService {
 
   }
 
-  // public readAllByDomain(domain: Domain, pageParams: PageParams): Observable<Page> {
+  public readAllByDomainID(domainID: number, pageParams: PageParams): Observable<Page<Sensor>> {
-  //   return this.rpcService.call('SensorService.readAllByDomain', domain, pageParams);
+    return this.rpcService.call('SensorService.readAllByDomainID', domainID, pageParams);
-  // }
+  }
 
   public registSensorConfig(sensor: Sensor, sensorItems: SensorItem[]): Observable<Sensor> {
     return this.rpcService.call('SensorService.registSensorConfig', sensor, sensorItems, null);

@overflow/sensor/store/entity/sensor/index.ts

@@ -0,0 +1,4 @@
+export * from './sensor.action';
+export * from './sensor.effect';
+export * from './sensor.reducer';
+export * from './sensor.state';

@overflow/sensor/store/entity/sensor/sensor.action.ts

@@ -0,0 +1,85 @@
+import { Action } from '@ngrx/store';
+import { RPCClientError } from '@loafer/ng-rpc';
+import { Sensor } from '@overflow/commons-typescript/model/sensor';
+import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
+import { Page } from '@overflow/commons-typescript/model/commons/Page';
+
+export enum ActionType {
+  ReadAllByDomainID = '[Sensor.list] ReadAllByDomainID',
+  ReadAllByDomainIDSuccess = '[Sensor.list] ReadAllByDomainIDSuccess',
+  ReadAllByDomainIDFailure = '[Sensor.list] ReadAllByDomainIDFailure',
+
+  Read = '[Sensor.detail] Read',
+  ReadSuccess = '[Sensor.detail] ReadSuccess',
+  ReadFailure = '[Sensor.detail] ReadFailure',
+
+  Modify = '[Sensor.detail] Modify',
+  ModifySuccess = '[Sensor.detail] ModifySuccess',
+  ModifyFailure = '[Sensor.detail] ModifyFailure',
+}
+
+export class ReadAllByDomainID implements Action {
+  readonly type = ActionType.ReadAllByDomainID;
+
+  constructor(public payload: {domainID: number, pageParams: PageParams}) {}
+}
+
+export class ReadAllByDomainIDSuccess implements Action {
+  readonly type = ActionType.ReadAllByDomainIDSuccess;
+
+  constructor(public payload: Page<Sensor>) {}
+}
+
+export class ReadAllByDomainIDFailure implements Action {
+  readonly type = ActionType.ReadAllByDomainIDFailure;
+
+  constructor(public payload: RPCClientError) {}
+}
+
+export class Read implements Action {
+  readonly type = ActionType.Read;
+
+  constructor(public payload: number) {}
+}
+
+export class ReadSuccess implements Action {
+  readonly type = ActionType.ReadSuccess;
+
+  constructor(public payload: Sensor) {}
+}
+
+export class ReadFailure implements Action {
+  readonly type = ActionType.ReadFailure;
+
+  constructor(public payload: RPCClientError) {}
+}
+
+export class Modify implements Action {
+  readonly type = ActionType.Modify;
+
+  constructor(public payload: Sensor) {}
+}
+
+export class ModifySuccess implements Action {
+  readonly type = ActionType.ModifySuccess;
+
+  constructor(public payload: Sensor) {}
+}
+
+export class ModifyFailure implements Action {
+  readonly type = ActionType.ModifyFailure;
+
+  constructor(public payload: RPCClientError) {}
+}
+
+export type Actions =
+  | ReadAllByDomainID
+  | ReadAllByDomainIDSuccess
+  | ReadAllByDomainIDFailure
+  | Read
+  | ReadSuccess
+  | ReadFailure
+  | Modify
+  | ModifySuccess
+  | ModifyFailure
+;

@overflow/sensor/store/entity/sensor/sensor.effect.ts

@@ -0,0 +1,78 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { Effect, Actions, ofType } from '@ngrx/effects';
+import { Action } from '@ngrx/store';
+
+import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs/observable/of';
+
+import 'rxjs/add/operator/catch';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/exhaustMap';
+import 'rxjs/add/operator/switchMap';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/take';
+
+import { RPCClientError } from '@loafer/ng-rpc';
+import { Sensor } from '@overflow/commons-typescript/model/sensor';
+
+import {
+  ReadAllByDomainID,
+  ReadAllByDomainIDFailure,
+  ReadAllByDomainIDSuccess,
+  Read,
+  ReadSuccess,
+  ReadFailure,
+  Modify,
+  ModifySuccess,
+  ModifyFailure,
+  ActionType
+} from './sensor.action';
+import { SensorService } from '../../../service/sensor.service';
+
+@Injectable()
+export class Effects {
+
+  constructor(
+    private actions$: Actions,
+    private sensorService: SensorService,
+    private router: Router
+  ) { }
+
+  @Effect()
+  ReadAllByDomainID$: Observable<Action> = this.actions$
+    .ofType(ActionType.ReadAllByDomainID)
+    .map((action: ReadAllByDomainID) => action.payload)
+    .switchMap(payload => this.sensorService.readAllByDomainID(payload.domainID, payload.pageParams))
+    .map(page => {
+      return new ReadAllByDomainIDSuccess(page);
+    })
+    .catch((error: RPCClientError) => {
+      return of(new ReadAllByDomainIDFailure(error));
+    });
+
+  // @Effect()
+  // Read$: Observable<Action> = this.actions$
+  //   .ofType(ActionType.Read)
+  //   .map((action: Read) => action.payload)
+  //   .switchMap(payload => this.sensorHostService.read(payload))
+  //   .map(sensorHost => {
+  //     return new ReadSuccess(sensorHost);
+  //   })
+  //   .catch((error: RPCClientError) => {
+  //     return of(new ReadFailure(error));
+  //   });
+
+  //   @Effect()
+  //   Modify$: Observable<Action> = this.actions$
+  //     .ofType(ActionType.Modify)
+  //     .map((action: Modify) => action.payload)
+  //     .switchMap(payload => this.sensorService.modify(payload))
+  //     .map(sensor => {
+  //       return new ModifySuccess(sensor);
+  //     })
+  //     .catch((error: RPCClientError) => {
+  //       return of(new ModifyFailure(error));
+  //     });
+}

@overflow/sensor/store/entity/sensor/sensor.reducer.ts

@@ -0,0 +1,63 @@
+import {
+  ActionType,
+  Actions,
+} from './sensor.action';
+
+import {
+  State,
+  initialState,
+  sensorAdapter,
+} from './sensor.state';
+
+export function reducer(state = initialState, action: Actions): State {
+  switch (action.type) {
+    case ActionType.ReadAllByDomainID: {
+      return {
+        ...state,
+        error: null,
+      };
+    }
+
+    case ActionType.ReadAllByDomainIDSuccess: {
+      return sensorAdapter.setAll(action.payload.content, {...state, page: action.payload});
+    }
+
+    case ActionType.ReadAllByDomainIDFailure: {
+      return sensorAdapter.setError(action.payload, state);
+    }
+
+    case ActionType.Read: {
+      return {
+        ...state,
+        error: null,
+      };
+    }
+
+    case ActionType.ReadSuccess: {
+      return sensorAdapter.setOne(action.payload, {...state, page: null});
+    }
+
+    case ActionType.ReadFailure: {
+      return sensorAdapter.setError(action.payload, state);
+    }
+
+    case ActionType.Modify: {
+      return {
+        ...state,
+        error: null,
+      };
+    }
+
+    case ActionType.ModifySuccess: {
+      return sensorAdapter.upsertOne(action.payload, state);
+    }
+
+    case ActionType.ModifyFailure: {
+      return sensorAdapter.setError(action.payload, state);
+    }
+
+    default: {
+      return state;
+    }
+  }
+}

@overflow/sensor/store/entity/sensor/sensor.state.ts

@@ -0,0 +1,24 @@
+import { RPCClientError } from '@loafer/ng-rpc';
+import { ProbeHost } from '@overflow/commons-typescript/model/probe';
+import { Selector, createSelector } from '@ngrx/store';
+import { createEntityAdapter, EntityState } from '@loafer/ng-entity';
+import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { Sensor } from '@overflow/commons-typescript/model/sensor';
+
+export const sensorAdapter = createEntityAdapter<Sensor, RPCClientError>();
+
+export interface State extends EntityState<Sensor, RPCClientError> {
+  page: Page<Sensor>;
+}
+
+export const initialState: State = {
+  ids : [],
+  entities : null,
+  page: null,
+  error: null,
+};
+
+export function getSelectors<S>(selector: Selector<any, State>) {
+  return sensorAdapter.getSelectors(selector);
+}
+

@overflow/sensor/store/index.ts

@@ -8,32 +8,30 @@ import { StateSelector } from '@overflow/core/ngrx/store';
 
 import { MODULE } from '../sensor.constant';
 
-import * as ListStore from './list';
+import * as SensorEntityStore from './entity/sensor';
-import * as DetailStore from './detail';
 
 export interface State {
-  list: ListStore.State;
+  sensor: SensorEntityStore.State;
-  sensor: DetailStore.State;
 }
 
 export const REDUCERS = {
-  list: ListStore.reducer,
+  sensor: SensorEntityStore.reducer,
-  sensor: DetailStore.reducer,
 };
 
 export const EFFECTS = [
-  ListStore.Effects,
+  SensorEntityStore.Effects,
-  DetailStore.Effects,
 ];
 
-export const sensorState = createFeatureSelector<State>(MODULE.name);
+export const selectState = createFeatureSelector<State>(MODULE.name);
 
-export const sensorListSelector = new StateSelector<ListStore.State>(createSelector(
+export const SensorEntitySelector = SensorEntityStore.getSelectors(createSelector(
-  sensorState,
+  selectState,
-  (state: State) => state.list
-));
-export const sensorSelector = new StateSelector<DetailStore.State>(createSelector(
-  sensorState,
   (state: State) => state.sensor
 ));
 
+export const SensorPageSelector = createSelector(
+  selectState,
+  (state: State) => state.sensor.page
+);
+
+

@overflow/target/component/detail/detail.component.ts

@@ -7,8 +7,7 @@ import { DetailSelector as InfraDetailSelector } from '@overflow/infra/store';
 import * as InfraDetailStore from '@overflow/infra/store/detail';
 import { Subscription } from 'rxjs/Subscription';
 import { RPCClientError } from '@loafer/ng-rpc';
-import { sensorListSelector } from '@overflow/sensor/store';
+// import * as SensorListStore from '@overflow/sensor/store/list';
-import * as SensorListStore from '@overflow/sensor/store/list';
 // import { PageParams, Page } from 'app/commons/model';
 import { ModifySelector } from '@overflow/target/store';
 import * as TargetModifyStore from '@overflow/target/store/modify';
@@ -24,7 +23,7 @@ export class DetailComponent implements OnInit, AfterContentInit, OnDestroy {
   infraSubscription$: Subscription;
   infra$ = this.infraDetailStore.pipe(select(InfraDetailSelector.select('infra')));
   sensorsSubscription$: Subscription;
-  sensors$ = this.sensorListStore.pipe(select(sensorListSelector.select('page')));
+  // sensors$ = this.sensorListStore.pipe(select(sensorListSelector.select('page')));
   target$ = this.targetModifyStore.pipe(select(ModifySelector.select('target')));
 
   infraId = null;
@@ -41,7 +40,7 @@ export class DetailComponent implements OnInit, AfterContentInit, OnDestroy {
     private router: Router,
     private route: ActivatedRoute,
     private infraDetailStore: Store<InfraDetailStore.State>,
-    private sensorListStore: Store<SensorListStore.State>,
+    // private sensorListStore: Store<SensorListStore.State>,
     private targetModifyStore: Store<TargetModifyStore.State>
   ) { }