forked from opensearch-project/dashboards-observability
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: enable data grid in Chatbot (opensearch-project#1341)
* feat: enable data grid in Chatbot Signed-off-by: SuZhou-Joe <[email protected]> * feat: update payload Signed-off-by: SuZhou-Joe <[email protected]> * feat: add unit test Signed-off-by: SuZhou-Joe <[email protected]> * feat: Optimize code Co-authored-by: Joshua Li <[email protected]> Signed-off-by: SuZhou-Joe <[email protected]> * feat: optimize code Signed-off-by: SuZhou-Joe <[email protected]> * feat: change to MessageRenderer Signed-off-by: SuZhou-Joe <[email protected]> * feat: change to fullWidth Signed-off-by: SuZhou-Joe <[email protected]> --------- Signed-off-by: SuZhou-Joe <[email protected]> Co-authored-by: Joshua Li <[email protected]> Co-authored-by: Kavitha Conjeevaram Mohan <[email protected]>
- Loading branch information
Showing
9 changed files
with
414 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
public/dependencies/components/__snapshots__/data_grid_container.test.tsx.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`<DataGridContainer /> should render empty when rawQuery is not provided 1`] = `<div />`; | ||
|
|
||
| exports[`<DataGridContainer /> should render when all props are provided 1`] = ` | ||
| <div> | ||
| <div | ||
| style="overflow-x: hidden;" | ||
| > | ||
| <div | ||
| data-test-subj="test" | ||
| > | ||
| { | ||
| "http": {}, | ||
| "pplService": {}, | ||
| "rows": [ | ||
| { | ||
| "timestamp": "now", | ||
| "count": 1 | ||
| } | ||
| ], | ||
| "explorerFields": { | ||
| "selectedFields": [], | ||
| "unselectedFields": [], | ||
| "availableFields": [], | ||
| "queriedFields": [] | ||
| }, | ||
| "timeStampField": "timestamp", | ||
| "totalHits": 1, | ||
| "requestParams": { | ||
| "tabId": "OBSERVABILITY_DEFAULT_TAB" | ||
| }, | ||
| "startTime": "", | ||
| "endTime": "now", | ||
| "storedSelectedColumns": [], | ||
| "OUIDataGridProps": { | ||
| "gridStyle": { | ||
| "fontSize": "s", | ||
| "cellPadding": "s" | ||
| }, | ||
| "minSizeForControls": 300, | ||
| "rowHeightsOptions": { | ||
| "defaultHeight": 80 | ||
| } | ||
| }, | ||
| "rawQuery": "source=foo", | ||
| "columns": [ | ||
| { | ||
| "id": "timestamp", | ||
| "isSortable": true, | ||
| "display": "Time", | ||
| "schema": "datetime", | ||
| "initialWidth": 50 | ||
| }, | ||
| { | ||
| "id": "_source", | ||
| "isSortable": false, | ||
| "display": "Source", | ||
| "schema": "_source" | ||
| } | ||
| ] | ||
| } | ||
| </div> | ||
| </div> | ||
| </div> | ||
| `; | ||
|
|
||
| exports[`<DataGridContainer /> should switch props when in full screen mode 1`] = ` | ||
| <div> | ||
| <div | ||
| style="overflow-x: hidden;" | ||
| > | ||
| <div | ||
| data-test-subj="test" | ||
| > | ||
| { | ||
| "http": {}, | ||
| "pplService": {}, | ||
| "rows": [ | ||
| { | ||
| "timestamp": "now", | ||
| "count": 1 | ||
| } | ||
| ], | ||
| "explorerFields": { | ||
| "selectedFields": [], | ||
| "unselectedFields": [], | ||
| "availableFields": [], | ||
| "queriedFields": [] | ||
| }, | ||
| "timeStampField": "timestamp", | ||
| "totalHits": 1, | ||
| "requestParams": { | ||
| "tabId": "OBSERVABILITY_DEFAULT_TAB" | ||
| }, | ||
| "startTime": "", | ||
| "endTime": "now", | ||
| "storedSelectedColumns": [], | ||
| "OUIDataGridProps": { | ||
| "gridStyle": {}, | ||
| "minSizeForControls": 300, | ||
| "rowHeightsOptions": {} | ||
| }, | ||
| "rawQuery": "source=foo", | ||
| "columns": [ | ||
| { | ||
| "id": "timestamp", | ||
| "isSortable": true, | ||
| "display": "Time", | ||
| "schema": "datetime", | ||
| "initialWidth": 200 | ||
| }, | ||
| { | ||
| "id": "_source", | ||
| "isSortable": false, | ||
| "display": "Source", | ||
| "schema": "_source" | ||
| } | ||
| ] | ||
| } | ||
| </div> | ||
| </div> | ||
| </div> | ||
| `; |
122 changes: 122 additions & 0 deletions
122
public/dependencies/components/data_grid_container.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { render, waitFor } from '@testing-library/react'; | ||
| import { Provider } from 'react-redux'; | ||
| import { DataGridContainer } from './data_grid_container'; | ||
| import { RenderProps } from '../../types'; | ||
| import { store } from '../../framework/redux/store'; | ||
| import { DataGridProps } from '../../components/event_analytics/explorer/events_views/data_grid'; | ||
| import { | ||
| DEFAULT_SOURCE_COLUMN as mock_DEFAULT_SOURCE_COLUMN, | ||
| DEFAULT_TIMESTAMP_COLUMN as mock_DEFAULT_TIMESTAMP_COLUMN, | ||
| } from '../../../common/constants/explorer'; | ||
|
|
||
| jest.mock('../../components/event_analytics/utils/utils', () => ({ | ||
| redoQuery: (...args: any[]) => { | ||
| args[7]([ | ||
| { | ||
| timestamp: 'now', | ||
| count: 1, | ||
| }, | ||
| ]); | ||
| }, | ||
| })); | ||
|
|
||
| jest.mock('../../../common/utils', () => ({ | ||
| getPPLService: () => ({}), | ||
| getOSDHttp: () => ({}), | ||
| })); | ||
|
|
||
| jest.mock('../../components/event_analytics/explorer/events_views/data_grid', () => ({ | ||
| DataGrid: (props: DataGridProps) => { | ||
| const columnsResult = props.formatGridColumn?.([ | ||
| mock_DEFAULT_TIMESTAMP_COLUMN, | ||
| mock_DEFAULT_SOURCE_COLUMN, | ||
| ]); | ||
| return ( | ||
| <div data-test-subj="test"> | ||
| {JSON.stringify({ ...props, columns: columnsResult }, null, 2)} | ||
| </div> | ||
| ); | ||
| }, | ||
| })); | ||
|
|
||
| describe('<DataGridContainer />', () => { | ||
| it('should render when all props are provided', async () => { | ||
| const { container, findByTestId } = render( | ||
| <Provider store={store}> | ||
| <DataGridContainer | ||
| rawQuery="source=foo" | ||
| renderProps={{ | ||
| props: { | ||
| message: { | ||
| type: 'output', | ||
| contentType: 'ppl_data_grid', | ||
| content: 'source=foo', | ||
| }, | ||
| }, | ||
| chatContext: { | ||
| flyoutFullScreen: false, | ||
| } as RenderProps['chatContext'], | ||
| }} | ||
| /> | ||
| </Provider> | ||
| ); | ||
| await findByTestId('test'); | ||
| expect(container).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it('should render empty when rawQuery is not provided', async () => { | ||
| const { container, queryByTestId } = render( | ||
| <Provider store={store}> | ||
| <DataGridContainer | ||
| rawQuery="" | ||
| renderProps={{ | ||
| props: { | ||
| message: { | ||
| type: 'output', | ||
| contentType: 'ppl_data_grid', | ||
| content: 'source=foo', | ||
| }, | ||
| }, | ||
| chatContext: { | ||
| flyoutFullScreen: false, | ||
| } as RenderProps['chatContext'], | ||
| }} | ||
| /> | ||
| </Provider> | ||
| ); | ||
| await waitFor(() => { | ||
| expect(queryByTestId('test')).toBeNull(); | ||
| }); | ||
| expect(container).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it('should switch props when in full screen mode', async () => { | ||
| const { container, findByTestId } = render( | ||
| <Provider store={store}> | ||
| <DataGridContainer | ||
| rawQuery="source=foo" | ||
| renderProps={{ | ||
| props: { | ||
| message: { | ||
| type: 'output', | ||
| contentType: 'ppl_data_grid', | ||
| content: 'source=foo', | ||
| }, | ||
| }, | ||
| chatContext: { | ||
| flyoutFullScreen: true, | ||
| } as RenderProps['chatContext'], | ||
| }} | ||
| /> | ||
| </Provider> | ||
| ); | ||
| await findByTestId('test'); | ||
| expect(container).toMatchSnapshot(); | ||
| }); | ||
| }); |
Oops, something went wrong.