github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Discover] Adapt default column behavior (#89826)

Browse source
This commit is contained in:
Matthias Wilhelm 2021-02-02 17:32:37 +01:00 • committed by GitHub
parent f317316fd4
commit 047dd29747
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/plugins/discover/public/application/angular/discover.js vendored
View file

@ -414,18 +414,9 @@ function discoverController($route, $scope, Promise) {
setBreadcrumbsTitle(savedSearch, chrome);
function removeSourceFromColumns(columns) {
return columns.filter((col) => col !== '_source');
}
function getDefaultColumns() {
const columns = [...savedSearch.columns];
if ($scope.useNewFieldsApi) {
return removeSourceFromColumns(columns);
}
if (columns.length > 0) {
return columns;
if (savedSearch.columns.length > 0) {
return [...savedSearch.columns];
}
return [...config.get(DEFAULT_COLUMNS_SETTING)];
}

13
src/plugins/discover/public/application/components/discover.tsx
View file

@ -7,7 +7,7 @@
*/
import './discover.scss';
import React, { useState, useRef } from 'react';
import React, { useState, useRef, useMemo } from 'react';
import {
EuiButtonEmpty,
EuiButtonIcon,
@ -102,6 +102,13 @@ export function Discover({
const contentCentered = resultState === 'uninitialized';
const isLegacy = services.uiSettings.get('doc_table:legacy');
const useNewFieldsApi = !services.uiSettings.get(SEARCH_FIELDS_FROM_SOURCE);
const columns = useMemo(() => {
if (!state.columns) {
return [];
}
return useNewFieldsApi ? state.columns.filter((col) => col !== '_source') : state.columns;
}, [state, useNewFieldsApi]);
return (
<I18nProvider>
<EuiPage className="dscPage" data-fetch-counter={fetchCounter}>
@ -127,7 +134,7 @@ export function Discover({
<EuiFlexGroup className="dscPageBody__contents" gutterSize="none">
<EuiFlexItem grow={false}>
<SidebarMemoized
columns={state.columns || []}
columns={columns}
fieldCounts={fieldCounts}
hits={rows}
indexPatternList={indexPatternList}
@ -277,7 +284,7 @@ export function Discover({
</h2>
{isLegacy && rows && rows.length && (
<DocTableLegacyMemoized
columns={state.columns || []}
columns={columns}
indexPattern={indexPattern}
minimumVisibleRows={minimumVisibleRows}
rows={rows}

2
test/functional/apps/discover/_shared_links.ts
View file

@ -77,7 +77,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'/app/discover?_t=1453775307251#' +
'/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time' +
":(from:'2015-09-19T06:31:44.000Z',to:'2015-09" +
"-23T18:31:44.000Z'))&_a=(columns:!(),filters:!(),index:'logstash-" +
"-23T18:31:44.000Z'))&_a=(columns:!(_source),filters:!(),index:'logstash-" +
"*',interval:auto,query:(language:kuery,query:'')" +
",sort:!(!('@timestamp',desc)))";
const actualUrl = await PageObjects.share.getSharedUrl();