[8.17] Remove inference_id field if no inference endpoint is selected (…

…#205660) (#209351) # Backport This will backport the following commits from `main` to `8.17`: - [Remove inference_id field if no inference endpoint is selected (#205660)](#205660)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) \n\n### Questions ?\nPlease refer to the [Backport tool\ndocumentation](https://github.com/sqren/backport)\n\n\n\nCo-authored-by: Samiul Monir <[email protected]>"}},{"branch":"8.17","label":"v8.17.2","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
elastic · Feb 3, 2025 · 4fa854d · 4fa854d
1 parent 1ebdc33
commit 4fa854d
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 6 deletions.
diff --git a/...plication/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx b/...plication/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx
@@ -29,6 +29,14 @@ describe('Mappings editor: core', () => {
   let getMappingsEditorData = getMappingsEditorDataFactory(onChangeHandler);
   let testBed: MappingsEditorTestBed;
   const appDependencies = {
+    core: { application: {} },
+    docLinks: {
+      links: {
+        inferenceManagement: {
+          inferenceAPIDocumentation: 'https://abc.com/inference-api-create',
+        },
+      },
+    },
     plugins: {
       ml: { mlApi: {} },
     },
@@ -474,6 +482,40 @@ describe('Mappings editor: core', () => {
       expect(data).toEqual(updatedMappings);
     });
 
+    test('updates mapping without inference id for semantic_text field', async () => {
+      let updatedMappings = { ...defaultMappings };
+
+      const {
+        find,
+        actions: { addField },
+        component,
+      } = testBed;
+
+      /**
+       * Mapped fields
+       */
+      await act(async () => {
+        find('addFieldButton').simulate('click');
+        jest.advanceTimersByTime(0); // advance timers to allow the form to validate
+      });
+      component.update();
+
+      const newField = { name: 'someNewField', type: 'semantic_text' };
+      await addField(newField.name, newField.type);
+
+      updatedMappings = {
+        ...updatedMappings,
+        properties: {
+          ...updatedMappings.properties,
+          [newField.name]: { reference_field: 'address.city', type: 'semantic_text' },
+        },
+      };
+
+      ({ data } = await getMappingsEditorData(component));
+
+      expect(data).toEqual(updatedMappings);
+    });
+
     describe('props.indexMode sets the correct default value of _source field', () => {
       it("defaults to 'stored' with 'standard' index mode prop", async () => {
         await act(async () => {

diff --git a/...omponents/mappings_editor/components/document_fields/fields/create_field/create_field.tsx b/...omponents/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
@@ -106,7 +106,7 @@ export const CreateField = React.memo(function CreateFieldComponent({
     }
   };
 
-  const { createInferenceEndpoint, handleSemanticText } = useSemanticText({
+  const { createInferenceEndpoint } = useSemanticText({
     form,
     setErrorsInTrainedModelDeployment,
     ml,
@@ -130,8 +130,9 @@ export const CreateField = React.memo(function CreateFieldComponent({
     const { isValid, data } = await form.submit();
 
     if (isValid && !clickOutside) {
-      if (isSemanticTextField(data)) {
-        handleSemanticText(data);
+      if (isSemanticTextField(data) && !data.inference_id) {
+        const { inference_id: inferenceId, ...rest } = data;
+        dispatch({ type: 'field.add', value: rest });
       } else {
         dispatch({ type: 'field.add', value: data });
       }

diff --git a/...ication/components/mappings_editor/components/document_fields/fields/fields_list_item.tsx b/...ication/components/mappings_editor/components/document_fields/fields/fields_list_item.tsx
@@ -293,11 +293,11 @@ function FieldListItemComponent(
               </EuiBadge>
             </EuiFlexItem>
 
-            {isSemanticText && (
+            {isSemanticText && source.inference_id ? (
               <EuiFlexItem grow={false}>
                 <EuiBadge color="hollow">{source.inference_id as string}</EuiBadge>
               </EuiFlexItem>
-            )}
+            ) : null}
 
             {isShadowed && (
               <EuiFlexItem grow={false}>

diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.ts
@@ -689,7 +689,7 @@ export const getAllFieldTypesFromState = (allFields: Fields): DataType[] => {
 };
 
 export function isSemanticTextField(field: Partial<Field>): field is SemanticTextField {
-  return Boolean(field.inference_id && field.type === 'semantic_text');
+  return field.type === 'semantic_text';
 }
 
 /**

diff --git a/...ublic/application/sections/home/index_list/details_page/details_page_mappings_content.tsx b/...ublic/application/sections/home/index_list/details_page/details_page_mappings_content.tsx
@@ -235,6 +235,7 @@ export const DetailsPageMappingsContent: FunctionComponent<{
               .map((field) => field.inference_id)
               .filter(
                 (inferenceId: string) =>
+                  inferenceId &&
                   inferenceToModelIdMap?.[inferenceId].trainedModelId && // third-party inference models don't have trainedModelId
                   !inferenceToModelIdMap?.[inferenceId].isDeployed &&
                   !isInferencePreconfigured(inferenceId)
-Original file line number
+Diff line change
@@ Expand Up @@
     };
     export function isSemanticTextField(field: Partial<Field>): field is SemanticTextField {
-      return Boolean(field.inference_id && field.type === 'semantic_text');
+      return field.type === 'semantic_text';
     }
     /**
@@ Expand Down @@