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

[Backport 2.x] [Console][Multiple Datasource]Fine tuned dev tool datasource selector UI #3850

Merged
merged 1 commit into from
Apr 15, 2023
Merged

[Backport 2.x] [Console][Multiple Datasource]Fine tuned dev tool datasource selector UI #3850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 36 additions & 45 deletions src/plugins/dev_tools/public/application.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,51 +154,42 @@ function DevToolsWrapper({

return (
<main className="devApp">
<div>
<EuiFlexGroup gutterSize="none">
<EuiFlexItem>
<EuiTabs>
{devTools.map((currentDevTool) => (
<EuiToolTip content={currentDevTool.tooltipContent} key={currentDevTool.id}>
<EuiTab
disabled={currentDevTool.isDisabled()}
isSelected={currentDevTool === activeDevTool}
onClick={() => {
if (!currentDevTool.isDisabled()) {
updateRoute(`/${currentDevTool.id}`);
}
}}
>
{currentDevTool.title}
</EuiTab>
</EuiToolTip>
))}
</EuiTabs>
</EuiFlexItem>
{dataSourceEnabled ? (
<EuiFlexItem grow={false} className="dataSourceSelector">
<EuiComboBox
aria-label={i18n.translate('devTool.devToolWrapper.DataSourceComboBoxAriaLabel', {
defaultMessage: 'Select a Data Source',
})}
placeholder={i18n.translate(
'devTool.devToolWrapper.DataSourceComboBoxPlaceholder',
{
defaultMessage: 'Select a Data Source',
}
)}
singleSelection={{ asPlainText: true }}
options={dataSources}
selectedOptions={selectedOptions}
onChange={onChange}
prepend="DataSource"
compressed
isDisabled={!dataSourceEnabled}
/>
</EuiFlexItem>
) : null}
</EuiFlexGroup>
</div>
<EuiTabs className="devAppTabs">
{devTools.map((currentDevTool) => (
<EuiToolTip content={currentDevTool.tooltipContent} key={currentDevTool.id}>
<EuiTab
disabled={currentDevTool.isDisabled()}
isSelected={currentDevTool === activeDevTool}
onClick={() => {
if (!currentDevTool.isDisabled()) {
updateRoute(`/${currentDevTool.id}`);
}
}}
>
{currentDevTool.title}
</EuiTab>
</EuiToolTip>
))}
{dataSourceEnabled ? (
<div className="devAppDataSourcePicker">
<EuiComboBox
aria-label={i18n.translate('devTool.devToolWrapper.DataSourceComboBoxAriaLabel', {
defaultMessage: 'Select a Data Source',
})}
placeholder={i18n.translate('devTool.devToolWrapper.DataSourceComboBoxPlaceholder', {
defaultMessage: 'Select a Data Source',
})}
singleSelection={{ asPlainText: true }}
options={dataSources}
selectedOptions={selectedOptions}
onChange={onChange}
prepend="DataSource"
compressed
isDisabled={!dataSourceEnabled}
/>
</div>
) : null}
</EuiTabs>

<div
className="devApp__container"
Expand Down
10 changes: 8 additions & 2 deletions src/plugins/dev_tools/public/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@
flex-grow: 1;
}

.dataSourceSelector {
margin: 5px 10px 5px 5px;
.devAppDataSourcePicker {
margin: 7px 8px 0 0;
min-width: 400px;
}

.devAppTabs {
display: flex;
flex-flow: row wrap;
justify-content: space-between;
}