[NP] Move saved object modal into new platform (elastic#56383) (elast…

…ic#57007) * Move saved object modal into new platform * Fix TS * Revert "Fix TS" This reverts commit f2f9f5e. * Revert "Move saved object modal into new platform" This reverts commit d0f0ea6. # Conflicts: # src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js * Move save_object_save_modal * Move show_saved_object_save_modal.tsx * Move save_object_finder.tsx * Remove unused export * Pass I18nContext to showSaveModal * Update i18n ids * Fix map save * Refactoring * Load styles * Revert importing styles * Update snapshot * Update snapshot * Structural refactoring * Fix path Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
lizozom · Feb 7, 2020 · 05574a9 · 05574a9
1 parent 085f52d
commit 05574a9
Show file tree

Hide file tree

Showing 51 changed files with 177 additions and 210 deletions.
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -33,6 +33,7 @@
     "navigation": "src/plugins/navigation",
     "newsfeed": "src/plugins/newsfeed",
     "regionMap": "src/legacy/core_plugins/region_map",
+    "savedObjects": "src/plugins/saved_objects",
     "server": "src/legacy/server",
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": "src/legacy/core_plugins/telemetry",

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -30,11 +30,9 @@ export const legacyChrome = chrome;
 export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
 export { IPrivate } from 'ui/private';
-export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
 export { ConfirmationButtonTypes } from 'ui/modals/confirm_modal';
-export { showSaveModal, SaveResult } from 'ui/saved_objects/show_saved_object_save_modal';
 export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
 export { KbnUrl } from 'ui/url/kbn_url';
 // @ts-ignore

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -31,8 +31,6 @@ import {
   ConfirmationButtonTypes,
   migrateLegacyQuery,
   SavedObjectSaveOpts,
-  SaveResult,
-  showSaveModal,
   subscribeWithScope,
 } from '../legacy_imports';
 import {
@@ -45,6 +43,11 @@ import {
   syncAppFilters,
   syncQuery,
 } from '../../../../../../plugins/data/public';
+import {
+  SaveResult,
+  showSaveModal,
+  getSavedObjectFinder,
+} from '../../../../../../plugins/saved_objects/public';
 
 import {
   DASHBOARD_CONTAINER_TYPE,
@@ -74,10 +77,6 @@ import { getDashboardTitle } from './dashboard_strings';
 import { DashboardAppScope } from './dashboard_app';
 import { convertSavedDashboardPanelToPanelState } from './lib/embeddable_saved_object_converters';
 import { RenderDeps } from './application';
-import {
-  SavedObjectFinderProps,
-  SavedObjectFinderUi,
-} from '../../../../../../plugins/kibana_react/public';
 import {
   IKbnUrlStateStorage,
   removeQueryParam,
@@ -114,7 +113,16 @@ export class DashboardAppController {
     share,
     dashboardCapabilities,
     npDataStart: { query: queryService },
-    core: { notifications, overlays, chrome, injectedMetadata, uiSettings, savedObjects, http },
+    core: {
+      notifications,
+      overlays,
+      chrome,
+      injectedMetadata,
+      uiSettings,
+      savedObjects,
+      http,
+      i18n: i18nStart,
+    },
     history,
     kbnUrlStateStorage,
   }: DashboardAppControllerDependencies) {
@@ -777,7 +785,7 @@ export class DashboardAppController {
           showCopyOnSave={dash.id ? true : false}
         />
       );
-      showSaveModal(dashboardSaveModal);
+      showSaveModal(dashboardSaveModal, i18nStart.Context);
     };
     navActions[TopNavIds.CLONE] = () => {
       const currentTitle = dashboardStateManager.getTitle();
@@ -806,17 +814,13 @@ export class DashboardAppController {
     };
     navActions[TopNavIds.ADD] = () => {
       if (dashboardContainer && !isErrorEmbeddable(dashboardContainer)) {
-        const SavedObjectFinder = (props: SavedObjectFinderProps) => (
-          <SavedObjectFinderUi {...props} savedObjects={savedObjects} uiSettings={uiSettings} />
-        );
-
         openAddPanelFlyout({
           embeddable: dashboardContainer,
           getAllFactories: embeddables.getEmbeddableFactories,
           getFactory: embeddables.getEmbeddableFactory,
           notifications,
           overlays,
-          SavedObjectFinder,
+          SavedObjectFinder: getSavedObjectFinder(savedObjects, uiSettings),
         });
       }
     };

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.test.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.test.js
@@ -20,7 +20,7 @@
 import React from 'react';
 import { shallowWithI18nProvider } from 'test_utils/enzyme_helpers';
 
-jest.mock('../../legacy_imports', () => ({
+jest.mock('../../../../../../../plugins/saved_objects/public', () => ({
   SavedObjectSaveModal: () => null,
 }));
 

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx
@@ -21,7 +21,7 @@ import React, { Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFormRow, EuiTextArea, EuiSwitch } from '@elastic/eui';
 
-import { SavedObjectSaveModal } from '../../legacy_imports';
+import { SavedObjectSaveModal } from '../../../../../../../plugins/saved_objects/public';
 
 interface SaveOptions {
   newTitle: string;

diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -58,8 +58,6 @@ export { getRequestInspectorStats, getResponseInspectorStats } from '../../../da
 export { intervalOptions } from 'ui/agg_types';
 // @ts-ignore
 export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
-export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
-export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
 export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore

diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -27,6 +27,10 @@ import { i18n } from '@kbn/i18n';
 import '../components/field_chooser/field_chooser';
 
 import { RequestAdapter } from '../../../../../../../plugins/inspector/public';
+import {
+  SavedObjectSaveModal,
+  showSaveModal,
+} from '../../../../../../../plugins/saved_objects/public';
 // doc table
 import './doc_table';
 import { getSortArray } from './doc_table/lib/get_sort';
@@ -48,12 +52,10 @@ import {
   hasSearchStategyForIndexPattern,
   intervalOptions,
   migrateLegacyQuery,
-  showSaveModal,
   unhashUrl,
   stateMonitorFactory,
   subscribeWithScope,
   tabifyAggResponse,
-  SavedObjectSaveModal,
   getAngularModule,
   ensureDefaultIndexPattern,
   registerTimefilterWithGlobalStateFactory,
@@ -305,7 +307,7 @@ function discoverController(
             })}
           />
         );
-        showSaveModal(saveModal);
+        showSaveModal(saveModal, core.i18n.Context);
       },
     };
 

diff --git a/...gacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js b/...gacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js
@@ -32,7 +32,7 @@ import {
   EuiFlyoutBody,
   EuiTitle,
 } from '@elastic/eui';
-import { SavedObjectFinderUi } from '../../../../../../../../plugins/kibana_react/public';
+import { SavedObjectFinderUi } from '../../../../../../../../plugins/saved_objects/public';
 import { getServices } from '../../../kibana_services';
 
 const SEARCH_OBJECT_TYPE = 'search';

diff --git a/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts b/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
@@ -23,6 +23,7 @@ import {
   SavedObjectsClientContract,
   ToastsStart,
   IUiSettingsClient,
+  I18nStart,
 } from 'kibana/public';
 
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
@@ -57,6 +58,7 @@ export interface VisualizeKibanaServices {
   visualizeCapabilities: any;
   visualizations: VisualizationsStart;
   usageCollection?: UsageCollectionSetup;
+  I18nContext: I18nStart['Context'];
 }
 
 let services: VisualizeKibanaServices | null = null;

diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -44,9 +44,6 @@ export { IPrivate } from 'ui/private';
 // @ts-ignore
 export { PrivateProvider } from 'ui/private/private';
 
-export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
-export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
-
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
 // @ts-ignore

diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -31,6 +31,10 @@ import { getEditBreadcrumbs } from '../breadcrumbs';
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
 import { FilterStateManager } from '../../../../../data/public';
 import { unhashUrl } from '../../../../../../../plugins/kibana_utils/public';
+import {
+  SavedObjectSaveModal,
+  showSaveModal,
+} from '../../../../../../../plugins/saved_objects/public';
 
 import { initVisEditorDirective } from './visualization_editor';
 import { initVisualizationDirective } from './visualization';
@@ -40,8 +44,6 @@ import {
   absoluteToParsedUrl,
   KibanaParsedUrl,
   migrateLegacyQuery,
-  SavedObjectSaveModal,
-  showSaveModal,
   stateMonitorFactory,
   DashboardConstants,
 } from '../../legacy_imports';
@@ -94,6 +96,7 @@ function VisualizeAppController(
     core: { docLinks },
     savedQueryService,
     uiSettings,
+    I18nContext,
   } = getServices();
 
   const filterStateManager = new FilterStateManager(globalState, getAppState, filterManager);
@@ -191,7 +194,7 @@ function VisualizeAppController(
                   description={savedVis.description}
                 />
               );
-              showSaveModal(saveModal);
+              showSaveModal(saveModal, I18nContext);
             },
           },
         ]

diff --git a/src/legacy/core_plugins/kibana/public/visualize/plugin.ts b/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
@@ -112,6 +112,7 @@ export class VisualizePlugin implements Plugin {
           visualizeCapabilities: contextCore.application.capabilities.visualize,
           visualizations,
           usageCollection,
+          I18nContext: contextCore.i18n.Context,
         };
         setServices(deps);
 

diff --git a/...lugins/visualizations/public/np_ready/public/wizard/search_selection/search_selection.tsx b/...lugins/visualizations/public/np_ready/public/wizard/search_selection/search_selection.tsx
@@ -23,7 +23,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { IUiSettingsClient, SavedObjectsStart } from 'kibana/public';
 
-import { SavedObjectFinderUi } from '../../../../../../../../plugins/kibana_react/public';
+import { SavedObjectFinderUi } from '../../../../../../../../plugins/saved_objects/public';
 import { VisType } from '../../types';
 
 interface SearchSelectionProps {

diff --git a/src/legacy/ui/public/saved_objects/_index.scss b/src/legacy/ui/public/saved_objects/_index.scss
@@ -1 +1 @@
-@import '../../../../plugins/kibana_react/public/saved_objects/index';
+@import '../../../../plugins/saved_objects/public/index';
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx b/src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container_factory.tsx
@@ -18,8 +18,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { SavedObjectMetaData } from '../../../saved_objects/public';
 import { SavedObjectAttributes } from '../../../../core/public';
-import { SavedObjectMetaData } from '../types';
 import {
   ContainerOutput,
   EmbeddableFactory,

diff --git a/src/plugins/dashboard_embeddable_container/public/plugin.tsx b/src/plugins/dashboard_embeddable_container/public/plugin.tsx
@@ -26,9 +26,8 @@ import { CONTEXT_MENU_TRIGGER, IEmbeddableSetup, IEmbeddableStart } from './embe
 import { ExpandPanelAction, ReplacePanelAction } from '.';
 import { DashboardContainerFactory } from './embeddable/dashboard_container_factory';
 import { Start as InspectorStartContract } from '../../../plugins/inspector/public';
+import { getSavedObjectFinder } from '../../../plugins/saved_objects/public';
 import {
-  SavedObjectFinderUi,
-  SavedObjectFinderProps,
   ExitFullScreenButton as ExitFullScreenButtonUi,
   ExitFullScreenButtonProps,
 } from '../../../plugins/kibana_react/public';
@@ -61,16 +60,7 @@ export class DashboardEmbeddableContainerPublicPlugin
     const { application, notifications, overlays } = core;
     const { embeddable, inspector, uiActions } = plugins;
 
-    const SavedObjectFinder: React.FC<Exclude<
-      SavedObjectFinderProps,
-      'savedObjects' | 'uiSettings'
-    >> = props => (
-      <SavedObjectFinderUi
-        {...props}
-        savedObjects={core.savedObjects}
-        uiSettings={core.uiSettings}
-      />
-    );
+    const SavedObjectFinder = getSavedObjectFinder(core.savedObjects, core.uiSettings);
 
     const useHideChrome = () => {
       React.useEffect(() => {

diff --git a/src/plugins/dashboard_embeddable_container/public/types.ts b/src/plugins/dashboard_embeddable_container/public/types.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { IconType } from '@elastic/eui';
 import { SavedObject as SavedObjectType, SavedObjectAttributes } from '../../../core/public';
 
 export interface DashboardCapabilities {
@@ -50,14 +49,6 @@ export interface SimpleSavedObject<T extends SavedObjectAttributes> {
   delete(): void;
 }
 
-export interface SavedObjectMetaData<T extends SavedObjectAttributes> {
-  type: string;
-  name: string;
-  getIconForSavedObject(savedObject: SimpleSavedObject<T>): IconType;
-  getTooltipForSavedObject?(savedObject: SimpleSavedObject<T>): string;
-  showSavedObject?(savedObject: SimpleSavedObject<T>): boolean;
-}
-
 interface FieldSubType {
   multi?: { parent: string };
   nested?: { path: string };

diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts
@@ -53,7 +53,6 @@ export {
   PanelNotFoundError,
   PanelState,
   PropertySpec,
-  SavedObjectMetaData,
   ViewMode,
   isErrorEmbeddable,
   openAddPanelFlyout,

diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory.ts
@@ -18,7 +18,7 @@
  */
 
 import { SavedObjectAttributes } from 'src/core/public';
-import { SavedObjectMetaData } from '../types';
+import { SavedObjectMetaData } from '../../../../saved_objects/public';
 import { EmbeddableInput, EmbeddableOutput, IEmbeddable } from './i_embeddable';
 import { ErrorEmbeddable } from './error_embeddable';
 import { IContainer } from '../containers/i_container';
@@ -40,7 +40,7 @@ export interface OutputSpec {
   [key: string]: PropertySpec;
 }
 
-export interface EmbeddableFactoryOptions<T> {
+export interface EmbeddableFactoryOptions<T extends SavedObjectAttributes> {
   savedObjectMetaData?: SavedObjectMetaData<T>;
 }
 

diff --git a/src/plugins/embeddable/public/lib/types.ts b/src/plugins/embeddable/public/lib/types.ts
@@ -42,16 +42,5 @@ export enum ViewMode {
 
 export { Adapters };
 
-// import { SavedObjectMetaData } from 'ui/saved_objects/components/saved_object_finder';
-// TODO: Figure out how to do this import in New Platform.
-export interface SavedObjectMetaData<T> {
-  type: string;
-  name: string;
-  getIconForSavedObject(savedObject: any): any;
-  getTooltipForSavedObject?(savedObject: any): any;
-  showSavedObject?(savedObject: any): boolean;
-  includeFields?: string[];
-}
-
 export type GetEmbeddableFactory = (id: string) => EmbeddableFactory | undefined;
 export type GetEmbeddableFactories = () => IterableIterator<EmbeddableFactory>;
diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
@@ -18,7 +18,6 @@
  */
 
 export * from './code_editor';
-export * from './saved_objects';
 export * from './exit_full_screen_button';
 export * from './context';
 export * from './overlays';

diff --git a/src/plugins/saved_objects/public/_index.scss b/src/plugins/saved_objects/public/_index.scss
@@ -0,0 +1 @@
+@import './save_modal/index';
diff --git a/...ibana_react/public/saved_objects/index.ts → ...gins/saved_objects/public/finder/index.ts b/...ibana_react/public/saved_objects/index.ts → ...gins/saved_objects/public/finder/index.ts
@@ -17,5 +17,8 @@
  * under the License.
  */
 
-export * from './saved_object_finder';
-export * from './saved_object_save_modal';
+export {
+  SavedObjectMetaData,
+  SavedObjectFinderUi,
+  getSavedObjectFinder,
+} from './saved_object_finder';
diff --git a/...aved_objects/saved_object_finder.test.tsx → ...ublic/finder/saved_object_finder.test.tsx b/...aved_objects/saved_object_finder.test.tsx → ...ublic/finder/saved_object_finder.test.tsx
@@ -36,7 +36,6 @@ import { shallow } from 'enzyme';
 import React from 'react';
 import * as sinon from 'sinon';
 import { SavedObjectFinderUi as SavedObjectFinder } from './saved_object_finder';
-// eslint-disable-next-line
 import { coreMock } from '../../../../core/public/mocks';
 
 describe('SavedObjectsFinder', () => {