Skip to content

Commit 37da75c

Browse files
[Explore] minor update on the edit query placement (opensearch-project#10259)
* minor update on the edit query placement Signed-off-by: Justin Kim <jungkm@amazon.com> * Changeset file for PR opensearch-project#10259 created/updated --------- Signed-off-by: Justin Kim <jungkm@amazon.com> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
1 parent f5647b9 commit 37da75c

File tree

4 files changed

+22
-24
lines changed

4 files changed

+22
-24
lines changed

changelogs/fragments/10259.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
refactor:
2+
- Change query editor ui ([#10259](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/10259))

src/plugins/explore/public/components/query_panel/query_panel_editor/query_panel_editor.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676

7777
&__promptIcon {
7878
color: $ouiColorDisabledText;
79+
filter: brightness(0.65);
7980
position: absolute;
8081
left: $ouiSizeXXS;
8182
top: 9px; // hard-coding to align it to editor

src/plugins/explore/public/components/query_panel/query_panel_generated_query/query_panel_generated_query.scss

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@
1818

1919
&__query {
2020
color: $ouiColorDisabledText;
21-
flex: 1;
2221
// stylelint-disable-next-line @osd/stylelint/no_restricted_properties
2322
font-family: $ouiCodeFontFamily;
24-
word-wrap: anywhere;
25-
}
26-
27-
&__rightSection {
28-
align-items: center;
29-
display: flex;
23+
overflow: hidden;
24+
text-overflow: ellipsis;
25+
white-space: nowrap;
3026
}
3127
}

src/plugins/explore/public/components/query_panel/query_panel_generated_query/query_panel_generated_query.tsx

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
import React from 'react';
77
import { useDispatch, useSelector } from 'react-redux';
88
import { i18n } from '@osd/i18n';
9-
import { EuiButtonEmpty, EuiIcon, EuiText } from '@elastic/eui';
9+
import { EuiBadge, EuiIcon, EuiText } from '@elastic/eui';
1010
import { selectLastExecutedTranslatedQuery } from '../../../application/utils/state_management/selectors';
1111
import { useEditorFocus, useSetEditorTextWithQuery } from '../../../application/hooks';
1212
import { clearLastExecutedData } from '../../../application/utils/state_management/slices';
1313
import './query_panel_generated_query.scss';
1414

15+
const editQueryText = i18n.translate('explore.queryPanel.queryPanelGeneratedQuery.editQuery', {
16+
defaultMessage: 'Edit query',
17+
});
18+
1519
export const QueryPanelGeneratedQuery = () => {
1620
const lastExecutedTranslatedQuery = useSelector(selectLastExecutedTranslatedQuery);
1721
const setEditorTextWithQuery = useSetEditorTextWithQuery();
@@ -34,22 +38,17 @@ export const QueryPanelGeneratedQuery = () => {
3438
<EuiText className="exploreQueryPanelGeneratedQuery__query" size="s">
3539
{lastExecutedTranslatedQuery}
3640
</EuiText>
37-
<div className="exploreQueryPanelGeneratedQuery__rightSection">
38-
<EuiButtonEmpty
39-
onClick={onEditClick}
40-
data-test-subj="exploreQueryPanelGeneratedQuery_editQuery"
41-
size="xs"
42-
>
43-
<div className="exploreQueryPanelGeneratedQuery__buttonTextWrapper">
44-
<EuiIcon type="editorCodeBlock" size="s" />
45-
<EuiText size="xs">
46-
{i18n.translate('explore.queryPanel.queryPanelGeneratedQuery.editQuery', {
47-
defaultMessage: 'Edit query',
48-
})}
49-
</EuiText>
50-
</div>
51-
</EuiButtonEmpty>
52-
</div>
41+
<EuiBadge
42+
data-test-subj="exploreQueryPanelGeneratedQuery_editQuery"
43+
onClick={onEditClick}
44+
onClickAriaLabel={editQueryText}
45+
color="hollow"
46+
>
47+
<div className="exploreQueryPanelGeneratedQuery__buttonTextWrapper">
48+
<EuiIcon type="editorCodeBlock" size="s" />
49+
<EuiText size="xs">{editQueryText}</EuiText>
50+
</div>
51+
</EuiBadge>
5352
</div>
5453
);
5554
};

0 commit comments

Comments
 (0)