[8.12] [Enterprise Search] Fix Continue button not activating when de…

…ploying model (elastic#173878) (elastic#173885) # Backport This will backport the following commits from `main` to `8.12`: - [[Enterprise Search] Fix Continue button not activating when deploying model (elastic#173878)](elastic#173878)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Adam Demjen <[email protected]>
kibanamachine · Dec 22, 2023 · 8794c84 · 8794c84
1 parent 609ad99
commit 8794c84
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 11 deletions.
diff --git a/..._search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.test.ts b/..._search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.test.ts
@@ -573,6 +573,32 @@ describe('MlInferenceLogic', () => {
   });
 
   describe('listeners', () => {
+    describe('clearModelPlaceholderFlag', () => {
+      it('sets placeholder flag false for selected model', () => {
+        MLInferenceLogic.actions.setInferencePipelineConfiguration({
+          ...MLInferenceLogic.values.addInferencePipelineModal.configuration,
+          modelID: 'unit-test-model',
+          isModelPlaceholderSelected: true,
+        });
+        MLInferenceLogic.actions.clearModelPlaceholderFlag('unit-test-model');
+
+        expect(
+          MLInferenceLogic.values.addInferencePipelineModal.configuration.isModelPlaceholderSelected
+        ).toBe(false);
+      });
+      it('leaves placeholder flag unmodified if another model was selected', () => {
+        MLInferenceLogic.actions.setInferencePipelineConfiguration({
+          ...MLInferenceLogic.values.addInferencePipelineModal.configuration,
+          modelID: 'unit-test-model',
+          isModelPlaceholderSelected: true,
+        });
+        MLInferenceLogic.actions.clearModelPlaceholderFlag('some-other-model-id');
+
+        expect(
+          MLInferenceLogic.values.addInferencePipelineModal.configuration.isModelPlaceholderSelected
+        ).toBe(true);
+      });
+    });
     describe('createPipeline', () => {
       const mockModelConfiguration = {
         ...DEFAULT_VALUES.addInferencePipelineModal,

diff --git a/...prise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.ts b/...prise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.ts
@@ -133,6 +133,7 @@ export interface MLInferenceProcessorsActions {
   >['apiSuccess'];
   attachPipeline: () => void;
   clearFetchedPipeline: FetchPipelineApiLogicActions['apiReset'];
+  clearModelPlaceholderFlag: (modelId: string) => { modelId: string };
   createApiError: Actions<
     CreateMlInferencePipelineApiLogicArgs,
     CreateMlInferencePipelineResponse
@@ -222,13 +223,13 @@ export const MLInferenceLogic = kea<
     }),
     attachPipeline: true,
     clearFormErrors: true,
+    clearModelPlaceholderFlag: (modelId: string) => ({ modelId }),
     createPipeline: true,
     onAddInferencePipelineStepChange: (step: AddInferencePipelineSteps) => ({ step }),
     removeFieldFromMapping: (fieldName: string) => ({ fieldName }),
     selectExistingPipeline: (pipelineName: string) => ({ pipelineName }),
     selectFields: (fieldNames: string[]) => ({ fieldNames }),
     setAddInferencePipelineStep: (step: AddInferencePipelineSteps) => ({ step }),
-    setFormErrors: (inputErrors: AddInferencePipelineFormErrors) => ({ inputErrors }),
     setIndexName: (indexName: string) => ({ indexName }),
     setInferencePipelineConfiguration: (configuration: InferencePipelineConfiguration) => ({
       configuration,
@@ -299,6 +300,19 @@ export const MLInferenceLogic = kea<
         pipelineName,
       });
     },
+    clearModelPlaceholderFlag: ({ modelId }) => {
+      const {
+        addInferencePipelineModal: { configuration },
+      } = values;
+
+      // Don't change the flag if the user clicked away from the selected model
+      if (modelId !== configuration.modelID) return;
+
+      actions.setInferencePipelineConfiguration({
+        ...configuration,
+        isModelPlaceholderSelected: false,
+      });
+    },
     createPipeline: () => {
       const {
         addInferencePipelineModal: { configuration, indexName },

diff --git a/..._search_content/components/search_index/pipelines/ml_inference/model_select_logic.test.ts b/..._search_content/components/search_index/pipelines/ml_inference/model_select_logic.test.ts
@@ -71,6 +71,15 @@ describe('ModelSelectLogic', () => {
 
         expect(ModelSelectLogic.actions.startPollingModels).toHaveBeenCalled();
       });
+      it('sets selected model as non-placeholder', () => {
+        jest.spyOn(ModelSelectLogic.actions, 'clearModelPlaceholderFlagFromMLInferenceLogic');
+
+        ModelSelectLogic.actions.createModelSuccess(CREATE_MODEL_API_RESPONSE);
+
+        expect(
+          ModelSelectLogic.actions.clearModelPlaceholderFlagFromMLInferenceLogic
+        ).toHaveBeenCalledWith(CREATE_MODEL_API_RESPONSE.modelId);
+      });
     });
 
     describe('fetchModels', () => {

diff --git a/...prise_search_content/components/search_index/pipelines/ml_inference/model_select_logic.ts b/...prise_search_content/components/search_index/pipelines/ml_inference/model_select_logic.ts
@@ -32,24 +32,22 @@ import {
 } from './ml_inference_logic';
 
 export interface ModelSelectActions {
+  clearModelPlaceholderFlagFromMLInferenceLogic: MLInferenceProcessorsActions['clearModelPlaceholderFlag'];
   createModel: (modelId: string) => { modelId: string };
   createModelError: CreateModelApiLogicActions['apiError'];
   createModelMakeRequest: CreateModelApiLogicActions['makeRequest'];
   createModelSuccess: CreateModelApiLogicActions['apiSuccess'];
-
   fetchModels: () => void;
   fetchModelsError: CachedFetchModlesApiLogicActions['apiError'];
   fetchModelsMakeRequest: CachedFetchModlesApiLogicActions['makeRequest'];
   fetchModelsSuccess: CachedFetchModlesApiLogicActions['apiSuccess'];
-  startPollingModels: CachedFetchModlesApiLogicActions['startPolling'];
-
+  setInferencePipelineConfiguration: MLInferenceProcessorsActions['setInferencePipelineConfiguration'];
+  setInferencePipelineConfigurationFromMLInferenceLogic: MLInferenceProcessorsActions['setInferencePipelineConfiguration'];
   startModel: (modelId: string) => { modelId: string };
   startModelError: CreateModelApiLogicActions['apiError'];
   startModelMakeRequest: StartModelApiLogicActions['makeRequest'];
   startModelSuccess: StartModelApiLogicActions['apiSuccess'];
-
-  setInferencePipelineConfiguration: MLInferenceProcessorsActions['setInferencePipelineConfiguration'];
-  setInferencePipelineConfigurationFromMLInferenceLogic: MLInferenceProcessorsActions['setInferencePipelineConfiguration'];
+  startPollingModels: CachedFetchModlesApiLogicActions['startPolling'];
 }
 
 export interface ModelSelectValues {
@@ -96,6 +94,7 @@ export const ModelSelectLogic = kea<MakeLogicType<ModelSelectValues, ModelSelect
       MLInferenceLogic,
       [
         'setInferencePipelineConfiguration as setInferencePipelineConfigurationFromMLInferenceLogic',
+        'clearModelPlaceholderFlag as clearModelPlaceholderFlagFromMLInferenceLogic',
       ],
       StartModelApiLogic,
       [
@@ -126,18 +125,20 @@ export const ModelSelectLogic = kea<MakeLogicType<ModelSelectValues, ModelSelect
     createModel: ({ modelId }) => {
       actions.createModelMakeRequest({ modelId });
     },
-    createModelSuccess: () => {
+    createModelSuccess: (response) => {
       actions.startPollingModels();
+      // The create action succeeded, so the model is no longer a placeholder
+      actions.clearModelPlaceholderFlagFromMLInferenceLogic(response.modelId);
     },
     fetchModels: () => {
       actions.fetchModelsMakeRequest({});
     },
-    startModel: ({ modelId }) => {
-      actions.startModelMakeRequest({ modelId });
-    },
     setInferencePipelineConfiguration: ({ configuration }) => {
       actions.setInferencePipelineConfigurationFromMLInferenceLogic(configuration);
     },
+    startModel: ({ modelId }) => {
+      actions.startModelMakeRequest({ modelId });
+    },
     startModelSuccess: () => {
       actions.startPollingModels();
     },