Adapt Visualize code

elastic · May 13, 2020 · 185d29c · 185d29c
1 parent 785c3a5
commit 185d29c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/plugins/visualize/public/application/listing/visualize_listing.js b/src/plugins/visualize/public/application/listing/visualize_listing.js
@@ -25,7 +25,6 @@ import { i18n } from '@kbn/i18n';
 
 import { getServices } from '../../kibana_services';
 import { syncQueryStateWithUrl } from '../../../../data/public';
-import { LISTING_LIMIT_SETTING, PER_PAGE_SETTING } from '../../../../saved_objects/common';
 
 export function initListingDirective(app, I18nContext) {
   app.directive('visualizeListingTable', reactDirective =>
@@ -43,6 +42,7 @@ export function VisualizeListingController($scope, createNewVis, kbnUrlStateStor
     toastNotifications,
     visualizations,
     core: { docLinks, savedObjects, uiSettings },
+    savedObjects: savedObjectsPublic,
   } = getServices();
 
   // syncs `_g` portion of url with query services
@@ -92,7 +92,7 @@ export function VisualizeListingController($scope, createNewVis, kbnUrlStateStor
   this.fetchItems = filter => {
     const isLabsEnabled = uiSettings.get('visualize:enableLabs');
     return savedVisualizations
-      .findListItems(filter, uiSettings.get(LISTING_LIMIT_SETTING))
+      .findListItems(filter, savedObjectsPublic.settings.getListingLimit())
       .then(result => {
         this.totalItems = result.total;
 
@@ -125,8 +125,8 @@ export function VisualizeListingController($scope, createNewVis, kbnUrlStateStor
     },
   ]);
 
-  this.listingLimit = uiSettings.get(LISTING_LIMIT_SETTING);
-  this.initialPageSize = uiSettings.get(PER_PAGE_SETTING);
+  this.listingLimit = savedObjectsPublic.settings.getListingLimit();
+  this.initialPageSize = savedObjectsPublic.settings.getPerPage();
 
   addHelpMenuToAppChrome(chrome, docLinks);
 

diff --git a/src/plugins/visualize/public/kibana_services.ts b/src/plugins/visualize/public/kibana_services.ts
@@ -34,6 +34,7 @@ import { VisualizationsStart } from '../../visualizations/public';
 import { SavedVisualizations } from './application/types';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
 import { DefaultEditorController } from '../../vis_default_editor/public';
+import { SavedObjectsStart } from '../../saved_objects/public';
 
 export interface VisualizeKibanaServices {
   pluginInitializerContext: PluginInitializerContext;
@@ -54,6 +55,7 @@ export interface VisualizeKibanaServices {
   setActiveUrl: (newUrl: string) => void;
   DefaultVisualizationEditor: typeof DefaultEditorController;
   createVisEmbeddableFromObject: VisualizationsStart['__LEGACY']['createVisEmbeddableFromObject'];
+  savedObjects: SavedObjectsStart;
 }
 
 let services: VisualizeKibanaServices | null = null;

diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
@@ -39,12 +39,14 @@ import { VisualizeConstants } from './application/visualize_constants';
 import { setServices, VisualizeKibanaServices } from './kibana_services';
 import { FeatureCatalogueCategory, HomePublicPluginSetup } from '../../home/public';
 import { DefaultEditorController } from '../../vis_default_editor/public';
+import { SavedObjectsStart } from '../../saved_objects/public';
 
 export interface VisualizePluginStartDependencies {
   data: DataPublicPluginStart;
   navigation: NavigationStart;
   share?: SharePluginStart;
   visualizations: VisualizationsStart;
+  savedObjects: SavedObjectsStart;
 }
 
 export interface VisualizePluginSetupDependencies {
@@ -120,6 +122,7 @@ export class VisualizePlugin
           DefaultVisualizationEditor: DefaultEditorController,
           createVisEmbeddableFromObject:
             pluginsStart.visualizations.__LEGACY.createVisEmbeddableFromObject,
+          savedObjects: pluginsStart.savedObjects,
         };
         setServices(deps);