Migrate graph usage of saved_objects module constants for uiSettings …

…to setting accessors
elastic · May 11, 2020 · 785c3a5 · 785c3a5
1 parent 72e29b7
commit 785c3a5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 12 deletions.
diff --git a/src/plugins/saved_objects/public/index.ts b/src/plugins/saved_objects/public/index.ts
@@ -36,5 +36,6 @@ export {
   isErrorNonFatal,
 } from './saved_object';
 export { SavedObjectSaveOpts, SavedObjectKibanaServices, SavedObject } from './types';
+export { SavedObjectsStart } from './plugin';
 
 export const plugin = () => new SavedObjectsPublicPlugin();
diff --git a/src/plugins/saved_objects/public/plugin.ts b/src/plugins/saved_objects/public/plugin.ts
@@ -26,6 +26,10 @@ import { PER_PAGE_SETTING, LISTING_LIMIT_SETTING } from '../common';
 
 export interface SavedObjectsStart {
   SavedObjectClass: any;
+  settings: {
+    getPerPage: () => number;
+    getListingLimit: () => number;
+  };
 }
 
 export interface SavedObjectsStartDeps {

diff --git a/x-pack/plugins/graph/kibana.json b/x-pack/plugins/graph/kibana.json
@@ -4,7 +4,7 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["licensing", "data", "navigation"],
+  "requiredPlugins": ["licensing", "data", "navigation", "savedObjects"],
   "optionalPlugins": ["home", "features"],
   "configPath": ["xpack", "graph"]
 }
diff --git a/x-pack/plugins/graph/public/app.js b/x-pack/plugins/graph/public/app.js
@@ -12,10 +12,6 @@ import { isColorDark, hexToRgb } from '@elastic/eui';
 
 import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
 import { showSaveModal } from '../../../../src/plugins/saved_objects/public';
-import {
-  LISTING_LIMIT_SETTING,
-  PER_PAGE_SETTING,
-} from '../../../../src/plugins/saved_objects/common';
 
 import appTemplate from './angular/templates/index.html';
 import listingTemplate from './angular/templates/listing_ng_wrapper.html';
@@ -50,13 +46,13 @@ export function initGraphApp(angularModule, deps) {
     addBasePath,
     getBasePath,
     data,
-    config,
     capabilities,
     coreStart,
     storage,
     canEditDrillDownUrls,
     graphSavePolicy,
     overlays,
+    savedObjects,
   } = deps;
 
   const app = angularModule;
@@ -116,8 +112,8 @@ export function initGraphApp(angularModule, deps) {
         template: listingTemplate,
         badge: getReadonlyBadge,
         controller: function($location, $scope) {
-          $scope.listingLimit = config.get(LISTING_LIMIT_SETTING);
-          $scope.initialPageSize = config.get(PER_PAGE_SETTING);
+          $scope.listingLimit = savedObjects.settings.getListingLimit();
+          $scope.initialPageSize = savedObjects.settings.getPerPage();
           $scope.create = () => {
             $location.url(getNewPath());
           };

diff --git a/x-pack/plugins/graph/public/application.ts b/x-pack/plugins/graph/public/application.ts
@@ -22,7 +22,6 @@ import {
   PluginInitializerContext,
   SavedObjectsClientContract,
   ToastsStart,
-  IUiSettingsClient,
   OverlayStart,
 } from 'kibana/public';
 // @ts-ignore
@@ -40,6 +39,7 @@ import {
 } from '../../../../src/plugins/kibana_legacy/public';
 
 import './index.scss';
+import { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
 
 /**
  * These are dependencies of the Graph app besides the base dependencies
@@ -57,7 +57,6 @@ export interface GraphDependencies {
   navigation: NavigationStart;
   licensing: LicensingPluginSetup;
   chrome: ChromeStart;
-  config: IUiSettingsClient;
   toastNotifications: ToastsStart;
   indexPatterns: IndexPatternsContract;
   data: ReturnType<DataPlugin['start']>;
@@ -68,6 +67,7 @@ export interface GraphDependencies {
   canEditDrillDownUrls: boolean;
   graphSavePolicy: string;
   overlays: OverlayStart;
+  savedObjects: SavedObjectsStart;
 }
 
 export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies) => {

diff --git a/x-pack/plugins/graph/public/components/listing.tsx b/x-pack/plugins/graph/public/components/listing.tsx
@@ -55,7 +55,6 @@ export function Listing(props: ListingProps) {
         tableListTitle={i18n.translate('xpack.graph.listing.graphsTitle', {
           defaultMessage: 'Graphs',
         })}
-        uiSettings={props.coreStart.uiSettings}
       />
     </I18nProvider>
   );

diff --git a/x-pack/plugins/graph/public/plugin.ts b/x-pack/plugins/graph/public/plugin.ts
@@ -23,6 +23,7 @@ import {
 } from '../../../../src/plugins/home/public';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 import { ConfigSchema } from '../config';
+import { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
 
 export interface GraphPluginSetupDependencies {
   licensing: LicensingPluginSetup;
@@ -32,6 +33,7 @@ export interface GraphPluginSetupDependencies {
 export interface GraphPluginStartDependencies {
   navigation: NavigationStart;
   data: DataPublicPluginStart;
+  savedObjects: SavedObjectsStart;
 }
 
 export class GraphPlugin
@@ -89,10 +91,10 @@ export class GraphPlugin
           capabilities: coreStart.application.capabilities.graph,
           coreStart,
           chrome: coreStart.chrome,
-          config: coreStart.uiSettings,
           toastNotifications: coreStart.notifications.toasts,
           indexPatterns: pluginsStart.data!.indexPatterns,
           overlays: coreStart.overlays,
+          savedObjects: pluginsStart.savedObjects,
         });
       },
     });