From 070371a90204643f81059fe030eee805754c8d9c Mon Sep 17 00:00:00 2001 From: Jim Unger Date: Mon, 9 May 2016 13:14:44 -0500 Subject: [PATCH 1/2] [add data] string resources prototype --- .../directives/pipeline_setup.js | 1 + .../pipeline_setup/views/pipeline_output.html | 6 +-- .../pipeline_setup/views/pipeline_setup.html | 23 ++++---- .../pipeline_setup/views/source_data.html | 8 +-- src/ui/public/string_resources/filter.js | 11 ++++ src/ui/public/string_resources/index.js | 1 + .../string_resources/string_resources.js | 52 +++++++++++++++++++ webpackShims/string-resources.js | 1 + 8 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 src/ui/public/string_resources/filter.js create mode 100644 src/ui/public/string_resources/index.js create mode 100644 src/ui/public/string_resources/string_resources.js create mode 100644 webpackShims/string-resources.js diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js index 667849fa7aa50c..8e7736517ac30e 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js @@ -10,6 +10,7 @@ import './source_data'; import './processor_ui_container'; import '../processors'; import pipelineSetupTemplate from '../views/pipeline_setup.html'; +import 'string-resources'; const app = uiModules.get('kibana'); diff --git a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/views/pipeline_output.html b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/views/pipeline_output.html index 07da2661985985..d7b47ceffdbf03 100644 --- a/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/views/pipeline_output.html +++ b/src/plugins/kibana/public/settings/sections/indices/add_data_steps/pipeline_setup/views/pipeline_output.html @@ -1,9 +1,9 @@
@@ -100,7 +100,7 @@
diff --git a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js index 6de8287171bfff..dd37ea7af9e2a1 100644 --- a/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js +++ b/src/plugins/kibana/public/settings/sections/indices/filebeat/directives/filebeat_wizard.js @@ -6,6 +6,7 @@ import 'plugins/kibana/settings/sections/indices/add_data_steps/paste_samples_st import 'plugins/kibana/settings/sections/indices/add_data_steps/pipeline_setup'; import 'plugins/kibana/settings/sections/indices/add_data_steps/install_filebeat_step'; import '../../styles/_add_data_wizard.less'; +import 'string-resources'; // wrapper directive, which sets up the breadcrumb for all filebeat steps modules.get('apps/settings') diff --git a/src/ui/public/string_resources/common_strings.js b/src/ui/public/string_resources/common_strings.js new file mode 100644 index 00000000000000..9ea19e1d9d1de7 --- /dev/null +++ b/src/ui/public/string_resources/common_strings.js @@ -0,0 +1,20 @@ +import registry from 'ui/string_resources/registry'; + +registry.register({ + + commonButtons: { + + next: + `Next`, + + previous: + `Prev`, + + save: + `Save`, + + done: + `Done` + + } +}); diff --git a/src/ui/public/string_resources/filter.js b/src/ui/public/string_resources/filter.js index ceb57642d70d70..13dfac79b13fc9 100644 --- a/src/ui/public/string_resources/filter.js +++ b/src/ui/public/string_resources/filter.js @@ -1,11 +1,12 @@ import _ from 'lodash'; import uiModules from 'ui/modules'; -import stringResources from './string_resources'; +import registry from './registry'; const app = uiModules.get('kibana'); +const strings = registry.all(); app.filter('resource', function () { return function (input) { - return _.get(stringResources, input) || ''; + return _.get(strings, input) || input; }; }); diff --git a/src/ui/public/string_resources/index.js b/src/ui/public/string_resources/index.js index af65484219d309..31e880921e6d33 100644 --- a/src/ui/public/string_resources/index.js +++ b/src/ui/public/string_resources/index.js @@ -1 +1,2 @@ +import './common_strings'; import './filter'; diff --git a/src/ui/public/string_resources/registry.js b/src/ui/public/string_resources/registry.js new file mode 100644 index 00000000000000..7da6f023d09c77 --- /dev/null +++ b/src/ui/public/string_resources/registry.js @@ -0,0 +1,11 @@ +import _ from 'lodash'; +const registry = {}; + +export default { + register: function (stringObj) { + _.defaultsDeep(registry, stringObj); + }, + all: function () { + return registry; + } +}; diff --git a/src/ui/public/string_resources/string_resources.js b/src/ui/public/string_resources/string_resources.js deleted file mode 100644 index df06135b3eddbc..00000000000000 --- a/src/ui/public/string_resources/string_resources.js +++ /dev/null @@ -1,52 +0,0 @@ -export default { - - pipelineSetup: { - - headerTextCallout: - 'Let\'s build a pipeline!', - - headerText: - 'Ingest pipelines are an easy way to modify documents before they\'re indexed in Elasticsearch. ' + - 'They\'re composed of processors which can change your data in many ways. Create a pipeline ' + - 'below while cycling through your samples to see its effect on your data.', - - pipelineLabel: - 'Processor Pipeline', - - pipelineTooltip: - 'A pipeline is a definition of a series of processors that are to be executed in the same order ' + - 'as they are declared.', - - pipelineOutputLabel: - 'Pipeline Output', - - pipelineOutputTooltip: - 'The pipeline output shows the result of the defined pipeline using the sample records ' + - 'supplied in the previous step.', - - nextSample: - 'Next Sample', - - previousSample: - 'Previous Sample', - - collapseLeftPanel: - 'Collapse Left Panel', - - expandLeftPanel: - 'Expand Left Panel', - - collapseRightPanel: - 'Collapse Right Panel', - - expandRightPanel: - 'Expand Right Panel', - - processorTypePlaceholder: - 'Select a Processor...', - - emptyPipeline: - 'Your pipeline is currently empty. Add a processor to get started!' - - } -}; diff --git a/webpackShims/string-resources.js b/webpackShims/string-resources.js index 41f86634e43ac5..db05ebf0bbba5c 100644 --- a/webpackShims/string-resources.js +++ b/webpackShims/string-resources.js @@ -1 +1 @@ -require('../src/ui/public/string_resources/index'); +require('ui/string_resources/index');