diff --git a/changelogs/fragments/7546.yml b/changelogs/fragments/7546.yml
new file mode 100644
index 000000000000..8431c60a2a0d
--- /dev/null
+++ b/changelogs/fragments/7546.yml
@@ -0,0 +1,2 @@
+fix:
+- Fixes Discover next styling ([#7546](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7546))
\ No newline at end of file
diff --git a/packages/osd-stylelint-config/config/global_selectors.json b/packages/osd-stylelint-config/config/global_selectors.json
index 285f11f40a2b..ca442760f731 100644
--- a/packages/osd-stylelint-config/config/global_selectors.json
+++ b/packages/osd-stylelint-config/config/global_selectors.json
@@ -25,7 +25,9 @@
"packages/osd-ui-framework/src/components/button/button_group/_button_group.scss",
"src/plugins/discover/public/application/components/data_grid/data_grid_table_cell_value.scss",
"src/plugins/discover/public/application/view_components/canvas/discover_canvas.scss",
- "src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss"
+ "src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss",
+ "src/plugins/data/public/ui/query_string_input/_query_bar.scss",
+ "src/plugins/data/public/ui/query_editor/_query_editor.scss"
]
}
}
\ No newline at end of file
diff --git a/src/plugins/data/public/ui/dataset_navigator/_dataset_navigator.scss b/src/plugins/data/public/ui/dataset_navigator/_dataset_navigator.scss
index 73a8c8719500..82ff0e91e34e 100644
--- a/src/plugins/data/public/ui/dataset_navigator/_dataset_navigator.scss
+++ b/src/plugins/data/public/ui/dataset_navigator/_dataset_navigator.scss
@@ -2,9 +2,14 @@
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/
-.datasetNavigator {
- min-width: 350px;
- border-bottom: $euiBorderThin !important;
+
+.dataSetNavigator {
+ padding: $euiSizeXS;
+ color: $euiColorPrimaryText;
+
+ &__icon {
+ margin-right: 4px;
+ }
}
.dataSetNavigatorFormWrapper {
diff --git a/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx b/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx
index ca98c2c1877f..854089fa1efe 100644
--- a/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx
+++ b/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx
@@ -10,10 +10,12 @@ import {
EuiContextMenu,
EuiForm,
EuiFormRow,
+ EuiIcon,
EuiLoadingSpinner,
EuiPanel,
EuiPopover,
EuiSelect,
+ EuiToolTip,
} from '@elastic/eui';
import { HttpStart, SavedObjectsClientContract } from 'opensearch-dashboards/public';
import _ from 'lodash';
@@ -568,23 +570,29 @@ export const DataSetNavigator = (props: DataSetNavigatorProps) => {
content:
{isCatalogCacheFetching(databasesLoadStatus) && createLoadingSpinner()}
,
});
+ const datasetTitle =
+ selectedDataSetState &&
+ selectedDataSetState?.dataSourceRef &&
+ selectedDataSetState?.dataSourceRef.name
+ ? `${selectedDataSetState.dataSourceRef?.name}::${selectedDataSetState?.title}`
+ : selectedDataSetState?.title;
+
return (
- {selectedDataSetState &&
- selectedDataSetState?.dataSourceRef &&
- selectedDataSetState?.dataSourceRef.name
- ? `${selectedDataSetState.dataSourceRef?.name}::${selectedDataSetState?.title}`
- : selectedDataSetState?.title}
-
+
+
+
+ {datasetTitle}
+
+
}
isOpen={navigatorState.isOpen}
closePopover={closePopover}
diff --git a/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss b/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss
index 9b25e874b190..f44be6910ec6 100644
--- a/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss
+++ b/src/plugins/data/public/ui/filter_bar/_global_filter_group.scss
@@ -11,18 +11,6 @@
padding-bottom: $euiSizeS;
}
-.globalQueryEditor {
- padding: 0 $euiSizeXS $euiSizeXS $euiSizeXS;
-}
-
-.globalQueryEditor:first-child {
- padding-top: $euiSizeXS;
-}
-
-.globalQueryEditor:not(:empty) {
- padding-bottom: $euiSizeXS;
-}
-
.globalFilterGroup__filterBar {
margin-top: $euiSizeXS;
}
diff --git a/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap b/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
index 031b12033176..00dd4ef65d32 100644
--- a/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
@@ -490,6 +490,7 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
className="languageSelector__button"
iconSide="right"
iconSize="s"
+ iconType="arrowDown"
onClick={[Function]}
>
DQL
@@ -513,6 +514,7 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
className="languageSelector__button"
iconSide="right"
iconSize="s"
+ iconType="arrowDown"
onClick={[Function]}
>