Skip to content

Commit

Permalink
Fixed missing item in File menu on Win / Lin. (#2100)
Browse files Browse the repository at this point in the history
* Fixed missing item in File menu on Win / Lin.

* Fixed changelog entry PR #
  • Loading branch information
tonyanziano authored Mar 12, 2020
1 parent 4ab4d87 commit 08315f6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [client] Fixed an issue that was causing adaptive card focus to be blurred when clicking on an activity in PR [2090](https://github.com/microsoft/BotFramework-Emulator/pull/2090)
- [client] Fixed an accessibility issue with the recent bots list remove button in PR [2091](https://github.com/microsoft/BotFramework-Emulator/pull/2091)
- [client] Copy secret key button now copies the secret key to the clipboar when creating a new bot file in PR [2098](https://github.com/microsoft/BotFramework-Emulator/pull/2098)
- [client] Fixed an issue on Windows & Linux where the "Close tab" item was missing in the File menu in PR [2100](https://github.com/microsoft/BotFramework-Emulator/pull/2100)

## Removed
- [client/main] Removed legacy payments code in PR [2058](https://github.com/microsoft/BotFramework-Emulator/pull/2058)
Expand Down
2 changes: 1 addition & 1 deletion packages/app/client/src/ui/shell/appMenu/appMenu.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ describe('<AppMenu />', () => {

expect(Object.keys(menuTemplate)).toHaveLength(6);
expect(menuTemplate['file'][3].items.length).toBe(4); // recent bots menu should be populated
expect(menuTemplate['file'][7].disabled).toBe(true); // "Close tab" should be disabled
expect(menuTemplate['file'][9].disabled).toBe(true); // "Close tab" should be disabled
expect(menuTemplate['file'][14].items.length).toBe(3); // themes menu should be populated
expect(menuTemplate['conversation'][0].disabled).toBe(true); // send activity menu should be disabled on welcome page
});
Expand Down
4 changes: 2 additions & 2 deletions packages/app/client/src/ui/shell/appMenu/appMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ export class AppMenu extends React.Component<AppMenuProps, {}> {
fileMenu[14].items = this.getThemeMenuItems();
fileMenu[3].items = this.getRecentBotsMenuItems();
// disable / enable "Close tab" button
fileMenu[7].disabled = !this.props.activeBot;
fileMenu[9] = this.getSignInMenuItem();
fileMenu[9].disabled = !this.props.activeBot;
fileMenu[11] = this.getSignInMenuItem();

// disable / enable send conversation activities menu
template['conversation'][0].disabled =
Expand Down

0 comments on commit 08315f6

Please sign in to comment.