Merge pull request #88 from SAPConversationalAI/mergeToOpenSource

Merge to open source

Author: JWandrocke

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "webchat",
-  "version": "1.4.45",
+  "version": "1.4.46",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package.json

@@ -55,7 +55,7 @@ class Message extends Component {
     }
     return false
   }
-  render () {
+  render () { // NOSONAR
     const {
       message,
       isLastMessage,
@@ -79,8 +79,12 @@ class Message extends Component {
       botMessageBackgroundColor,
     } = preferences
     const { displayIcon, attachment, participant } = message
-    const { type, content, error, title, markdown } = attachment
+    const { type, content, error, title, markdown, welcomeMessage } = attachment
     const { exceptionThrownOccurred } = this.state
+    if (welcomeMessage) {
+      // Ignore unsupported WebClient feature
+      return null
+    }
     if (exceptionThrownOccurred) {
       const style = {
         color: '#fff',

src/components/Message/index.js

@@ -23,6 +23,10 @@ const delayBetweenMessages = async (messages, dispatch) => {
     dispatch({ type: 'SET_CREDENTIALS', payload: { lastMessageId } })
   }
   for (const msg of messages) {
+    if (pathOr(false, ['attachment', 'welcomeMessage'], msg)) {
+      // Skip new WebClient welcome messages Feature
+      continue
+    }
     dispatch({ type: 'ADD_MESSAGES', payload: { messages: [msg] } })
     if (lastMessageId !== msg.id) {
     // If there is a delay in this message wait before showing the next message.