fix set action menu function

Signed-off-by: Lu Yu <[email protected]>
junqiu-lei · Mar 13, 2024 · d723834 · d723834
1 parent c3eda54
commit d723834
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/public/application.tsx b/public/application.tsx
@@ -11,13 +11,13 @@ import { MapsDashboardsApp } from './components/app';
 import { OpenSearchDashboardsContextProvider } from '../../../src/plugins/opensearch_dashboards_react/public';
 
 export const renderApp = (
-  { element, setHeaderActionMenu }: AppMountParameters,
+  { element }: AppMountParameters,
   services: MapServices,
   dataSourceManagementEnabled: boolean
 ) => {
   ReactDOM.render(
     <OpenSearchDashboardsContextProvider services={services}>
-      <MapsDashboardsApp setHeaderActionMenu={setHeaderActionMenu} />
+      <MapsDashboardsApp />
     </OpenSearchDashboardsContextProvider>,
     element
   );

diff --git a/public/components/app.tsx b/public/components/app.tsx
@@ -12,7 +12,7 @@ import { APP_PATH } from '../../common';
 import { useOpenSearchDashboards } from '../../../../src/plugins/opensearch_dashboards_react/public';
 import { MapServices } from '../types';
 
-export const MapsDashboardsApp = (setHeaderActionMenu: any) => {
+export const MapsDashboardsApp = () => {
   const {
     services: { appBasePath },
   } = useOpenSearchDashboards<MapServices>();
@@ -25,7 +25,7 @@ export const MapsDashboardsApp = (setHeaderActionMenu: any) => {
           <Route
             exact
             path={APP_PATH.LANDING_PAGE_PATH}
-            render={() => <MapsList setHeaderActionMenu={setHeaderActionMenu} />}
+            render={() => <MapsList />}
           />
         </Switch>
       </I18nProvider>

diff --git a/public/components/maps_list/maps_list.tsx b/public/components/maps_list/maps_list.tsx
@@ -22,16 +22,16 @@ import { MapSavedObjectAttributes } from '../../../common/map_saved_object_attri
 import { MapServices } from '../../types';
 import { getMapsLandingBreadcrumbs } from '../../utils/breadcrumbs';
 import { APP_PATH, MAPS_APP_ID } from '../../../common';
-import { MountPoint } from '../../../../../src/core/public';
 
-export const MapsList = (setHeaderActionMenu: (menuMount: MountPoint | undefined) => void) => {
+export const MapsList = () => {
   const {
     services: {
       notifications,
       savedObjects: { client: savedObjectsClient },
       application: { navigateToApp },
       chrome: { docTitle, setBreadcrumbs },
       dataSourceManagement,
+      setActionMenu,
     },
   } = useOpenSearchDashboards<MapServices>();
 
@@ -116,7 +116,7 @@ export const MapsList = (setHeaderActionMenu: (menuMount: MountPoint | undefined
     />
   );
   const dataSourceManagementEnabled: boolean = !!dataSourceManagement;
-  console.log('test: ', setHeaderActionMenu);
+  console.log('test: ', setActionMenu);
   // Render the map list DOM.
   return (
     <I18nProvider>
@@ -126,7 +126,7 @@ export const MapsList = (setHeaderActionMenu: (menuMount: MountPoint | undefined
             <EuiPageContentBody>
               {dataSourceManagementEnabled && (
                 <dataSourceManagement.ui.DataSourceMenu
-                  setMenuMountPoint={setHeaderActionMenu}
+                  setMenuMountPoint={setActionMenu}
                   showDataSourceAggregatedView={true}
                   savedObjects={savedObjectsClient}
                   notifications={notifications}

diff --git a/public/plugin.tsx b/public/plugin.tsx
@@ -92,6 +92,7 @@ export class CustomImportMapPlugin
           uiSettings: coreStart.uiSettings,
           mapConfig,
           dataSourceManagement,
+          setActionMenu: params.setHeaderActionMenu,
         };
         params.element.classList.add('mapAppContainer');
         // Render the application

diff --git a/public/types.ts b/public/types.ts
@@ -9,6 +9,7 @@ import {
   SavedObjectsClient,
   ToastsStart,
   ScopedHistory,
+  MountPoint,
 } from '../../../src/core/public';
 import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../src/plugins/data/public';
@@ -43,6 +44,7 @@ export interface MapServices extends CoreStart {
   uiSettings: CoreStart['uiSettings'];
   mapConfig: ConfigSchema;
   dataSourceManagement: DataSourceManagementPluginSetup;
+  setActionMenu: (menuMount: MountPoint | undefined) => void;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface