Bump to Adaptive Cards 1.0.0

CHANGELOG.md

@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Update dependencies
-  - [`[email protected]-beta9`](https://www.npmjs.com/package/adaptivecards), in [PR #849](https://github.com/Microsoft/BotFramework-WebChat/pull/849)
+  - [`[email protected]`](https://www.npmjs.com/package/adaptivecards), in [PR #849](https://github.com/Microsoft/BotFramework-WebChat/pull/849) and [PR #XXX](https://github.com/Microsoft/BotFramework-WebChat/pull/XXX)
   - [`[email protected]`](https://www.npmjs.com/package/http-server), in [PR #829](https://github.com/Microsoft/BotFramework-WebChat/pull/829)
   - [`[email protected]`](https://www.npmjs.com/package/microsoft-speech-browser-sdk), in [PR #888](https://github.com/Microsoft/BotFramework-WebChat/pull/888)
   - [`[email protected]`](https://www.npmjs.com/package/nightmare), in [PR #887](https://github.com/Microsoft/BotFramework-WebChat/pull/887)

package.json

@@ -28,7 +28,7 @@
   "author": "Microsoft Corp",
   "license": "MIT",
   "dependencies": {
-    "adaptivecards": "1.0.0-beta9",
+    "adaptivecards": "1.0.0",
     "botframework-directlinejs": "0.9.13",
     "core-js": "2.4.1",
     "markdown-it": "8.3.1",

src/AdaptiveCardContainer.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { findDOMNode } from 'react-dom';
 import { connect } from 'react-redux';
 import { Action, AdaptiveCard, HostConfig, IValidationError, OpenUrlAction, SubmitAction } from 'adaptivecards';
-import { IActionBase, IActionShowCard, IAdaptiveCard } from 'adaptivecards/lib/schema';
+import { IAction, IAdaptiveCard, IOpenUrlAction, IShowCardAction, ISubmitAction } from 'adaptivecards/lib/schema';
 import { CardAction } from 'botframework-directlinejs/built/directLine';
 import { classList, IDoCardAction } from './Chat';
 import { AjaxResponse, AjaxRequest } from 'rxjs/observable/dom/AjaxObservable';
@@ -31,18 +31,34 @@ export interface BotFrameworkCardAction extends CardAction {
 const defaultHostConfig = new HostConfig(adaptivecardsHostConfig);
 
 function cardWithoutHttpActions(card: IAdaptiveCard) {
-    if (!card.actions) return card;
-    const actions: IActionBase[] = [];
-    card.actions.forEach(action => {
-        //filter out http action buttons
-        if (action.type === 'Action.Http') return;
-        if (action.type === 'Action.ShowCard') {
-            const showCardAction = action as IActionShowCard;
-            showCardAction.card = cardWithoutHttpActions(showCardAction.card);
+    if (!card.actions) {
+        return card;
+    }
+
+    const nextActions: (IOpenUrlAction | IShowCardAction | ISubmitAction)[] = card.actions.reduce((nextActions, action) => {
+        // Filter out HTTP action buttons
+        switch (action.type) {
+            case 'Action.Submit':
+                break;
+
+            case 'Action.ShowCard':
+                nextActions.push({
+                    ...action,
+                    card: cardWithoutHttpActions(action.card)
+                });
+
+                break;
+
+            default:
+                nextActions.push(action);
+
+                break;
         }
-        actions.push(action);
-    });
-    return { ...card, actions };
+
+        return nextActions;
+    }, []);
+
+    return { ...card, nextActions };
 }
 
 class AdaptiveCardContainer extends React.Component<Props, State> {

tsconfig.json

@@ -11,6 +11,7 @@
         "noImplicitAny": true,
         "outDir": "./built/",
         "target": "es5",
+        "skipLibCheck": true,
         "sourceMap": true,
         "inlineSources": true
     },