Merge branch 'double_fetch' of github.com:nreese/kibana into double_f…

…etch

src/core/public/mocks.ts

@@ -48,6 +48,7 @@ export { overlayServiceMock } from './overlays/overlay_service.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 export { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
 export { scopedHistoryMock } from './application/scoped_history.mock';
+export { applicationServiceMock } from './application/application_service.mock';
 
 function createCoreSetupMock({
   basePath = '',
@@ -62,9 +63,8 @@ function createCoreSetupMock({
     application: applicationServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
     fatalErrors: fatalErrorsServiceMock.createSetupContract(),
-    getStartServices: jest.fn<Promise<[ReturnType<typeof createCoreStartMock>, object, any]>, []>(
-      () =>
-        Promise.resolve([createCoreStartMock({ basePath }), pluginStartDeps, pluginStartContract])
+    getStartServices: jest.fn<Promise<[ReturnType<typeof createCoreStartMock>, any, any]>, []>(() =>
+      Promise.resolve([createCoreStartMock({ basePath }), pluginStartDeps, pluginStartContract])
     ),
     http: httpServiceMock.createSetupContract({ basePath }),
     notifications: notificationServiceMock.createSetupContract(),

src/core/server/saved_objects/service/index.ts

@@ -36,7 +36,6 @@ export interface SavedObjectsLegacyService {
   getScopedSavedObjectsClient: SavedObjectsClientProvider['getClient'];
   SavedObjectsClient: typeof SavedObjectsClient;
   types: string[];
-  importAndExportableTypes: string[];
   schema: SavedObjectsSchema;
   getSavedObjectsRepository(...rest: any[]): any;
   importExport: {

src/core/server/server.api.md

@@ -2084,8 +2084,6 @@ export interface SavedObjectsLegacyService {
     // (undocumented)
     getScopedSavedObjectsClient: SavedObjectsClientProvider['getClient'];
     // (undocumented)
-    importAndExportableTypes: string[];
-    // (undocumented)
     importExport: {
         objectLimit: number;
         importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;

src/legacy/core_plugins/kibana/inject_vars.js

@@ -20,10 +20,7 @@
 export function injectVars(server) {
   const serverConfig = server.config();
 
-  const { importAndExportableTypes } = server.savedObjects;
-
   return {
-    importAndExportableTypes,
     autocompleteTerminateAfter: serverConfig.get('kibana.autocompleteTerminateAfter'),
     autocompleteTimeout: serverConfig.get('kibana.autocompleteTimeout'),
   };

src/legacy/core_plugins/kibana/public/index.ts

@@ -20,4 +20,4 @@
 export {
   ProcessedImportResponse,
   processImportResponse,
-} from './management/sections/objects/lib/process_import_response';
+} from '../../../../plugins/saved_objects_management/public/lib';

src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts

@@ -17,66 +17,8 @@
  * under the License.
  */
 
-import _ from 'lodash';
-import { i18n } from '@kbn/i18n';
-import { npStart } from 'ui/new_platform';
-import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
-import { createSavedSearchesLoader } from '../../../../../plugins/discover/public';
+import { npSetup } from 'ui/new_platform';
 
-/**
- * This registry is used for the editing mode of Saved Searches, Visualizations,
- * Dashboard and Time Lion saved objects.
- */
-interface SavedObjectRegistryEntry {
-  id: string;
-  service: SavedObjectLoader;
-  title: string;
-}
-
-export interface ISavedObjectsManagementRegistry {
-  register(service: SavedObjectRegistryEntry): void;
-  all(): SavedObjectRegistryEntry[];
-  get(id: string): SavedObjectRegistryEntry | undefined;
-}
-
-const registry: SavedObjectRegistryEntry[] = [];
-
-export const savedObjectManagementRegistry: ISavedObjectsManagementRegistry = {
-  register: (service: SavedObjectRegistryEntry) => {
-    registry.push(service);
-  },
-  all: () => {
-    return registry;
-  },
-  get: (id: string) => {
-    return _.find(registry, { id });
-  },
-};
-
-const services = {
-  savedObjectsClient: npStart.core.savedObjects.client,
-  indexPatterns: npStart.plugins.data.indexPatterns,
-  search: npStart.plugins.data.search,
-  chrome: npStart.core.chrome,
-  overlays: npStart.core.overlays,
-};
-
-savedObjectManagementRegistry.register({
-  id: 'savedVisualizations',
-  service: npStart.plugins.visualizations.savedVisualizationsLoader,
-  title: 'visualizations',
-});
-
-savedObjectManagementRegistry.register({
-  id: 'savedDashboards',
-  service: npStart.plugins.dashboard.getSavedDashboardLoader(),
-  title: i18n.translate('kbn.dashboard.savedDashboardsTitle', {
-    defaultMessage: 'dashboards',
-  }),
-});
+const registry = npSetup.plugins.savedObjectsManagement?.serviceRegistry;
 
-savedObjectManagementRegistry.register({
-  id: 'savedSearches',
-  service: createSavedSearchesLoader(services),
-  title: 'searches',
-});
+export const savedObjectManagementRegistry = registry!;

src/legacy/core_plugins/kibana/public/management/sections/index.js

@@ -17,5 +17,4 @@
  * under the License.
  */
 
-import './objects';
 import './index_patterns';

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/call_outs.test.js → src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.test.tsx

@@ -23,7 +23,7 @@ import { shallow } from 'enzyme';
 import { CallOuts } from '../call_outs';
 
 describe('CallOuts', () => {
-  it('should render normally', async () => {
+  test('should render normally', () => {
     const component = shallow(
       <CallOuts
         deprecatedLangsInUse={['php']}
@@ -34,7 +34,7 @@ describe('CallOuts', () => {
     expect(component).toMatchSnapshot();
   });
 
-  it('should render without any call outs', async () => {
+  test('should render without any call outs', () => {
     const component = shallow(
       <CallOuts deprecatedLangsInUse={[]} painlessDocLink="http://www.elastic.co/painlessDocs" />
     );

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.js → src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.tsx

@@ -20,16 +20,20 @@
 import React from 'react';
 
 import { EuiCallOut, EuiLink, EuiSpacer } from '@elastic/eui';
-
 import { FormattedMessage } from '@kbn/i18n/react';
 
-export const CallOuts = ({ deprecatedLangsInUse, painlessDocLink }) => {
+interface CallOutsProps {
+  deprecatedLangsInUse: string[];
+  painlessDocLink: string;
+}
+
+export const CallOuts = ({ deprecatedLangsInUse, painlessDocLink }: CallOutsProps) => {
   if (!deprecatedLangsInUse.length) {
     return null;
   }
 
   return (
-    <div>
+    <>
       <EuiCallOut
         title={
           <FormattedMessage
@@ -60,6 +64,6 @@ export const CallOuts = ({ deprecatedLangsInUse, painlessDocLink }) => {
         </p>
       </EuiCallOut>
       <EuiSpacer size="m" />
-    </div>
+    </>
   );
 };

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx

@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { DeleteScritpedFieldConfirmationModal } from './confirmation_modal';
+
+describe('DeleteScritpedFieldConfirmationModal', () => {
+  test('should render normally', () => {
+    const component = shallow(
+      <DeleteScritpedFieldConfirmationModal
+        field={{ name: '', script: '', lang: '' }}
+        deleteField={() => {}}
+        hideDeleteConfirmationModal={() => {}}
+      />
+    );
+
+    expect(component).toMatchSnapshot();
+  });
+});