-
Notifications
You must be signed in to change notification settings - Fork 762
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added the ability to open a bot from just a URL (#1232)
* Added the ability to open a bot from just a URL * Formatting, whitespace and license
- Loading branch information
Justin Wilaby
authored
Jan 16, 2019
1 parent
76468bd
commit 023c955
Showing
30 changed files
with
1,412 additions
and
430 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
packages/app/client/src/ui/dialogs/openBotDialog/openBotDialog.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. | ||
| // | ||
| // Microsoft Bot Framework: http://botframework.com | ||
| // | ||
| // Bot Framework Emulator Github: | ||
| // https://github.com/Microsoft/BotFramwork-Emulator | ||
| // | ||
| // Copyright (c) Microsoft Corporation | ||
| // All rights reserved. | ||
| // | ||
| // MIT License: | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // | ||
|
|
||
| .browse-button { | ||
| overflow: hidden; | ||
| position: absolute; | ||
| right: 0; | ||
| bottom: 12px; | ||
| } | ||
|
|
||
| .input-container { | ||
| padding-right: 115px; | ||
|
|
||
| & + div { | ||
| margin-left: 8px; | ||
| } | ||
| } | ||
|
|
||
| .file-input { | ||
| position: absolute; | ||
| left: 0; | ||
| height: 100%; | ||
| z-index: 2; | ||
| opacity: 0; | ||
| } | ||
|
|
||
| /* maintains "light" theme for the recent bots list since it's in a modal */ | ||
| .theme-overrides { | ||
| --my-bots-entry-bg: var(--neutral-4); | ||
| --my-bots-entry-border: 1px solid transparent; | ||
| --tab-icon-color: var(--neutral-12); | ||
| --my-bots-path-color: var(--neutral-12); | ||
| --focused-selected-list-item-bg: #006AB1; | ||
| --my-bots-well-bg: var(--neutral-3); | ||
| --my-bots-well-border: 0; | ||
| --my-bots-scrollbar-color: rgba(136, 136, 136, 0.5); | ||
| --my-bots-entry-color: var(--neutral-12); | ||
| } |
5 changes: 5 additions & 0 deletions
5
packages/app/client/src/ui/dialogs/openBotDialog/openBotDialog.scss.d.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| // This is a generated file. Changes are likely to result in being overwritten | ||
| export const browseButton: string; | ||
| export const inputContainer: string; | ||
| export const fileInput: string; | ||
| export const themeOverrides: string; |
196 changes: 196 additions & 0 deletions
196
packages/app/client/src/ui/dialogs/openBotDialog/openBotDialog.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,196 @@ | ||
| // | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. | ||
| // | ||
| // Microsoft Bot Framework: http://botframework.com | ||
| // | ||
| // Bot Framework Emulator Github: | ||
| // https://github.com/Microsoft/BotFramwork-Emulator | ||
| // | ||
| // Copyright (c) Microsoft Corporation | ||
| // All rights reserved. | ||
| // | ||
| // MIT License: | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // | ||
|
|
||
| import { newNotification, SharedConstants } from '@bfemulator/app-shared'; | ||
| import { mount } from 'enzyme'; | ||
| import * as React from 'react'; | ||
| import { Provider } from 'react-redux'; | ||
| import { combineReducers, createStore } from 'redux'; | ||
| import * as BotActions from '../../../data/action/botActions'; | ||
| import { beginAdd } from '../../../data/action/notificationActions'; | ||
| import { bot } from '../../../data/reducer/bot'; | ||
| import { CommandServiceImpl } from '../../../platform/commands/commandServiceImpl'; | ||
| import { ActiveBotHelper } from '../../helpers/activeBotHelper'; | ||
| import { DialogService } from '../service'; | ||
| import { OpenBotDialog } from './openBotDialog'; | ||
| import { OpenBotDialogContainer } from './openBotDialogContainer'; | ||
|
|
||
| const mockStore = createStore(combineReducers({ bot })); | ||
| jest.mock('./openBotDialog.scss', () => ({})); | ||
| jest.mock('../../../data/store', () => ({ | ||
| get store() { | ||
| return mockStore; | ||
| } | ||
| })); | ||
| jest.mock('../service', () => ({ | ||
| DialogService: { | ||
| showDialog: () => Promise.resolve(true), | ||
| hideDialog: () => Promise.resolve(false), | ||
| } | ||
| })); | ||
| jest.mock('../dialogStyles.scss', () => ({})); | ||
| jest.mock('../../editor/recentBotsList/recentBotsList.scss', () => ({})); | ||
| jest.mock('../', () => ({})); | ||
|
|
||
| const bots = [ | ||
| { | ||
| 'path': '/some/path', | ||
| 'displayName': 'mockMock', | ||
| 'transcriptsPath': '/Users/microsoft/Documents/testbot/transcripts', | ||
| 'chatsPath': '/Users/microsoft/Documents/testbot/dialogs' | ||
| } | ||
| ]; | ||
|
|
||
| describe('The OpenBotDialog', () => { | ||
| let mockDispatch; | ||
| let node; | ||
| let parent; | ||
| let instance; | ||
| beforeEach(() => { | ||
| mockStore.dispatch(BotActions.load(bots)); | ||
| mockDispatch = jest.spyOn(mockStore, 'dispatch'); | ||
| parent = mount(<Provider store={ mockStore }> | ||
| <OpenBotDialogContainer/> | ||
| </Provider>); | ||
| node = parent.find(OpenBotDialog); | ||
| instance = node.instance(); | ||
| }); | ||
|
|
||
| it('should hide the dialog when cancel is clicked', () => { | ||
| const spy = jest.spyOn(DialogService, 'hideDialog'); | ||
| instance.props.onDialogCancel(); | ||
| expect(spy).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should orchestrate the appropriate sequences when a recent bot is clicked', async () => { | ||
| const commandServiceSpy = jest.spyOn(CommandServiceImpl, 'call').mockResolvedValue(true); | ||
| const dialogSpy = jest.spyOn(DialogService, 'hideDialog'); | ||
| await instance.onBotSelected(bots[0]); | ||
| const { Switch } = SharedConstants.Commands.Bot; | ||
| expect(commandServiceSpy).toHaveBeenCalledWith(Switch, '/some/path'); | ||
| expect(dialogSpy).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should send a notification when the bot fails to open', async () => { | ||
| await instance.onBotSelected(null); | ||
| const message = `An Error occurred on the Open Bot Dialog: TypeError: Cannot read property 'path' of null`; | ||
| const notification = newNotification(message); | ||
| const action = beginAdd(notification); | ||
| notification.timestamp = jasmine.any(Number) as any; | ||
| notification.id = jasmine.any(String) as any; | ||
| expect(mockDispatch).toHaveBeenLastCalledWith(action); | ||
| }); | ||
|
|
||
| it('should make the appropriate calls when onCreateNewBotClick in called', async () => { | ||
| const commandServiceSpy = jest.spyOn(CommandServiceImpl, 'call').mockResolvedValue(true); | ||
| const dialogSpy = jest.spyOn(DialogService, 'hideDialog'); | ||
|
|
||
| await instance.onCreateNewBotClick(); | ||
| expect(commandServiceSpy).toHaveBeenLastCalledWith(SharedConstants.Commands.UI.ShowBotCreationDialog); | ||
| expect(dialogSpy).toHaveBeenCalled(); | ||
| }); | ||
|
|
||
| it('should send a notification when onCreateNewBotClick fails', async () => { | ||
| const commandServiceSpy = jest.spyOn(CommandServiceImpl, 'call').mockRejectedValue('oh noes!'); | ||
| await instance.onCreateNewBotClick(); | ||
| const message = `An Error occurred on the Open Bot Dialog: oh noes!`; | ||
| const notification = newNotification(message); | ||
| const action = beginAdd(notification); | ||
| notification.timestamp = jasmine.any(Number) as any; | ||
| notification.id = jasmine.any(String) as any; | ||
| expect(mockDispatch).toHaveBeenLastCalledWith(action); | ||
|
|
||
| expect(commandServiceSpy).toHaveBeenLastCalledWith(SharedConstants.Commands.UI.ShowBotCreationDialog); | ||
| }); | ||
|
|
||
| it('should properly set the state when the input changes', () => { | ||
| instance.onInputChange({ | ||
| target: { | ||
| type: 'text', | ||
| value: 'http://localhost:6500/api/messages' | ||
| } | ||
| } as any); | ||
|
|
||
| expect(instance.state.botUrl).toBe('http://localhost:6500/api/messages'); | ||
|
|
||
| instance.onInputChange({ | ||
| target: { | ||
| type: 'file', | ||
| files: { item: () => ({ path: 'some/path/to/myBot.bot' }) } | ||
| } | ||
| } as any); | ||
|
|
||
| expect(instance.state.botUrl).toBe('some/path/to/myBot.bot'); | ||
| }); | ||
|
|
||
| it('should select all text in the input when focused', () => { | ||
| const spy = jest.fn(); | ||
| const mockInput = { | ||
| value: 'this is some text', | ||
| setSelectionRange: spy | ||
| }; | ||
|
|
||
| instance.onFocus({ target: mockInput } as any); | ||
|
|
||
| expect(spy).toHaveBeenCalledWith(0, 17); | ||
| }); | ||
|
|
||
| it('should open a bot when a path is provided', async () => { | ||
| instance.onInputChange({ | ||
| target: { | ||
| type: 'file', | ||
| files: { item: () => ({ path: 'some/path/to/myBot.bot' }) } | ||
| } | ||
| } as any); | ||
|
|
||
| const botHelperSpy = jest.spyOn(ActiveBotHelper, 'confirmAndOpenBotFromFile').mockResolvedValue(true); | ||
| await instance.onOpenClick(); | ||
|
|
||
| expect(botHelperSpy).toHaveBeenCalledWith('some/path/to/myBot.bot'); | ||
| }); | ||
|
|
||
| it('should open an endpoint when a URL is provided', async () => { | ||
| instance.onInputChange({ | ||
| target: { | ||
| type: 'text', | ||
| value: 'http://localhost:6500/api/messages' | ||
| } | ||
| } as any); | ||
|
|
||
| const commandServiceSpy = jest.spyOn(CommandServiceImpl, 'call'); | ||
| await instance.onOpenClick(); | ||
|
|
||
| expect(commandServiceSpy).toHaveBeenCalledWith(SharedConstants.Commands.Emulator.NewLiveChat, | ||
| { endpoint: 'http://localhost:6500/api/messages' }); | ||
| }); | ||
| }); |
Oops, something went wrong.