Skip to content

Commit

Permalink
[Discover] Show "Copy value" button for any grid cell (elastic#149525)
Browse files Browse the repository at this point in the history
Closes elastic#108857

## Summary

Before we had "Copy to clipboard" only for cell popovers with JSON
content. This PR adds it also for any other cell values.

![Jan-25-2023
18-23-03](https://user-images.githubusercontent.com/1415710/214636400-b347e856-8bf0-4038-bc41-aae23df5e5a9.gif)

### Checklist

- [x] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [x] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [x] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
  • Loading branch information
jughosta authored and darnautov committed Feb 7, 2023
1 parent b1434ea commit f4b49d5
Show file tree
Hide file tree
Showing 12 changed files with 176 additions and 51 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,21 @@ import { DataViewField } from '@kbn/data-views-plugin/public';

describe('Discover cell actions ', function () {
it('should not show cell actions for unfilterable fields', async () => {
expect(buildCellActions({ name: 'foo', filterable: false } as DataViewField)).toBeUndefined();
expect(buildCellActions({ name: 'foo', filterable: false } as DataViewField)).toEqual([
CopyBtn,
]);
});

it('should show filter actions for filterable fields', async () => {
expect(buildCellActions({ name: 'foo', filterable: true } as DataViewField, jest.fn())).toEqual(
[FilterInBtn, FilterOutBtn, CopyBtn]
);
});

it('should show Copy action for _source field', async () => {
expect(
buildCellActions({ name: '_source', type: '_source', filterable: false } as DataViewField)
).toEqual([CopyBtn]);
});

it('triggers filter function when FilterInBtn is clicked', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,13 @@ export const CopyBtn = ({ Component, rowIndex, columnId }: EuiDataGridColumnCell
title={buttonTitle}
data-test-subj="copyClipboardButton"
>
{i18n.translate('discover.grid.copyClipboardButton', {
defaultMessage: 'Copy to clipboard',
{i18n.translate('discover.grid.copyCellValueButton', {
defaultMessage: 'Copy value',
})}
</Component>
);
};

export function buildCellActions(field: DataViewField, onFilter?: DocViewFilterFn) {
if (field?.type === '_source') {
return [CopyBtn];
} else if (!onFilter || !field.filterable) {
return undefined;
}

return [FilterInBtn, FilterOutBtn];
return [...(onFilter && field.filterable ? [FilterInBtn, FilterOutBtn] : []), CopyBtn];
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ describe('Discover grid columns', function () {
"cellActions": Array [
[Function],
[Function],
[Function],
],
"displayAsText": "extension",
"id": "extension",
Expand Down Expand Up @@ -120,7 +121,9 @@ describe('Discover grid columns', function () {
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"cellActions": Array [
[Function],
],
"displayAsText": "message",
"id": "message",
"isSortable": false,
Expand Down Expand Up @@ -188,6 +191,7 @@ describe('Discover grid columns', function () {
"cellActions": Array [
[Function],
[Function],
[Function],
],
"displayAsText": "extension",
"id": "extension",
Expand Down Expand Up @@ -230,7 +234,9 @@ describe('Discover grid columns', function () {
"showMoveLeft": false,
"showMoveRight": false,
},
"cellActions": undefined,
"cellActions": Array [
[Function],
],
"displayAsText": "message",
"id": "message",
"isSortable": false,
Expand Down Expand Up @@ -298,6 +304,7 @@ describe('Discover grid columns', function () {
"cellActions": Array [
[Function],
[Function],
[Function],
],
"display": <div
aria-label="timestamp - this field represents the time that events occurred."
Expand Down Expand Up @@ -365,6 +372,7 @@ describe('Discover grid columns', function () {
"cellActions": Array [
[Function],
[Function],
[Function],
],
"displayAsText": "extension",
"id": "extension",
Expand Down Expand Up @@ -410,7 +418,9 @@ describe('Discover grid columns', function () {
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"cellActions": Array [
[Function],
],
"displayAsText": "message",
"id": "message",
"isSortable": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ describe('Discover grid cell rendering', function () {
<EuiFlexGroup
gutterSize="none"
justifyContent="flexEnd"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand Down Expand Up @@ -490,6 +491,7 @@ describe('Discover grid cell rendering', function () {
<EuiFlexGroup
gutterSize="none"
justifyContent="flexEnd"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand Down Expand Up @@ -653,6 +655,7 @@ describe('Discover grid cell rendering', function () {
<EuiFlexGroup
gutterSize="none"
justifyContent="flexEnd"
responsive={false}
>
<EuiFlexItem
grow={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ function renderPopoverContent({
className="dscDiscoverGrid__cellPopover"
>
<EuiFlexItem grow={false}>
<EuiFlexGroup justifyContent="flexEnd" gutterSize="none">
<EuiFlexGroup justifyContent="flexEnd" gutterSize="none" responsive={false}>
<EuiFlexItem grow={false}>{closeButton}</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/discover/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { type DatatableColumn } from '@kbn/expressions-plugin/common';
export type ValueToStringConverter = (
rowIndex: number,
columnId: string,
options?: { disableMultiline?: boolean }
options?: { compatibleWithCSV?: boolean }
) => { formattedString: string; withFormula: boolean };

export interface EsHitRecord extends Omit<estypes.SearchHit, '_source'> {
Expand Down
Loading

0 comments on commit f4b49d5

Please sign in to comment.