Merge branch 'master' into fix/legend-sizing

Author: elasticmachine

src/core/MIGRATION.md

@@ -1170,7 +1170,7 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
 | `import 'ui/query_bar'`                           | `import { QueryStringInput } from '../data/public'`          | Directives are deprecated.                                                                                                           |
 | `import 'ui/search_bar'`                          | `import { SearchBar } from '../data/public'`                 | Directive is deprecated.                                                                                                             |
 | `import 'ui/kbn_top_nav'`                         | `import { TopNavMenu } from '../navigation/public'`          | Directive is still available in `ui/kbn_top_nav`.                                                                                    |
-| `ui/saved_objects/components/saved_object_finder` | `import { SavedObjectFinder } from '../kibana_react/public'` |                                                                                                                                      |
+| `ui/saved_objects/components/saved_object_finder` | `import { SavedObjectFinder } from '../saved_objects/public'` |                                                                                                                                      |
 | `core_plugins/interpreter`                        | `data.expressions`                                           | still in progress                                                                                                                    |
 | `ui/courier`                                      | `data.search`                                                | still in progress                                                                                                                    |
 | `ui/embeddable`                                   | `embeddables`                                                | still in progress                                                                                                                    |

src/legacy/ui/public/saved_objects/__tests__/simple_saved_object.js renamed to src/core/public/saved_objects/simple_saved_object.test.ts

@@ -17,36 +17,43 @@
  * under the License.
  */
 
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import { SimpleSavedObject } from '../../../../../core/public';
+import { SavedObject } from '../../server';
+import { SimpleSavedObject } from './simple_saved_object';
+import { SavedObjectsClientContract } from './saved_objects_client';
 
 describe('SimpleSavedObject', () => {
+  let client: SavedObjectsClientContract;
+
+  beforeEach(() => {
+    client = {
+      update: jest.fn(),
+      create: jest.fn(),
+      delete: jest.fn(),
+    } as any;
+  });
+
   it('persists type and id', () => {
     const id = 'logstash-*';
     const type = 'index-pattern';
 
-    const client = sinon.stub();
-    const savedObject = new SimpleSavedObject(client, { id, type });
+    const savedObject = new SimpleSavedObject(client, { id, type } as SavedObject);
 
-    expect(savedObject.id).to.be(id);
-    expect(savedObject.type).to.be(type);
+    expect(savedObject.id).toEqual(id);
+    expect(savedObject.type).toEqual(type);
   });
 
   it('persists attributes', () => {
     const attributes = { title: 'My title' };
 
-    const client = sinon.stub();
-    const savedObject = new SimpleSavedObject(client, { attributes });
+    const savedObject = new SimpleSavedObject(client, { attributes } as SavedObject);
 
-    expect(savedObject.attributes).to.be(attributes);
+    expect(savedObject.attributes).toEqual(attributes);
   });
 
   it('persists version', () => {
-    const version = 2;
+    const version = '2';
 
-    const client = sinon.stub();
-    const savedObject = new SimpleSavedObject(client, { version });
-    expect(savedObject._version).to.be(version);
+    const savedObject = new SimpleSavedObject(client, { version } as SavedObject);
+    expect(savedObject._version).toEqual(version);
   });
 });

src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts

@@ -24,7 +24,6 @@
  * directly where they are needed.
  */
 
-export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 export { KbnUrl } from 'ui/url/kbn_url';
@@ -33,7 +32,6 @@ export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_to
 // @ts-ignore
 export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url/index';
 export { IInjector } from 'ui/chrome';
-export { SavedObjectLoader } from 'ui/saved_objects';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export {
   configureAppAngularModule,

src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts

@@ -38,7 +38,6 @@ import {
   PrivateProvider,
   PromiseServiceCreator,
   RedirectWhenMissingProvider,
-  SavedObjectLoader,
 } from '../legacy_imports';
 // @ts-ignore
 import { initDashboardApp } from './legacy_app';
@@ -47,6 +46,7 @@ import { NavigationPublicPluginStart as NavigationStart } from '../../../../../.
 import { DataPublicPluginStart } from '../../../../../../plugins/data/public';
 import { SharePluginStart } from '../../../../../../plugins/share/public';
 import { KibanaLegacyStart } from '../../../../../../plugins/kibana_legacy/public';
+import { SavedObjectLoader } from '../../../../../../plugins/saved_objects/public';
 
 export interface RenderDeps {
   pluginInitializerContext: PluginInitializerContext;

src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx

@@ -26,9 +26,10 @@ import angular from 'angular';
 import { Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { History } from 'history';
+import { SavedObjectSaveOpts } from 'src/plugins/saved_objects/public';
 import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen';
 
-import { migrateLegacyQuery, SavedObjectSaveOpts, subscribeWithScope } from '../legacy_imports';
+import { migrateLegacyQuery, subscribeWithScope } from '../legacy_imports';
 import {
   esFilters,
   IndexPattern,

src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts

@@ -18,7 +18,7 @@
  */
 
 import { TimefilterContract } from 'src/plugins/data/public';
-import { SavedObjectSaveOpts } from '../../legacy_imports';
+import { SavedObjectSaveOpts } from '../../../../../../../plugins/saved_objects/public';
 import { updateSavedDashboard } from './update_saved_dashboard';
 import { DashboardStateManager } from '../dashboard_state_manager';
 

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts

@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import {
+  createSavedObjectClass,
+  SavedObject,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { extractReferences, injectReferences } from './saved_dashboard_references';
 
 import {

src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts

@@ -17,8 +17,10 @@
  * under the License.
  */
 
-import { SavedObjectLoader } from 'ui/saved_objects';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import {
+  SavedObjectLoader,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { createSavedDashboardClass } from './saved_dashboard';
 
 export function createSavedDashboardLoader(services: SavedObjectKibanaServices) {

src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.ts

@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+
+import {
+  createSavedObjectClass,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 
 export function createSavedSearchClass(services: SavedObjectKibanaServices) {
   const SavedObjectClass = createSavedObjectClass(services);

src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts

@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectLoader } from 'ui/saved_objects';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+
+import {
+  SavedObjectLoader,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { createSavedSearchClass } from './_saved_search';
 
 export function createSavedSearchesLoader(services: SavedObjectKibanaServices) {