[9.2] [Discover][Advanced Settings] Fix missing fields when using combined filters with ignoreFilterIfFieldNotInIndex UI setting (#238945) (#239190)

kibanamachine · MiloszRadzynski · web-flow · commit c020ab9bb0a7 · 2025-10-15T20:18:38.000+02:00
# Backport This will backport the following commits from `main` to `9.2`: - [[Discover][Advanced Settings] Fix missing fields when using combined filters with `ignoreFilterIfFieldNotInIndex` UI setting (#238945)](#238945)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Miłosz Radzyński <mradzynski.elastic@gmail.com>
diff --git a/src/platform/plugins/shared/data/common/search/search_source/query_to_fields.test.ts b/src/platform/plugins/shared/data/common/search/search_source/query_to_fields.test.ts
@@ -10,6 +10,7 @@
 import type { EsQuerySortValue, SearchRequest } from '../..';
 import { queryToFields, SortDirection } from '../..';
 import type { DataViewLazy } from '@kbn/data-views-plugin/common';
+import { type Filter, FILTERS } from '@kbn/es-query';
 
 describe('SearchSource#queryToFields', () => {
   it('should include time field', async () => {
@@ -81,4 +82,55 @@ describe('SearchSource#queryToFields', () => {
     const { fieldName } = dataView.getFields.mock.calls[0][0];
     expect(fieldName).toEqual(['@timestamp']);
   });
+
+  it('should include fields from nested combined filters', async () => {
+    const dataView = {
+      getSourceFiltering: jest.fn().mockReturnValue({ excludes: [] }),
+      getFields: jest.fn().mockResolvedValue({
+        getFieldMapSorted: jest.fn(),
+      }),
+    };
+
+    const combinedFilter: Filter = {
+      meta: {
+        type: FILTERS.COMBINED,
+        disabled: false,
+        params: [
+          {
+            meta: { disabled: false },
+            query: {
+              exists: { field: 'process.name' },
+            },
+          } as Filter,
+          {
+            meta: {
+              type: FILTERS.COMBINED,
+              disabled: false,
+              params: [
+                {
+                  meta: { key: 'attributes.process.name', disabled: false },
+                } as Filter,
+                {
+                  meta: { disabled: false },
+                  query: {
+                    exists: { field: 'stream.name' },
+                  },
+                } as Filter,
+              ],
+            },
+          } as Filter,
+        ],
+      },
+    } as Filter;
+
+    const request: SearchRequest = {
+      query: [],
+      filters: [combinedFilter],
+    };
+
+    await queryToFields({ dataView: dataView as unknown as DataViewLazy, request });
+
+    const { fieldName } = dataView.getFields.mock.calls[0][0];
+    expect(fieldName).toEqual(['process.name', 'attributes.process.name', 'stream.name']);
+  });
 });
diff --git a/src/platform/plugins/shared/data/common/search/search_source/query_to_fields.ts b/src/platform/plugins/shared/data/common/search/search_source/query_to_fields.ts
@@ -8,10 +8,35 @@
  */
 
 import type { DataViewLazy } from '@kbn/data-views-plugin/common';
-import { fromKueryExpression, getKqlFieldNames, isFilter, isOfQueryType } from '@kbn/es-query';
+import {
+  fromKueryExpression,
+  getFilterField,
+  getKqlFieldNames,
+  isCombinedFilter,
+  isFilter,
+  isOfQueryType,
+  type Filter,
+} from '@kbn/es-query';
 import type { SearchRequest } from './fetch';
 import type { EsQuerySortValue } from '../..';
 
+const collectFilterFields = (filter: Filter, acc: string[] = []): string[] => {
+  if (!isFilter(filter) || filter.meta?.disabled === true) return acc;
+
+  if (isCombinedFilter(filter)) {
+    for (const nested of filter.meta.params ?? []) {
+      collectFilterFields(nested, acc);
+    }
+
+    return acc;
+  }
+
+  const field = filter.meta?.key ?? getFilterField(filter);
+  if (field) acc.push(field);
+
+  return acc;
+};
+
 export async function queryToFields({
   dataView,
   sort,
@@ -33,15 +58,10 @@ export async function queryToFields({
       fields = fields.concat(queryFields);
     }
   }
+
   const { filters = [] } = request;
-  for (const f of typeof filters === 'function' ? filters() : filters) {
-    // unified search bar filters have meta object and key (regular filters)
-    // unified search bar "custom" filters ("Edit as query DSL", where meta.key is not present but meta is)
-    // Any other Elasticsearch query DSL filter that gets passed in by consumers (not coming from unified search, and these probably won't have a meta key at all)
-    if (isFilter(f) && f?.meta?.key && f.meta.disabled !== true) {
-      fields.push(f.meta.key);
-    }
-  }
+  const requestFilters = typeof filters === 'function' ? filters() : filters;
+  fields = fields.concat(requestFilters.flatMap((filter) => collectFilterFields(filter)));
 
   // if source filtering is enabled, we need to fetch all the fields
   const fieldName =
