fix(qna): fix qna-form not displaying item data (#974)

botpress · Oct 3, 2018 · ca8e2eb · ca8e2eb
1 parent 991d9fb
commit ca8e2eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/packages/functionals/botpress-qna/src/views/FormModal.js b/packages/functionals/botpress-qna/src/views/FormModal.js
@@ -109,7 +109,7 @@ export default class FormModal extends Component {
     }
 
     return this.props.bp.axios.post('/api/botpress-qna', this.state.item).then(() => {
-      this.onClose()
+      this.props.closeQnAModal()
       this.props.fetchData()
     })
   }
@@ -133,13 +133,11 @@ export default class FormModal extends Component {
         params: { ...page, question, categories: categories.map(({ value }) => value) }
       })
       .then(({ data }) => {
-        this.onClose()
+        this.props.closeQnAModal()
         this.props.updateQuestion(data)
       })
   }
 
-  onClose = () => this.setState(this.defaultState, this.props.closeQnAModal)
-
   alertMessage() {
     if (this.state.isValidForm) {
       return null
@@ -163,7 +161,11 @@ export default class FormModal extends Component {
     const isEdit = modalType === 'edit'
 
     return (
-      <Modal className={classnames(style.newQnaModal, 'newQnaModal')} show={showQnAModal} onHide={this.onClose}>
+      <Modal
+        className={classnames(style.newQnaModal, 'newQnaModal')}
+        show={showQnAModal}
+        onHide={this.props.closeQnAModal}
+      >
         <form onSubmit={!isEdit ? this.onCreate : this.onEdit}>
           <Modal.Header className={style.qnaModalHeader}>
             <Modal.Title>{!isEdit ? 'Create a new' : 'Edit'} Q&A</Modal.Title>
@@ -253,7 +255,7 @@ export default class FormModal extends Component {
           </Modal.Body>
 
           <Modal.Footer className={style.qnaModalFooter}>
-            <Button className={style.qnaModalFooterCancelBtn} onClick={this.onClose}>
+            <Button className={style.qnaModalFooterCancelBtn} onClick={this.props.closeQnAModal}>
               Cancel
             </Button>
             <Button className={style.qnaModalFooterSaveBtn} type="submit">

diff --git a/packages/functionals/botpress-qna/src/views/index.js b/packages/functionals/botpress-qna/src/views/index.js
@@ -400,15 +400,15 @@ export default class QnaAdmin extends Component {
     )
   }
 
-  closeQnAModal = () => this.setState({ showQnAModal: false })
+  closeQnAModal = () => this.setState({ showQnAModal: false, currentItemId: null })
 
   questionsList = () => this.state.items.map(this.renderItem)
 
   updateQuestion = ({ items }) => this.setState({ items })
 
   render() {
     return (
-      <Panel className={`${style.qnaContainer} qnaContainer`}>
+      <Panel className={classnames(style.qnaContainer, 'qnaContainer')}>
         <a
           ref={this.csvDownloadableLink}
           href={this.state.csvDownloadableLinkHref}