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

[Maps][File upload] Set complete on index pattern creation #44423

Merged
merged 7 commits into from
Sep 10, 2019
Merged

[Maps][File upload] Set complete on index pattern creation #44423

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
473b393
Set complete on index pattern creation
Aug 29, 2019
e34f81e
Merge branch 'master' of github.com:elastic/kibana into show-final-st…
nickpeihl Sep 3, 2019
1ae0387
Merge remote-tracking branch 'upstream/master' into show-final-status…
Sep 3, 2019
9a64a7d
Merge remote-tracking branch 'upstream/master' into show-final-status…
Sep 5, 2019
f50bf8e
Merge remote-tracking branch 'upstream/master' into show-final-status…
Sep 9, 2019
dfb47ed
Set complete on error as well. Pass resp to callback function on time…
Sep 9, 2019
e150544
Merge branch 'show-final-status-on-geojson-upload' of github.com:aaro…
Sep 9, 2019
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
19 changes: 14 additions & 5 deletions x-pack/legacy/plugins/file_upload/public/components/json_upload_and_parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@ const INDEXING_STAGE = {
WRITING_TO_INDEX: i18n.translate(
'xpack.fileUpload.jsonUploadAndParse.writingToIndex',
{ defaultMessage: 'Writing to index' }),
INDEXING_COMPLETE: i18n.translate(
'xpack.fileUpload.jsonUploadAndParse.indexingComplete',
{ defaultMessage: 'Indexing complete' }),
CREATING_INDEX_PATTERN: i18n.translate(
'xpack.fileUpload.jsonUploadAndParse.creatingIndexPattern',
{ defaultMessage: 'Creating index pattern' }),
INDEX_PATTERN_COMPLETE: i18n.translate(
'xpack.fileUpload.jsonUploadAndParse.indexPatternComplete',
{ defaultMessage: 'Index pattern complete' }),
DATA_INDEXING_ERROR: i18n.translate(
INDEXING_ERROR: i18n.translate(
'xpack.fileUpload.jsonUploadAndParse.dataIndexingError',
{ defaultMessage: 'Data indexing error' }),
INDEX_PATTERN_ERROR: i18n.translate(
Expand Down Expand Up @@ -134,11 +137,11 @@ export class JsonUploadAndParse extends Component {
indexedFile: null,
indexDataResp,
indexRequestInFlight: false,
currentIndexingStage: INDEXING_STAGE.INDEXING_COMPLETE,
currentIndexingStage: INDEXING_STAGE.INDEXING_ERROR,
});
this._resetFileAndIndexSettings();
if (onIndexingComplete) {
onIndexingComplete();
onIndexingComplete({ indexDataResp });
}
return;
}
Expand All @@ -147,14 +150,17 @@ export class JsonUploadAndParse extends Component {
this.setState({
indexDataResp,
indexedFile: parsedFile,
currentIndexingStage: INDEXING_STAGE.INDEXING_COMPLETE,
});
let indexPatternResp;
if (boolCreateIndexPattern) {
indexPatternResp = await this._createIndexPattern(this.state);
}

// Indexing complete, update state & callback (if any)
this.setState({ currentIndexingStage: INDEXING_STAGE.INDEXING_COMPLETE });
this.setState({
currentIndexingStage: INDEXING_STAGE.INDEX_PATTERN_COMPLETE
});
if (onIndexingComplete) {
onIndexingComplete({
indexDataResp,
Expand Down Expand Up @@ -221,7 +227,10 @@ export class JsonUploadAndParse extends Component {
importStage={currentIndexingStage}
indexDataResp={indexDataResp}
indexPatternResp={indexPatternResp}
complete={currentIndexingStage === INDEXING_STAGE.INDEXING_COMPLETE}
complete={
currentIndexingStage === INDEXING_STAGE.INDEX_PATTERN_COMPLETE
|| currentIndexingStage === INDEXING_STAGE.INDEXING_ERROR
}
indexName={indexName}
/>
: (
Expand Down