Applying PR comments

Removing faulty rebase imports

Fixing unresolved conflict

Removing faulty merge files

Removing faulty import

Readd accidentally added file

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

@@ -29,11 +29,9 @@ import chrome from 'ui/chrome';
 export const legacyChrome = chrome;
 export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
-export { IPrivate } from 'ui/private';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
 export { ConfirmationButtonTypes } from 'ui/modals/confirm_modal';
-export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
 export { KbnUrl } from 'ui/url/kbn_url';
 // @ts-ignore
 export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';

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

@@ -54,8 +54,6 @@ export { buildVislibDimensions } from '../../../visualizations/public';
 export { getRequestInspectorStats, getResponseInspectorStats } from '../../../data/public';
 // @ts-ignore
 export { intervalOptions } from 'ui/agg_types';
-// @ts-ignore
-export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
 export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore

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

@@ -40,9 +40,6 @@ export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 export { PersistedState } from 'ui/persisted_state';
 
 export { npSetup, npStart } from 'ui/new_platform';
-export { IPrivate } from 'ui/private';
-// @ts-ignore
-export { PrivateProvider } from 'ui/private/private';
 
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore

src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx

@@ -31,21 +31,17 @@ import { mountWithIntl as mount } from 'test_utils/enzyme_helpers';
 import { ReactWrapper } from 'enzyme';
 // eslint-disable-next-line
 import { coreMock } from '../../../../../../../../core/public/mocks';
-<<<<<<< HEAD
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
 
-// @ts-ignore
-function DummySavedObjectFinder(props) {
+function DummySavedObjectFinder(props: { children: React.ReactNode }) {
   return (
     <div>
       <div>Hello World</div>
       {props.children}
     </div>
-  );
+  ) as JSX.Element;
 }
-=======
->>>>>>> [Add panel flyout] Moving create new to the top of SavedObjectFinder
 
 test('createNewEmbeddable() add embeddable to container', async () => {
   const core = coreMock.createStart();
@@ -91,7 +87,6 @@ test('createNewEmbeddable() add embeddable to container', async () => {
     lastName: 'bar',
   });
 });
-<<<<<<< HEAD
 
 test('selecting embeddable in "Create new ..." list calls createNewEmbeddable()', async () => {
   const core = coreMock.createStart();
@@ -134,5 +129,3 @@ test('selecting embeddable in "Create new ..." list calls createNewEmbeddable()'
 
   expect(spy).toHaveBeenCalledTimes(1);
 });
-=======
->>>>>>> [Add panel flyout] Moving create new to the top of SavedObjectFinder

src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/saved_object_finder_create_new.tsx

@@ -54,7 +54,7 @@ export function SavedObjectFinderCreateNew({ menuItems }: Props) {
       isOpen={isCreateMenuOpen}
       closePopover={closeCreateMenu}
       panelPaddingSize="none"
-      anchorPosition="upLeft"
+      anchorPosition="downRight"
     >
       <EuiContextMenuPanel items={menuItems} />
     </EuiPopover>

src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/saved_object_finder_create_new.test.tsx

@@ -28,8 +28,12 @@ describe('SavedObjectFinderCreateNew', () => {
     expect(wrapper.find(EuiPopover).length).toEqual(1);
     const menuPanel = wrapper.find(EuiContextMenuPanel);
     expect(menuPanel.length).toEqual(1);
-    // @ts-ignore
-    expect(menuPanel.prop('items').length).toEqual(0);
+    const panelItems = menuPanel.prop('items');
+    if (panelItems) {
+      expect(panelItems.length).toEqual(0);
+    } else {
+      fail('Expect paneltems to be defined');
+    }
   });
 
   test('renders correctly with items', () => {
@@ -46,7 +50,6 @@ describe('SavedObjectFinderCreateNew', () => {
     }
 
     const wrapper = shallow(<SavedObjectFinderCreateNew menuItems={items} />);
-    expect(wrapper).toMatchSnapshot();
     expect(wrapper.find(EuiPopover).length).toEqual(1);
     const menuPanel = wrapper.find(EuiContextMenuPanel);
     expect(menuPanel.length).toEqual(1);

x-pack/legacy/plugins/graph/public/legacy_imports.ts

@@ -15,7 +15,4 @@ export { confirmModalFactory } from 'ui/modals/confirm_modal';
 // @ts-ignore
 export { addAppRedirectMessageToUrl } from 'ui/notify';
 export { createSavedObjectClass } from 'ui/saved_objects/saved_object';
-<<<<<<< HEAD
 export { configureAppAngularModule } from '../../../../../src/plugins/kibana_legacy/public';
-=======
->>>>>>> [NP] Move saved object modal into new platform (#56383)