From bfb5a728e57bc7d2307e48d3ffd097144848f25a Mon Sep 17 00:00:00 2001 From: ch-bas Date: Fri, 5 Jun 2020 12:36:18 +0200 Subject: [PATCH] Support for Kibana 7.6 --- public/time.js | 19 ++++++++++--------- public/timeController.js | 6 ------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/public/time.js b/public/time.js index aba5b47..66cef14 100644 --- a/public/time.js +++ b/public/time.js @@ -6,20 +6,19 @@ import 'plugins/kibana-time-plugin/bower_components/bootstrap-addons/dist/css/bo import 'plugins/kibana-time-plugin/bower_components/bootstrap-addons/dist/js/bootstrap-addons.js'; import 'plugins/kibana-time-plugin/time.less'; import 'plugins/kibana-time-plugin/timeController'; -import { VisFactoryProvider } from 'ui/vis/vis_factory'; -import { VisTypesRegistryProvider } from 'ui/registry/vis_types'; import visTemplate from 'plugins/kibana-time-plugin/time.html'; import optionsTemplate from 'plugins/kibana-time-plugin/timeOptions.html'; +import { AngularVisController } from 'ui/vis/vis_types/angular_vis_type'; +import KbnTimeVisController from './timeController' -VisTypesRegistryProvider.register(TimeVisProvider); +import { setup as visualizations } from '../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy'; +import { npSetup } from 'ui/new_platform'; -function TimeVisProvider(Private) { - const VisFactory = Private(VisFactoryProvider); - - return VisFactory.createAngularVisualization({ + const timePickeerDefinition = { name: 'time', title: 'Time widget', icon: 'clock', + visualization: AngularVisController, description: 'Add time inputs to your dashboards.', visConfig: { template: visTemplate, @@ -35,5 +34,7 @@ function TimeVisProvider(Private) { }, requestHandler: 'none', responseHandler: 'none' - }); -} + }; + +npSetup.plugins.expressions.registerFunction(timePickeerDefinition); +visualizations.types.createBaseVisualization(timePickeerDefinition); \ No newline at end of file diff --git a/public/timeController.js b/public/timeController.js index 1b1e64e..cd933da 100644 --- a/public/timeController.js +++ b/public/timeController.js @@ -29,12 +29,6 @@ module.config(function($httpProvider) { let lastUpdated = 0; - //$scope.$listenAndDigestAsync(timefilter, 'timeUpdate', setTime); - - $scope.$listen(timefilter, 'timeUpdate', () => { - $scope.$evalAsync(() => setTime()); - }); - var changeVisOff = $rootScope.$on( 'change:vis', _.debounce(updateTimeslider, 200, false));