Clear suggested-actions on button click (#2190)

tdurnford · corinagum · commit 84d194ba0a21 · 2019-07-16T22:25:07.000-07:00
* Clear suggested-actions on button click

* Updated CHANGELOG.md

* Created clearSuggestedActions action

* Removed setSuggestedActions from dispatchers

* Modified clearSuggestedActions action
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,7 +43,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
    - Removed [`redux-promise-middleware`](https://www.npmjs.com/package/redux-promise-middleware)
 
 ### Fixed
-   -  Fix [#2187](https://github.com/microsoft/BotFramework-WebChat/issues/2187). Bump core-js and update core-js modules on index-es5.js, by [@corinagum](https://github.com/corinagum) in PR [#2195](https://github.com/microsoft/BotFramework-WebChat/pull/2195)
+
+-  Fix [#2160](https://github.com/microsoft/BotFramework-WebChat/issues/2160). Clear suggested actions after clicking on a suggested actions of type `openUrl`, by [@tdurnford](https://github.com/tdurnford) in PR [#2190](https://github.com/microsoft/BotFramework-WebChat/pull/2190)
+-  Fix [#2187](https://github.com/microsoft/BotFramework-WebChat/issues/2187). Bump core-js and update core-js modules on index-es5.js, by [@corinagum](https://github.com/corinagum) in PR [#2195](https://github.com/microsoft/BotFramework-WebChat/pull/2195)
+
 
 ## [4.5.0] - 2019-07-10
 
diff --git a/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-suggested-action-bar-should-reset-after-button-click-1-snap.png b/__tests__/__image_snapshots__/chrome-docker/suggested-actions-js-suggested-actions-command-suggested-action-bar-should-reset-after-button-click-1-snap.png
diff --git a/__tests__/stacked.js b/__tests__/stacked.js
@@ -2,6 +2,7 @@ import { imageSnapshotOptions, timeouts } from './constants.json';
 
 import allImagesLoaded from './setup/conditions/allImagesLoaded';
 import minNumActivitiesShown from './setup/conditions/minNumActivitiesShown';
+import scrollToBottomCompleted from './setup/conditions/scrollToBottomCompleted';
 import uiConnected from './setup/conditions/uiConnected';
 
 // selenium-webdriver API doc:
@@ -18,6 +19,7 @@ describe('stacked without avatar initials', () => {
 
     await driver.wait(minNumActivitiesShown(2), timeouts.directLine);
     await driver.wait(allImagesLoaded(), timeouts.fetch);
+    await driver.wait(scrollToBottomCompleted(), timeouts.scrollToBottom);
 
     expect(await driver.takeScreenshot()).toMatchImageSnapshot(imageSnapshotOptions);
   });
diff --git a/packages/component/src/Composer.js b/packages/component/src/Composer.js
@@ -10,6 +10,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 
 import {
+  clearSuggestedActions,
   connect as createConnectAction,
   createStore,
   disconnect,
@@ -46,6 +47,7 @@ import shallowEquals from './Utils/shallowEquals';
 const EMPTY_ARRAY = [];
 
 const DISPATCHERS = {
+  clearSuggestedActions,
   markActivity,
   postActivity,
   sendEvent,
diff --git a/packages/component/src/SendBox/SuggestedAction.js b/packages/component/src/SendBox/SuggestedAction.js
@@ -16,9 +16,10 @@ const SUGGESTED_ACTION_CSS = css({
 
 const connectSuggestedAction = (...selectors) =>
   connectToWebChat(
-    ({ disabled, language, onCardAction }, { displayText, text, type, value }) => ({
+    ({ clearSuggestedActions, disabled, language, onCardAction }, { displayText, text, type, value }) => ({
       click: () => {
         onCardAction({ displayText, text, type, value });
+        type === 'openUrl' && clearSuggestedActions();
       },
       disabled,
       language
diff --git a/packages/core/src/actions/clearSuggestedActions.js b/packages/core/src/actions/clearSuggestedActions.js
@@ -0,0 +1,9 @@
+const CLEAR_SUGGESTED_ACTIONS = 'WEB_CHAT/CLEAR_SUGGESTED_ACTIONS';
+
+export default function clearSuggestedActions() {
+  return {
+    type: CLEAR_SUGGESTED_ACTIONS
+  };
+}
+
+export { CLEAR_SUGGESTED_ACTIONS };
diff --git a/packages/core/src/index.js b/packages/core/src/index.js
@@ -1,5 +1,6 @@
 /* global process:readonly */
 
+import clearSuggestedActions from './actions/clearSuggestedActions';
 import connect from './actions/connect';
 import createStore from './createStore';
 import disconnect from './actions/disconnect';
@@ -30,6 +31,7 @@ const Constants = { ActivityClientState, DictateState };
 const version = process.env.NPM_PACKAGE_VERSION;
 
 export {
+  clearSuggestedActions,
   connect,
   Constants,
   createStore,
diff --git a/packages/core/src/reducers/suggestedActions.js b/packages/core/src/reducers/suggestedActions.js
@@ -1,3 +1,4 @@
+import { CLEAR_SUGGESTED_ACTIONS } from '../actions/clearSuggestedActions';
 import { SET_SUGGESTED_ACTIONS } from '../actions/setSuggestedActions';
 
 const DEFAULT_STATE = [];
@@ -7,7 +8,9 @@ export default function suggestedActions(state = DEFAULT_STATE, { payload = {},
     case SET_SUGGESTED_ACTIONS:
       state = [].slice.call(payload.suggestedActions || []);
       break;
-
+    case CLEAR_SUGGESTED_ACTIONS:
+      state = DEFAULT_STATE;
+      break;
     default:
       break;
   }
