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.

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

[Emotion] Convert EuiDataGrid toolbar control styles to Emotion (Part 2) #7997

Merged
merged 11 commits into from
Sep 5, 2024
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions packages/eui/.storybook/test.ts
Copy link
Member Author

@cee-chen cee-chen Sep 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a quick note that 052965f / these VRT snapshots & utils technically won't work without #8003, which I decided to split it out into a separate PR (but left the generated screenshots in here for easier review).

Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import { queries, within, waitFor, fireEvent, expect } from '@storybook/test';
import * as dataTestSubjQueries from '../src/test/rtl/data_test_subj_queries';

/**
* Custom Storybook within util with EUI query helpers
* + additional chained async/waitFor component utils
*
* @see https://storybook.js.org/docs/writing-stories/play-function#writing-stories-with-the-play-function
* @see https://testing-library.com/docs/dom-testing-library/api-within/
*/
const customWithin = (canvasElement: HTMLElement) => {
const canvas = within<typeof queries & typeof dataTestSubjQueries>(
canvasElement,
{ ...queries, ...dataTestSubjQueries }
);

return {
...canvas,

/**
* 1. Loki doesn't like userEvent, only fireEvent
* 2. Storybook fires fireEvents too early (esp. on page load), so we add a waitFor
*/
waitForAndClick: async (testSubject: string) => {
await waitFor(() =>
expect(canvas.getByTestSubject(testSubject)).toBeInTheDocument()
);
await fireEvent.click(canvas.getByTestSubject(testSubject));
},

waitForEuiPopoverVisible: async () =>
await waitFor(() =>
expect(canvasElement.querySelector('[data-popover-open]')).toBeVisible()
),
};
};

export { customWithin as within };
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import React, { useState } from 'react';
import { fireEvent } from '@storybook/test';
import type { Meta, StoryObj, ReactRenderer } from '@storybook/react';
import type { PlayFunctionContext } from '@storybook/csf';
import { within } from '../../../../.storybook/test';
import { LOKI_SELECTORS } from '../../../../.storybook/loki';

import { EuiButtonEmpty, EuiButtonIcon } from '../../button';
import { EuiFlexGroup, EuiFlexItem } from '../../flex';
import { EuiToolTip } from '../../tool_tip';

import { EuiDataGrid } from '../data_grid';
import { EuiDataGridProps } from '../data_grid_types';

const meta: Meta<EuiDataGridProps> = {
title: 'Tabular Content/EuiDataGrid/Toolbar Controls',
component: EuiDataGrid,
};

export default meta;
type Story = StoryObj<EuiDataGridProps>;

export const AdditionalControls: Story = {
parameters: {
controls: { include: ['toolbarVisibility'] },
},
args: {
toolbarVisibility: {
additionalControls: {
left: {
prepend: (
<EuiButtonEmpty size="xs" iconType="document" color="text">
12 results
</EuiButtonEmpty>
),
append: (
<EuiButtonEmpty size="xs" iconType="download" color="primary">
Download
</EuiButtonEmpty>
),
},
right: (
<>
<EuiToolTip title="Updated 3 min ago" content="Click to refresh">
<EuiButtonIcon
aria-label="Refresh grid data"
size="xs"
iconType="refresh"
/>
</EuiToolTip>
<EuiToolTip content="Inspect grid data">
<EuiButtonIcon
aria-label="Inspect grid data"
size="xs"
iconType="inspect"
/>
</EuiToolTip>
</>
),
},
},
},
render: (args: EuiDataGridProps) => <StatefulDataGrid {...args} />,
};

export const RenderCustomToolbar: Story = {
parameters: {
controls: { include: ['renderCustomToolbar'] },
},
args: {
renderCustomToolbar: ({
hasRoomForGridControls,
columnControl,
columnSortingControl,
displayControl,
fullScreenControl,
keyboardShortcutsControl,
}) => {
return (
<EuiFlexGroup
responsive={false}
gutterSize="s"
justifyContent="spaceBetween"
alignItems="center"
css={({ euiTheme }) => ({
backgroundColor: euiTheme.colors.emptyShade,
padding: euiTheme.size.xs,
border: euiTheme.border.thin,
})}
>
<EuiFlexItem grow={false}>
<EuiButtonEmpty size="xs" iconType="brush" color="accent">
Custom left side
</EuiButtonEmpty>
</EuiFlexItem>

{hasRoomForGridControls && (
<EuiFlexItem grow={false}>
<EuiFlexGroup
responsive={false}
gutterSize="s"
alignItems="center"
>
<EuiFlexItem grow={false}>{columnControl}</EuiFlexItem>
<EuiFlexItem grow={false}>{columnSortingControl}</EuiFlexItem>
<EuiFlexItem grow={false}>
{keyboardShortcutsControl}
</EuiFlexItem>
<EuiFlexItem grow={false}>{displayControl}</EuiFlexItem>
<EuiFlexItem grow={false}>{fullScreenControl}</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
)}
</EuiFlexGroup>
);
},
},
render: (args: EuiDataGridProps) => <StatefulDataGrid {...args} />,
};

