diff --git a/packages/app/client/src/ui/editor/welcomePage/welcomePage.spec.tsx b/packages/app/client/src/ui/editor/welcomePage/welcomePage.spec.tsx index a366246a5..d822cee93 100644 --- a/packages/app/client/src/ui/editor/welcomePage/welcomePage.spec.tsx +++ b/packages/app/client/src/ui/editor/welcomePage/welcomePage.spec.tsx @@ -64,7 +64,7 @@ describe('The AzureLoginFailedDialogContainer component should', () => { }, }; const spy = jest.spyOn(CommandServiceImpl, 'remoteCall'); - instance.onAnchorClick(mockEvent); + instance.onLinkClick(mockEvent); expect(spy).toHaveBeenCalledWith(SharedConstants.Commands.Electron.OpenExternal, 'https://aka.ms/'); }); diff --git a/packages/app/client/src/ui/editor/welcomePage/welcomePage.tsx b/packages/app/client/src/ui/editor/welcomePage/welcomePage.tsx index c029179c5..3fb548381 100644 --- a/packages/app/client/src/ui/editor/welcomePage/welcomePage.tsx +++ b/packages/app/client/src/ui/editor/welcomePage/welcomePage.tsx @@ -41,7 +41,7 @@ import { GenericDocument } from '../../layout'; export interface WelcomePageProps { accessToken?: string; documentId?: string; - onAnchorClick: (url: string) => void; + onLinkClick: (url: string) => void; onNewBotClick?: () => void; onOpenBotClick?: () => void; onBotClick?: (_e: any, path: string) => void; @@ -90,10 +90,10 @@ export class WelcomePage extends React.Component { this.props.showContextMenuForBot(bot); } - private onAnchorClick = (event: MouseEvent): void => { + private onLinkClick = (event: MouseEvent): void => { const { currentTarget: link } = event; const { href } = link.dataset; - this.props.onAnchorClick(href); + this.props.onLinkClick(href); } private onDeleteBotClick = (event: React.MouseEvent) => { @@ -110,12 +110,12 @@ export class WelcomePage extends React.Component { Start by testing your bot Start talking to your bot by connecting to an endpoint or by opening a bot saved locally.
- More about working locally with a bot. - +
@@ -192,14 +192,13 @@ export class WelcomePage extends React.Component {
Plan:
Review the bot  - design guidelines -   - for best practices  +  for best practices 
@@ -210,51 +209,51 @@ export class WelcomePage extends React.Component {
Build:
- Download Command Line tools -
+
Create a bot  - from Azure - or  - or  +
Add services such as
- Language Understanding (LUIS) - ,  - ,  +   and  - Dispatch - +
@@ -266,21 +265,21 @@ export class WelcomePage extends React.Component {
Test:
Test with the  - Emulator -
+
Test online in  - Web Chat -
+
@@ -291,13 +290,14 @@ export class WelcomePage extends React.Component {
Publish:
Publish directly to Azure or
- Use Continuous Deployment - +  
@@ -310,13 +310,13 @@ export class WelcomePage extends React.Component {
Connect:
Connect to  - channels - +  
@@ -328,13 +328,13 @@ export class WelcomePage extends React.Component {
Evaluate:
- View analytics - +
diff --git a/packages/app/client/src/ui/editor/welcomePage/welcomePageContainer.ts b/packages/app/client/src/ui/editor/welcomePage/welcomePageContainer.ts index cffa7ee3f..3815673c2 100644 --- a/packages/app/client/src/ui/editor/welcomePage/welcomePageContainer.ts +++ b/packages/app/client/src/ui/editor/welcomePage/welcomePageContainer.ts @@ -51,7 +51,7 @@ function mapStateToProps(state: RootState, ownProps: WelcomePageProps): WelcomeP function mapDispatchToProps(dispatch: (action: Action) => void): WelcomePageProps { const { Commands } = SharedConstants; return { - onAnchorClick: (url) => { + onLinkClick: (url) => { CommandServiceImpl.remoteCall(Commands.Electron.OpenExternal, url).catch(); }, onNewBotClick: () => { diff --git a/packages/app/main/src/commands/botCommands.spec.ts b/packages/app/main/src/commands/botCommands.spec.ts index d637fda60..f8299e80b 100644 --- a/packages/app/main/src/commands/botCommands.spec.ts +++ b/packages/app/main/src/commands/botCommands.spec.ts @@ -56,7 +56,7 @@ jest.mock('../emulator', () => ({ })); const mockCommandRegistry = new CommandRegistryImpl(); const mockBot = BotConfigWithPathImpl.fromJSON({ - 'path': 'some/path.bot', + 'path': path.normalize('some/path.bot'), 'name': 'AuthBot', 'description': '', 'padlock': '', @@ -98,11 +98,11 @@ describe('The botCommands', () => { const saveBotSpy = jest.spyOn((helpers as any).default, 'saveBot'); const mockBotInfo = { - path: botToSave.path, + path: path.normalize(botToSave.path), displayName: 'AuthBot', secret: 'secret', - chatsPath: 'some/dialogs', - transcriptsPath: 'some/transcripts' + chatsPath: path.normalize('some/dialogs'), + transcriptsPath: path.normalize('some/transcripts') }; const command = mockCommandRegistry.getCommand(Bot.Create); const result = await command.handler(botToSave, 'secret'); @@ -234,7 +234,7 @@ describe('The botCommands', () => { it('should patch the bots list and watch for chat and transcript changes', async () => { const mockBotInfo = { - path: 'this/is/my.json', + path: path.normalize('this/is/my.json'), displayName: 'AuthBot', secret: 'secret' }; @@ -243,8 +243,8 @@ describe('The botCommands', () => { const { handler } = mockCommandRegistry.getCommand(SharedConstants.Commands.Bot.PatchBotList); await handler(mockBotInfo.path, mockBotInfo); - expect(transcriptWatchSpy).toHaveBeenCalledWith('this/is/transcripts'); - expect(chatWatcherSpy).toHaveBeenCalledWith('this/is/dialogs'); + expect(transcriptWatchSpy).toHaveBeenCalledWith(path.normalize('this/is/transcripts')); + expect(chatWatcherSpy).toHaveBeenCalledWith(path.normalize('this/is/dialogs')); }); it('should remove a bot from the list', async () => {