Skip to content
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 @@ -446,6 +446,11 @@ storiesOf('SearchBar', module)
},
} as unknown as SearchBarProps)
)
.add('without switch query language', () =>
wrapSearchBarInContext({
disableQueryLanguageSwitcher: true,
} as SearchBarProps)
)
.add('show only query bar without submit', () =>
wrapSearchBarInContext({
showDatePicker: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export interface QueryBarMenuProps extends WithCloseFilterEditorConfirmModalProp
toggleFilterBarMenuPopover: (value: boolean) => void;
openQueryBarMenu: boolean;
nonKqlMode?: 'lucene' | 'text';
disableQueryLanguageSwitcher?: boolean;
dateRangeFrom?: string;
dateRangeTo?: string;
savedQueryService: SavedQueryService;
Expand All @@ -72,6 +73,7 @@ export interface QueryBarMenuProps extends WithCloseFilterEditorConfirmModalProp
function QueryBarMenuComponent({
language,
nonKqlMode,
disableQueryLanguageSwitcher,
dateRangeFrom,
dateRangeTo,
onQueryChange,
Expand Down Expand Up @@ -158,6 +160,7 @@ function QueryBarMenuComponent({
manageFilterSetComponent,
hiddenPanelOptions,
nonKqlMode,
disableQueryLanguageSwitcher,
closePopover: plainClosePopover,
onQueryBarSubmit,
onFiltersUpdated,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ export interface QueryBarMenuPanelsProps {
manageFilterSetComponent?: JSX.Element;
hiddenPanelOptions?: FilterPanelOption[];
nonKqlMode?: 'lucene' | 'text';
disableQueryLanguageSwitcher?: boolean;
closePopover: () => void;
onQueryBarSubmit: (payload: { dateRange: TimeRange; query?: Query }) => void;
onFiltersUpdated?: (filters: Filter[]) => void;
Expand All @@ -170,6 +171,7 @@ export function QueryBarMenuPanels({
manageFilterSetComponent,
hiddenPanelOptions,
nonKqlMode,
disableQueryLanguageSwitcher = false,
closePopover,
onQueryBarSubmit,
onFiltersUpdated,
Expand Down Expand Up @@ -384,7 +386,7 @@ export function QueryBarMenuPanels({
}

// language menu appears when the showQueryInput is true
if (showQueryInput) {
if (showQueryInput && !disableQueryLanguageSwitcher) {
items.push({
name: `Language: ${language === 'kuery' ? kqlLabel : luceneLabel}`,
panel: 3,
Expand Down
2 changes: 2 additions & 0 deletions src/plugins/unified_search/public/search_bar/search_bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export interface SearchBarOwnProps<QT extends AggregateQuery | Query = Query> {
isClearable?: boolean;
iconType?: EuiIconProps['type'];
nonKqlMode?: 'lucene' | 'text';
disableQueryLanguageSwitcher?: boolean;
// defines padding and border; use 'inPage' to avoid any padding or border;
// use 'detached' if the searchBar appears at the very top of the view, without any wrapper
displayStyle?: 'inPage' | 'detached';
Expand Down Expand Up @@ -472,6 +473,7 @@ class SearchBarUI<QT extends (Query | AggregateQuery) | Query = Query> extends C
const queryBarMenu = this.props.showQueryMenu ? (
<QueryBarMenu
nonKqlMode={this.props.nonKqlMode}
disableQueryLanguageSwitcher={this.props.disableQueryLanguageSwitcher}
language={
this.state.query && isOfQueryType(this.state?.query)
? this.state?.query?.language
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const ActionAlertsFilterQuery: React.FC<ActionAlertsFilterQueryProps> = (
<EuiSpacer size="s" />
<AlertsSearchBar
appName="siem"
disableQueryLanguageSwitcher={true}
featureIds={['siem']}
query={query.kql}
filters={query.filters ?? []}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { TriggersAndActionsUiServices } from '../../..';
// TODO Share buildEsQuery to be used between AlertsSearchBar and AlertsStateTable component https://github.com/elastic/kibana/issues/144615
export function AlertsSearchBar({
appName,
disableQueryLanguageSwitcher = false,
featureIds,
query,
filters,
Expand Down Expand Up @@ -70,6 +71,7 @@ export function AlertsSearchBar({
return (
<SearchBar
appName={appName}
disableQueryLanguageSwitcher={disableQueryLanguageSwitcher}
indexPatterns={loading || error ? NO_INDEX_PATTERNS : [dataView!]}
placeholder={placeholder}
query={{ query: query ?? '', language: queryLanguage }}
Expand All @@ -82,6 +84,8 @@ export function AlertsSearchBar({
onFiltersUpdated={onFiltersUpdated}
onRefresh={onRefresh}
showDatePicker={showDatePicker}
showQueryInput={true}
showSaveQuery={true}
showSubmitButton={showSubmitButton}
submitOnBlur={submitOnBlur}
onQueryChange={onSearchQueryChange}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type QueryLanguageType = 'lucene' | 'kuery';

export interface AlertsSearchBarProps {
appName: string;
disableQueryLanguageSwitcher?: boolean;
featureIds: ValidFeatureId[];
rangeFrom?: string;
rangeTo?: string;
Expand Down