Skip to content
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

[Discover] Adapt default column behavior #89826

Merged
merged 5 commits into from
Feb 2, 2021
Merged

[Discover] Adapt default column behavior #89826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db90932
Adapt default column behavior
kertal Jan 29, 2021
28ef89b
Merge branch 'master' into kertal-pr-2021-01-29-discover-fix-default-…
kibanamachine Feb 1, 2021
428640f
Improve code
kertal Feb 1, 2021
5747e30
Merge branch 'kertal-pr-2021-01-29-discover-fix-default-column-behavi…
kertal Feb 1, 2021
0e51cfa
Fix functional test
kertal Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions src/plugins/discover/public/application/angular/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
}
Expand Down
13 changes: 10 additions & 3 deletions src/plugins/discover/public/application/components/discover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import './discover.scss';
import React, { useState, useRef } from 'react';
import React, { useState, useRef, useMemo } from 'react';
import {
EuiButtonEmpty,
EuiButtonIcon,
Expand Down Expand Up @@ -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}>
Expand All @@ -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}
Expand Down Expand Up @@ -277,7 +284,7 @@ export function Discover({
</h2>
{isLegacy && rows && rows.length && (
<DocTableLegacyMemoized
columns={state.columns || []}
columns={columns}
indexPattern={indexPattern}
minimumVisibleRows={minimumVisibleRows}
rows={rows}
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/discover/_shared_links.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down