[8.x] [Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777) (#200529)

# Backport This will backport the following commits from `main` to `8.x`: - [[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (#199777)](https://github.com/elastic/kibana/pull/199777)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Jedr Blaszyk <jedrazb@gmail.com>
2025-04-24 09:48:58 -04:00 · 2024-11-18 23:29:41 +11:00 · 2024-11-18 23:29:41 +11:00 · 702d5f96c5
commit 702d5f96c5
parent cfa54f7704
6 changed files with 11 additions and 2 deletions
--- 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
@ -47,6 +47,7 @@ export const mockKibanaValues = {
  indexMappingComponent: null,
  isCloud: false,
  isSidebarEnabled: true,
+  kibanaVersion: null,
  lens: {
    EmbeddableComponent: jest.fn(),
    stateHelperApi: jest.fn().mockResolvedValue({
--- 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<DockerInstructionsStepProps> = ({
  connectorId,
  isWaitingForConnector,
  serviceType,
  apiKeyData,
+  connectorVersion,
 }) => {
  const [isOpen, setIsOpen] = React.useState<EuiAccordionProps['forceState']>('open');
  const { elasticsearchUrl } = useCloudDetails();
@ -163,7 +165,7 @@ export const DockerInstructionsStep: React.FC<DockerInstructionsStepProps> = ({
          showTopBar={false}
          languageType="bash"
          codeSnippet={getRunFromDockerSnippet({
-            version: '8.15.0',
+            version: connectorVersion,
          })}
        />
      </EuiAccordion>
--- 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 ?? ''}
                        />
                      )}
                    </>
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@ -119,6 +119,7 @@ export const renderApp = (
    history,
    indexMappingComponent,
    isSidebarEnabled,
+    kibanaVersion,
    lens,
    ml,
    navigateToUrl,
--- 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
@ -60,6 +60,7 @@ export interface KibanaLogicProps {
  history: ScopedHistory;
  indexMappingComponent?: React.FC<IndexMappingProps>;
  isSidebarEnabled: boolean;
+  kibanaVersion?: string;
  lens?: LensPublicStart;
  ml?: MlPluginStart;
  navigateToUrl: RequiredFieldsOnly<ApplicationStart['navigateToUrl']>;
@ -94,6 +95,7 @@ export interface KibanaValues {
  indexMappingComponent: React.FC<IndexMappingProps> | null;
  isCloud: boolean;
  isSidebarEnabled: boolean;
+  kibanaVersion: string | null;
  lens: LensPublicStart | null;
  ml: MlPluginStart | null;
  navigateToUrl(path: string, options?: CreateHrefOptions): Promise<void>;
@ -133,6 +135,7 @@ export const KibanaLogic = kea<MakeLogicType<KibanaValues>>({
    history: [props.history, {}],
    indexMappingComponent: [props.indexMappingComponent || null, {}],
    isSidebarEnabled: [props.isSidebarEnabled, {}],
+    kibanaVersion: [props.kibanaVersion || null, {}],
    lens: [props.lens || null, {}],
    ml: [props.ml || null, {}],
    navigateToUrl: [
--- 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 {