before deploy

lackdaz · Jun 1, 2017 · dd45a54 · dd45a54
1 parent 9743eb3
commit dd45a54
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/client/app/bundles/Main/components/ChatBotComponents/Intent.jsx b/client/app/bundles/Main/components/ChatBotComponents/Intent.jsx
@@ -12,7 +12,7 @@ export default class WitAi extends Component {
       result: '',
       show: '',
       trigger: false,
-      clear: false
+      steps: {}
     }
 
     this.triggetNext = this.triggetNext.bind(this)
@@ -60,7 +60,7 @@ export default class WitAi extends Component {
         self.triggetNext(self.state.result)
       }
     }).catch(console.error)
-    self.setState({ clear: false})
+
   }
 
   triggetNext (triggerInput, value) {
@@ -76,30 +76,21 @@ export default class WitAi extends Component {
 
     if (this.props.tonesArr !== nextProps.tonesArr) {
       this.setState({
-        clear: true
+        tonesArr: nextProps.tonesArr,
+        steps: nextProps.steps
       })
     }
   }
 
   shouldComponentUpdate (nextProps, nextState) {
-    if (this.props.tonesArr !== nextProps.tonesArr && nextState.clear) {
+    // if (this.props.tonesArr !== nextProps.tonesArr || this.steps !== nextProps.steps) {
+    if (this.props.tonesArr !== nextProps.tonesArr) {
+
       return true
     }
     return false
   }
 
-  componentDidUpdate (prevProps, prevState) {
-    const { loading, clear, result, trigger } = this.state
-    if (!loading) {
-      this.setState({
-        clear: false,
-        loading: false,
-        trigger: false,
-        result: '',
-      })
-    }
-  }
-
   componentWillUpdate () {
     this.witCall()
   }

diff --git a/client/app/bundles/Main/components/MainApp.jsx b/client/app/bundles/Main/components/MainApp.jsx
@@ -267,10 +267,10 @@ export default class MainApp extends React.Component {
       steps: steps,
       opened: false,
       floating: true,
-      inputValue: '',
+      inputValue: undefined,
       sentiment: '',
       endDelay: 2000,
-      tonesArr: []
+      tonesArr: [],
     }
 
     // Callback function to trigger next step when user attribute is true. Optionally you can pass a object with value to be setted in the step and the next step to be triggered
@@ -320,6 +320,18 @@ export default class MainApp extends React.Component {
     // }, this.state.endDelay)
   }
 
+  componentWillUpdate(nextProps, nextState) {
+    // console.log("called receive props!")
+    // console.log(this.props.opened)
+    // console.log(nextProps.opened)
+    // console.log(this.props.opened !== nextProps.opened)
+    if (this.state.inputValue === nextState.inputValue) {
+      this.setState({
+        inputValue: undefined
+      })    
+    }
+  }
+
   componentDidUpdate (prevProps, prevState) {
   }
 

diff --git a/client/app/bundles/Main/components/ReactSimpleChatBot/ChatBot.jsx b/client/app/bundles/Main/components/ReactSimpleChatBot/ChatBot.jsx
@@ -96,9 +96,11 @@ class ChatBot extends Component {
     })
   }
 
-  componentDidMount () {
+  componentDidMount (prevProps, prevState) {
     const chatbotContent = document.querySelector('.rsc-content')
 
+
+
     /* istanbul ignore next */
     if (chatbotContent) {
       chatbotContent.addEventListener('DOMNodeInserted', this.onNodeInserted)

diff --git a/client/app/bundles/Main/components/SentimentBot/SentimentBot.jsx b/client/app/bundles/Main/components/SentimentBot/SentimentBot.jsx
@@ -157,7 +157,7 @@ export default class SentimentBot extends React.Component {
       // console.log(this.props.opened)
       // console.log(nextProps.opened)
       // console.log(this.props.opened !== nextProps.opened)
-      if (this.props.response !== nextProps.response) {
+      if (this.props.response !== nextProps.response && this.props.toneArr === nextProps.toneArr) {
         this.checktone(nextProps.response)
       }
     }