From 16b37e5061da0a00f23c742482ae49e899471db5 Mon Sep 17 00:00:00 2001
From: insanity <insanity@loafle.com>
Date: Mon, 10 Sep 2018 17:51:14 +0900
Subject: [PATCH] scan condition apply or cancel

---
 .../primeng/dropdown-panel.component.html        |  2 +-
 .../primeng/dropdown-panel.component.ts          |  4 +++-
 .../component/primeng/popup-panel.component.ts   |  5 ++++-
 .../scanner-setting-dropdown.component.html      |  5 +++--
 .../scanner-setting-dropdown.component.ts        | 16 ++++++++++------
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/@overflow/commons/ui/component/primeng/dropdown-panel.component.html b/@overflow/commons/ui/component/primeng/dropdown-panel.component.html
index 04036b7..f8237ea 100644
--- a/@overflow/commons/ui/component/primeng/dropdown-panel.component.html
+++ b/@overflow/commons/ui/component/primeng/dropdown-panel.component.html
@@ -2,7 +2,7 @@
   <ng-content select="p-header"></ng-content>
 </div>
 
-<of-p-popupPanel #popupPanel [style]="style" [styleClass]="styleClass" [blockTarget]="blockTarget">
+<of-p-popupPanel #popupPanel [style]="style" [styleClass]="styleClass" [blockTarget]="blockTarget" (cancel)="cancel.emit($event)">
   <div [ngClass]="'ui-popuppanel-content'">
     <ng-content></ng-content>
   </div>
diff --git a/@overflow/commons/ui/component/primeng/dropdown-panel.component.ts b/@overflow/commons/ui/component/primeng/dropdown-panel.component.ts
index cd7fcea..647f1af 100644
--- a/@overflow/commons/ui/component/primeng/dropdown-panel.component.ts
+++ b/@overflow/commons/ui/component/primeng/dropdown-panel.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, ContentChild, ViewChild } from '@angular/core';
+import { Component, Input, ContentChild, ViewChild, Output, EventEmitter } from '@angular/core';
 import { Header, Footer } from 'primeng/primeng';
 import { PopupPanelComponent } from './popup-panel.component';
 
@@ -28,6 +28,8 @@ export class DropdownPanelComponent {
 
   @ViewChild('popupPanel') popupPanel: PopupPanelComponent;
 
+  @Output() cancel = new EventEmitter();
+
   constructor() { }
 
   hide(): void {
diff --git a/@overflow/commons/ui/component/primeng/popup-panel.component.ts b/@overflow/commons/ui/component/primeng/popup-panel.component.ts
index dc00d7a..93a70c3 100644
--- a/@overflow/commons/ui/component/primeng/popup-panel.component.ts
+++ b/@overflow/commons/ui/component/primeng/popup-panel.component.ts
@@ -1,4 +1,4 @@
-import { NgModule, Component, ElementRef, OnDestroy, Input, Renderer2, ViewChild, Inject, forwardRef } from '@angular/core';
+import { NgModule, Component, ElementRef, OnDestroy, Input, Renderer2, ViewChild, Inject, forwardRef, Output, EventEmitter } from '@angular/core';
 import { trigger, state, style, transition, animate, AnimationEvent } from '@angular/animations';
 import { DomHandler } from 'primeng/primeng';
 
@@ -36,6 +36,8 @@ export class PopupPanelComponent implements OnDestroy {
 
   @Input() baseZIndex = 0;
 
+  @Output() cancel = new EventEmitter();
+
   @ViewChild('container') containerViewChild: ElementRef;
 
   readonly popup = true;
@@ -129,6 +131,7 @@ export class PopupPanelComponent implements OnDestroy {
     if (!this.documentClickListener) {
       this.documentClickListener = this.renderer.listen('document', 'click', () => {
         if (!this.preventDocumentDefault) {
+          this.cancel.emit();
           this.hide();
         }
 
diff --git a/src/commons/component/scanner-setting-dropdown.component.html b/src/commons/component/scanner-setting-dropdown.component.html
index 16c04cb..16b3986 100644
--- a/src/commons/component/scanner-setting-dropdown.component.html
+++ b/src/commons/component/scanner-setting-dropdown.component.html
@@ -1,4 +1,4 @@
-<of-p-dropdownPanel #panel [style]="{'width':'400px'}" [headerStyle]="{'width':'300px'}" [blockTarget]="blockTarget">
+<of-p-dropdownPanel #panel [style]="{'width':'400px'}" [headerStyle]="{'width':'300px'}" [blockTarget]="blockTarget" (cancel)="setDefault()">
   <p-header class="toolbar-button">
     <button _ngcontent-c1="" class="button-component" type="button">
       <!-- <svg _ngcontent-c1="" aria-hidden="true" class="octicon icon" version="1.1" viewBox="0 0 10 16" width="16px" height="16px">
@@ -87,7 +87,8 @@
   </p-panel>
    -->
   <div class="ui-g-12">
-    <button type="button" pButton label="확인" style="float: right;" (click)="done()" [disabled]="portErrMsg || ipErrMsg"></button>
+    <button type="button" pButton label="Reset" style="float: right;" (click)="setDefault()"></button>
+    <button type="button" pButton label="Apply" style="float: right;" (click)="done()" [disabled]="portErrMsg || ipErrMsg"></button>
   </div>
   <!-- <p-footer>
     Footer content here
diff --git a/src/commons/component/scanner-setting-dropdown.component.ts b/src/commons/component/scanner-setting-dropdown.component.ts
index 94372ce..abab156 100644
--- a/src/commons/component/scanner-setting-dropdown.component.ts
+++ b/src/commons/component/scanner-setting-dropdown.component.ts
@@ -33,6 +33,8 @@ export class ScannerSettingDropdownComponent implements OnInit {
   ipErrMsg: string;
   portErrMsg: string;
 
+  zone: Zone;
+
   constructor(
     private discoveryConfigService: DiscoveryConfigService
   ) {
@@ -40,18 +42,18 @@ export class ScannerSettingDropdownComponent implements OnInit {
 
   ngOnInit(): void {
     this.discoveryConfigService.zone.subscribe(res => {
-      var zone = res as Zone;
-      this.setDefault(zone);
+      this.zone = res as Zone;
+      this.setDefault();
     });
 
   }
 
-  setDefault(zone: Zone): void {
-    if (zone === null) {
+  setDefault(): void {
+    if (this.zone === null) {
       return;
     }
 
-    const cidr = new IPCIDR(zone.network);
+    const cidr = new IPCIDR(this.zone.network);
     this.ipType = MetaIPTypeEnum.V4;
 
     this.firstIP = cidr.start();
@@ -135,13 +137,14 @@ export class ScannerSettingDropdownComponent implements OnInit {
   done() {
     // TODO: re-validation
     this.setSummary();
+    this.panel.hide();
+
   }
 
   setSummary(): void {
     this.ipSummary = this.ipType + ' (' + this.firstIP + ' - ' + this.lastIP + ')';
     this.portSummary = this.includePortType.join(',');
     this.portSummary += ' (' + this.firstPort + ' - ' + this.lastPort + ')';
-    this.panel.hide();
 
     this.configDiscoverHost();
   }
@@ -160,4 +163,5 @@ export class ScannerSettingDropdownComponent implements OnInit {
     }
     this.ready.emit(discoverHost);
   }
+
 }