diff --git a/src/core_plugins/kbn_vislib_vis_types/public/area.js b/src/core_plugins/kbn_vislib_vis_types/public/area.js index 6e6b47055f7c0..868c3a9d1179f 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/area.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/area.js @@ -1,19 +1,20 @@ +import VisVisTypeProvider from 'ui/vis/vis_type'; import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; import VisSchemasProvider from 'ui/vis/schemas'; import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html'; +import image from './images/icon-area.svg'; export default function PointSeriesVisType(Private) { + const VisType = Private(VisVisTypeProvider); const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); return new VislibVisType({ name: 'area', - title: 'Area chart', - icon: 'fa-area-chart', - description: 'Great for stacked timelines in which the total of all series is more important ' + - 'than comparing any two or more series. Less useful for assessing the relative change of ' + - 'unrelated data points as changes in a series lower down the stack will have a difficult to gauge ' + - 'effect on the series above it.', + title: 'Area', + image, + description: 'Emphasize the quantity beneath a line chart', + category: VisType.CATEGORY.BASIC, params: { defaults: { grid: { diff --git a/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js b/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js index 53316d79529c2..265d2ed141cc5 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js @@ -1,18 +1,21 @@ +import VisVisTypeProvider from 'ui/vis/vis_type'; import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; import VisSchemasProvider from 'ui/vis/schemas'; import heatmapTemplate from 'plugins/kbn_vislib_vis_types/editors/heatmap.html'; import heatmapColors from 'ui/vislib/components/color/colormaps'; +import image from './images/icon-heatmap.svg'; export default function HeatmapVisType(Private) { + const VisType = Private(VisVisTypeProvider); const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); return new VislibVisType({ name: 'heatmap', - title: 'Heatmap chart', - icon: 'fa-barcode', - description: 'A heat map is a graphical representation of data' + - ' where the individual values contained in a matrix are represented as colors. ', + title: 'Heat Map', + image, + description: 'Shade cells within a matrix', + category: VisType.CATEGORY.BASIC, params: { defaults: { addTooltip: true, diff --git a/src/core_plugins/kbn_vislib_vis_types/public/histogram.js b/src/core_plugins/kbn_vislib_vis_types/public/histogram.js index 04b87c41593f0..ee4217ed69ec1 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/histogram.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/histogram.js @@ -1,17 +1,20 @@ +import VisVisTypeProvider from 'ui/vis/vis_type'; import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; import VisSchemasProvider from 'ui/vis/schemas'; import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html'; +import image from './images/icon-vertical.svg'; export default function PointSeriesVisType(Private) { + const VisType = Private(VisVisTypeProvider); const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); return new VislibVisType({ name: 'histogram', - title: 'Vertical bar chart', - icon: 'fa-bar-chart', - description: 'The goto chart for oh-so-many needs. Great for time and non-time data. Stacked or grouped, ' + - 'exact numbers or percentages. If you are not sure which chart you need, you could do worse than to start here.', + title: 'Vertical Bar', + image, + description: 'Assign a continuous variable to each axis', + category: VisType.CATEGORY.BASIC, params: { defaults: { grid: { diff --git a/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js b/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js index ed5af51626a10..9de565200b945 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js @@ -1,16 +1,20 @@ +import VisVisTypeProvider from 'ui/vis/vis_type'; import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; import VisSchemasProvider from 'ui/vis/schemas'; import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html'; +import image from './images/icon-horizontal.svg'; export default function PointSeriesVisType(Private) { + const VisType = Private(VisVisTypeProvider); const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); return new VislibVisType({ name: 'horizontal_bar', - title: 'Horizontal bar chart', - icon: 'fa-bars', - description: 'Like histogram chart but with horizontal bars.', + title: 'Horizontal Bar', + image, + description: 'Assign a continuous variable to each axis', + category: VisType.CATEGORY.BASIC, params: { defaults: { grid: { diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-area.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-area.svg new file mode 100644 index 0000000000000..b7469195dae17 --- /dev/null +++ b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-area.svg @@ -0,0 +1,19 @@ + + \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-heatmap.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-heatmap.svg new file mode 100644 index 0000000000000..a480d4435f8b6 --- /dev/null +++ b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-heatmap.svg @@ -0,0 +1,27 @@ + + \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-horizontal.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-horizontal.svg new file mode 100644 index 0000000000000..bc779f9ab0c73 --- /dev/null +++ b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-horizontal.svg @@ -0,0 +1,23 @@ + + \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-line.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-line.svg new file mode 100644 index 0000000000000..c46e5f56e88c2 --- /dev/null +++ b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-line.svg @@ -0,0 +1,19 @@ + + \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-pie.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-pie.svg new file mode 100644 index 0000000000000..a2ddb72d7a6bd --- /dev/null +++ b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-pie.svg @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-tilemap.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-tilemap.svg new file mode 100644 index 0000000000000..0888ce38f05a2 --- /dev/null +++ b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-tilemap.svg @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-vertical.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-vertical.svg new file mode 100644 index 0000000000000..78bf5661942f5 --- /dev/null +++ b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-vertical.svg @@ -0,0 +1,19 @@ + + \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/line.js b/src/core_plugins/kbn_vislib_vis_types/public/line.js index 896e5163ab296..1c3330dced3aa 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/line.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/line.js @@ -1,17 +1,20 @@ +import VisVisTypeProvider from 'ui/vis/vis_type'; import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; import VisSchemasProvider from 'ui/vis/schemas'; import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html'; +import image from './images/icon-line.svg'; export default function PointSeriesVisType(Private) { + const VisType = Private(VisVisTypeProvider); const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); return new VislibVisType({ name: 'line', - title: 'Line chart', - icon: 'fa-line-chart', - description: 'Often the best chart for high density time series. Great for comparing one series to another. ' + - 'Be careful with sparse sets as the connection between points can be misleading.', + title: 'Line', + image, + description: 'Emphasize trends', + category: VisType.CATEGORY.BASIC, params: { defaults: { grid: { diff --git a/src/core_plugins/kbn_vislib_vis_types/public/pie.js b/src/core_plugins/kbn_vislib_vis_types/public/pie.js index 6ec170695fdc9..c25c3d76cfb3b 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/pie.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/pie.js @@ -1,17 +1,20 @@ +import VisVisTypeProvider from 'ui/vis/vis_type'; import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type'; import VisSchemasProvider from 'ui/vis/schemas'; import pieTemplate from 'plugins/kbn_vislib_vis_types/editors/pie.html'; +import image from './images/icon-pie.svg'; export default function HistogramVisType(Private) { + const VisType = Private(VisVisTypeProvider); const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); return new VislibVisType({ name: 'pie', - title: 'Pie chart', - icon: 'fa-pie-chart', - description: 'Pie charts are ideal for displaying the parts of some whole. For example, sales percentages by department.' + - 'Pro Tip: Pie charts are best used sparingly, and with no more than 7 slices per pie.', + title: 'Pie', + image, + description: 'Compare parts of a whole', + category: VisType.CATEGORY.BASIC, params: { defaults: { addTooltip: true, diff --git a/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js b/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js index 5859d2d532112..f0b0449b59808 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js @@ -1,20 +1,23 @@ import supports from 'ui/utils/supports'; +import VisVisTypeProvider from 'ui/vis/vis_type'; import MapsVisTypeVislibVisTypeProvider from 'ui/vis_maps/maps_vis_type'; import VisSchemasProvider from 'ui/vis/schemas'; import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json'; import tileMapTemplate from 'plugins/kbn_vislib_vis_types/editors/tile_map.html'; +import image from './images/icon-tilemap.svg'; export default function TileMapVisType(Private, getAppState, courier, config) { + const VisType = Private(VisVisTypeProvider); const MapsVisType = Private(MapsVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); const geoJsonConverter = Private(AggResponseGeoJsonGeoJsonProvider); return new MapsVisType({ name: 'tile_map', - title: 'Tile map', - icon: 'fa-map-marker', - description: 'Your source for geographic maps. Requires an elasticsearch geo_point field. More specifically, a field ' + - 'that is mapped as type:geo_point with latitude and longitude coordinates.', + title: 'Tile Map', + image, + description: 'Plot latitude and longitude coordinates on a map', + category: VisType.CATEGORY.MAP, params: { defaults: { mapType: 'Scaled Circle Markers', diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.html b/src/core_plugins/kibana/public/visualize/editor/editor.html index 667551edbfb2c..557550337d911 100644 --- a/src/core_plugins/kibana/public/visualize/editor/editor.html +++ b/src/core_plugins/kibana/public/visualize/editor/editor.html @@ -71,13 +71,15 @@