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.

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

[Backport 2.11] Explorer minor UI updates #1100

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
>
source = openserach_dashboard_sample_logs
Expand Down Expand Up @@ -1564,6 +1565,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
>
source = openserach_dashboard_sample_logs
Expand Down Expand Up @@ -2758,6 +2760,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -3925,6 +3928,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -5151,6 +5155,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -6318,6 +6323,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -7537,6 +7543,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -8641,6 +8648,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -9807,6 +9815,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
>
source = openserach_dashboard_sample_logs
Expand Down Expand Up @@ -10940,6 +10949,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
>
source = openserach_dashboard_sample_logs
Expand Down Expand Up @@ -12132,6 +12142,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -13299,6 +13310,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -14525,6 +14537,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -15692,6 +15705,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
/>
</div>
Expand Down Expand Up @@ -16920,6 +16934,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
>
source = openserach_dashboard_sample_logs
Expand Down Expand Up @@ -18169,6 +18184,7 @@ Object {
placeholder="Enter PPL query"
rows="6"
spellcheck="false"
style="margin-top: 0px; height: 18px; padding: 8px;"
type="search"
>
source = openserach_dashboard_sample_logs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,13 @@ exports[`Log Config component renders empty log config 1`] = `
onKeyDown={[Function]}
placeholder="Enter PPL query"
spellCheck="false"
style={
Object {
"height": "18px",
"marginTop": "0px",
"padding": "8px",
}
}
type="search"
value=""
>
Expand All @@ -541,6 +548,13 @@ exports[`Log Config component renders empty log config 1`] = `
placeholder="Enter PPL query"
rows={6}
spellCheck="false"
style={
Object {
"height": "18px",
"marginTop": "0px",
"padding": "8px",
}
}
type="search"
value=""
/>
Expand Down Expand Up @@ -1126,6 +1140,13 @@ exports[`Log Config component renders with query 1`] = `
onKeyDown={[Function]}
placeholder="Enter PPL query"
spellCheck="false"
style={
Object {
"height": "18px",
"marginTop": "0px",
"padding": "8px",
}
}
type="search"
value="source = openserach_dashboard_sample_logs"
>
Expand All @@ -1151,6 +1172,13 @@ exports[`Log Config component renders with query 1`] = `
placeholder="Enter PPL query"
rows={6}
spellCheck="false"
style={
Object {
"height": "18px",
"marginTop": "0px",
"padding": "8px",
}
}
type="search"
value="source = openserach_dashboard_sample_logs"
/>
Expand Down
11 changes: 6 additions & 5 deletions public/components/common/search/autocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
*/
/* eslint-disable react-hooks/exhaustive-deps */

import './search.scss';
import $ from 'jquery';
import React, { useEffect, useMemo, useState } from 'react';
import { AutocompleteState, createAutocomplete } from '@algolia/autocomplete-core';
import { EuiFieldText, EuiTextArea } from '@elastic/eui';
import $ from 'jquery';
import DSLService from 'public/services/requests/dsl';
import { IQueryBarProps } from './search';
import { uiSettingsService } from '../../../../common/utils';
import React, { useEffect, useMemo, useState } from 'react';
import { AutocompleteItem } from '../../../../common/constants/autocomplete';
import { uiSettingsService } from '../../../../common/utils';
import { IQueryBarProps } from './search';
import './search.scss';

interface AutocompleteProps extends IQueryBarProps {
getSuggestions: (
Expand Down Expand Up @@ -136,6 +136,7 @@ export const Autocomplete = (props: AutocompleteProps) => {
return (
<div className="aa-Autocomplete" {...autocomplete.getRootProps({ id: 'autocomplete-root' })}>
<TextArea
style={{ marginTop: '0px', height: '18px', padding: '8px' }}
{...autocomplete.getInputProps({
id: 'autocomplete-textarea',
'data-test-subj': 'searchAutocompleteTextArea',
Expand Down
16 changes: 8 additions & 8 deletions public/components/common/search/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

.globalQueryBar {
margin: 0;
padding: .5rem;
padding: 0.5rem;
}
.aa-Autocomplete {
width: 100%;
position: relative;
--aa-search-input-height: 38px;
--aa-panel-border-color-rgb: rgba(227,230,238,255);
--aa-input-background-color-rbg: rgba(250,251,253,255);
--aa-panel-border-color-rgb: rgba(227, 230, 238, 255);
--aa-input-background-color-rbg: rgba(250, 251, 253, 255);
}
.styling {
font-weight: bold;
Expand All @@ -26,7 +26,7 @@
#autocomplete-textarea {
width: 100%;
outline: none;
min-height: 48px;
min-height: 40px;
max-width: unset;
height: 45px;
resize: vertical;
Expand All @@ -40,12 +40,12 @@
}

.aa-Panel--scrollable-dark {
background-color: #1D1E24;
background-color: #1d1e24;
border: 2px groove #383444;
}

.aa-Item-dark {
color: #DFE5EF;
color: #dfe5ef;
}

.event-date-picker {
Expand All @@ -60,11 +60,11 @@
background-color: transparent;
}
.ppl-link-light {
color: #006BB4;
color: #006bb4;
}

.ppl-link-dark {
color: #1BA9F5;
color: #1ba9f5;
}

.base-query-popover {
Expand Down
Loading
Loading