[8.16] [Ent Search Plugin] Fix loading initial plugin data, save kbn …

…version in kea, fix connector img version (elastic#199777) (elastic#200528) # Backport This will backport the following commits from `main` to `8.16`: - [[Ent Search Plugin] Fix loading initial plugin data, save kbn version in kea, fix connector img version (elastic#199777)](elastic#199777)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Jedr Blaszyk <[email protected]>
kibanamachine · Nov 18, 2024 · 256ffda · 256ffda
1 parent c77b1b6
commit 256ffda
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/...ck/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/...ck/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/...rprise_search_content/components/connector_detail/components/docker_instructions_step.tsx b/...rprise_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>

diff --git a/.../public/applications/enterprise_search_content/components/connector_detail/deployment.tsx b/.../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
@@ -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
@@ -59,6 +59,7 @@ export interface KibanaLogicProps {
   history: ScopedHistory;
   indexMappingComponent?: React.FC<IndexMappingProps>;
   isSidebarEnabled: boolean;
+  kibanaVersion?: string;
   lens?: LensPublicStart;
   ml?: MlPluginStart;
   navigateToUrl: RequiredFieldsOnly<ApplicationStart['navigateToUrl']>;
@@ -92,6 +93,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>;
@@ -130,6 +132,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: [

diff --git 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 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 {
@@ Expand Down @@