Skip to content

Commit

Permalink
[Discover] Deangularize classic table (elastic#104361)
Browse files Browse the repository at this point in the history
* [Discover] move angular directives to react compoenents

* [Discover] add support of infiniteScroll

* [Discover] support paginated classic table

* [Discover] refactor docTable component, remove redundant angular code

* [Discover] remove redundant files

* [Discover] fix some functional tests and pgination

* [Discover] fix functionals

* [Discover] code refactoring, adding tests

* [Discover] update tests

* [Discover] fix embeddable view of doc table

* [Discover] update pagination view

* [Discover] remove unused translations

* [Discover] improve readability, fix pagination

* [Discover] adjust isFilterable check

* [Discover] improve doc viewer table row display

* [Discover] clean up implementation, fix functional test

* [Discover] fix skip button

* [Discover] update test snapshot

* [Discover] update test

* [Discover] simplify pagination, update layout in embeddable

* [Discover] fix functional, remove redundant i18n translations

* [Discover] return indexPatternField

* [Discover] add support of fixed footer for embeddable

* [Discover] move doc_table to apps/components folder, update test

* [Discover] fix imports

* [Discover] update imports, beautify code

* Update src/plugins/discover/public/application/apps/main/components/doc_table/doc_table_wrapper.tsx

Co-authored-by: Tim Roes <[email protected]>

* [Discover] remove redundant styles

* [Discover] fix lining

* [Discover] fix discover grid embeddable

* [Discover] fix by comments

* [Discover] return extraWidth, describe the problem

* [Discover] fix unresolved conflicts

Co-authored-by: Kibana Machine <[email protected]>
Co-authored-by: Tim Roes <[email protected]>
  • Loading branch information
3 people authored Aug 10, 2021
1 parent f479259 commit 328c36d
Show file tree
Hide file tree
Showing 102 changed files with 2,006 additions and 2,547 deletions.
13 changes: 11 additions & 2 deletions src/plugins/discover/public/__mocks__/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@ import { DiscoverServices } from '../build_services';
import { dataPluginMock } from '../../../data/public/mocks';
import { chromeServiceMock, coreMock, docLinksServiceMock } from '../../../../core/public/mocks';
import {
CONTEXT_STEP_SETTING,
DEFAULT_COLUMNS_SETTING,
DOC_HIDE_TIME_COLUMN_SETTING,
SAMPLE_SIZE_SETTING,
SORT_DEFAULT_ORDER_SETTING,
} from '../../common';
import { savedSearchMock } from './saved_search';
import { UI_SETTINGS } from '../../../data/common';
import { TopNavMenu } from '../../../navigation/public';
import { FORMATS_UI_SETTINGS } from 'src/plugins/field_formats/common';
const dataPlugin = dataPluginMock.createStartContract();

export const discoverServiceMock = ({
Expand Down Expand Up @@ -49,10 +52,16 @@ export const discoverServiceMock = ({
return [];
} else if (key === UI_SETTINGS.META_FIELDS) {
return [];
} else if (key === SAMPLE_SIZE_SETTING) {
return 250;
} else if (key === DOC_HIDE_TIME_COLUMN_SETTING) {
return false;
} else if (key === CONTEXT_STEP_SETTING) {
return 5;
} else if (key === SORT_DEFAULT_ORDER_SETTING) {
return 'desc';
} else if (key === FORMATS_UI_SETTINGS.SHORT_DOTS_ENABLE) {
return false;
} else if (key === SAMPLE_SIZE_SETTING) {
return 250;
}
},
isDefault: (key: string) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ export enum SurrDocType {
}

export type EsHitRecord = Required<
Pick<
estypes.SearchResponse['hits']['hits'][number],
'_id' | 'fields' | 'sort' | '_index' | '_version'
>
Pick<estypes.SearchHit, '_id' | 'fields' | 'sort' | '_index' | '_version'>
> & {
_source?: Record<string, unknown>;
_score?: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,40 @@
*/
import React, { useState } from 'react';
import { I18nProvider } from '@kbn/i18n/react';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { DiscoverGrid, DiscoverGridProps } from '../components/discover_grid/discover_grid';
import { getServices } from '../../kibana_services';
import { ElasticSearchHit } from '../doc_views/doc_views_types';
import { TotalDocuments } from '../apps/main/components/total_documents/total_documents';

export interface DiscoverGridEmbeddableProps extends DiscoverGridProps {
totalHitCount: number;
}

export const DataGridMemoized = React.memo((props: DiscoverGridProps) => (
<DiscoverGrid {...props} />
));

export function DiscoverGridEmbeddable(props: DiscoverGridProps) {
export function DiscoverGridEmbeddable(props: DiscoverGridEmbeddableProps) {
const [expandedDoc, setExpandedDoc] = useState<ElasticSearchHit | undefined>(undefined);

return (
<I18nProvider>
<DataGridMemoized
{...props}
setExpandedDoc={setExpandedDoc}
expandedDoc={expandedDoc}
services={getServices()}
/>
<EuiFlexGroup style={{ width: '100%' }} direction="column" gutterSize="xs" responsive={false}>
{props.totalHitCount !== 0 && (
<EuiFlexItem grow={false} style={{ alignSelf: 'flex-end' }}>
<TotalDocuments totalHitCount={props.totalHitCount} />
</EuiFlexItem>
)}
<EuiFlexItem style={{ minHeight: 0 }}>
<DataGridMemoized
{...props}
setExpandedDoc={setExpandedDoc}
expandedDoc={expandedDoc}
services={getServices()}
/>
</EuiFlexItem>
</EuiFlexGroup>
</I18nProvider>
);
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 328c36d

Please sign in to comment.