remove uiSettings from props

alexwizp · alexwizp · commit 5ed1f1ea7bf0 · 2020-11-03T12:53:38.000+03:00
diff --git a/src/plugins/inspector/public/plugin.tsx b/src/plugins/inspector/public/plugin.tsx
@@ -70,7 +70,7 @@ export class InspectorPublicPlugin implements Plugin<Setup, Start> {
   public async setup(core: CoreSetup) {
     this.views = new InspectorViewRegistry();
 
-    this.views.register(getDataViewDescription(core.uiSettings));
+    this.views.register(getDataViewDescription());
     this.views.register(getRequestsViewDescription());
 
     return {
diff --git a/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/inspector/public/views/data/components/__snapshots__/data_view.test.tsx.snap
diff --git a/src/plugins/inspector/public/views/data/components/data_view.test.tsx b/src/plugins/inspector/public/views/data/components/data_view.test.tsx
@@ -21,7 +21,6 @@ import React, { Suspense } from 'react';
 import { getDataViewDescription } from '../index';
 import { DataAdapter } from '../../../../common/adapters/data';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { IUiSettingsClient } from '../../../../../../core/public';
 
 jest.mock('../lib/export_csv', () => ({
   exportAsCsv: jest.fn(),
@@ -31,9 +30,7 @@ describe('Inspector Data View', () => {
   let DataView: any;
 
   beforeEach(() => {
-    const uiSettings = {} as IUiSettingsClient;
-
-    DataView = getDataViewDescription(uiSettings);
+    DataView = getDataViewDescription();
   });
 
   it('should only show if data adapter is present', () => {
diff --git a/src/plugins/inspector/public/views/data/components/data_view.tsx b/src/plugins/inspector/public/views/data/components/data_view.tsx
@@ -38,6 +38,7 @@ import {
   TabularCallback,
 } from '../../../../common/adapters/data/types';
 import { IUiSettingsClient } from '../../../../../../core/public';
+import { withKibana, KibanaReactContextValue } from '../../../../../kibana_react/public';
 
 interface DataViewComponentState {
   tabularData: TabularData | null;
@@ -47,20 +48,23 @@ interface DataViewComponentState {
 }
 
 interface DataViewComponentProps extends InspectorViewProps {
-  uiSettings: IUiSettingsClient;
+  kibana: KibanaReactContextValue<{ uiSettings: IUiSettingsClient }>;
 }
 
-export class DataViewComponent extends Component<DataViewComponentProps, DataViewComponentState> {
+class DataViewComponent extends Component<DataViewComponentProps, DataViewComponentState> {
   static propTypes = {
-    uiSettings: PropTypes.object.isRequired,
     adapters: PropTypes.object.isRequired,
     title: PropTypes.string.isRequired,
+    kibana: PropTypes.object,
   };
 
   state = {} as DataViewComponentState;
   _isMounted = false;
 
-  public static getDerivedStateFromProps(nextProps: any, state: DataViewComponentState) {
+  public static getDerivedStateFromProps(
+    nextProps: DataViewComponentProps,
+    state: DataViewComponentState
+  ) {
     if (state && nextProps.adapters === state.adapters) {
       return null;
     }
@@ -172,12 +176,12 @@ export class DataViewComponent extends Component<DataViewComponentProps, DataVie
         data={this.state.tabularData}
         isFormatted={this.state.tabularOptions.returnsFormattedValues}
         exportTitle={this.props.title}
-        uiSettings={this.props.uiSettings}
+        uiSettings={this.props.kibana.services.uiSettings}
       />
     );
   }
 }
 
 // default export required for React.Lazy
 // eslint-disable-next-line import/no-default-export
-export { DataViewComponent as default };
+export default withKibana(DataViewComponent);
diff --git a/src/plugins/inspector/public/views/data/index.ts b/src/plugins/inspector/public/views/data/index.ts
@@ -16,18 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { lazy } from 'react';
+import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { InspectorViewDescription, InspectorViewProps } from '../../types';
+import { InspectorViewDescription } from '../../types';
 import { Adapters } from '../../../common';
-import { IUiSettingsClient } from '../../../../../core/public';
 
 const DataViewComponent = lazy(() => import('./components/data_view'));
 
-export const getDataViewDescription = (
-  uiSettings: IUiSettingsClient
-): InspectorViewDescription => ({
+export const getDataViewDescription = (): InspectorViewDescription => ({
   title: i18n.translate('inspector.data.dataTitle', {
     defaultMessage: 'Data',
   }),
@@ -38,7 +35,5 @@ export const getDataViewDescription = (
   shouldShow(adapters: Adapters) {
     return Boolean(adapters.data);
   },
-  component: (props: InspectorViewProps) => (
-    <DataViewComponent {...props} uiSettings={uiSettings} />
-  ),
+  component: DataViewComponent,
 });
