From 1fd712f5962414afff0c432fb569deee6b7af824 Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Fri, 7 Jul 2017 15:34:13 -0400 Subject: [PATCH] Revert "Visualize Refactor (#11786)" This reverts commit 3000221fac3f7e0ae576ec1267c962e8400be11a. --- .../kbn_vislib_vis_types/public/area.js | 165 +++++----- .../public/controls/gauge_options.html | 6 +- .../public/controls/gauge_options.js | 2 +- .../public/controls/heatmap_options.html | 8 +- .../public/controls/heatmap_options.js | 3 - .../controls/point_series/category_axis.html | 2 +- .../public/controls/point_series/series.html | 6 +- .../public/controls/point_series/series.js | 2 +- .../controls/point_series/value_axes.html | 6 +- .../public/controls/vislib_basic_options.html | 2 +- .../public/editors/__tests__/point_series.js | 2 +- .../public/editors/heatmap.html | 2 +- .../public/editors/tile_map.html | 6 +- .../kbn_vislib_vis_types/public/gauge.js | 74 +++-- .../kbn_vislib_vis_types/public/goal.js | 72 ++--- .../kbn_vislib_vis_types/public/heatmap.js | 125 ++++---- .../kbn_vislib_vis_types/public/histogram.js | 166 +++++----- .../public/horizontal_bar.js | 159 +++++----- .../public/kbn_vislib_vis_types.js | 2 + .../kbn_vislib_vis_types/public/line.js | 165 +++++----- .../kbn_vislib_vis_types/public/metric.js | 72 ++--- .../kbn_vislib_vis_types/public/pie.js | 115 ++++--- .../kbn_vislib_vis_types/public/tile_map.js | 80 +++++ .../kibana/public/dashboard/dashboard.html | 2 - .../kibana/public/dashboard/dashboard.js | 1 - .../kibana/public/dashboard/grid.js | 2 - .../kibana/public/dashboard/panel/panel.html | 4 +- .../kibana/public/dashboard/panel/panel.js | 3 +- .../public/discover/controllers/discover.js | 6 +- .../kibana/public/discover/index.html | 9 +- .../public/visualize/editor}/__tests__/agg.js | 2 +- .../visualize/editor}/__tests__/agg_params.js | 4 +- .../public/visualize/editor/add_bucket_agg.js | 0 .../visualize/editor}/advanced_toggle.html | 0 .../kibana/public/visualize/editor}/agg.html | 2 +- .../kibana/public/visualize/editor}/agg.js | 6 +- .../public/visualize/editor}/agg_add.html | 0 .../public/visualize/editor}/agg_add.js | 2 +- .../public/visualize/editor}/agg_group.html | 2 +- .../public/visualize/editor}/agg_group.js | 9 +- .../public/visualize/editor}/agg_param.js | 0 .../public/visualize/editor}/agg_params.html | 0 .../public/visualize/editor}/agg_params.js | 8 +- .../public/visualize/editor}/agg_select.html | 0 .../public/visualize/editor/editor.html | 59 +++- .../kibana/public/visualize/editor/editor.js | 175 ++++++++-- .../visualize/editor}/nesting_indicator.js | 0 .../public/visualize/editor}/sidebar.html | 20 +- .../public/visualize/editor}/sidebar.js | 8 +- .../visualize/editor/styles/_editor.less | 10 +- .../public/visualize/editor}/vis_options.html | 4 +- .../public/visualize/editor/vis_options.js | 35 ++ .../kibana/public/visualize/index.js | 27 +- .../kibana/public/visualize/wizard/wizard.js | 22 +- .../__tests__/markdown_vis_controller.js | 1 - .../markdown_vis/public/markdown_vis.js | 21 +- .../public/markdown_vis_controller.js | 4 +- .../metrics/public/components/vis_editor.js | 45 +-- .../metrics/public/directives/vis_editor.js | 37 +++ .../public/directives/visualization.js | 46 +++ .../metrics/public/kbn_vis_types/editor.html | 5 + .../public/kbn_vis_types/editor_controller.js | 139 ++++++-- .../metrics/public/kbn_vis_types/index.js | 65 ++-- .../public/kbn_vis_types/request_handler.js | 69 ---- .../metrics/public/kbn_vis_types/vis.html | 4 + .../public/kbn_vis_types/vis_controller.js | 49 +++ .../metrics/public/less/editor.less | 3 - .../metrics/public/lib/__tests__/add_scope.js | 58 ++++ .../lib/__tests__/create_brush_handler.js | 14 +- .../metrics/public/lib/add_scope.js | 33 ++ .../public/lib/create_brush_handler.js | 13 +- src/core_plugins/metrics/public/lib/fetch.js | 42 +++ .../metrics/public/lib/fetch_fields.js | 44 ++- .../region_map/public/choropleth_layer.js | 2 +- .../public/region_map_controller.js | 15 +- .../region_map/public/region_map_vis.js | 97 +++--- .../public/region_map_vis_params.html | 6 +- .../public/region_map_vis_params.js | 10 +- .../spy_modes/public/table_spy_mode.js | 6 +- .../table_vis/public/__tests__/_table_vis.js | 34 +- .../public/__tests__/_table_vis_controller.js | 1 - .../table_vis/public/table_vis.js | 69 ++-- .../table_vis/public/table_vis_controller.js | 2 +- .../tagcloud/public/tag_cloud_controller.js | 16 +- .../tagcloud/public/tag_cloud_vis.js | 71 ++--- .../tagcloud/public/tag_cloud_vis_params.html | 4 +- .../tagcloud/public/tag_cloud_vis_params.js | 3 - src/core_plugins/tile_map/index.js | 8 - src/core_plugins/tile_map/package.json | 4 - .../tile_map/public/images/icon-tilemap.svg | 16 - .../tile_map/public/maps_visualization.js | 270 ---------------- .../tile_map/public/tile_map_vis.js | 94 ------ .../public/panels/timechart/schema.js | 2 +- src/core_plugins/timelion/public/vis/index.js | 76 ++--- .../public/vis/timelion_request_handler.js | 48 --- .../timelion/public/vis/timelion_vis.html | 2 +- .../public/vis/timelion_vis_controller.js | 73 ++++- .../public/vis/timelion_vis_params.html | 2 +- .../vis/timelion_vis_params_controller.js | 12 + .../agg_types/__tests__/agg_param_writer.js | 25 +- src/ui/public/agg_types/buckets/terms.js | 2 +- .../metrics/lib/parent_pipeline_agg_helper.js | 2 +- .../lib/sibling_pipeline_agg_helper.js | 2 +- .../collapsible_sidebar.js | 2 - src/ui/public/registry/vis_editor_types.js | 7 - .../public/registry/vis_request_handlers.js | 6 - .../public/registry/vis_response_handlers.js | 6 - .../template_vis_type/template_renderbot.js | 27 ++ .../template_vis_type/template_vis_type.js | 25 ++ src/ui/public/test_harness/test_harness.js | 3 +- src/ui/public/timefilter/timefilter.js | 10 - src/ui/public/vis/__tests__/_agg_configs.js | 2 +- src/ui/public/vis/__tests__/_renderbot.js | 41 +++ src/ui/public/vis/__tests__/_vis.js | 10 + .../public/vis/editors/default/default.html | 7 - src/ui/public/vis/editors/default/default.js | 102 ------ .../public/vis/editors/default/vis_options.js | 63 ---- src/ui/public/vis/renderbot.js | 50 +++ src/ui/public/vis/request_handlers/courier.js | 51 --- src/ui/public/vis/request_handlers/none.js | 12 - src/ui/public/vis/response_handlers/none.js | 17 - src/ui/public/vis/response_handlers/tabify.js | 22 -- .../vis/{editors/default => }/schemas.js | 0 src/ui/public/vis/update_status.js | 47 --- src/ui/public/vis/vis.js | 299 +++++++++--------- src/ui/public/vis/vis_category.js | 8 - src/ui/public/vis/vis_factory.js | 23 -- src/ui/public/vis/vis_type.js | 47 +++ .../public/vis/vis_types/angular_vis_type.js | 60 ---- src/ui/public/vis/vis_types/base_vis_type.js | 55 ---- src/ui/public/vis/vis_types/index.js | 6 - src/ui/public/vis/vis_types/react_vis_type.js | 42 --- .../public/vis/vis_types/vislib_vis_type.js | 65 ---- .../vis_maps}/__tests__/geohash_layer.js | 4 +- .../__tests__/geohash_sample_data.js | 0 .../public/vis_maps}/__tests__/kibana_map.js | 2 +- .../vis_maps}/__tests__/service_settings.js | 25 +- .../public/vis_maps}/geohash_layer.js | 0 .../public/vis_maps}/kibana_map.js | 7 +- .../public/vis_maps}/kibana_map_layer.js | 0 .../public/vis_maps}/lib/service_settings.js | 0 src/ui/public/vis_maps/maps_renderbot.js | 262 +++++++++++++++ src/ui/public/vis_maps/maps_vis_type.js | 22 ++ .../public/vis_maps}/markers/geohash_grid.js | 0 .../public/vis_maps}/markers/heatmap.js | 0 .../vis_maps}/markers/scaled_circles.js | 1 + .../vis_maps}/markers/shaded_circles.js | 0 .../public/vis_maps}/styles/_tilemap.less | 0 src/ui/public/vislib/__tests__/vis.js | 19 ++ src/ui/public/vislib/lib/handler.js | 2 +- .../public/vislib/lib/types/point_series.js | 2 +- src/ui/public/vislib/vis.js | 36 ++- .../public/vislib/visualizations/pie_chart.js | 4 +- .../__tests__}/_build_chart_data.js | 4 +- .../__tests__/_vislib_renderbot.js | 173 ++++++++++ .../public/vislib_vis_type/__tests__/index.js | 4 + .../build_chart_data.js} | 62 ++-- .../vislib_vis_type/vislib_renderbot.js | 79 +++++ .../public/vislib_vis_type/vislib_vis_type.js | 85 +++++ .../public/visualize/__tests__/visualize.js | 20 +- src/ui/public/visualize/spy.js | 1 - src/ui/public/visualize/visualization.html | 17 - src/ui/public/visualize/visualization.js | 153 --------- .../public/visualize/visualization_editor.js | 48 --- src/ui/public/visualize/visualize.html | 48 ++- src/ui/public/visualize/visualize.js | 264 ++++++++++------ src/ui/public/visualize/visualize.less | 4 +- src/ui/public/visualize/visualize_legend.js | 20 +- test/functional/apps/visualize/_region_map.js | 3 - .../functional/page_objects/visualize_page.js | 2 +- 170 files changed, 2992 insertions(+), 2826 deletions(-) rename src/core_plugins/{tile_map => kbn_vislib_vis_types}/public/editors/tile_map.html (95%) create mode 100644 src/core_plugins/kbn_vislib_vis_types/public/tile_map.js rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/__tests__/agg.js (97%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/__tests__/agg_params.js (96%) create mode 100644 src/core_plugins/kibana/public/visualize/editor/add_bucket_agg.js rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/advanced_toggle.html (100%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg.html (98%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg.js (93%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_add.html (100%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_add.js (89%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_group.html (82%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_group.js (87%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_param.js (100%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_params.html (100%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_params.js (94%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/agg_select.html (100%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/nesting_indicator.js (100%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/sidebar.html (83%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/sidebar.js (70%) rename src/{ui/public/vis/editors/default => core_plugins/kibana/public/visualize/editor}/vis_options.html (79%) create mode 100644 src/core_plugins/kibana/public/visualize/editor/vis_options.js create mode 100644 src/core_plugins/metrics/public/directives/vis_editor.js create mode 100644 src/core_plugins/metrics/public/directives/visualization.js create mode 100644 src/core_plugins/metrics/public/kbn_vis_types/editor.html delete mode 100644 src/core_plugins/metrics/public/kbn_vis_types/request_handler.js create mode 100644 src/core_plugins/metrics/public/kbn_vis_types/vis.html create mode 100644 src/core_plugins/metrics/public/kbn_vis_types/vis_controller.js create mode 100644 src/core_plugins/metrics/public/lib/__tests__/add_scope.js create mode 100644 src/core_plugins/metrics/public/lib/add_scope.js create mode 100644 src/core_plugins/metrics/public/lib/fetch.js delete mode 100644 src/core_plugins/tile_map/index.js delete mode 100644 src/core_plugins/tile_map/package.json delete mode 100644 src/core_plugins/tile_map/public/images/icon-tilemap.svg delete mode 100644 src/core_plugins/tile_map/public/maps_visualization.js delete mode 100644 src/core_plugins/tile_map/public/tile_map_vis.js delete mode 100644 src/core_plugins/timelion/public/vis/timelion_request_handler.js create mode 100644 src/core_plugins/timelion/public/vis/timelion_vis_params_controller.js delete mode 100644 src/ui/public/registry/vis_editor_types.js delete mode 100644 src/ui/public/registry/vis_request_handlers.js delete mode 100644 src/ui/public/registry/vis_response_handlers.js create mode 100644 src/ui/public/template_vis_type/template_renderbot.js create mode 100644 src/ui/public/template_vis_type/template_vis_type.js create mode 100644 src/ui/public/vis/__tests__/_renderbot.js delete mode 100644 src/ui/public/vis/editors/default/default.html delete mode 100644 src/ui/public/vis/editors/default/default.js delete mode 100644 src/ui/public/vis/editors/default/vis_options.js create mode 100644 src/ui/public/vis/renderbot.js delete mode 100644 src/ui/public/vis/request_handlers/courier.js delete mode 100644 src/ui/public/vis/request_handlers/none.js delete mode 100644 src/ui/public/vis/response_handlers/none.js delete mode 100644 src/ui/public/vis/response_handlers/tabify.js rename src/ui/public/vis/{editors/default => }/schemas.js (100%) delete mode 100644 src/ui/public/vis/update_status.js delete mode 100644 src/ui/public/vis/vis_category.js delete mode 100644 src/ui/public/vis/vis_factory.js create mode 100644 src/ui/public/vis/vis_type.js delete mode 100644 src/ui/public/vis/vis_types/angular_vis_type.js delete mode 100644 src/ui/public/vis/vis_types/base_vis_type.js delete mode 100644 src/ui/public/vis/vis_types/index.js delete mode 100644 src/ui/public/vis/vis_types/react_vis_type.js delete mode 100644 src/ui/public/vis/vis_types/vislib_vis_type.js rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/__tests__/geohash_layer.js (99%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/__tests__/geohash_sample_data.js (100%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/__tests__/kibana_map.js (98%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/__tests__/service_settings.js (95%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/geohash_layer.js (100%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/kibana_map.js (98%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/kibana_map_layer.js (100%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/lib/service_settings.js (100%) create mode 100644 src/ui/public/vis_maps/maps_renderbot.js create mode 100644 src/ui/public/vis_maps/maps_vis_type.js rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/markers/geohash_grid.js (100%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/markers/heatmap.js (100%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/markers/scaled_circles.js (99%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/markers/shaded_circles.js (100%) rename src/{core_plugins/tile_map/public => ui/public/vis_maps}/styles/_tilemap.less (100%) rename src/ui/public/{vis/__tests__/response_handlers => vislib_vis_type/__tests__}/_build_chart_data.js (96%) create mode 100644 src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js create mode 100644 src/ui/public/vislib_vis_type/__tests__/index.js rename src/ui/public/{vis/response_handlers/basic.js => vislib_vis_type/build_chart_data.js} (51%) create mode 100644 src/ui/public/vislib_vis_type/vislib_renderbot.js create mode 100644 src/ui/public/vislib_vis_type/vislib_vis_type.js delete mode 100644 src/ui/public/visualize/visualization.html delete mode 100644 src/ui/public/visualize/visualization.js delete mode 100644 src/ui/public/visualize/visualization_editor.js 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 a143e057a997e5..62bdf1cf0fab0d 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/area.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/area.js @@ -1,22 +1,22 @@ -import { VisFactoryProvider } from 'ui/vis/vis_factory'; -import { VisSchemasProvider } from 'ui/vis/editors/default/schemas'; -import { CATEGORY } from 'ui/vis/vis_category'; +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 VisFactory = Private(VisFactoryProvider); + const VisType = Private(VisVisTypeProvider); + const VislibVisType = Private(VislibVisTypeVislibVisTypeProvider); const Schemas = Private(VisSchemasProvider); - return VisFactory.createVislibVisualization({ + return new VislibVisType({ name: 'area', title: 'Area', image, description: 'Emphasize the quantity beneath a line chart', - category: CATEGORY.BASIC, - visConfig: { + category: VisType.CATEGORY.BASIC, + params: { defaults: { - type: 'area', grid: { categoryLines: false, style: { @@ -29,7 +29,8 @@ export default function PointSeriesVisType(Private) { type: 'category', position: 'bottom', show: true, - style: {}, + style: { + }, scale: { type: 'linear' }, @@ -47,7 +48,8 @@ export default function PointSeriesVisType(Private) { type: 'value', position: 'left', show: true, - style: {}, + style: { + }, scale: { type: 'linear', mode: 'normal' @@ -82,34 +84,31 @@ export default function PointSeriesVisType(Private) { times: [], addTimeMarker: false, }, - }, - editorConfig: { - collections: { - positions: ['top', 'left', 'right', 'bottom'], - chartTypes: [{ - value: 'line', - text: 'line' - }, { - value: 'area', - text: 'area' - }, { - value: 'histogram', - text: 'bar' - }], - axisModes: ['normal', 'percentage', 'wiggle', 'silhouette'], - scaleTypes: ['linear', 'log', 'square root'], - chartModes: ['normal', 'stacked'], - interpolationModes: [{ - value: 'linear', - text: 'straight', - }, { - value: 'cardinal', - text: 'smoothed', - }, { - value: 'step-after', - text: 'stepped', - }], - }, + positions: ['top', 'left', 'right', 'bottom'], + chartTypes: [{ + value: 'line', + text: 'line' + }, { + value: 'area', + text: 'area' + }, { + value: 'histogram', + text: 'bar' + }], + axisModes: ['normal', 'percentage', 'wiggle', 'silhouette'], + scaleTypes: ['linear', 'log', 'square root'], + chartModes: ['normal', 'stacked'], + interpolationModes: [{ + value: 'linear', + text: 'straight', + }, { + value: 'cardinal', + text: 'smoothed', + }, { + value: 'step-after', + text: 'stepped', + }], + editor: pointSeriesTemplate, optionTabs: [ { name: 'advanced', @@ -119,50 +118,50 @@ export default function PointSeriesVisType(Private) { }, { name: 'options', title: 'Panel Settings', editor: pointSeriesTemplate }, ], - schemas: new Schemas([ - { - group: 'metrics', - name: 'metric', - title: 'Y-Axis', - aggFilter: ['!geo_centroid'], - min: 1, - defaults: [ - { schema: 'metric', type: 'count' } - ] - }, - { - group: 'metrics', - name: 'radius', - title: 'Dot Size', - min: 0, - max: 1, - aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality'] - }, - { - group: 'buckets', - name: 'segment', - title: 'X-Axis', - min: 0, - max: 1, - aggFilter: '!geohash_grid' - }, - { - group: 'buckets', - name: 'group', - title: 'Split Series', - min: 0, - max: 1, - aggFilter: '!geohash_grid' - }, - { - group: 'buckets', - name: 'split', - title: 'Split Chart', - min: 0, - max: 1, - aggFilter: '!geohash_grid' - } - ]) - } + }, + schemas: new Schemas([ + { + group: 'metrics', + name: 'metric', + title: 'Y-Axis', + aggFilter: ['!geo_centroid'], + min: 1, + defaults: [ + { schema: 'metric', type: 'count' } + ] + }, + { + group: 'metrics', + name: 'radius', + title: 'Dot Size', + min: 0, + max: 1, + aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality'] + }, + { + group: 'buckets', + name: 'segment', + title: 'X-Axis', + min: 0, + max: 1, + aggFilter: '!geohash_grid' + }, + { + group: 'buckets', + name: 'group', + title: 'Split Series', + min: 0, + max: 1, + aggFilter: '!geohash_grid' + }, + { + group: 'buckets', + name: 'split', + title: 'Split Chart', + min: 0, + max: 1, + aggFilter: '!geohash_grid' + } + ]) }); } diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html index fee2c53a65b5c0..4c8afa31f64e98 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html @@ -8,7 +8,7 @@ id="gaugeType" class="kuiSelect kuiSideBarSelect" ng-model="vis.params.gauge.gaugeType" - ng-options="mode for mode in collections.gaugeTypes" + ng-options="mode for mode in vis.type.params.gaugeTypes" > @@ -183,7 +183,7 @@ id="colorSchema" class="kuiSelect kuiSideBarSelect" ng-model="vis.params.gauge.colorSchema" - ng-options="mode for mode in collections.colorSchemas" + ng-options="mode for mode in vis.type.params.colorSchemas" >
reset colors
@@ -255,7 +255,7 @@ id="gaugeColorMode" class="kuiSelect kuiSideBarSelect" ng-model="vis.params.gauge.gaugeColorMode" - ng-options="mode for mode in collections.gaugeColorMode" + ng-options="mode for mode in vis.type.params.gaugeColorMode" > diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js index e2849ac43797b6..6523c57d644338 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js @@ -9,7 +9,7 @@ module.directive('gaugeOptions', function () { template: gaugeOptionsTemplate, replace: true, link: function ($scope) { - $scope.collections = $scope.vis.type.editorConfig.collections; + $scope.showColorRange = true; $scope.$watch('vis.params.gauge.gaugeType', type => { diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html index ed2affb0e34c0d..24b1ff32289686 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html @@ -8,7 +8,7 @@ id="colorSchema" class="kuiSelect kuiSideBarSelect" ng-model="vis.params.colorSchema" - ng-options="mode for mode in collections.colorSchemas" + ng-options="mode for mode in vis.type.params.colorSchemas" >
@@ -141,7 +141,7 @@ ng-click="removeRange($index)" class="kuiButton kuiButton--danger kuiButton--small" > - + @@ -149,7 +149,7 @@

- + Required: You must specify at least one range.

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js index 2810cc72ce9064..bfdaad8071068c 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js @@ -9,9 +9,6 @@ module.directive('heatmapOptions', function () { template: heatmapOptionsTemplate, replace: true, link: function ($scope) { - - $scope.collections = $scope.vis.type.editorConfig.collections; - const verticalRotation = 270; $scope.showColorRange = false; $scope.showLabels = false; diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html index e2637c8650d9d1..a4902f4de4dbd2 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html @@ -25,7 +25,7 @@ id="categoryAxisPosition" class="kuiSelect kuiSideBarSelect" ng-model="vis.params.categoryAxes[0].position" - ng-options="mode for mode in vis.type.editorConfig.collections.positions" + ng-options="mode for mode in vis.type.params.positions" > diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html index 72cbf410a94b56..5e418675970f4c 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html @@ -40,7 +40,7 @@ id="{{ 'seriesType' + $index }}" class="kuiSelect kuiSideBarSelect" ng-model="chart.type" - ng-options="mode.value as mode.text for mode in vis.type.editorConfig.collections.chartTypes" + ng-options="mode.value as mode.text for mode in vis.type.params.chartTypes" > @@ -54,7 +54,7 @@ id="{{ 'seriesMode' + $index }}" class="kuiSelect kuiSideBarSelect" ng-model="chart.mode" - ng-options="mode for mode in vis.type.editorConfig.collections.chartModes" + ng-options="mode for mode in vis.type.params.chartModes" > @@ -86,7 +86,7 @@ id="{{ 'lineMode' + $index }}" class="kuiSelect kuiSideBarSelect" ng-model="chart.interpolate" - ng-options="mode.value as mode.text for mode in vis.type.editorConfig.collections.interpolationModes" + ng-options="mode.value as mode.text for mode in vis.type.params.interpolationModes" > diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js index 501869ba5243d7..b0512ff20cebc6 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.js @@ -61,7 +61,7 @@ module.directive('vislibSeries', function () { return $scope.vis.params.seriesParams.map(series => series.type).join(); }, () => { const types = _.uniq(_.map($scope.vis.params.seriesParams, 'type')); - $scope.vis.type.type = types.length === 1 ? types[0] : 'histogram'; + $scope.savedVis.type = types.length === 1 ? types[0] : 'histogram'; }); $scope.$watch('vis.params.valueAxes.length', () => { diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.html index f2f0b910af7abf..5d101490b2b268 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/value_axes.html @@ -84,7 +84,7 @@ class="kuiSelect kuiSideBarSelect" ng-change="updateAxisName(axis)" ng-model="axis.position" - ng-options="mode disable when isPositionDisabled(mode) for mode in vis.type.editorConfig.collections.positions" + ng-options="mode disable when isPositionDisabled(mode) for mode in vis.type.params.positions" > @@ -98,7 +98,7 @@ id="{{ 'valueAxisMode' + $index }}" class="kuiSelect kuiSideBarSelect" ng-model="axis.scale.mode" - ng-options="mode for mode in vis.type.editorConfig.collections.axisModes" + ng-options="mode for mode in vis.type.params.axisModes" > @@ -112,7 +112,7 @@ id="{{ 'valueAxisScaleType' + $index }}" class="kuiSelect kuiSideBarSelect" ng-model="axis.scale.type" - ng-options="type for type in vis.type.editorConfig.collections.scaleTypes" + ng-options="type for type in vis.type.params.scaleTypes" > diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html index 50b4d37a44a409..9104462e414f16 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html @@ -6,7 +6,7 @@ diff --git a/src/core_plugins/kbn_vislib_vis_types/public/editors/__tests__/point_series.js b/src/core_plugins/kbn_vislib_vis_types/public/editors/__tests__/point_series.js index b0bf4191a6b202..8b46f02d555b49 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/editors/__tests__/point_series.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/editors/__tests__/point_series.js @@ -20,7 +20,7 @@ describe('point series editor', function () { function makeConfig() { return { type: 'line', - params: lineVisType.visConfig.defaults, + params: lineVisType.params.defaults, aggs: [ { type: 'count', schema: 'metric', params: { field: 'bytes' } }, { type: 'terms', schema: 'segment', params: { field: 'machine.os' } }, diff --git a/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html b/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html index 1d1d5e418a5911..fa86afbd9d3c7f 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html @@ -32,7 +32,7 @@ id="legendPosition" class="kuiSelect kuiSideBarSelect" ng-model="vis.params.legendPosition" - ng-options="position.value as position.text for position in vis.type.editorConfig.collections.legendPositions" + ng-options="position.value as position.text for position in vis.type.params.legendPositions" > diff --git a/src/core_plugins/tile_map/public/editors/tile_map.html b/src/core_plugins/kbn_vislib_vis_types/public/editors/tile_map.html similarity index 95% rename from src/core_plugins/tile_map/public/editors/tile_map.html rename to src/core_plugins/kbn_vislib_vis_types/public/editors/tile_map.html index e0a1bb60782bd5..b215b68bb0e188 100644 --- a/src/core_plugins/tile_map/public/editors/tile_map.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/editors/tile_map.html @@ -4,8 +4,8 @@ @@ -104,7 +104,7 @@