diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts index cca5523ded68..38b2d42f4a4d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts +++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts @@ -46,6 +46,7 @@ export const mockKibanaValues = { indexMappingComponent: null, isCloud: false, isSidebarEnabled: true, + kibanaVersion: null, lens: { EmbeddableComponent: jest.fn(), stateHelperApi: jest.fn().mockResolvedValue({ diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/docker_instructions_step.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/docker_instructions_step.tsx index 46e799844472..ea5b59c4d326 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/docker_instructions_step.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/components/docker_instructions_step.tsx @@ -34,12 +34,14 @@ export interface DockerInstructionsStepProps { hasApiKey: boolean; isWaitingForConnector: boolean; serviceType: string; + connectorVersion: string; } export const DockerInstructionsStep: React.FC = ({ connectorId, isWaitingForConnector, serviceType, apiKeyData, + connectorVersion, }) => { const [isOpen, setIsOpen] = React.useState('open'); const { elasticsearchUrl } = useCloudDetails(); @@ -163,7 +165,7 @@ export const DockerInstructionsStep: React.FC = ({ showTopBar={false} languageType="bash" codeSnippet={getRunFromDockerSnippet({ - version: '8.15.0', + version: connectorVersion, })} /> diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx index 2a617a87df8b..7bf1f101cc71 100644 --- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/deployment.tsx @@ -30,6 +30,7 @@ import { ConnectorStatus } from '@kbn/search-connectors'; import { Status } from '../../../../../common/types/api'; +import { KibanaLogic } from '../../../shared/kibana'; import { GetApiKeyByIdLogic } from '../../api/api_key/get_api_key_by_id_api_logic'; import { GenerateConnectorApiKeyApiLogic } from '../../api/connector/generate_connector_api_key_api_logic'; @@ -48,6 +49,7 @@ export const ConnectorDeployment: React.FC = () => { const [selectedDeploymentMethod, setSelectedDeploymentMethod] = useState<'docker' | 'source'>( 'docker' ); + const { kibanaVersion } = useValues(KibanaLogic); const { generatedData, isGenerateLoading } = useValues(DeploymentLogic); const { index, isLoading, connector, connectorId } = useValues(ConnectorViewLogic); const { fetchConnector } = useActions(ConnectorViewLogic); @@ -199,6 +201,7 @@ export const ConnectorDeployment: React.FC = () => { serviceType={connector.service_type ?? ''} isWaitingForConnector={isWaitingForConnector} apiKeyData={apiKey} + connectorVersion={kibanaVersion ?? ''} /> )} diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx index eafa8827869d..cd42372d838d 100644 --- a/x-pack/plugins/enterprise_search/public/applications/index.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx @@ -118,6 +118,7 @@ export const renderApp = ( history, indexMappingComponent, isSidebarEnabled, + kibanaVersion, lens, ml, navigateToUrl, diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts index f74345a1c75c..933e25a6dd68 100644 --- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts +++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts @@ -59,6 +59,7 @@ export interface KibanaLogicProps { history: ScopedHistory; indexMappingComponent?: React.FC; isSidebarEnabled: boolean; + kibanaVersion?: string; lens?: LensPublicStart; ml?: MlPluginStart; navigateToUrl: RequiredFieldsOnly; @@ -92,6 +93,7 @@ export interface KibanaValues { indexMappingComponent: React.FC | null; isCloud: boolean; isSidebarEnabled: boolean; + kibanaVersion: string | null; lens: LensPublicStart | null; ml: MlPluginStart | null; navigateToUrl(path: string, options?: CreateHrefOptions): Promise; @@ -130,6 +132,7 @@ export const KibanaLogic = kea>({ history: [props.history, {}], indexMappingComponent: [props.indexMappingComponent || null, {}], isSidebarEnabled: [props.isSidebarEnabled, {}], + kibanaVersion: [props.kibanaVersion || null, {}], lens: [props.lens || null, {}], ml: [props.ml || null, {}], navigateToUrl: [ diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts index 06f14ba3d703..80d7840501d3 100644 --- a/x-pack/plugins/enterprise_search/public/plugin.ts +++ b/x-pack/plugins/enterprise_search/public/plugin.ts @@ -199,7 +199,6 @@ export class EnterpriseSearchPlugin implements Plugin { this.esConfig = { elasticsearch_host: ELASTICSEARCH_URL_PLACEHOLDER }; } - if (!this.config.host) return; // No API to call if (this.hasInitialized) return; // We've already made an initial call try {