From 31d30f814e97d7575c7a824fe42d4e47d8af79a7 Mon Sep 17 00:00:00 2001 From: Walter Rafelsberger Date: Mon, 29 Oct 2018 13:42:25 +0100 Subject: [PATCH] [ML] Change file data visualizer JSON format label to NDJSON (#24643) (#24714) * [ML] Change file datavisualizer JSON format label to NDJSON * [ML] Update edit flyout overrides snapshot --- .../components/__snapshots__/add_data.test.js.snap | 2 +- .../kibana/public/home/components/add_data.js | 2 +- .../components/about_panel/welcome_content.js | 4 ++-- .../edit_flyout/__snapshots__/overrides.test.js.snap | 12 ++++++------ .../components/edit_flyout/options/option_lists.js | 2 +- .../components/file_datavisualizer_view/utils.js | 2 +- .../import_view/importer/importer_factory.js | 6 +++--- .../{json_importer.js => ndjson_importer.js} | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) rename x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/{json_importer.js => ndjson_importer.js} (94%) diff --git a/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap b/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap index d2002077b15d..220d5e472c99 100644 --- a/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap @@ -832,7 +832,7 @@ exports[`mlEnabled 1`] = ` type="button" > diff --git a/src/core_plugins/kibana/public/home/components/add_data.js b/src/core_plugins/kibana/public/home/components/add_data.js index 8e598e4f26c3..a45eda343cfc 100644 --- a/src/core_plugins/kibana/public/home/components/add_data.js +++ b/src/core_plugins/kibana/public/home/components/add_data.js @@ -229,7 +229,7 @@ const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => { > diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/about_panel/welcome_content.js b/x-pack/plugins/ml/public/file_datavisualizer/components/about_panel/welcome_content.js index 323db3b35fbc..c33b684c52f9 100644 --- a/x-pack/plugins/ml/public/file_datavisualizer/components/about_panel/welcome_content.js +++ b/x-pack/plugins/ml/public/file_datavisualizer/components/about_panel/welcome_content.js @@ -53,7 +53,7 @@ export function WelcomeContent() {

- JSON + Delimited text files, such as CSV and TSV

@@ -66,7 +66,7 @@ export function WelcomeContent() {

- Delimited text files, such as CSV and TSV + Newline-delimited JSON

diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap index e1697b865ce1..c11317ccad9e 100644 --- a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap +++ b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap @@ -12,18 +12,18 @@ exports[`Overrides render overrides 1`] = ` onChange={[Function]} options={ Array [ - Object { - "inputDisplay": - json - , - "value": "json", - }, Object { "inputDisplay": delimited , "value": "delimited", }, + Object { + "inputDisplay": + ndjson + , + "value": "ndjson", + }, Object { "inputDisplay": semi_structured_text diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js index 8918850c3f97..7534790de0a8 100644 --- a/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js +++ b/x-pack/plugins/ml/public/file_datavisualizer/components/edit_flyout/options/option_lists.js @@ -6,8 +6,8 @@ export const FORMAT_OPTIONS = [ - 'json', 'delimited', + 'ndjson', 'semi_structured_text', 'xml', ]; diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/utils.js b/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/utils.js index cb82f6f4b191..e97c16b629b8 100644 --- a/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/utils.js +++ b/x-pack/plugins/ml/public/file_datavisualizer/components/file_datavisualizer_view/utils.js @@ -65,7 +65,7 @@ export function createUrlOverrides(overrides, originalSettings) { } } - if (formattedOverrides.format === 'json' || originalSettings.format === 'json') { + if (formattedOverrides.format === 'ndjson' || originalSettings.format === 'ndjson') { formattedOverrides.should_trim_fields = ''; formattedOverrides.has_header_row = ''; formattedOverrides.delimiter = ''; diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/importer_factory.js b/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/importer_factory.js index e2bf8f5707be..c82d94696ac5 100644 --- a/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/importer_factory.js +++ b/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/importer_factory.js @@ -7,7 +7,7 @@ import { CsvImporter } from './csv_importer'; import { SstImporter } from './sst_importer'; -import { JsonImporter } from './json_importer'; +import { NdjsonImporter } from './ndjson_importer'; export function importerFactory(format, results, settings) { @@ -16,8 +16,8 @@ export function importerFactory(format, results, settings) { return new CsvImporter(results, settings); case 'semi_structured_text': return new SstImporter(results, settings); - case 'json': - return new JsonImporter(results, settings); + case 'ndjson': + return new NdjsonImporter(results, settings); default: return; } diff --git a/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/json_importer.js b/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/ndjson_importer.js similarity index 94% rename from x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/json_importer.js rename to x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/ndjson_importer.js index 4fdfbf8d8f00..5f1c834b03af 100644 --- a/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/json_importer.js +++ b/x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/ndjson_importer.js @@ -7,7 +7,7 @@ import { Importer } from './importer'; -export class JsonImporter extends Importer { +export class NdjsonImporter extends Importer { constructor(results, settings) { super(settings); }