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

Jump to bottom

[Lens] Fixes vertical alignment validation messages #91878

Merged
merged 6 commits into from
Feb 25, 2021
Merged

[Lens] Fixes vertical alignment validation messages #91878

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f992b4b
:lipstick: fix centering of the messages
dej611 Feb 18, 2021
9dfb853
Merge branch 'master' into fix/91845
kibanamachine Feb 22, 2021
e53dffe
reduce EuiFlexGroup usage; use EuiEmptyPrompt
MichaelMarcialis Feb 23, 2021
34fa146
rm EuiIcon import
MichaelMarcialis Feb 23, 2021
fe522ea
Merge pull request #5 from MichaelMarcialis/fix/91845
dej611 Feb 24, 2021
9973a28
Merge branch 'master' into fix/91845
kibanamachine Feb 24, 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
98 changes: 55 additions & 43 deletions ...plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,13 +375,14 @@ export const InnerVisualizationWrapper = ({
key={longMessage}
className="eui-textBreakAll"
data-test-subj="configuration-failure-error"
grow={false}
>
{longMessage}
</EuiFlexItem>
));
} else {
showExtraErrors = (
<EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty
onClick={() => {
setLocalState((prevState: WorkspaceState) => ({
Expand All @@ -403,35 +404,42 @@ export const InnerVisualizationWrapper = ({

return (
<EuiFlexGroup
style={{ maxWidth: '100%' }}
direction="column"
style={{ maxWidth: '100%', height: '100%' }}
alignItems="center"
data-test-subj="configuration-failure"
>
<EuiFlexItem>
<EuiIcon type="alert" size="xl" color="danger" />
</EuiFlexItem>
<EuiFlexItem className="eui-textBreakAll" data-test-subj="configuration-failure-error">
{localState.configurationValidationError[0].longMessage}
<EuiFlexGroup alignItems="center" direction="column">
<EuiFlexItem>
<EuiIcon type="alert" size="xl" color="danger" />
</EuiFlexItem>
<EuiFlexItem className="eui-textBreakAll" data-test-subj="configuration-failure-error">
{localState.configurationValidationError[0].longMessage}
</EuiFlexItem>
{showExtraErrors}
</EuiFlexGroup>
</EuiFlexItem>
{showExtraErrors}
</EuiFlexGroup>
);
}

if (localState.expressionBuildError?.length) {
return (
<EuiFlexGroup style={{ maxWidth: '100%' }} direction="column" alignItems="center">
<EuiFlexGroup style={{ maxWidth: '100%' }} alignItems="center">
<EuiFlexItem>
<EuiIcon type="alert" size="xl" color="danger" />
</EuiFlexItem>
<EuiFlexItem data-test-subj="expression-failure">
<FormattedMessage
id="xpack.lens.editorFrame.expressionFailure"
defaultMessage="An error occurred in the expression"
/>
<EuiFlexGroup alignItems="center" direction="column">
<EuiFlexItem>
<EuiIcon type="alert" size="xl" color="danger" />
</EuiFlexItem>
<EuiFlexItem data-test-subj="expression-failure">
<FormattedMessage
id="xpack.lens.editorFrame.expressionFailure"
defaultMessage="An error occurred in the expression"
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>{localState.expressionBuildError[0].longMessage}</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
<EuiFlexItem grow={false}>{localState.expressionBuildError[0].longMessage}</EuiFlexItem>
</EuiFlexGroup>
);
}
Expand All @@ -451,34 +459,38 @@ export const InnerVisualizationWrapper = ({
const visibleErrorMessage = getOriginalRequestErrorMessage(error) || errorMessage;

return (
<EuiFlexGroup style={{ maxWidth: '100%' }} direction="column" alignItems="center">
<EuiFlexGroup style={{ maxWidth: '100%' }} alignItems="center">
<EuiFlexItem>
<EuiIcon type="alert" size="xl" color="danger" />
</EuiFlexItem>
<EuiFlexItem data-test-subj="expression-failure">
<FormattedMessage
id="xpack.lens.editorFrame.dataFailure"
defaultMessage="An error occurred when loading data."
/>
</EuiFlexItem>
{visibleErrorMessage ? (
<EuiFlexItem className="eui-textBreakAll" grow={false}>
<EuiButtonEmpty
onClick={() => {
setLocalState((prevState: WorkspaceState) => ({
...prevState,
expandError: !prevState.expandError,
}));
}}
>
{i18n.translate('xpack.lens.editorFrame.expandRenderingErrorButton', {
defaultMessage: 'Show details of error',
})}
</EuiButtonEmpty>
<EuiFlexGroup alignItems="center" direction="column">
<EuiFlexItem>
<EuiIcon type="alert" size="xl" color="danger" />
</EuiFlexItem>
<EuiFlexItem data-test-subj="expression-failure">
<FormattedMessage
id="xpack.lens.editorFrame.dataFailure"
defaultMessage="An error occurred when loading data."
/>
</EuiFlexItem>
{visibleErrorMessage ? (
<EuiFlexItem className="eui-textBreakAll" grow={false}>
<EuiButtonEmpty
onClick={() => {
setLocalState((prevState: WorkspaceState) => ({
...prevState,
expandError: !prevState.expandError,
}));
}}
>
{i18n.translate('xpack.lens.editorFrame.expandRenderingErrorButton', {
defaultMessage: 'Show details of error',
})}
</EuiButtonEmpty>

{localState.expandError ? visibleErrorMessage : null}
</EuiFlexItem>
) : null}
{localState.expandError ? visibleErrorMessage : null}
</EuiFlexItem>
) : null}{' '}
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
);
}}
Expand Down