From dbb03c79796c0f708ddeb2862fe8e6a214958f5a Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Thu, 6 Jul 2017 13:37:30 +0900 Subject: [PATCH] fix the bug --- webui/src/containers/Subscriber/Collection.js | 85 ++++++++++--------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/webui/src/containers/Subscriber/Collection.js b/webui/src/containers/Subscriber/Collection.js index 97fd44218..772a0a7bd 100644 --- a/webui/src/containers/Subscriber/Collection.js +++ b/webui/src/containers/Subscriber/Collection.js @@ -27,12 +27,13 @@ class Collection extends Component { visible: false, dimmed: false }, - view: { + confirm: { visible: false, imsi: '' }, - confirm: { + view: { visible: false, + disableOnClickOutside: false, imsi: '' } }; @@ -107,7 +108,7 @@ class Collection extends Component { hide: () => { this.setState({ document: { - ...this.state.document, + action: '', visible: false, dimmed: false }, @@ -127,6 +128,46 @@ class Collection extends Component { } } + confirmHandler = { + show: (imsi) => { + this.setState({ + confirm: { + visible: true, + imsi, + }, + view: { + ...this.state.view, + disableOnClickOutside: true + } + }) + }, + hide: () => { + this.setState({ + confirm: { + ...this.state.confirm, + visible: false + }, + view: { + ...this.state.view, + disableOnClickOutside: false + } + }) + }, + actions : { + delete: () => { + const { dispatch } = this.props + + if (this.state.confirm.visible === true) { + this.confirmHandler.hide(); + this.documentHandler.hide(); + this.viewHandler.hide(); + + dispatch(deleteSubscriber(this.state.confirm.imsi)); + } + } + } + } + viewHandler = { show: (subscriber) => { this.setState({ @@ -147,42 +188,6 @@ class Collection extends Component { } } - confirmHandler = { - show: (imsi) => { - this.setState({ - confirm: { - imsi, - visible: true - }, - view: { - ...this.state.view, - disableOnClickOutside: true - } - }) - }, - hide: () => { - this.setState({ - confirm: { - ...this.state.confirm, - visible: false - }, - view: { - ...this.state.view, - disableOnClickOutside: false - } - }) - }, - delete: () => { - const { dispatch } = this.props - - if (this.state.confirm.visible === true) { - this.confirmHandler.hide(); - this.viewHandler.hide(); - - dispatch(deleteSubscriber(this.state.confirm.imsi)); - } - } - } render() { const { @@ -249,7 +254,7 @@ class Collection extends Component { onOutside={confirmHandler.hide} buttons={[ { text: "CANCEL", action: confirmHandler.hide, info:true }, - { text: "DELETE", action: confirmHandler.delete, danger:true } + { text: "DELETE", action: confirmHandler.actions.delete, danger:true } ]}/> )