Skip to content

[6.5] Fix File Upload fatal (#25361) #25394

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

Merged
spalger merged 1 commit into from
Nov 8, 2018
Merged

[6.5] Fix File Upload fatal (#25361) #25394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
EuiForm,
EuiFlexGroup,
EuiFlexItem,
EuiImage,
Expand All @@ -15,7 +16,10 @@ import {
EuiButton,
EuiFieldText,
} from '@elastic/eui';
import { Loading } from '../../../../public/components/loading';

// TODO: (clintandrewhall) This is a quick fix for #25342 -- we should figure out how to use the overall component.
import { Loading } from '../../../../public/components/loading/loading';

import { FileUpload } from '../../../../public/components/file_upload';
import { elasticOutline } from '../../../lib/elastic_outline';
import { resolveFromArgs } from '../../../../common/lib/resolve_dataurl';
Expand Down Expand Up @@ -123,18 +127,19 @@ class ImageUpload extends React.Component {
}

const pasteImageUrl = urlTypeSrc ? (
<form onSubmit={this.setSrcUrl} className="eui-textRight">
<EuiForm onSubmit={this.setSrcUrl} className="eui-textRight">
<EuiFieldText
compressed
value={this.state.url}
defaultValue={this.state.url}
inputRef={ref => (this.inputRefs.srcUrlText = ref)}
placeholder="Image URL"
aria-label="Image URL"
/>
<EuiSpacer size="m" />
<EuiButton type="submit" size="s" onClick={this.setSrcUrl}>
Set
</EuiButton>
</form>
</EuiForm>
) : null;

const shouldPreview =
Expand Down