github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Fix for create ingest pipline label issue (#29070) (#29081)

Browse source
This commit is contained in:
James Gowdy 2019-01-22 11:58:34 +00:00 • committed by GitHub
parent 8674d18358
commit 5a66b8bb2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
x-pack/plugins/ml/public/file_datavisualizer/components/import_progress/import_progress.js
View file

@ -50,7 +50,10 @@ export const ImportProgress = injectI18n(function ({ statuses, intl }) {
if (indexCreatedStatus === IMPORT_STATUS.COMPLETE) {
completedStep = 2;
}
if (ingestPipelineCreatedStatus === IMPORT_STATUS.COMPLETE) {
if (
ingestPipelineCreatedStatus === IMPORT_STATUS.COMPLETE ||
(createPipeline === false && indexCreatedStatus === IMPORT_STATUS.COMPLETE)
) {
completedStep = 3;
}
if (uploadStatus === IMPORT_STATUS.COMPLETE) {
@ -81,6 +84,24 @@ export const ImportProgress = injectI18n(function ({ statuses, intl }) {
defaultMessage: 'Create index pattern'
});
const creatingIndexStatus = (
<p>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.importProgress.stepTwoCreatingIndexDescription"
defaultMessage="Creating index"
/>
</p>
);
const creatingIndexAndIngestPipelineStatus = (
<p>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.importProgress.stepTwoCreatingIndexIngestPipelineDescription"
defaultMessage="Creating index and ingest pipeline"
/>
</p>
);
if (completedStep >= 0) {
processFileTitle = intl.formatMessage({
id: 'xpack.ml.fileDatavisualizer.importProgress.processingFileTitle',
@ -104,14 +125,7 @@ export const ImportProgress = injectI18n(function ({ statuses, intl }) {
id: 'xpack.ml.fileDatavisualizer.importProgress.creatingIndexTitle',
defaultMessage: 'Creating index'
});
statusInfo = (
<p>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.importProgress.stepTwoCreatingIndexIngestPipelineDescription"
defaultMessage="Creating index and ingest pipeline"
/>
</p>
);
statusInfo = (createPipeline === true) ? creatingIndexAndIngestPipelineStatus : creatingIndexStatus;
}
if (completedStep >= 2) {
createIndexTitle = intl.formatMessage({
@ -122,14 +136,7 @@ export const ImportProgress = injectI18n(function ({ statuses, intl }) {
id: 'xpack.ml.fileDatavisualizer.importProgress.creatingIngestPipelineTitle',
defaultMessage: 'Creating ingest pipeline'
});
statusInfo = (
<p>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.importProgress.stepThreeCreatingIndexIngestPipelineDescription"
defaultMessage="Creating index and ingest pipeline"
/>
</p>
);
statusInfo = (createPipeline === true) ? creatingIndexAndIngestPipelineStatus : creatingIndexStatus;
}
if (completedStep >= 3) {
createIngestPipelineTitle = intl.formatMessage({