fixing bugs with rebase

fixing tests

fixing tsvb auto apply button

fix tsvb resizing issue

update scope.$apply for react editor components

re-render react component when vis.params are updated (#12347)

fixing heatmap

remove obsolete maps_renderbot indirection

remove cruft/ remove custom resizing and hook into global event

fixing brush event

fixing resize event for vislib_vis_type

fixing legend

changing based on nathans review

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 vis.type.params.gaugeTypes"
+        ng-options="mode for mode in collections.gaugeTypes"
       ></select>
     </div>
   </div>
@@ -183,7 +183,7 @@
               id="colorSchema"
               class="kuiSelect kuiSideBarSelect"
               ng-model="vis.params.gauge.colorSchema"
-              ng-options="mode for mode in vis.type.params.colorSchemas"
+              ng-options="mode for mode in collections.colorSchemas"
             ></select>
           </div>
           <div class="text-info text-center" ng-show="customColors" ng-click="resetColors()">reset colors</div>
@@ -255,7 +255,7 @@
                 id="gaugeColorMode"
                 class="kuiSelect kuiSideBarSelect"
                 ng-model="vis.params.gauge.gaugeColorMode"
-                ng-options="mode for mode in vis.type.params.gaugeColorMode"
+                ng-options="mode for mode in collections.gaugeColorMode"
               ></select>
             </div>
           </div>

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 => {

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 vis.editorConfig.collections.colorSchemas"
+        ng-options="mode for mode in collections.colorSchemas"
       ></select>
     </div>
     <div
@@ -39,7 +39,7 @@
         id="axisScale"
         class="kuiSelect kuiSideBarSelect"
         ng-model="vis.params.valueAxes[0].scale.type"
-        ng-options="mode for mode in vis.type.params.scales"
+        ng-options="mode for mode in collections.scales"
       ></select>
     </div>
   </div>
@@ -141,15 +141,15 @@
                 ng-click="removeRange($index)"
                 class="kuiButton kuiButton--danger kuiButton--small"
               >
-                <span class="kuiIcon fa-times"><span>
+                <span class="kuiIcon fa-times"></span>
               </button>
             </td>
           </tr>
         </table>
 
         <div class="hintbox" ng-show="!vis.params.colorsRange.length">
           <p>
-            <span class="kuiIcon fa-danger text-danger"><span>
+            <span class="kuiIcon fa-danger text-danger"></span>
             <strong>Required:</strong> You must specify at least one range.
           </p>
         </div>

src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js

@@ -9,6 +9,9 @@ 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;

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.params.defaults,
+      params: lineVisType.visConfig.defaults,
       aggs: [
         { type: 'count', schema: 'metric', params: { field: 'bytes' } },
         { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },

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.params.legendPositions"
+        ng-options="position.value as position.text for position in vis.type.editorConfig.collections.legendPositions"
       ></select>
     </div>
   </div>

src/core_plugins/kbn_vislib_vis_types/public/gauge.js

@@ -18,6 +18,7 @@ export default function GaugeVisType(Private) {
     category: CATEGORY.DATA,
     visConfig: {
       defaults: {
+        type:'gauge',
         addTooltip: true,
         addLegend: true,
 

src/core_plugins/kbn_vislib_vis_types/public/heatmap.js

@@ -46,7 +46,7 @@ export default function HeatmapVisType(Private) {
       },
     },
     editorConfig: {
-      collectons: {
+      collections: {
         legendPositions: [{
           value: 'left',
           text: 'left',

src/core_plugins/kibana/public/dashboard/panel/panel.html

@@ -83,8 +83,10 @@
     saved-obj="savedObj"
     app-state="appState"
     ui-state="uiState"
+    data-shared-item
     data-title="{{savedObj.title}}"
     data-description="{{savedObj.description}}"
+    render-counter
     class="panel-content">
   </visualize>
 

src/core_plugins/kibana/public/visualize/editor/editor.html

@@ -90,6 +90,8 @@
     ui-state="uiState"
     app-state="state"
     editor-mode="true"
+    data-shared-item
+    render-counter
     data-title="{{savedVis.lastSavedTitle}}"
     data-description="{{savedVis.description}}"
     show-spy-panel="chrome.getVisible()">

src/core_plugins/kibana/public/visualize/editor/editor.js

@@ -1,9 +1,6 @@
 import _ from 'lodash';
 import 'plugins/kibana/visualize/saved_visualizations/saved_visualizations';
-
-// import 'plugins/kibana/visualize/editor/sidebar';
 import 'ui/vis/editors/default/sidebar';
-
 import 'plugins/kibana/visualize/editor/agg_filter';
 import 'ui/visualize';
 import 'ui/collapsible_sidebar';

src/core_plugins/kibana/public/visualize/index.js

@@ -23,9 +23,9 @@ import { BasicResponseHandlerProvider } from 'ui/vis/response_handlers/basic';
 import { defaultEditor } from 'ui/vis/editors/default/default';
 
 
-import { RequestHandlersRegistryProvider } from 'ui/registry/request_handlers';
-import { ResponseHandlersRegistryProvider } from 'ui/registry/response_handlers';
-import { EditorTypesRegistryProvider } from 'ui/registry/editor_types';
+import { VisRequestHandlersRegistryProvider } from 'ui/registry/vis_request_handlers';
+import { VisResponseHandlersRegistryProvider } from 'ui/registry/vis_response_handlers';
+import { VisEditorTypesRegistryProvider } from 'ui/registry/vis_editor_types';
 
 uiRoutes
 .defaults(/visualize/, {
@@ -39,9 +39,9 @@ uiRoutes
 
 // preloading
 SavedObjectRegistryProvider.register(savedVisualizationProvider);
-RequestHandlersRegistryProvider.register(CourierRequestHandlerProvider);
-RequestHandlersRegistryProvider.register(noneRequestHandlerProvider);
-ResponseHandlersRegistryProvider.register(noneResponseHandler);
-ResponseHandlersRegistryProvider.register(BasicResponseHandlerProvider);
-EditorTypesRegistryProvider.register(defaultEditor);
+VisRequestHandlersRegistryProvider.register(CourierRequestHandlerProvider);
+VisRequestHandlersRegistryProvider.register(noneRequestHandlerProvider);
+VisResponseHandlersRegistryProvider.register(noneResponseHandler);
+VisResponseHandlersRegistryProvider.register(BasicResponseHandlerProvider);
+VisEditorTypesRegistryProvider.register(defaultEditor);
 

src/core_plugins/markdown_vis/public/__tests__/markdown_vis_controller.js

@@ -8,6 +8,7 @@ describe('markdown vis controller', function () {
   beforeEach(ngMock.module('kibana/markdown_vis'));
   beforeEach(ngMock.inject(function ($rootScope, $controller) {
     $scope = $rootScope.$new();
+    $scope.renderComplete = () => {};
     const $element = $('<div>');
     $controller('KbnMarkdownVisController', { $scope, $element });
     $scope.$digest();

src/core_plugins/metrics/public/components/vis_editor.js

@@ -9,20 +9,29 @@ class VisEditor extends Component {
 
   constructor(props) {
     super(props);
-    this.state = { model: props.vis.params };
+    this.state = { model: props.vis.params, dirty: false, autoApply: true };
     this.onBrush = brushHandler(props.vis.API.timeFilter);
   }
 
   render() {
     const handleChange = (part) => {
       const nextModel = { ...this.state.model, ...part };
-      this.setState({ model: nextModel });
-      if (this.props.onChange || true) {
-        console.log(nextModel);
-        this.props.vis.params = nextModel;
+
+      this.props.vis.params = nextModel;
+      if (this.state.autoApply) {
         this.props.vis.updateState();
-        //this.props.onChange(nextModel);
       }
+
+      this.setState({ model: nextModel, dirty: !this.state.autoApply });
+    };
+
+    const handleAutoApplyToggle = (part) => {
+      this.setState({ autoApply: part.target.checked });
+    };
+
+    const handleCommit = () => {
+      this.props.vis.updateState();
+      this.setState({ dirty: false });
     };
 
     if (!this.props.vis.isEditorMode()) {
@@ -44,13 +53,13 @@ class VisEditor extends Component {
             model={model}
             onChange={handleChange} />
           <VisEditorVisualization
-            dirty={this.props.dirty}
-            autoApply={this.props.autoApply}
+            dirty={this.state.dirty}
+            autoApply={this.state.autoApply}
             model={model}
             visData={this.props.visData}
             onBrush={this.onBrush}
-            onCommit={this.props.onCommit}
-            onToggleAutoApply={this.props.onToggleAutoApply}
+            onCommit={handleCommit}
+            onToggleAutoApply={handleAutoApplyToggle}
             onChange={handleChange} />
           <PanelConfig
             fields={this.props.vis.fields}
@@ -60,9 +69,14 @@ class VisEditor extends Component {
         </div>
       );
     }
+
     return null;
   }
 
+  componentDidMount() {
+    this.props.renderComplete();
+  }
+
 }
 
 VisEditor.propTypes = {

src/core_plugins/metrics/public/lib/__tests__/create_brush_handler.js

@@ -1,29 +1,19 @@
 import createBrushHandler from '../create_brush_handler';
-import sinon from 'sinon';
 import moment from 'moment';
 import { expect } from 'chai';
 
 describe('createBrushHandler', () => {
-
-  let evalAsyncStub;
-  let $scope;
   let timefilter;
   let fn;
   let range;
 
   beforeEach(() => {
-    evalAsyncStub = sinon.stub().yields();
-    $scope = { $evalAsync: evalAsyncStub };
-    timefilter = { time: {} };
-    fn = createBrushHandler($scope, timefilter);
+    timefilter = { time: {}, update: () => {} };
+    fn = createBrushHandler(timefilter);
     range = { xaxis: { from: '2017-01-01T00:00:00Z', to: '2017-01-01T00:10:00Z' } };
     fn(range);
   });
 
-  it('returns brushHandler() that calls $scope.$evalAsync()', () => {
-    expect(evalAsyncStub.calledOnce).to.equal(true);
-  });
-
   it('returns brushHandler() that updates timefilter', () => {
     expect(timefilter.time.from).to.equal(moment(range.xaxis.from).toISOString());
     expect(timefilter.time.to).to.equal(moment(range.xaxis.to).toISOString());

src/core_plugins/region_map/public/region_map_controller.js

@@ -6,27 +6,26 @@ import { KibanaMap } from '../../tile_map/public/kibana_map';
 import ChoroplethLayer from './choropleth_layer';
 import { truncatedColorMaps }  from 'ui/vislib/components/color/truncated_colormaps';
 import AggResponsePointSeriesTooltipFormatterProvider from './tooltip_formatter';
-import { ResizeCheckerProvider } from 'ui/resize_checker';
-import 'ui/vis_maps/lib/service_settings';
+import '../../tile_map/public/lib/service_settings';
 
 
 const module = uiModules.get('kibana/region_map', ['kibana']);
 module.controller('KbnRegionMapController', function ($scope, $element, Private, Notifier, getAppState,
                                                        serviceSettings, config) {
 
   const tooltipFormatter = Private(AggResponsePointSeriesTooltipFormatterProvider);
-  const ResizeChecker = Private(ResizeCheckerProvider);
   const notify = new Notifier({ location: 'Region map' });
-  const resizeChecker = new ResizeChecker($element);
+
 
   let kibanaMap = null;
-  resizeChecker.on('resize', () => {
+  let choroplethLayer = null;
+  const kibanaMapReady = makeKibanaMap();
+
+  $scope.$watch('resize', () => {
     if (kibanaMap) {
       kibanaMap.resize();
     }
   });
-  let choroplethLayer = null;
-  const kibanaMapReady = makeKibanaMap();
 
   $scope.$watch('esResponse', async function (response) {
     kibanaMapReady.then(() => {

src/core_plugins/region_map/public/region_map_vis_params.html

@@ -15,9 +15,9 @@
         id="regionMap"
         class="kuiSelect kuiSideBarSelect"
         ng-model="vis.params.selectedLayer"
-        ng-options="layer.name for layer in vis.type.params.vectorLayers"
+        ng-options="layer.name for layer in collections.vectorLayers"
         ng-change="onLayerChange()"
-        ng-init="vis.params.selectedLayer=vis.type.params.vectorLayers[0]"
+        ng-init="vis.params.selectedLayer=collections.vectorLayers[0]"
       ></select>
     </div>
   </div>
@@ -51,7 +51,7 @@
         id="colorSchema"
         class="kuiSelect kuiSideBarSelect"
         ng-model="vis.params.colorSchema"
-        ng-options="mode for mode in vis.type.params.colorSchemas"
+        ng-options="mode for mode in collections.colorSchemas"
       ></select>
     </div>
   </div>