Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: error dialog should allow scrolling of error text #7251

Merged
natalgar merged 11 commits into from
Apr 22, 2021
Merged

fix: error dialog should allow scrolling of error text #7251

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e321b56
Issue-6727: update error popup consoleStyle to scroll, change backgro…
Apr 21, 2021
a1f50cd
Issue-6727: refactor format error title
Apr 21, 2021
50c3178
Merge branch 'main' into natalgar/6727-fix-error-popup
pavolum Apr 22, 2021
a18cf68
Merge branch 'main' into natalgar/6727-fix-error-popup
GeoffCoxMSFT Apr 22, 2021
90d98e5
Issue-6727: use formatMessage, lighten up gray
natalgar Apr 22, 2021
e1981bd
Merge branch 'main' of github.com:microsoft/BotFramework-Composer int…
natalgar Apr 22, 2021
6a11978
Merge branch 'natalgar/6727-fix-error-popup' of github.com:microsoft/…
natalgar Apr 22, 2021
7cc7cca
Merge branch 'main' into natalgar/6727-fix-error-popup
hatpick Apr 22, 2021
73103d7
Merge branch 'main' into natalgar/6727-fix-error-popup
hatpick Apr 22, 2021
2fbf728
Merge branch 'main' into natalgar/6727-fix-error-popup
GeoffCoxMSFT Apr 22, 2021
10c750a
Merge branch 'main' into natalgar/6727-fix-error-popup
GeoffCoxMSFT Apr 22, 2021
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
5 changes: 2 additions & 3 deletions Composer/packages/client/src/components/ErrorPopup/ErrorPopup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ type ErrorPopupProps = {
onDismiss: () => void;
};

const formatErrorTitle = (error: StateError): string => {
const { summary } = error;
const formatErrorTitle = (summary: string): string => {
if (!summary) return '';
return summary.length > 20 ? summary.substring(0, 20) + '...' : summary;
};
Expand Down Expand Up @@ -62,7 +61,7 @@ export const ErrorPopup = (props: ErrorPopupProps) => {
}
}, [props.error]);

const title = props.error ? formatErrorTitle(props.error) : '';
const title = props.error && props.error.summary ? formatErrorTitle(props.error.summary) : 'Error';
Comment thread
natalgar marked this conversation as resolved.
Outdated
const detail = props.error ? formatErrorDetail(props.error) : '';

return (
Expand Down
5 changes: 3 additions & 2 deletions Composer/packages/client/src/components/ErrorPopup/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import { FontWeights, FontSizes } from 'office-ui-fabric-react/lib/Styling';
import { NeutralColors, SharedColors } from '@uifabric/fluent-theme';

export const consoleStyle = css`
background: ${NeutralColors.black};
color: ${NeutralColors.white};
background: ${NeutralColors.gray30};
padding: 15px;
margin-bottom: 20px;
overflow-y: auto;
max-height: 434px;

a {
color: ${SharedColors.blueMagenta10};
Expand Down