Merge branch 'master' of https://git.loafle.net/overflow/overflow-webapp

src/packages/infra/component/map/map.component.ts

@@ -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%',

src/packages/sensor/component/setting/crawler-auth/crawler-auth.component.ts

@@ -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();
         }

src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.html

@@ -9,7 +9,7 @@
       <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>

src/packages/sensor/component/setting/crawler-selector/crawler-selector.component.ts

@@ -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) {

src/packages/sensor/component/setting/sensor-item-selector/sensor-item-selector.component.html

@@ -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>

src/packages/sensor/component/setting/sensor-item-selector/sensor-item-selector.component.ts

@@ -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 (node.isActive) {
+      if (this.checkedSet.has(node.data.displayItem) === false) {
-    //   if (this.checkedSet.has(node.data) === false) {
+        this.checkedSet.add(node.data.displayItem);
-    //     this.checkedSet.add(node.data);
+      }
-    //   }
+    } else {
-    // } else {
+      if (this.checkedSet.has(node.data.displayItem)) {
-    //   if (this.checkedSet.has(node.data)) {
+        this.checkedSet.delete(node.data.displayItem);
-    //     this.checkedSet.delete(node.data);
+      }
-    //   }
+    }
-    // }
+    this.itemSelectEvent.emit(this.checkedSet);
   }
 
   onTreeDataLoad(tree) {

src/packages/sensor/component/setting/setting.component.html

@@ -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">

src/packages/sensor/component/setting/setting.component.ts

@@ -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() {
+  validateSelection() {
-    this.step += 1;
+    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;
+  }
 }

src/packages/settings/member/component/totp/totp.component.ts

@@ -3,9 +3,12 @@ import { ActivatedRoute, Router } from '@angular/router';
 import * as TotpStore from '../../store/totp';
 import { Store, select } from '@ngrx/store';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+
+import { AuthSelector } from 'packages/member/store';
+
+
 import { TotpSelector } from '../../store';
-import {AuthSelector} from "../../../../member/store/index";
+import { Member } from 'packages/member/model/Member';
-import {Member} from "../../../../member/model/Member";
 
 @Component({
   selector: 'of-totp',
@@ -51,6 +54,29 @@ export class TotpComponent implements OnInit {
     });
   }
 
+  // ngAfterContentInit() {
+  //
+  //   this.listStore.select(AuthSelector.select('member')).subscribe(
+  //     (member: Member) => {
+  //       this.store.dispatch(new TotpRegistStore.createTotp(member));
+  //     },
+  //     (error) => {
+  //       console.log(error);
+  //     }
+  //   );
+  //
+  //   this.probes$.subscribe(
+  //     (probes: boo) => {
+  //       console.log(probes);
+  //       this.dataSource = new MatTableDataSource(probes);
+  //       this.dataSource.sort = this.sort;
+  //     },
+  //     (error: RPCError) => {
+  //       console.log(error.response.message);
+  //     }
+  //   );
+  //
+  // }
   registClick() {
     const code = this.totpForm.value['code'];
     const secretCode = 'X6AWAK573M5372NM';

src/packages/settings/member/service/member-totp.service.ts

@@ -16,7 +16,7 @@ export class MemberTotpService {
   public createTotp(member: Member): Observable<MemberTotp[]> {
     // Todo Store get member object
 
-    return this.rpcClient.call<MemberTotp[]>('MemberTotpService.createTotp', {Member: {id:1}});
+    return this.rpcClient.call<MemberTotp[]>('MemberTotpService.createTotp', {Member: member});
   }
 
   public regist(member: Member, secretCode: string, code: string): Observable<boolean> {
@@ -27,4 +27,8 @@ export class MemberTotpService {
     // };
     return this.rpcClient.call<boolean>('MemberTotpService.regist', member, secretCode, code);
   }
+
+  public checkCodeForMember(member: Member, code: string): Observable<boolean> {
+    return this.rpcClient.call<boolean>('MemberTotpService.checkCodeForMember', member, code);
+  }
 }

src/packages/settings/member/store/totp/totp.action.ts

@@ -12,6 +12,10 @@ export enum ActionType {
   Regist                    = '[member.totp] Regist',
   RegistSuccess             = '[member.totp] RegistSuccess',
   RegistFailure             = '[member.totp] RegistFailure',
+
+  CheckCodeForMember        = '[member.totp] CheckCodeForMember',
+  CheckCodeForMemberSuccess = '[member.totp] CheckCodeForMemberSuccess',
+  CheckCodeForMemberFailure = '[member.totp] CheckCodeForMemberFailure',
 }
 
 export class CreateTotp implements Action {
@@ -52,6 +56,26 @@ export class RegistFailure implements Action {
   constructor(public payload: RESTError) {}
 }
 
+// ----------------------------------------------------------------------------------------
+
+export class CheckCodeForMember implements Action {
+  readonly type = ActionType.CheckCodeForMember;
+
+  constructor(public payload: {member: Member, code: string}) {}
+}
+
+export class CheckCodeForMemberSuccess implements Action {
+  readonly type = ActionType.CheckCodeForMemberSuccess;
+
+  constructor(public payload: void) {}
+}
+
+export class CheckCodeForMemberFailure implements Action {
+  readonly type = ActionType.CheckCodeForMemberFailure;
+
+  constructor(public payload: RESTError) {}
+}
+
 export type Actions =
   | CreateTotp
   | CreateTotpSuccess
@@ -59,4 +83,7 @@ export type Actions =
   | Regist
   | RegistSuccess
   | RegistFailure
+  | CheckCodeForMember
+  | CheckCodeForMemberSuccess
+  | CheckCodeForMemberFailure
   ;

src/packages/settings/member/store/totp/totp.effect.ts

@@ -26,6 +26,10 @@ import {
   RegistSuccess,
   RegistFailure,
 
+  CheckCodeForMember,
+  CheckCodeForMemberSuccess,
+  CheckCodeForMemberFailure,
+
   ActionType,
 } from './totp.action';
 
@@ -56,14 +60,6 @@ export class Effects {
       return of(new CreateTotpFailure(error));
     });
 
-  @Effect({ dispatch: false })
-  createTotpSuccess$ = this.actions$
-    .ofType(ActionType.CreateTotpSuccess)
-    .do(() => {
-    // Todo TOTP View Print
-      this.router.navigateByUrl(this._returnURL);
-    });
-
   @Effect()
   regist: Observable<Action> = this.actions$
     .ofType(ActionType.Regist)
@@ -78,4 +74,20 @@ export class Effects {
     .catch((error: RESTError) => {
       return of(new RegistFailure(error));
     });
+
+
+  @Effect()
+  checkCodeForMember: Observable<Action> = this.actions$
+    .ofType(ActionType.CheckCodeForMember)
+    .map((action: Regist) => action.payload)
+    .switchMap((payload) => {
+      // this._returnURL = payload.returnURL;
+      return this.memberTotpService.checkCodeForMember(payload.member, payload.code);
+    })
+    .map((result: any) => {
+      return new CheckCodeForMemberSuccess(result);
+    })
+    .catch((error: RESTError) => {
+      return of(new CheckCodeForMemberFailure(error));
+    });
 }