/**
* VRT tests only
*/

export const ColumnSelector: Story = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 Awesome update adding these VRT stories and additional helpers. Very useful! 👏

tags: ['vrt-only'],
parameters: {
loki: { chromeSelector: LOKI_SELECTORS.portal },
},
render: () => <StatefulDataGrid minSizeForControls={1} />, // Column sorting is hidden on mobile otherwise
play: async ({ canvasElement, step }: PlayFunctionContext<ReactRenderer>) => {
const canvas = within(canvasElement);

await step('Open column selector popover', async () => {
await canvas.waitForAndClick('dataGridColumnSelectorButton');
await canvas.waitForEuiPopoverVisible();
});
await step('Hide all columns', async () => {
await fireEvent.click(
canvas.getByTestSubject('dataGridColumnSelectorHideAllButton')
);
});
},
};

export const ColumnSorting: Story = {
tags: ['vrt-only'],
parameters: {
loki: { chromeSelector: LOKI_SELECTORS.portal },
},
render: () => <StatefulDataGrid minSizeForControls={1} />, // Column sorting is hidden on mobile otherwise
play: async ({ canvasElement, step }: PlayFunctionContext<ReactRenderer>) => {
const canvas = within(canvasElement);

await step('Open column sorting and field selection popovers', async () => {
await canvas.waitForAndClick('dataGridColumnSortingButton');
await canvas.waitForEuiPopoverVisible();
await canvas.waitForAndClick('dataGridColumnSortingSelectionButton');
});
await step('Sort descending', async () => {
await canvas.waitForAndClick(
'dataGridColumnSortingPopoverColumnSelection-Test'
);
await fireEvent.click(
canvas.getByTestSubject('euiDataGridColumnSorting-sortColumn-Test-desc')
);
await canvas.waitForEuiPopoverVisible(); // Without an extra wait, the screenshot diff is flaky
});
},
};

export const KeyboardShortcuts: Story = {
tags: ['vrt-only'],
parameters: {
loki: { chromeSelector: LOKI_SELECTORS.portal },
},
render: () => <StatefulDataGrid />,
play: async ({ canvasElement }: PlayFunctionContext<ReactRenderer>) => {
const canvas = within(canvasElement);
await canvas.waitForAndClick('dataGridKeyboardShortcutsButton');
},
};

export const DisplaySelector: Story = {
tags: ['vrt-only'],
parameters: {
loki: { chromeSelector: LOKI_SELECTORS.portal },
},
render: () => <StatefulDataGrid />,
play: async ({ canvasElement, step }: PlayFunctionContext<ReactRenderer>) => {
const canvas = within(canvasElement);

await step('Open display selector popover', async () => {
await canvas.waitForAndClick('dataGridDisplaySelectorButton');
await canvas.waitForEuiPopoverVisible();
});
await step('Toggle density and row height settings', async () => {
await fireEvent.click(canvas.getByTestSubject('compact'));
await fireEvent.click(canvas.getByTestSubject('lineCount'));
});
},
};

export const FullScreenToggle: Story = {
tags: ['vrt-only'],
parameters: {
loki: { chromeSelector: LOKI_SELECTORS.portal },
},
render: () => <StatefulDataGrid />,
play: async ({ canvasElement }: PlayFunctionContext<ReactRenderer>) => {
const canvas = within(canvasElement);
await canvas.waitForAndClick('dataGridFullScreenButton');
},
};

const StatefulDataGrid = (
props: Partial<Omit<EuiDataGridProps, 'aria-labelledby'>>
) => {
const [visibleColumns, setVisibleColumns] = useState(['Test']);
const [sortingColumns, setSortingColumns] = useState<any[]>([]);

return (
<EuiDataGrid
aria-label="Test"
renderCellValue={() => 'Test'}
rowCount={2}
columns={[{ id: 'Test' }]}
columnVisibility={{ visibleColumns, setVisibleColumns }}
sorting={{
columns: sortingColumns,
onSort: (sortingColumns) => {
setSortingColumns(sortingColumns);
},
}}
inMemory={{ level: 'sorting' }}
{...props}
/>
);
};
Loading