BOT-373 suggestedActions not mapped as button

Author: treml

.gitignore

@@ -58,3 +58,5 @@ typings/
 .env
 
 dist
+package-lock.json
+yarn.lock

index.js

@@ -60,7 +60,7 @@ class BotiumConnectorDirectline3 {
             botMsg.messageText = message.text || null
 
             const mapButton = (b) => ({
-              text: b.title,
+              text: b.title || b.text,
               payload: b.value || b.url || b.data,
               imageUri: b.image || b.iconUrl
             })
@@ -78,7 +78,7 @@ class BotiumConnectorDirectline3 {
             message.attachments && message.attachments.forEach(a => {
               if (a.contentType === 'application/vnd.microsoft.card.hero') {
                 botMsg.cards.push({
-                  text: a.content.title,
+                  text: a.content.title || a.content.text,
                   image: a.content.images && a.content.images.length > 0 && mapImage(a.content.images[0]),
                   buttons: a.content.buttons && a.content.buttons.map(mapButton)
                 })
@@ -108,6 +108,25 @@ class BotiumConnectorDirectline3 {
               }
             })
 
+            message.suggestedActions && message.suggestedActions.actions && message.suggestedActions.actions.forEach(a => {
+              botMsg.buttons.push(mapButton(a))
+            })
+
+            if (!botMsg.messageText && botMsg.cards) {
+              const card = botMsg.cards.find(c => c.text)
+              if (card && _.isArray(card.text) && card.text.length > 0) {
+                botMsg.messageText = card.text[0]
+              } else if (card && _.isString(card.text)) {
+                botMsg.messageText = card.text
+              }
+            }
+            if (!botMsg.messageText && botMsg.buttons) {
+              const button = botMsg.buttons.find(b => b.text)
+              if (button) {
+                botMsg.messageText = button.text
+              }
+            }
+
             this.queueBotSays(botMsg)
           }
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "botium-connector-directline3",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Botium Connector for Bot Framework Direct Line 3 API",
   "main": "dist/botium-connector-directline3-cjs.js",
   "module": "dist/botium-connector-directline3-es.js",
@@ -19,12 +19,12 @@
   },
   "homepage": "https://github.com/codeforequity-at/botium-connector-directline3#readme",
   "devDependencies": {
-    "eslint": "^4.19.1",
-    "eslint-config-standard": "^11.0.0",
-    "eslint-plugin-import": "^2.11.0",
-    "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-promise": "^3.7.0",
-    "eslint-plugin-standard": "^3.1.0",
+    "eslint": "^5.12.0",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0",
     "rollup": "^0.58.2",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-commonjs": "^9.1.3",

samples/convo/botiumFluent.js

@@ -1,19 +1,12 @@
 {
   "name": "samples",
   "version": "1.0.0",
-  "description": "",
-  "main": "botiumFluent.js",
   "scripts": {
     "mocha": "mocha spec"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "dependencies": {
-    "botium-bindings": "latest",
-    "botium-connector-directline3": "latest",
-    "botium-core": "latest"
-  },
   "botium": {
     "convodirs": [
       "spec\\convo"
@@ -24,6 +17,6 @@
   "devDependencies": {
     "mocha": "latest",
     "botium-bindings": "latest",
-    "botium-connector-echo": "latest"
+    "botium-connector-directline3": "../../"
   }
 }