github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ES|QL] Improves application messages (#168078)

Browse source
This commit is contained in:
Stratoula Kalafateli 2023-10-05 20:21:22 +03:00 • committed by GitHub
parent cee55e3b50
commit e430a7f9fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/kbn-es-query/src/es_query/es_aggregate_query.ts
View file

@ -28,8 +28,9 @@ export function getAggregateQueryMode(query: AggregateQuery): Language {
return Object.keys(query)[0] as Language;
}
export function getLanguageDisplayName(language: string): string {
return language === 'esql' ? 'es|ql' : language;
export function getLanguageDisplayName(language?: string): string {
const displayName = language && language === 'esql' ? 'es|ql' : language ?? 'es|ql';
return displayName.toUpperCase();
}
// retrieves the index pattern from the aggregate query for SQL

2
packages/kbn-text-based-editor/src/text_based_languages_editor.tsx
View file

@ -580,7 +580,7 @@ export const TextBasedLanguagesEditor = memo(function TextBasedLanguagesEditor({
{documentationSections && (
<EuiFlexItem grow={false}>
<LanguageDocumentationPopover
language={getLanguageDisplayName(String(language)).toUpperCase()}
language={getLanguageDisplayName(String(language))}
sections={documentationSections}
buttonProps={{
color: 'text',

6
src/plugins/unified_search/public/dataview_picker/change_dataview.tsx
View file

@ -120,7 +120,7 @@ export function ChangeDataView({
useEffect(() => {
if (textBasedLanguage) {
setTriggerLabel(getLanguageDisplayName(textBasedLanguage).toUpperCase());
setTriggerLabel(getLanguageDisplayName(textBasedLanguage));
} else {
setTriggerLabel(trigger.label);
}
@ -244,7 +244,9 @@ export function ChangeDataView({
{
defaultMessage:
"Switching data views removes the current {textBasedLanguage} query. Save this search to ensure you don't lose work.",
values: { textBasedLanguage },
values: {
textBasedLanguage: getLanguageDisplayName(textBasedLanguage),
},
}
)}
>

4
src/plugins/unified_search/public/dataview_picker/text_languages_transition_modal.tsx
View file

@ -8,7 +8,7 @@
import React, { useState, useCallback } from 'react';
import { i18n } from '@kbn/i18n';
import { getLanguageDisplayName } from '@kbn/es-query';
import {
EuiModal,
EuiModalBody,
@ -39,7 +39,7 @@ export default function TextBasedLanguagesTransitionModal({
setDismissModalChecked(e.target.checked);
}, []);
const language = textBasedLanguage?.toUpperCase();
const language = getLanguageDisplayName(textBasedLanguage);
return (
<EuiModal onClose={() => setIsTextLangTransitionModalVisible(false)} style={{ width: 700 }}>
<EuiModalHeader>

2
src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
View file

@ -90,7 +90,7 @@ const getWrapperWithTooltip = (
position="top"
content={i18n.translate('unifiedSearch.query.queryBar.textBasedNonTimestampWarning', {
defaultMessage:
'Date range selection for {language} queries requires the presence of an @timestamp field in the dataset.',
'Date range selection for {language} queries requires an @timestamp field in the dataset.',
values: { language: displayName },
})}
>