Skip to content

[Discover][ES|QL] Show multi-fields in the DocViewer by default #245890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jughosta merged 9 commits into from
Dec 15, 2025
Merged

[Discover][ES|QL] Show multi-fields in the DocViewer by default #245890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4bbba50
[Discover] Hide the multifield badge
jughosta Dec 10, 2025
6f66c67
[Discover] Always show multi fields in DocViewer in ES|QL mode
jughosta Dec 10, 2025
6a86267
[Discover] Update tests
jughosta Dec 11, 2025
e2f2809
Merge branch 'main' into 240103-improve-search-in-doc-viewer
jughosta Dec 11, 2025
2d6a78e
[Scout] Automated config manifest updates
kibanamachine Dec 11, 2025
2b7c853
[Discover] Update tests
jughosta Dec 11, 2025
3109faa
Merge remote-tracking branch 'upstream/main' into 240103-improve-sear…
jughosta Dec 11, 2025
2da47be
Merge branch 'main' into 240103-improve-search-in-doc-viewer
jughosta Dec 11, 2025
03952f8
Merge branch 'main' into 240103-improve-search-in-doc-viewer
jughosta Dec 15, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/platform/packages/shared/kbn-unified-doc-viewer/src/components/field_name/field_name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ interface Props {
fieldIconProps?: Omit<FieldIconProps, 'type'>;
scripted?: boolean;
highlight?: string;
disableMultiFieldBadge?: boolean;
}

export function FieldName({
Expand All @@ -35,6 +36,7 @@ export function FieldName({
displayNameOverride,
scripted = false,
highlight = '',
disableMultiFieldBadge = false,
}: Props) {
const typeName = getFieldTypeName(fieldType);
const fieldMappingDisplayName = fieldMapping?.displayName ? fieldMapping.displayName : fieldName;
Expand Down Expand Up @@ -78,7 +80,7 @@ export function FieldName({
</EuiToolTip>
</EuiFlexItem>

{isMultiField && (
{isMultiField && !disableMultiFieldBadge && (
<EuiToolTip
position="top"
delay="long"
Expand Down
5 changes: 3 additions & 2 deletions src/platform/plugins/shared/unified_doc_viewer/public/components/doc_viewer_table/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ export const DocViewerTable = ({

const flattened = hit.flattened;
const shouldShowFieldHandler = useMemo(
() => getShouldShowFieldHandler(Object.keys(flattened), dataView, showMultiFields),
[flattened, dataView, showMultiFields]
() =>
getShouldShowFieldHandler(Object.keys(flattened), dataView, isEsqlMode || showMultiFields),
[flattened, dataView, isEsqlMode, showMultiFields]
);

const mapping = useCallback((name: string) => dataView.fields.getByName(name), [dataView.fields]);
Expand Down
4 changes: 3 additions & 1 deletion ...tform/plugins/shared/unified_doc_viewer/public/components/doc_viewer_table/table_cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ interface TableCellProps {
rowIndex: number;
columnId: string;
isDetails: boolean;
isESQLMode: boolean;
onFindSearchTermMatch?: UseTableFiltersReturn['onFindSearchTermMatch'];
}

export const TableCell: React.FC<TableCellProps> = React.memo(
({ searchTerm, rows, rowIndex, columnId, isDetails, onFindSearchTermMatch }) => {
({ searchTerm, rows, rowIndex, columnId, isDetails, isESQLMode, onFindSearchTermMatch }) => {
const { fieldsMetadata } = getUnifiedDocViewerServices();

const row = rows[rowIndex];
Expand Down Expand Up @@ -62,6 +63,7 @@ export const TableCell: React.FC<TableCellProps> = React.memo(
fieldMapping={dataViewField}
scripted={dataViewField?.scripted}
highlight={nameHighlight}
disableMultiFieldBadge={isESQLMode}
/>

{isDetails && !!dataViewField ? (
Expand Down
3 changes: 2 additions & 1 deletion ...tform/plugins/shared/unified_doc_viewer/public/components/doc_viewer_table/table_grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,12 @@ export function TableGrid({
rowIndex={rowIndex}
columnId={columnId}
isDetails={isDetails}
isESQLMode={isEsqlMode}
onFindSearchTermMatch={onFindSearchTermMatch}
/>
);
},
[searchTerm, rows, onFindSearchTermMatch]
[searchTerm, rows, isEsqlMode, onFindSearchTermMatch]
);

const renderCellPopover = useCallback(
Expand Down
5 changes: 3 additions & 2 deletions ...omponents/observability/attributes/doc_viewer_attributes_overview/attributes_overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ export function AttributesOverview({
const flattened = hit.flattened;

const shouldShowFieldHandler = useMemo(
() => getShouldShowFieldHandler(Object.keys(flattened), dataView, showMultiFields),
[flattened, dataView, showMultiFields]
() =>
getShouldShowFieldHandler(Object.keys(flattened), dataView, isEsqlMode || showMultiFields),
[flattened, dataView, isEsqlMode, showMultiFields]
);

const attributesTitle = getAttributesTitle(hit);
Expand Down
1 change: 1 addition & 0 deletions ...c/components/observability/attributes/doc_viewer_attributes_overview/attributes_table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const AttributesTable = ({
rowIndex={rowIndex}
columnId={columnId}
isDetails={false}
isESQLMode={isEsqlMode}
/>
)}
columnVisibility={{
Expand Down
6 changes: 3 additions & 3 deletions src/platform/test/functional/apps/discover/group2_data_grid2/_data_grid_field_tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

expect(await findFirstDocViewerTokens()).to.eql([
'Text',
'Keyword',
'Text',
'Keyword',
'Date',
'Text',
'Keyword',
'Number',
'IP address',
'Text',
'Geo point',
'Keyword',
'Keyword',
]);
});

Expand Down
6 changes: 3 additions & 3 deletions src/platform/test/functional/apps/discover/group9/_doc_viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const fieldNames = await Promise.all(fieldNameCells.map((cell) => cell.getVisibleText()));

expect(
fieldNames.join(',').startsWith('@message,@tags,@timestamp,agent,bytes,clientip')
fieldNames.join(',').startsWith('@message,@message.raw,@tags,@tags.raw,@timestamp,agent')
).to.be(true);
});

Expand Down Expand Up @@ -319,7 +319,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
let fieldNames = await Promise.all(fieldNameCells.map((cell) => cell.getVisibleText()));

expect(
fieldNames.join(',').startsWith('@message,@tags,@timestamp,agent,bytes,clientip')
fieldNames.join(',').startsWith('@message,@message.raw,@tags,@tags.raw,@timestamp,agent')
).to.be(true);

await showOnlySelectedFieldsSwitch.click();
Expand All @@ -343,7 +343,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await retry.waitFor('updates after switching from showing only selected', async () => {
fieldNameCells = await find.allByCssSelector('.kbnDocViewer__fieldName');
fieldNames = await Promise.all(fieldNameCells.map((cell) => cell.getVisibleText()));
return fieldNames.join(',').startsWith('agent,@message,@tags');
return fieldNames.join(',').startsWith('agent,@message,@message.raw');
});
});
});
Expand Down