Skip to content

Commit 386f823

Browse files
opensearch-trigger-bot[bot]github-actions[bot]opensearch-changeset-bot[bot]kavilla
authored andcommitted
Update data explorer ui to use compressed components (opensearch-project#8222) (opensearch-project#8343)
* update discover ui to use compressed components * revert query editor changes * Changeset file for PR opensearch-project#8222 created/updated * update overflow prop for query editor * update language selector snapshots --------- (cherry picked from commit 8d45530) Signed-off-by: Shenoy Pratik <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Kawika Avilla <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> Co-authored-by: Kawika Avilla <[email protected]>
1 parent 0c54648 commit 386f823

File tree

10 files changed

+155
-170
lines changed

10 files changed

+155
-170
lines changed

changelogs/fragments/8222.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fix:
2+
- Update data explorer ui to use compressed components ([#8222](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8222))

src/plugins/data/public/data_sources/datasource_selector/data_selector_refresher.tsx

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import React from 'react';
6+
import { EuiButtonIconProps, EuiSmallButtonIcon, EuiToolTip, EuiToolTipProps } from '@elastic/eui';
77
import { i18n } from '@osd/i18n';
8-
import {
9-
EuiSmallButtonIcon,
10-
EuiButtonIconProps,
11-
EuiText,
12-
EuiToolTip,
13-
EuiToolTipProps,
14-
} from '@elastic/eui';
8+
import React from 'react';
159

1610
interface IDataSelectorRefresherProps {
1711
tooltipText: string;
@@ -23,26 +17,24 @@ interface IDataSelectorRefresherProps {
2317
export const DataSelectorRefresher: React.FC<IDataSelectorRefresherProps> = React.memo(
2418
({ tooltipText, onRefresh, buttonProps, toolTipProps }) => {
2519
return (
26-
<EuiText size="s" className="sourceRefreshText">
27-
<EuiToolTip
28-
position="right"
29-
content={i18n.translate('data.datasource.selector.refreshDataSources', {
30-
defaultMessage: tooltipText,
31-
})}
32-
display="block"
33-
data-test-subj="sourceRefreshButtonToolTip"
34-
{...toolTipProps}
35-
>
36-
<EuiSmallButtonIcon
37-
onClick={onRefresh}
38-
iconType="refresh"
39-
aria-label="sourceRefresh"
40-
className="sourceRefreshButton"
41-
data-test-subj="sourceRefreshButton"
42-
{...buttonProps}
43-
/>
44-
</EuiToolTip>
45-
</EuiText>
20+
<EuiToolTip
21+
position="right"
22+
content={i18n.translate('data.datasource.selector.refreshDataSources', {
23+
defaultMessage: tooltipText,
24+
})}
25+
display="block"
26+
data-test-subj="sourceRefreshButtonToolTip"
27+
{...toolTipProps}
28+
>
29+
<EuiSmallButtonIcon
30+
onClick={onRefresh}
31+
iconType="refresh"
32+
aria-label="sourceRefresh"
33+
className="sourceRefreshButton"
34+
data-test-subj="sourceRefreshButton"
35+
{...buttonProps}
36+
/>
37+
</EuiToolTip>
4638
);
4739
}
4840
);

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import React, { useEffect, useCallback, useMemo } from 'react';
76
import { EuiCompressedComboBox } from '@elastic/eui';
87
import { i18n } from '@osd/i18n';
9-
import { DataSource, DataSetWithDataSource, IndexPatternOption } from '../datasource';
10-
import { DataSourceGroup, DataSourceOption, DataSourceSelectableProps } from './types';
11-
import { DataSelectorRefresher } from './data_selector_refresher';
8+
import React, { useCallback, useEffect, useMemo } from 'react';
129
import {
1310
DATA_SELECTOR_DEFAULT_PLACEHOLDER,
1411
DATA_SELECTOR_REFRESHER_POPOVER_TEXT,
1512
DATA_SELECTOR_S3_DATA_SOURCE_GROUP_HINT_LABEL,
1613
} from '../constants';
14+
import { DataSetWithDataSource, DataSource, IndexPatternOption } from '../datasource';
15+
import { DataSelectorRefresher } from './data_selector_refresher';
16+
import { DataSourceGroup, DataSourceOption, DataSourceSelectableProps } from './types';
1717

1818
// Asynchronously retrieves and formats dataset from a given data source.
1919
const getAndFormatDataSetFromDataSource = async (

src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
import React, { useEffect, useMemo, useState, useCallback, useRef } from 'react';
76
import {
87
EuiButton,
9-
EuiButtonEmpty,
108
EuiIcon,
119
EuiPopover,
1210
EuiPopoverFooter,
1311
EuiSelectable,
1412
EuiSelectableOption,
13+
EuiSmallButtonEmpty,
1514
EuiToolTip,
1615
} from '@elastic/eui';
1716
import { FormattedMessage } from '@osd/i18n/react';
17+
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
1818
import { toMountPoint } from '../../../../opensearch_dashboards_react/public';
1919
import { Dataset, DEFAULT_DATA } from '../../../common';
20+
import { getQueryService } from '../../services';
2021
import { IDataPluginServices } from '../../types';
2122
import { AdvancedSelector } from './advanced_selector';
22-
import { getQueryService } from '../../services';
2323

2424
interface DatasetSelectorProps {
2525
selectedDataset?: Dataset;
@@ -138,15 +138,15 @@ export const DatasetSelector = ({
138138
<EuiPopover
139139
button={
140140
<EuiToolTip content={`${selectedDataset?.title ?? 'Select data'}`}>
141-
<EuiButtonEmpty
141+
<EuiSmallButtonEmpty
142142
className="datasetSelector__button"
143143
iconType="arrowDown"
144144
iconSide="right"
145145
onClick={togglePopover}
146146
>
147147
<EuiIcon type={datasetIcon} className="datasetSelector__icon" />
148148
{datasetTitle}
149-
</EuiButtonEmpty>
149+
</EuiSmallButtonEmpty>
150150
</EuiToolTip>
151151
}
152152
isOpen={isOpen}

src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap

Lines changed: 92 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)