Prevent passing props to activity middleware (#2105)

* Prevent passing props to activity middleware * Package lock updated * Changelog updated * Corrected changelog
microsoft · Mar 13, 2020 · 4e714bf · 4e714bf
1 parent 186d8e2
commit 4e714bf
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## v4.8.1 - 2019 - 03 - 16
 ## Fixed
-
-- [client] Fixed an issue where Restart activity wont appear on selected activity after restarting once in PR [2103](https://github.com/microsoft/BotFramework-Emulator/pull/2103)
 - [build] Replaced a missing .icns file that was deleted by mistake in a previous PR. Fixes the app icon on Linux & Mac in PR [2104](https://github.com/microsoft/BotFramework-Emulator/pull/2104)
+- [client] Fixed an issue where Restart activity wont appear on selected activity after restarting once in PR [2105](https://github.com/microsoft/BotFramework-Emulator/pull/2105)
+
 
 ## v4.8.0 - 2019 - 03 - 12
 ## Added

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/client/src/ui/editor/emulator/parts/chat/chat.tsx b/packages/app/client/src/ui/editor/emulator/parts/chat/chat.tsx
@@ -139,18 +139,13 @@ export class Chat extends PureComponent<ChatProps, ChatState> {
   }
 
   private activityWrapper(next, card, children): ReactNode {
-    const { mode, restartStatus } = this.props;
-    const isWebChatDisabled =
-      mode === 'transcript' || mode === 'debug' || restartStatus === RestartConversationStatus.Started;
     return (
       <OuterActivityWrapperContainer
         card={card}
         documentId={this.props.documentId}
         onContextMenu={this.onContextMenu}
         onItemRendererClick={this.onItemRendererClick}
         onItemRendererKeyDown={this.onItemRendererKeyDown}
-        restartStatusForActivity={this.props.restartStatus}
-        isWebChatDisabled={isWebChatDisabled}
       >
         {next(card)(children)}
       </OuterActivityWrapperContainer>

diff --git a/packages/app/client/src/ui/editor/emulator/parts/chat/outerActivityWrapper.spec.tsx b/packages/app/client/src/ui/editor/emulator/parts/chat/outerActivityWrapper.spec.tsx
@@ -35,7 +35,7 @@ import * as React from 'react';
 import { createStore } from 'redux';
 import { Provider } from 'react-redux';
 import { mount, shallow } from 'enzyme';
-import { ValueTypes, RestartConversationOptions } from '@bfemulator/app-shared';
+import { ValueTypes, RestartConversationOptions, RestartConversationStatus } from '@bfemulator/app-shared';
 
 import { OuterActivityWrapper } from './outerActivityWrapper';
 import { OuterActivityWrapperContainer } from './outerActivityWrapperContainer';
@@ -49,7 +49,9 @@ describe('<OuterActivityWrapper />', () => {
             highlightedObjects: [],
             inspectorObjects: [{ value: {}, valueType: ValueTypes.Activity }],
           },
-          restartStatus: {},
+        },
+        restartStatus: {
+          doc1: RestartConversationStatus.Stop,
         },
       },
     };

diff --git a/packages/app/client/src/ui/editor/emulator/parts/chat/outerActivityWrapper.tsx b/packages/app/client/src/ui/editor/emulator/parts/chat/outerActivityWrapper.tsx
@@ -35,6 +35,7 @@ import * as React from 'react';
 import { SharedConstants, RestartConversationOptions } from '@bfemulator/app-shared';
 import { Activity } from 'botframework-schema';
 import { RestartConversationStatus } from '@bfemulator/app-shared';
+import { EmulatorMode } from '@bfemulator/sdk-shared';
 
 import { areActivitiesEqual } from '../../../../../utils';
 
@@ -54,15 +55,27 @@ export interface OuterActivityWrapperProps {
     restartOption: RestartConversationOptions
   ) => void;
   currentRestartConversationOption: RestartConversationOptions;
-  isWebChatDisabled: boolean;
+  mode: EmulatorMode;
+  restartStatus: RestartConversationStatus;
 }
 
 export class OuterActivityWrapper extends React.Component<OuterActivityWrapperProps, {}> {
   public render() {
-    const { card, children, onContextMenu, onItemRendererClick, onItemRendererKeyDown, isWebChatDisabled } = this.props;
+    const {
+      card,
+      children,
+      onContextMenu,
+      onItemRendererClick,
+      onItemRendererKeyDown,
+      mode,
+      restartStatus,
+    } = this.props;
 
     const isSelected = this.shouldBeSelected(card.activity);
     const isUserActivity = this.isUserActivity(card.activity);
+    const isWebChatDisabled =
+      mode === 'transcript' || mode === 'debug' || restartStatus === RestartConversationStatus.Started;
+
     const showRestartBubble = isUserActivity && isSelected && !isWebChatDisabled;
 
     return (

diff --git a/packages/app/client/src/ui/editor/emulator/parts/chat/outerActivityWrapperContainer.ts b/packages/app/client/src/ui/editor/emulator/parts/chat/outerActivityWrapperContainer.ts
@@ -57,6 +57,8 @@ function mapStateToProps(state: RootState, { documentId }: { documentId: string
     highlightedActivities,
     documentId,
     currentRestartConversationOption: state.chat.chats[documentId].restartConversationOption,
+    mode: state.chat.chats[documentId].mode,
+    restartStatus: state.chat.restartStatus[documentId],
   };
 }