Add imports for SavedObjectRegistryProvider.register, fixing Timelion (…

…#12844) * Add imports for SavedObjectRegistryProvider.register, fixing timelion * Undoing accidental change
elastic · Jul 13, 2017 · 8f34633 · 8f34633
1 parent 58ef02c
commit 8f34633
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.js b/src/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.js
@@ -1,4 +1,5 @@
 import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import './saved_dashboards';
 
 SavedObjectRegistryProvider.register((savedDashboards) => {
   return savedDashboards;

diff --git a/src/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js b/src/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js
@@ -1,4 +1,6 @@
 import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import './saved_searches';
+
 
 SavedObjectRegistryProvider.register((savedSearches) => {
   return savedSearches;

diff --git a/...core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js b/...core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js
@@ -1,4 +1,5 @@
 import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
+import './saved_visualizations';
 
 SavedObjectRegistryProvider.register((savedVisualizations) => {
   return savedVisualizations;

diff --git a/src/core_plugins/timelion/index.js b/src/core_plugins/timelion/index.js
@@ -27,7 +27,10 @@ export default function (kibana) {
             esShardTimeout: config.get('elasticsearch.shardTimeout'),
             esApiVersion: config.get('elasticsearch.apiVersion')
           };
-        }
+        },
+        uses: [
+          'savedObjectTypes',
+        ]
       },
       hacks: [
         'plugins/timelion/lib/panel_registry',

diff --git a/src/core_plugins/timelion/public/app.js b/src/core_plugins/timelion/public/app.js
@@ -24,8 +24,6 @@ const app = require('ui/modules').get('apps/timelion', []);
 require('plugins/timelion/services/saved_sheets');
 require('plugins/timelion/services/_saved_sheet');
 
-require('plugins/kibana/visualize/saved_visualizations/saved_visualizations');
-require('plugins/kibana/discover/saved_searches/saved_searches');
 require('./vis');
 
 SavedObjectRegistryProvider.register(require('plugins/timelion/services/saved_sheet_register'));
@@ -61,7 +59,6 @@ app.controller('timelion', function (
     kbnUrl,
     Notifier,
     Private,
-    savedVisualizations,
     timefilter
   ) {
 
@@ -78,6 +75,7 @@ app.controller('timelion', function (
     location: 'Timelion'
   });
 
+  const savedVisualizations = Private(SavedObjectRegistryProvider).byLoaderPropertiesName.visualizations;
   const timezone = Private(require('plugins/timelion/services/timezone'))();
   const docTitle = Private(DocTitleProvider);
 

diff --git a/src/core_plugins/timelion/public/services/saved_sheet_register.js b/src/core_plugins/timelion/public/services/saved_sheet_register.js
@@ -1,3 +1,5 @@
+import './saved_sheets';
+
 export default function savedSearchObjectFn(savedSheets) {
   return savedSheets;
 }