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

[Data Explorer][Discover 2.0] Append popout icon to oui link for doc viewer links #4855

Merged
merged 2 commits into from
Aug 31, 2023
Merged

[Data Explorer][Discover 2.0] Append popout icon to oui link for doc viewer links #4855

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
1d981e1
[Data Explorer][Discover 2.0] Append popout icon to oui link for doc …
ananzh Aug 30, 2023
26acb3e
fix all failed ut
ananzh Aug 30, 2023
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
72 changes: 45 additions & 27 deletions ...plugins/discover/public/application/components/data_grid/data_grid_table_columns.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,12 @@ describe('Testing buildDataGridColumns function ', () => {
Array [
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": Object {
"iconType": "cross",
"label": "Remove column",
},
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": undefined,
Expand All @@ -69,9 +72,12 @@ describe('Testing buildDataGridColumns function ', () => {
},
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": Object {
"iconType": "cross",
"label": "Remove column",
},
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": undefined,
Expand All @@ -98,9 +104,9 @@ describe('Testing buildDataGridColumns function ', () => {
Array [
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": false,
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": "Time (order_date)",
Expand All @@ -111,9 +117,12 @@ describe('Testing buildDataGridColumns function ', () => {
},
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": Object {
"iconType": "cross",
"label": "Remove column",
},
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": undefined,
Expand All @@ -123,9 +132,12 @@ describe('Testing buildDataGridColumns function ', () => {
},
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": Object {
"iconType": "cross",
"label": "Remove column",
},
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": undefined,
Expand All @@ -135,9 +147,9 @@ describe('Testing buildDataGridColumns function ', () => {
},
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": false,
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": "Source",
Expand All @@ -162,9 +174,12 @@ describe('Testing buildDataGridColumns function ', () => {
Array [
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": Object {
"iconType": "cross",
"label": "Remove column",
},
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": undefined,
Expand All @@ -174,9 +189,12 @@ describe('Testing buildDataGridColumns function ', () => {
},
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": Object {
"iconType": "cross",
"label": "Remove column",
},
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": undefined,
Expand All @@ -186,9 +204,9 @@ describe('Testing buildDataGridColumns function ', () => {
},
Object {
"actions": Object {
"showHide": true,
"showMoveLeft": false,
"showMoveRight": false,
"showHide": false,
"showMoveLeft": true,
"showMoveRight": true,
},
"cellActions": undefined,
"display": "Time (order_date)",
Expand Down
34 changes: 22 additions & 12 deletions ...blic/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions src/plugins/discover/public/application/components/doc_viewer_links/doc_viewer_links.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import React from 'react';
import { EuiFlexGroup, EuiFlexItem, EuiListGroupItem, EuiListGroupItemProps } from '@elastic/eui';
import { EuiFlexGroup, EuiFlexItem, EuiListGroupItemProps, EuiLink } from '@elastic/eui';
import { getDocViewsLinksRegistry } from '../../../opensearch_dashboards_services';
import { DocViewLinkRenderProps } from '../../doc_views_links/doc_views_links_types';

Expand All @@ -24,10 +24,12 @@ export function DocViewerLinks(renderProps: DocViewLinkRenderProps) {
});

return (
<EuiFlexGroup gutterSize="xs" justifyContent="flexEnd">
<EuiFlexGroup gutterSize="m" justifyContent="flexEnd">
{listItems.map((item, index) => (
<EuiFlexItem key={index} grow={false}>
<EuiListGroupItem {...item} />
<EuiLink href={item.href} target="_blank" style={{ fontWeight: 'normal' }}>
{item.label}
</EuiLink>
</EuiFlexItem>
))}
</EuiFlexGroup>
Expand Down
10 changes: 1 addition & 9 deletions src/plugins/discover/public/application/utils/state_management/common.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { addColumn, removeColumn, reorderColumn, setColumns } from './common';
import { addColumn, removeColumn, reorderColumn } from './common';

describe('commonUtils', () => {
it('should handle addColumn', () => {
Expand All @@ -22,12 +22,4 @@ describe('commonUtils', () => {
'column1',
]);
});

it('should handle setColumns', () => {
expect(setColumns('timeField', ['timeField', 'column1', 'column2'])).toEqual([
'column1',
'column2',
]);
expect(setColumns(undefined, ['column1', 'column2'])).toEqual(['column1', 'column2']);
});
});
2 changes: 1 addition & 1 deletion src/plugins/discover/public/application/utils/state_management/discover_slice.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('discoverSlice', () => {
it('should handle setColumns', () => {
const action = {
type: 'discover/setColumns',
payload: { timeField: 'timeField', columns: ['timeField', 'column1', 'column2'] },
payload: { columns: ['column1', 'column2'] },
};
const result = discoverSlice.reducer(initialState, action);
expect(result.columns).toEqual(['column1', 'column2']);
Expand Down
Loading