Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: show bot url as tooltip #2676

Merged
merged 15 commits into from
Apr 21, 2020
Merged

fix: show bot url as tooltip #2676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1a55773
show botendpoint as tooltip
boydc2014 Apr 16, 2020
beb2e1e
fix lint
boydc2014 Apr 16, 2020
29dedec
Merge branch 'master' into donglei/show-botendpoint
boydc2014 Apr 16, 2020
639ce09
Fix tests
boydc2014 Apr 17, 2020
f5432b8
Merge branch 'donglei/show-botendpoint' of https://github.com/microso…
boydc2014 Apr 17, 2020
3c4b985
add a button to write to clipboard
boydc2014 Apr 17, 2020
0896209
Merge branch 'master' into donglei/show-botendpoint
boydc2014 Apr 17, 2020
d19737f
fix lint
boydc2014 Apr 18, 2020
9eb4b1f
Merge branch 'master' into donglei/show-botendpoint
boydc2014 Apr 18, 2020
16ab563
Merge branch 'master' into donglei/show-botendpoint
boydc2014 Apr 20, 2020
00bd59a
Merge branch 'master' into donglei/show-botendpoint
cwhitten Apr 20, 2020
8b5ceec
Merge branch 'master' into donglei/show-botendpoint
cwhitten Apr 20, 2020
2e955c6
Merge branch 'master' into donglei/show-botendpoint
a-b-r-o-w-n Apr 20, 2020
b4a24fd
remove close delay and URL prefix
boydc2014 Apr 20, 2020
756cafb
Merge branch 'master' into donglei/show-botendpoint
boydc2014 Apr 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions Composer/packages/client/__tests__/components/TestController/emulatorOpenButton.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ describe('<EmulatorOpenButton />', () => {
it('should show the button to open emulator', () => {
const onClick = jest.fn(() => {});
const { container, getByText } = render(
<EmulatorOpenButton onClick={onClick} botStatus={BotStatus.connected} hidden={false} />
<EmulatorOpenButton
botEndpoint={'http://localhost:3979/api/messages'}
onClick={onClick}
botStatus={BotStatus.connected}
hidden={false}
/>
);

expect(container).toHaveTextContent('Test in Emulator');
Expand All @@ -24,7 +29,12 @@ describe('<EmulatorOpenButton />', () => {
it('should hidden the button if set hidden', () => {
const onClick = jest.fn(() => {});
const { container } = render(
<EmulatorOpenButton onClick={onClick} botStatus={BotStatus.connected} hidden={true} />
<EmulatorOpenButton
botEndpoint={'http://localhost:3979/api/messages'}
onClick={onClick}
botStatus={BotStatus.connected}
hidden={true}
/>
);

expect(container).not.toHaveTextContent('Test in Emulator');
Expand All @@ -33,7 +43,12 @@ describe('<EmulatorOpenButton />', () => {
it('should show the button if the bot status is not connected', () => {
const onClick = jest.fn(() => {});
const { container } = render(
<EmulatorOpenButton onClick={onClick} botStatus={BotStatus.publishing} hidden={false} />
<EmulatorOpenButton
botEndpoint={'http://localhost:3979/api/messages'}
onClick={onClick}
botStatus={BotStatus.publishing}
hidden={false}
/>
);

expect(container).not.toHaveTextContent('Test in Emulator');
Expand Down
30 changes: 21 additions & 9 deletions Composer/packages/client/src/components/TestController/emulatorOpenButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,42 @@
/** @jsx jsx */
import { jsx } from '@emotion/core';
import formatMessage from 'format-message';
import { ActionButton } from 'office-ui-fabric-react/lib/Button';
import { ActionButton, IconButton } from 'office-ui-fabric-react/lib/Button';
import { TooltipHost } from 'office-ui-fabric-react/lib/Tooltip';
import { Fragment } from 'react';

import { BotStatus } from './../../constants';

interface IEmulatorOpenButtonProps {
botEndpoint: string;
botStatus: BotStatus;
hidden: boolean;
onClick: () => void;
}

export const EmulatorOpenButton: React.FC<IEmulatorOpenButtonProps> = props => {
const { onClick, botStatus, hidden } = props;
const { onClick, botStatus, hidden, botEndpoint } = props;
const connected = botStatus === BotStatus.connected;

if (hidden || !connected) return null;

return (
<ActionButton
iconProps={{
iconName: 'OpenInNewTab',
}}
onClick={onClick}
<TooltipHost
content={
<Fragment>
{botEndpoint}
<IconButton iconProps={{ iconName: 'copy' }} onClick={() => navigator.clipboard.writeText(botEndpoint)} />
</Fragment>
}
>
{formatMessage('Test in Emulator')}
</ActionButton>
<ActionButton
iconProps={{
iconName: 'OpenInNewTab',
}}
onClick={onClick}
>
{formatMessage('Test in Emulator')}
</ActionButton>
</TooltipHost>
);
};
7 changes: 6 additions & 1 deletion Composer/packages/client/src/components/TestController/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,12 @@ export const TestController: React.FC = () => {
return (
<Fragment>
<div css={bot} ref={botActionRef}>
<EmulatorOpenButton botStatus={botStatus} hidden={showError} onClick={handleOpenEmulator} />
<EmulatorOpenButton
botEndpoint={botEndpoints[projectId] || 'http://localhost:3979/api/messages'}
botStatus={botStatus}
hidden={showError}
onClick={handleOpenEmulator}
/>
<Loading botStatus={botStatus} />
<div ref={addRef}>
<ErrorInfo hidden={!showError} onClick={handleErrorButtonClick} count={errorLength} />
Expand Down