[data view mgmt] Field conflict modal - restore functionality (#132197)

* fix conflicted fields modal * fix mock
elastic · May 16, 2022 · 61ae132 · 61ae132
1 parent 6ed28ac
commit 61ae132
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
@@ -448,7 +448,7 @@ export function Tabs({
                       getFieldInfo,
                     }}
                     openModal={overlays.openModal}
-                    theme={theme!}
+                    theme={theme}
                     userEditPermission={dataViews.getCanSaveSync()}
                   />
                 )}

diff --git a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
@@ -67,6 +67,7 @@ export async function mountManagementSection(
     IndexPatternEditor: dataViewEditor.IndexPatternEditorComponent,
     fieldFormats,
     spaces,
+    theme,
   };
 
   ReactDOM.render(

diff --git a/src/plugins/data_view_management/public/mocks.ts b/src/plugins/data_view_management/public/mocks.ts
@@ -56,7 +56,8 @@ const docLinks = {
 const createIndexPatternManagmentContext = (): {
   [key in keyof IndexPatternManagmentContext]: any;
 } => {
-  const { application, chrome, uiSettings, notifications, overlays } = coreMock.createStart();
+  const { application, chrome, uiSettings, notifications, overlays, theme } =
+    coreMock.createStart();
   const { http } = coreMock.createSetup();
   const data = dataPluginMock.createStartContract();
   const dataViewFieldEditor = indexPatternFieldEditorPluginMock.createStartContract();
@@ -81,6 +82,7 @@ const createIndexPatternManagmentContext = (): {
     IndexPatternEditor:
       indexPatternEditorPluginMock.createStartContract().IndexPatternEditorComponent,
     fieldFormats: fieldFormatsServiceMock.createStartContract(),
+    theme,
   };
 };
 

diff --git a/src/plugins/data_view_management/public/types.ts b/src/plugins/data_view_management/public/types.ts
@@ -14,6 +14,7 @@ import {
   DocLinksStart,
   HttpSetup,
   ApplicationStart,
+  ThemeServiceStart,
 } from '@kbn/core/public';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
@@ -44,6 +45,7 @@ export interface IndexPatternManagmentContext {
   IndexPatternEditor: DataViewEditorStart['IndexPatternEditorComponent'];
   fieldFormats: FieldFormatsStart;
   spaces?: SpacesPluginStart;
+  theme: ThemeServiceStart;
 }
 
 export type IndexPatternManagmentContextValue =