From 7497592c5d6a1d0d54e2b2e7a5b492acf9a8fcf3 Mon Sep 17 00:00:00 2001 From: Ryan Keairns Date: Tue, 16 Oct 2018 15:56:34 -0500 Subject: [PATCH] Proofreading edits, UI text consistency (#24016) (#24097) --- .../canvas/canvas_plugin_src/elements/image/index.js | 2 +- .../canvas_plugin_src/elements/markdown/index.js | 6 +++--- .../canvas_plugin_src/functions/browser/markdown.js | 2 +- .../functions/common/alterColumn.js | 4 ++-- .../canvas_plugin_src/functions/common/axisConfig.js | 2 +- .../canvas_plugin_src/functions/common/case.js | 2 +- .../canvas_plugin_src/functions/common/date.js | 8 ++++---- .../functions/common/seriesStyle.js | 12 ++++++------ .../functions/common/staticColumn.js | 2 +- .../canvas_plugin_src/functions/common/table.js | 4 ++-- .../functions/server/src/demodata/index.js | 2 +- .../canvas_plugin_src/functions/server/src/esdocs.js | 2 +- .../functions/server/src/timelion.js | 2 +- .../renderers/advanced_filter/index.js | 2 +- .../renderers/dropdown_filter/index.js | 2 +- .../canvas_plugin_src/renderers/error/index.js | 2 +- .../canvas_plugin_src/renderers/repeat_image.js | 2 +- .../renderers/reveal_image/index.js | 2 +- .../canvas/canvas_plugin_src/renderers/table.js | 2 +- .../canvas/canvas_plugin_src/renderers/text.js | 2 +- .../canvas_plugin_src/renderers/time_filter/index.js | 2 +- .../uis/arguments/axis_config/index.js | 2 +- .../uis/arguments/image_upload/index.js | 2 +- .../canvas_plugin_src/uis/arguments/palette.js | 2 +- .../canvas/canvas_plugin_src/uis/arguments/string.js | 2 +- .../canvas_plugin_src/uis/arguments/textarea.js | 2 +- .../canvas_plugin_src/uis/datasources/demodata.js | 8 ++++---- .../canvas_plugin_src/uis/datasources/essql.js | 2 +- .../canvas_plugin_src/uis/datasources/timelion.js | 2 +- .../canvas_plugin_src/uis/models/point_series.js | 4 ++-- .../canvas/canvas_plugin_src/uis/transforms/sort.js | 4 ++-- .../canvas_plugin_src/uis/views/dropdownControl.js | 6 +++--- .../canvas/canvas_plugin_src/uis/views/getCell.js | 2 +- .../canvas/canvas_plugin_src/uis/views/metric.js | 4 ++-- .../canvas/canvas_plugin_src/uis/views/pie.js | 10 +++++----- .../canvas/canvas_plugin_src/uis/views/plot.js | 10 +++++----- .../canvas/canvas_plugin_src/uis/views/progress.js | 12 ++++++------ .../canvas_plugin_src/uis/views/repeatImage.js | 4 ++-- .../canvas_plugin_src/uis/views/revealImage.js | 4 ++-- .../canvas/canvas_plugin_src/uis/views/shape.js | 6 +++--- .../canvas/canvas_plugin_src/uis/views/table.js | 8 ++++---- .../canvas_plugin_src/uis/views/timefilterControl.js | 2 +- x-pack/plugins/canvas/common/functions/to.js | 2 +- .../arg_types/container_style/index.js | 2 +- .../canvas/public/expression_types/arg_types/font.js | 2 +- .../expression_types/arg_types/series_style/index.js | 2 +- .../public/expression_types/datasources/esdocs.js | 2 +- x-pack/plugins/canvas/public/functions/asset.js | 2 +- 48 files changed, 88 insertions(+), 88 deletions(-) diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js index ead02acb40716..6c6b8ca9f3e64 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js @@ -9,7 +9,7 @@ import header from './header.png'; export const image = () => ({ name: 'image', displayName: 'Image', - help: 'A static image.', + help: 'A static image', image: header, expression: `image dataurl=null mode="contain" | render`, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js index 48a161d8d20fc..89c7b1203e8f3 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js @@ -13,18 +13,18 @@ export const markdown = () => ({ image: header, expression: `filters | demodata -| markdown "### Welcome to the Markdown Element. +| markdown "### Welcome to the Markdown element Good news! You're already connected to some demo data! -The datatable contains +The data table contains **{{rows.length}} rows**, each containing the following columns: {{#each columns}} **{{name}}** {{/each}} -You can use standard Markdown in here, but you can also access your piped-in data using Handlebars. If you want to know more, check out the [Handlebars Documentation](http://handlebarsjs.com/expressions.html) +You can use standard Markdown in here, but you can also access your piped-in data using Handlebars. If you want to know more, check out the [Handlebars documentation](http://handlebarsjs.com/expressions.html). #### Enjoy!" | render`, }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js index 8f35a1eb74951..7e6a78832508e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js @@ -25,7 +25,7 @@ export const markdown = () => ({ }, font: { types: ['style'], - help: 'Font settings. Technically you can stick other styles in here too!', + help: 'Font settings. Technically, you can add other styles in here as well', default: '{font}', }, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js index b5fd1a1333fc3..f588138e3f43f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js @@ -21,12 +21,12 @@ export const alterColumn = () => ({ }, type: { types: ['string'], - help: 'The type to convert the column to. Leave blank to not change type.', + help: 'The type to convert the column to. Leave blank to not change type', default: null, }, name: { types: ['string'], - help: 'The resultant column name. Leave blank to not rename.', + help: 'The resultant column name. Leave blank to not rename', default: null, }, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js index d583368266249..f8ae4a5af333d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js @@ -21,7 +21,7 @@ export const axisConfig = () => ({ }, position: { types: ['string'], - help: 'Position of the axis labels. Eg, top, bottom, left, and right.', + help: 'Position of the axis labels - top, bottom, left, and right', default: '', }, min: { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js index 84a5ba58a3731..b4579c414afce 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js @@ -7,7 +7,7 @@ export const caseFn = () => ({ name: 'case', type: 'case', - help: 'Build a case (including a condition/result) to pass to the switch function.', + help: 'Build a case (including a condition/result) to pass to the switch function', args: { when: { aliases: ['_'], diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js index 20fc9ca98f649..23b2631325763 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js @@ -20,19 +20,19 @@ export const date = () => ({ context: { types: ['null'], }, - help: 'Returns the current time, or a time parsed from a string, as milliseconds since epoch.', + help: 'Returns the current time, or a time parsed from a string, as milliseconds since epoch', args: { value: { aliases: ['_'], types: ['string', 'null'], help: - 'An optional date string to parse into milliseconds since epoch. ' + - 'Can be either a valid Javascript Date input or a string to parse using the format argument. Must be an ISO 8601 string or you must provide the format.', + 'An optional date string to parse into milliseconds since epoch ' + + 'Can be either a valid Javascript Date input or a string to parse using the format argument. Must be an ISO 8601 string or you must provide the format', }, format: { types: ['string'], help: - 'The momentJS format for parsing the optional date string (See https://momentjs.com/docs/#/displaying/).', + 'The momentJS format for parsing the optional date string (See https://momentjs.com/docs/#/displaying/)', }, }, fn: (context, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js index 5af8d345df4a1..5afb7263147c3 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js @@ -17,9 +17,9 @@ export const seriesStyle = () => ({ args: { label: { types: ['string'], - displayName: 'Series Label', + displayName: 'Series label', help: - 'The label of the line this style applies to, not the name you would like to give the line.', + 'The label of the line this style applies to, not the name you would like to give the line', }, color: { types: ['string', 'null'], @@ -33,12 +33,12 @@ export const seriesStyle = () => ({ }, bars: { types: ['number'], - displayName: 'Bar Width', + displayName: 'Bar width', help: 'Width of bars', }, points: { types: ['number'], - displayName: 'Show Points', + displayName: 'Show points', help: 'Size of points on line', }, fill: { @@ -48,13 +48,13 @@ export const seriesStyle = () => ({ }, stack: { types: ['number', 'null'], - displayName: 'Stack Series', + displayName: 'Stack series', help: 'Should we stack the series? This is the stack "id". Series with the same stack id will be stacked together', }, horizontalBars: { types: ['boolean'], - displayName: 'Horizontal Bars Orientation', + displayName: 'Horizontal bars orientation', help: 'Sets the orientation of bars in the chart to horizontal', }, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js index 4b9e96bda7354..77580be49719a 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js @@ -9,7 +9,7 @@ import { getType } from '../../../common/lib/get_type'; export const staticColumn = () => ({ name: 'staticColumn', type: 'datatable', - help: 'Add a column with a static value.', + help: 'Add a column with a static value', context: { types: ['datatable'], }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js index 3afd345c65c4a..ec3d21738dcdf 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js @@ -21,7 +21,7 @@ export const table = () => ({ paginate: { types: ['boolean'], default: true, - help: 'Show pagination controls. If set to false only the first page will be displayed.', + help: 'Show pagination controls. If set to false only the first page will be displayed', }, perPage: { types: ['number'], @@ -31,7 +31,7 @@ export const table = () => ({ showHeader: { types: ['boolean'], default: true, - help: 'Show or hide the header row with titles for each column.', + help: 'Show or hide the header row with titles for each column', }, }, fn: (context, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/index.js index fab2fcc38209c..9137e3e11657e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/index.js @@ -12,7 +12,7 @@ export const demodata = () => ({ name: 'demodata', aliases: [], type: 'datatable', - help: 'A mock data set that includes project CI times with usernames, countries and run phases.', + help: 'A mock data set that includes project CI times with usernames, countries and run phases', context: { types: ['filter'], }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/esdocs.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/esdocs.js index 7cb559b10464b..725d5f30197f1 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/esdocs.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/esdocs.js @@ -36,7 +36,7 @@ export const esdocs = () => ({ help: 'Sort directions as "field, direction". Eg "@timestamp, desc" or "bytes, asc"', }, fields: { - help: 'Comma separated list of fields. Fewer fields will perform better.', + help: 'Comma separated list of fields. Fewer fields will perform better', types: ['string', 'null'], }, metaFields: { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/timelion.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/timelion.js index a19460edb03d4..2779f8e1e2c1d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/timelion.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/timelion.js @@ -42,7 +42,7 @@ export const timelion = () => ({ }, }, type: 'datatable', - help: 'Use timelion to extract one or more timeseries from many sources.', + help: 'Use timelion to extract one or more timeseries from many sources', fn: (context, args, handlers) => { // Timelion requires a time range. Use the time range from the timefilter element in the // workpad, if it exists. Otherwise fall back on the function args. diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js index 1b44045f44a70..4b628e5de93f6 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js @@ -10,7 +10,7 @@ import { AdvancedFilter } from './component'; export const advancedFilter = () => ({ name: 'advanced_filter', - displayName: 'Advanced Filter', + displayName: 'Advanced filter', help: 'Render a Canvas filter expression', reuseDomNode: true, height: 50, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js index caef38781bdb6..863fa41a90be5 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js @@ -12,7 +12,7 @@ import { DropdownFilter } from './component'; export const dropdownFilter = () => ({ name: 'dropdown_filter', - displayName: 'Dropdown Filter', + displayName: 'Dropdown filter', help: 'A dropdown from which you can select values for an "exactly" filter', reuseDomNode: true, height: 50, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js index 23d4b28b89811..45d85f2e3dd6c 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js @@ -12,7 +12,7 @@ import { Popover } from '../../../public/components/popover'; export const error = () => ({ name: 'error', - displayName: 'Error Information', + displayName: 'Error information', help: 'Render error data in a way that is helpful to users', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js index dbc6338d8939c..240a9a6b84a31 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js @@ -11,7 +11,7 @@ import { isValid } from '../../common/lib/url'; export const repeatImage = () => ({ name: 'repeatImage', - displayName: 'Image Repeat', + displayName: 'Image repeat', help: 'Repeat an image a given number of times', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js index de43c1fff0da8..08ab96ffa58de 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js @@ -10,7 +10,7 @@ import './reveal_image.scss'; export const revealImage = () => ({ name: 'revealImage', - displayName: 'Image Reveal', + displayName: 'Image reveal', help: 'Reveal a percentage of an image to make a custom gauge-style chart', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js index 09950f743c9d9..3989a13c338fd 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js @@ -11,7 +11,7 @@ import { Datatable } from '../../public/components/datatable'; export const table = () => ({ name: 'table', - displayName: 'Data Table', + displayName: 'Data table', help: 'Render tabular data as HTML', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js index f5aa833f437d0..3a833fc0c8472 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js @@ -9,7 +9,7 @@ import React from 'react'; export const text = () => ({ name: 'text', - displayName: 'Plain Text', + displayName: 'Plain text', help: 'Render output as plain text', reuseDomNode: true, render(domNode, { text }, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js index d9d1ae3c2d754..cdc4f563e1340 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js @@ -12,7 +12,7 @@ import { TimeFilter } from './components/time_filter'; export const timeFilter = () => ({ name: 'time_filter', - displayName: 'Time Filter', + displayName: 'Time filter', help: 'Set a time window', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js index 31635bf2a5b1e..e8237ecc32314 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js @@ -10,7 +10,7 @@ import { ExtendedTemplate } from './extended_template'; export const axisConfig = () => ({ name: 'axisConfig', - displayName: 'Axis Config', + displayName: 'Axis config', help: 'Visualization axis configuration', simpleTemplate: templateFromReactComponent(SimpleTemplate), template: templateFromReactComponent(ExtendedTemplate), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js index 364752763cd27..1bafa734815b6 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js @@ -168,7 +168,7 @@ class ImageUpload extends React.Component { export const imageUpload = () => ({ name: 'imageUpload', - displayName: 'Image Upload', + displayName: 'Image upload', help: 'Select or upload an image', resolveArgValue: true, template: templateFromReactComponent(ImageUpload), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js index 61c5208b108f5..e0f8e56df8b6f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js @@ -65,7 +65,7 @@ PaletteArgInput.propTypes = { export const palette = () => ({ name: 'palette', - displayName: 'Color Palette', + displayName: 'Color palette', help: 'Choose a color palette', default: '{palette #882E72 #B178A6 #D6C1DE #1965B0 #5289C7 #7BAFDE #4EB265 #90C987 #CAE0AB #F7EE55 #F6C141 #F1932D #E8601C #DC050C}', diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js index 013b0f19f6ca0..9c117e694a1fd 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js @@ -57,7 +57,7 @@ EnhancedStringArgInput.propTypes = { export const string = () => ({ name: 'string', - displayName: 'string', + displayName: 'String', help: 'Input short strings', simpleTemplate: templateFromReactComponent(EnhancedStringArgInput), }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js index d0dbfb22a5dd3..8a9593a15cac7 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js @@ -63,7 +63,7 @@ EnhancedTextAreaArgInput.propTypes = { export const textarea = () => ({ name: 'textarea', - displayName: 'textarea', + displayName: 'Textarea', help: 'Input long strings', template: templateFromReactComponent(EnhancedTextAreaArgInput), }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js index 66e18c8bf5392..32be8b79d8fc9 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js @@ -14,16 +14,16 @@ const DemodataDatasource = () => (

This data source is connected to every Canvas element by default. Its purpose is to give you some playground data to get started. The demo set contains 4 strings, 3 numbers and a date. - Feel free to experiment and, when you're ready, click the Change Datasource{' '} - link below to connect to your own data. + Feel free to experiment and, when you're ready, click Change your data source{' '} + above to connect to your own data.

); export const demodata = () => ({ name: 'demodata', - displayName: 'Demo Data', - help: 'Mock data set with with usernames, prices, projects, countries and phases.', + displayName: 'Demo data', + help: 'Mock data set with usernames, prices, projects, countries, and phases', // Replace this with a better icon when we have time. image: 'logoElasticStack', template: templateFromReactComponent(DemodataDatasource), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js index 9acfa963c0dab..abaeecfc1c756 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js @@ -71,7 +71,7 @@ EssqlDatasource.propTypes = { export const essql = () => ({ name: 'essql', displayName: 'Elasticsearch SQL', - help: 'Use Elasticsearch SQL to get a datatable', + help: 'Use Elasticsearch SQL to get a data table', // Replace this with a SQL logo when we have one in EUI image: 'logoElasticsearch', template: templateFromReactComponent(EssqlDatasource), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js index 386b8ce89214f..16f1a70f6763d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js @@ -99,7 +99,7 @@ TimelionDatasource.propTypes = { export const timelion = () => ({ name: 'timelion', displayName: 'Timelion', - help: 'Use timelion syntax to retrieve a timeseries', + help: 'Use Timelion syntax to retrieve a timeseries', image: 'timelionApp', template: templateFromReactComponent(TimelionDatasource), }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js index 60fe433ef60b3..ac5ee08d21349 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js @@ -9,7 +9,7 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const pointseries = () => ({ name: 'pointseries', - displayName: 'Dimensions & Measures', + displayName: 'Dimensions & measures', args: [ { name: 'x', @@ -20,7 +20,7 @@ export const pointseries = () => ({ { name: 'y', displayName: 'Y-axis', - help: 'Data along the vertical axis. Usually a number.', + help: 'Data along the vertical axis. Usually a number', argType: 'datacolumn', }, { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js index ac19bafc27e5a..a864d4ff55763 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js @@ -9,11 +9,11 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const sort = () => ({ name: 'sort', - displayName: 'Datatable Sorting', + displayName: 'Datatable sorting', args: [ { name: '_', - displayName: 'Sort Field', + displayName: 'Sort field', argType: 'datacolumn', }, { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js index e88f8e8bba369..95370ce177782 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js @@ -9,12 +9,12 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const dropdownControl = () => ({ name: 'dropdownControl', - displayName: 'Dropdown Filter', + displayName: 'Dropdown filter', modelArgs: [], args: [ { name: 'valueColumn', - displayName: 'Values Column', + displayName: 'Values column', help: 'Column from which to extract values to make available in the dropdown', argType: 'string', options: { @@ -23,7 +23,7 @@ export const dropdownControl = () => ({ }, { name: 'filterColumn', - displayName: 'Filter Column ', + displayName: 'Filter column ', help: 'Column to which the value selected from the dropdown is applied', argType: 'string', options: { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js index f356b74c7127e..2ceffe3efb9f6 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js @@ -6,7 +6,7 @@ export const getCell = () => ({ name: 'getCell', - displayName: 'Get Cell', + displayName: 'Get cell', help: 'Grab the first row and first column', modelArgs: ['size'], requiresContext: true, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js index e03f4d5359a6b..15da536c56e46 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js @@ -21,14 +21,14 @@ export const metric = () => ({ }, { name: 'metricFont', - displayName: 'Metric Text Settings', + displayName: 'Metric text settings', help: 'Fonts, alignment and color', argType: 'font', default: `{font size=48 family="${openSans.value}" color="#000000" align=center lHeight=48}`, }, { name: 'labelFont', - displayName: 'Label Text Settings', + displayName: 'Label text settings', help: 'Fonts, alignment and color', argType: 'font', default: `{font size=18 family="${openSans.value}" color="#000000" align=center}`, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js index 7c63b4cf559ad..1975aa8005d4f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js @@ -10,7 +10,7 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const pie = () => ({ name: 'pie', - displayName: 'Chart Style', + displayName: 'Chart style', modelArgs: [['color', { label: 'Slice Labels' }], ['size', { label: 'Slice Angles' }]], args: [ { @@ -19,7 +19,7 @@ export const pie = () => ({ }, { name: 'hole', - displayName: 'Inner Radius', + displayName: 'Inner radius', help: 'Radius of the hole', argType: 'range', default: 50, @@ -37,7 +37,7 @@ export const pie = () => ({ }, { name: 'labelRadius', - displayName: 'Label Radius', + displayName: 'Label radius', help: 'Distance of the labels from the center of the pie', argType: 'range', default: 100, @@ -48,7 +48,7 @@ export const pie = () => ({ }, { name: 'legend', - displayName: 'Legend Position', + displayName: 'Legend position', help: 'Disable or position the legend', argType: 'select', default: 'ne', @@ -74,7 +74,7 @@ export const pie = () => ({ }, { name: 'tilt', - displayName: 'Tilt Angle', + displayName: 'Tilt angle', help: 'Percentage of tilt where 1 is fully vertical and 0 is completely flat', argType: 'percentage', default: 1, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js index e56e2bcfd08c4..1f609155a9cf6 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js @@ -12,7 +12,7 @@ const styleProps = ['lines', 'bars', 'points', 'fill', 'stack']; export const plot = () => ({ name: 'plot', - displayName: 'Chart Style', + displayName: 'Chart style', modelArgs: ['x', 'y', 'color', 'size', 'text'], args: [ { @@ -21,7 +21,7 @@ export const plot = () => ({ }, { name: 'legend', - displayName: 'Legend Position', + displayName: 'Legend position', help: 'Disable or position the legend', argType: 'select', default: 'ne', @@ -31,14 +31,14 @@ export const plot = () => ({ }, { name: 'xaxis', - displayName: 'X-Axis', + displayName: 'X-axis', help: 'Configure or disable the x-axis', argType: 'axisConfig', default: true, }, { name: 'yaxis', - displayName: 'Y-Axis', + displayName: 'Y-axis', help: 'Configure or disable the Y-axis', argType: 'axisConfig', default: true, @@ -50,7 +50,7 @@ export const plot = () => ({ { name: 'defaultStyle', displayName: 'Default style', - help: 'Set the style to be used by default by every series, unless overridden.', + help: 'Set the style to be used by default by every series, unless overridden', argType: 'seriesStyle', default: '{seriesStyle points=5}', options: { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js index 4c9a885fe12cc..bd929a32232d4 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js @@ -33,28 +33,28 @@ export const progress = () => ({ }, { name: 'valueColor', - displayName: 'Progress Color', + displayName: 'Progress color', help: 'Color of the progress bar', argType: 'color', default: `#1785b0`, }, { name: 'valueWeight', - displayName: 'Progress Weight', + displayName: 'Progress weight', help: 'Thickness of the progress bar', argType: 'number', default: '20', }, { name: 'barColor', - displayName: 'Background Color', + displayName: 'Background color', help: 'Color of the background bar', argType: 'color', default: `#f0f0f0`, }, { name: 'barWeight', - displayName: 'Background Weight', + displayName: 'Background weight', help: 'Thickness of the background bar', argType: 'number', default: '20', @@ -68,8 +68,8 @@ export const progress = () => ({ }, { name: 'font', - displayName: 'Label Settings', - help: 'Font settings for the label. Technically you can stick other styles in here too!', + displayName: 'Label settings', + help: 'Font settings for the label. Technically, you can add other styles as well', argType: 'font', default: `{font size=24 family="${openSans.value}" color="#000000" align=center}`, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js index 8a9d51e5bc005..95a5c54f8307a 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js @@ -6,7 +6,7 @@ export const repeatImage = () => ({ name: 'repeatImage', - displayName: 'Repeating Image', + displayName: 'Repeating image', help: '', modelArgs: [['_', { label: 'Value' }]], args: [ @@ -18,7 +18,7 @@ export const repeatImage = () => ({ }, { name: 'emptyImage', - displayName: 'Empty Image', + displayName: 'Empty image', help: 'An image to fill up the difference between the value and the max count', argType: 'imageUpload', }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js index 58af27ba0ce92..f5369f572c817 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js @@ -6,7 +6,7 @@ export const revealImage = () => ({ name: 'revealImage', - displayName: 'Reveal Image', + displayName: 'Reveal image', help: '', modelArgs: [['_', { label: 'Value' }]], args: [ @@ -18,7 +18,7 @@ export const revealImage = () => ({ }, { name: 'emptyImage', - displayName: 'Background Image', + displayName: 'Background image', help: 'A background image. Eg, an empty glass', argType: 'imageUpload', }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js index 03ec39fb46d55..3de5bd3d9d63e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js @@ -14,7 +14,7 @@ export const shape = () => ({ args: [ { name: '_', - displayName: 'Select a Shape', + displayName: 'Select a shape', argType: 'shape', options: { shapes, @@ -34,13 +34,13 @@ export const shape = () => ({ }, { name: 'borderWidth', - displayName: 'Border Width', + displayName: 'Border width', argType: 'number', help: 'Border width', }, { name: 'maintainAspect', - displayName: 'Maintain Aspect Ratio', + displayName: 'Maintain aspect ratio', argType: 'toggle', help: `Select 'true' to maintain aspect ratio`, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js index 59c2d8dbdbef4..cee6b44705682 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js @@ -6,7 +6,7 @@ export const table = () => ({ name: 'table', - displayName: 'Table Style', + displayName: 'Table style', help: 'Set styling for a Table element', modelArgs: [], args: [ @@ -17,7 +17,7 @@ export const table = () => ({ { name: 'perPage', displayName: 'Rows per page', - help: 'Number of rows to display per table page.', + help: 'Number of rows to display per table page', argType: 'select', default: 10, options: { @@ -27,14 +27,14 @@ export const table = () => ({ { name: 'paginate', displayName: 'Pagination', - help: 'Show or hide pagination controls. If disabled only the first page will be shown.', + help: 'Show or hide pagination controls. If disabled only the first page will be shown', argType: 'toggle', default: true, }, { name: 'showHeader', displayName: 'Header', - help: 'Show or hide the header row with titles for each column.', + help: 'Show or hide the header row with titles for each column', argType: 'toggle', default: true, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js index 288de400b17f0..d368e933b88df 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js @@ -9,7 +9,7 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const timefilterControl = () => ({ name: 'timefilterControl', - displayName: 'Time Filter', + displayName: 'Time filter', modelArgs: [], args: [ { diff --git a/x-pack/plugins/canvas/common/functions/to.js b/x-pack/plugins/canvas/common/functions/to.js index 142ffe490ca38..6f15569c27a11 100644 --- a/x-pack/plugins/canvas/common/functions/to.js +++ b/x-pack/plugins/canvas/common/functions/to.js @@ -9,7 +9,7 @@ import { castProvider } from '../interpreter/cast'; export const to = () => ({ name: 'to', aliases: [], - help: 'Explicitly cast from one type to another.', + help: 'Explicitly cast from one type to another', context: {}, args: { type: { diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/index.js b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/index.js index f7056be915623..d2a3bf59f6b40 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/index.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/index.js @@ -26,7 +26,7 @@ const wrap = Component => export const containerStyle = () => ({ name: 'containerStyle', - displayName: 'Container Style', + displayName: 'Container style', help: 'Tweak the appearance of the element container', default: '{containerStyle}', simpleTemplate: templateFromReactComponent(wrap(SimpleTemplate)), diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/font.js b/x-pack/plugins/canvas/public/expression_types/arg_types/font.js index fc64c9c3a668c..ed1bf29e2514f 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/font.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/font.js @@ -53,7 +53,7 @@ FontArgInput.displayName = 'FontArgInput'; export const font = () => ({ name: 'font', - displayName: 'Text Settings', + displayName: 'Text settings', help: 'Set the font, size and color', template: templateFromReactComponent(FontArgInput), default: `{font size=14 family="${openSans.value}" color="#000000" align=left}`, diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js index 829804e2bf88a..8661413c0b1e4 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js @@ -35,7 +35,7 @@ EnhancedExtendedTemplate.propTypes = { export const seriesStyle = () => ({ name: 'seriesStyle', - displayName: 'Series Style', + displayName: 'Series style', help: 'Set the style for a selected named series', template: templateFromReactComponent(EnhancedExtendedTemplate), simpleTemplate: templateFromReactComponent(SimpleTemplate), diff --git a/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js b/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js index b2675777d3bf1..a2436f0e92681 100644 --- a/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js +++ b/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js @@ -115,7 +115,7 @@ EsdocsDatasource.propTypes = { export const esdocs = () => ({ name: 'esdocs', - displayName: 'Elasticsearch Raw Documents', + displayName: 'Elasticsearch raw documents', help: 'Pull back raw documents from elasticsearch', image: 'logoElasticsearch', template: templateFromReactComponent(EsdocsDatasource), diff --git a/x-pack/plugins/canvas/public/functions/asset.js b/x-pack/plugins/canvas/public/functions/asset.js index 4ec4889fc344e..52c9d45e9fd09 100644 --- a/x-pack/plugins/canvas/public/functions/asset.js +++ b/x-pack/plugins/canvas/public/functions/asset.js @@ -14,7 +14,7 @@ export const asset = () => ({ types: ['null'], }, type: 'string', - help: 'Use Canvas workpad asset objects to provide argument values. Usually images.', + help: 'Use Canvas workpad asset objects to provide argument values. Usually images', args: { id: { aliases: ['_'],