Get it hooked up correctly

Signed-off-by: Derek Ho <dxho@amazon.com>

Author: derek-ho

public/apps/account/cluster-selector.tsx

@@ -41,7 +41,7 @@ import { ResourceType } from '../../../common';
 import { buildHashUrl, buildUrl } from './utils/url-builder';
 import { CrossPageToast } from './cross-page-toast';
 import { useOpenSearchDashboards } from '../../../../../src/plugins/opensearch_dashboards_react/public';
-import { TopNavMenu } from './top-nav-menu';
+import { SecurityPluginTopNavMenu, TopNavMenu } from './top-nav-menu';
 
 const LANDING_PAGE_URL = '/getstarted';
 
@@ -257,22 +257,22 @@ export function AppRouter(props: AppDependencies) {
               path={ROUTE_MAP.tenants.href}
               render={() => {
                 setGlobalBreadcrumbs(ResourceType.tenants);
-                return <><TopNavMenu dataSourcePickerReadOnly={true} {...props}/><TenantList tabID={'Manage'} {...props} /></>;
+                return <><SecurityPluginTopNavMenu dataSourcePickerReadOnly={true} {...props}/><TenantList tabID={'Manage'} {...props} /></>;
               }}
             />
             <Route
               path={ROUTE_MAP.tenantsConfigureTab.href}
               render={() => {
                 setGlobalBreadcrumbs(ResourceType.tenants);
 
-                return <><TopNavMenu dataSourcePickerReadOnly={true} {...props}/><TenantList tabID={'Configure'} {...props} /></>;
+                return <><SecurityPluginTopNavMenu dataSourcePickerReadOnly={true} {...props}/><TenantList tabID={'Configure'} {...props} /></>;
               }}
             />
             <Route
               path={ROUTE_MAP.getStarted.href}
               render={() => {
                 setGlobalBreadcrumbs();
-                return (<><TopNavMenu {...props} dataSourcePickerReadOnly={false}/><GetStarted {...props} /></>);
+                return (<><GetStarted {...props} /></>);
               }}
             />
             <Redirect exact from="/" to={LANDING_PAGE_URL} />

public/apps/configuration/app-router.tsx

@@ -25,7 +25,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import React from 'react';
+import React, { useState } from 'react';
 import { FormattedMessage } from '@osd/i18n/react';
 import { AppDependencies } from '../../types';
 import { buildHashUrl } from '../utils/url-builder';
@@ -34,6 +34,8 @@ import { ResourceType } from '../../../../common';
 import { API_ENDPOINT_CACHE, DocLinks } from '../constants';
 import { ExternalLink, ExternalLinkButton } from '../utils/display-utils';
 import { httpDelete } from '../utils/request-utils';
+import { SecurityPluginTopNavMenu, TopNavMenu } from '../top-nav-menu';
+import { setData } from 'src/plugins/vis_type_vega/public/services';
 
 const addBackendStep = {
   title: 'Add backends',
@@ -157,6 +159,8 @@ const setOfSteps = [
 ];
 
 export function GetStarted(props: AppDependencies) {
+  const [datasourceId, setDatasourceId] = useState(undefined);
+
   let steps;
   if (props.config.ui.backend_configurable) {
     steps = [addBackendStep, ...setOfSteps];
@@ -167,6 +171,7 @@ export function GetStarted(props: AppDependencies) {
   return (
     <>
       <div className="panel-restrict-width">
+      <SecurityPluginTopNavMenu {...props} dataSourcePickerReadOnly={false} random={setDatasourceId}/>
         <EuiPageHeader>
           <EuiTitle size="l">
             <h1>Get started</h1>
@@ -231,7 +236,7 @@ export function GetStarted(props: AppDependencies) {
               iconType="refresh"
               fill
               onClick={() => {
-                httpDelete(props.coreStart.http, API_ENDPOINT_CACHE, {dataSourceId: '84e72d90-db00-11ee-baf1-55ab53c9cfb9'});
+                httpDelete(props.coreStart.http, API_ENDPOINT_CACHE, {dataSourceId: datasourceId});
               }}
             >
               Purge cache

public/apps/configuration/panels/get-started.tsx

@@ -22,12 +22,13 @@ import { AppDependencies } from '../types';
 
 export interface TopNavMenuProps extends AppDependencies {
   dataSourcePickerReadOnly: boolean
+  random: any;
 }
 
-export const TopNavMenu = (props: TopNavMenuProps) => {
+export const SecurityPluginTopNavMenu = (props: TopNavMenuProps) => {
   const {securityPluginStartDeps, dataSourcePickerReadOnly, setHeaderActionMenu} = props;
   const TopNavMenu = securityPluginStartDeps.navigation.ui.TopNavMenu;
   const dataSourceEnabled = securityPluginStartDeps.dataSource.dataSourceEnabled;
 
-  return <TopNavMenu appName={PLUGIN_NAME} dataSourcePickerReadOnly={dataSourcePickerReadOnly} showDataSourcePicker={dataSourceEnabled} setMenuMountPoint={setHeaderActionMenu}/>
+  return <TopNavMenu appName={PLUGIN_NAME} disableDataSourcePicker={dataSourcePickerReadOnly} showDataSourcePicker={dataSourceEnabled} setMenuMountPoint={setHeaderActionMenu} dataSourceCallBackFunc={props.random}/>
 }

public/apps/configuration/top-nav-menu.tsx

@@ -50,7 +50,6 @@ import { addTenantToShareURL } from './services/shared-link';
 import { interceptError } from './utils/logout-utils';
 import { tenantColumn, getNamespacesToRegister } from './apps/configuration/utils/tenant-utils';
 import { getDashboardsInfoSafe } from './utils/dashboards-info-utils';
-import { setupClusterSelector } from './apps/account/cluster-selector';
 
 async function hasApiPermission(core: CoreSetup): Promise<boolean | undefined> {
   try {
@@ -191,7 +190,6 @@ export class SecurityPlugin
     const config = this.initializerContext.config.get<ClientConfigType>();
 
     setupTopNavButton(core, config);
-    setupClusterSelector(core, deps);
 
     if (config.ui.autologout) {
       // logout the user when getting 401 unauthorized, e.g. when session timed out.

public/plugin.ts

@@ -752,7 +752,7 @@ export function defineRoutes(router: IRouter, dataSourceEnabled: boolean) {
       }
     },
     async (context, request, response) => {
-      if (!dataSourceEnabled) {
+      if (!dataSourceEnabled || !request.body?.dataSourceId) {
       const client = context.security_plugin.esClient.asScoped(request);
       let esResponse;
       try {
@@ -766,7 +766,6 @@ export function defineRoutes(router: IRouter, dataSourceEnabled: boolean) {
         return errorResponse(response, error);
       }
     } else {
-      console.log(request.body)
       const client = context.dataSource.opensearch.legacy.getClient(request.body?.dataSourceId);
       let esResponse;
       try{