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

Jump to bottom

Discover: Handle source column differences in embeddable as well #91987

Merged
merged 2 commits into from
Feb 22, 2021
Merged

Discover: Handle source column differences in embeddable as well #91987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec8c414
handle source column differences in embeddable as well
flash1293 Feb 19, 2021
ca5eb34
Merge branch 'master' into discover/fix-source-column-embeddable
kibanamachine Feb 22, 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
3 changes: 1 addition & 2 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 @@ -34,7 +34,6 @@ import { SkipBottomButton } from './skip_bottom_button';
import { esFilters, IndexPatternField, search } from '../../../../data/public';
import { DiscoverSidebarResponsive } from './sidebar';
import { DiscoverProps } from './types';
import { getDisplayedColumns } from '../helpers/columns';
import { SortPairArr } from '../angular/doc_table/lib/get_sort';
import { SEARCH_FIELDS_FROM_SOURCE } from '../../../common';
import { popularizeField } from '../helpers/popularize_field';
Expand Down Expand Up @@ -390,7 +389,7 @@ export function Discover({
<div className="dscDiscoverGrid">
<DataGridMemoized
ariaLabelledBy="documentsAriaLabel"
columns={getDisplayedColumns(state.columns, indexPattern)}
columns={columns}
expandedDoc={expandedDoc}
indexPattern={indexPattern}
rows={rows}
Expand Down
14 changes: 8 additions & 6 deletions src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
} from './discover_grid_columns';
import { defaultPageSize, gridStyle, pageSizeArr, toolbarVisibility } from './constants';
import { DiscoverServices } from '../../../build_services';
import { getDisplayedColumns } from '../../helpers/columns';

interface SortObj {
id: string;
Expand Down Expand Up @@ -146,7 +147,8 @@ export const DiscoverGrid = ({
showTimeCol,
sort,
}: DiscoverGridProps) => {
const defaultColumns = columns.includes('_source');
const displayedColumns = getDisplayedColumns(columns, indexPattern);
const defaultColumns = displayedColumns.includes('_source');

/**
* Pagination
Expand Down Expand Up @@ -207,19 +209,19 @@ export const DiscoverGrid = ({
const randomId = useMemo(() => htmlIdGenerator()(), []);

const euiGridColumns = useMemo(
() => getEuiGridColumns(columns, settings, indexPattern, showTimeCol, defaultColumns),
[columns, indexPattern, showTimeCol, settings, defaultColumns]
() => getEuiGridColumns(displayedColumns, settings, indexPattern, showTimeCol, defaultColumns),
[displayedColumns, indexPattern, showTimeCol, settings, defaultColumns]
);
const schemaDetectors = useMemo(() => getSchemaDetectors(), []);
const popoverContents = useMemo(() => getPopoverContents(), []);
const columnsVisibility = useMemo(
() => ({
visibleColumns: getVisibleColumns(columns, indexPattern, showTimeCol) as string[],
visibleColumns: getVisibleColumns(displayedColumns, indexPattern, showTimeCol) as string[],
setVisibleColumns: (newColumns: string[]) => {
onSetColumns(newColumns);
},
}),
[columns, indexPattern, showTimeCol, onSetColumns]
[displayedColumns, indexPattern, showTimeCol, onSetColumns]
);
const sorting = useMemo(() => ({ columns: sortingColumns, onSort: onTableSort }), [
sortingColumns,
Expand Down Expand Up @@ -316,7 +318,7 @@ export const DiscoverGrid = ({
indexPattern={indexPattern}
hit={expandedDoc}
// if default columns are used, dont make them part of the URL - the context state handling will take care to restore them
columns={defaultColumns ? [] : columns}
columns={defaultColumns ? [] : displayedColumns}
onFilter={onFilter}
onRemoveColumn={onRemoveColumn}
onAddColumn={onAddColumn}
Expand Down
6 changes: 5 additions & 1 deletion src/plugins/discover/public/application/embeddable/search_embeddable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import { DiscoverGridSettings } from '../components/discover_grid/types';
import { DiscoverServices } from '../../build_services';
import { ElasticSearchHit } from '../doc_views/doc_views_types';
import { getDefaultSort } from '../angular/doc_table/lib/get_default_sort';
import { handleSourceColumnState } from '../angular/helpers';

interface SearchScope extends ng.IScope {
columns?: string[];
Expand Down Expand Up @@ -371,7 +372,10 @@ export class SearchEmbeddable

// If there is column or sort data on the panel, that means the original columns or sort settings have
// been overridden in a dashboard.
searchScope.columns = this.input.columns || this.savedSearch.columns;
searchScope.columns = handleSourceColumnState(
{ columns: this.input.columns || this.savedSearch.columns },
this.services.core.uiSettings
).columns;
const savedSearchSort =
this.savedSearch.sort && this.savedSearch.sort.length
? this.savedSearch.sort
Expand Down