Address code review comments

elastic · Aug 31, 2023 · 6b75898 · 6b75898
1 parent b937d2a
commit 6b75898
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/packages/kbn-text-based-editor/src/helpers.ts b/packages/kbn-text-based-editor/src/helpers.ts
@@ -143,7 +143,7 @@ export const getDocumentationSections = async (language: string) => {
       await import('./esql_documentation_sections');
     groups.push({
       label: i18n.translate('textBasedEditor.query.textBasedLanguagesEditor.esql', {
-        defaultMessage: 'ESQL',
+        defaultMessage: 'ES|QL',
       }),
       items: [],
     });

diff --git a/src/plugins/data/common/search/expressions/esql.ts b/src/plugins/data/common/search/expressions/esql.ts
@@ -92,14 +92,14 @@ export const getEsqlFn = ({ getStartDependencies }: EsqlFnArguments) => {
     type: 'datatable',
     inputTypes: ['kibana_context', 'null'],
     help: i18n.translate('data.search.esql.help', {
-      defaultMessage: 'Queries Elasticsearch using ESQL.',
+      defaultMessage: 'Queries Elasticsearch using ES|QL.',
     }),
     args: {
       query: {
         aliases: ['_', 'q'],
         types: ['string'],
         help: i18n.translate('data.search.esql.query.help', {
-          defaultMessage: 'An ESQL query.',
+          defaultMessage: 'An ES|QL query.',
         }),
       },
       timezone: {

diff --git a/src/plugins/discover/public/application/main/hooks/use_test_based_query_language.test.tsx b/src/plugins/discover/public/application/main/hooks/use_test_based_query_language.test.tsx
@@ -50,7 +50,7 @@ function getHookProps(
     replaceUrlState,
   };
 }
-const query = { esql: 'rom the-data-view-title' };
+const query = { esql: 'from the-data-view-title' };
 const msgComplete = {
   recordRawType: RecordRawType.PLAIN,
   fetchStatus: FetchStatus.PARTIAL,
@@ -108,12 +108,11 @@ describe('useTextBasedQueryLanguage', () => {
         index: 'the-data-view-id',
       });
     });
-    expect(replaceUrlState).toHaveBeenCalledWith({ index: 'the-data-view-id' });
 
     replaceUrlState.mockReset();
 
     stateContainer.dataState.data$.documents$.next(msgComplete);
-    await waitFor(() => expect(replaceUrlState).toHaveBeenCalledTimes(0));
+    expect(replaceUrlState).toHaveBeenCalledTimes(0);
   });
   test('should change viewMode to DOCUMENT_LEVEL if it was AGGREGATED_LEVEL', async () => {
     const { replaceUrlState } = renderHookWithContext(false, {
@@ -284,7 +283,7 @@ describe('useTextBasedQueryLanguage', () => {
       fetchStatus: FetchStatus.LOADING,
       query: { esql: 'from the-data-view-title | WHERE field1=2' },
     });
-    await waitFor(() => expect(replaceUrlState).toHaveBeenCalledTimes(0));
+    expect(replaceUrlState).toHaveBeenCalledTimes(0);
     documents$.next({
       recordRawType: RecordRawType.PLAIN,
       fetchStatus: FetchStatus.PARTIAL,
@@ -297,7 +296,7 @@ describe('useTextBasedQueryLanguage', () => {
       ],
       query: { esql: 'from the-data-view-title | WHERE field1=2' },
     });
-    await waitFor(() => expect(replaceUrlState).toHaveBeenCalledTimes(0));
+    expect(replaceUrlState).toHaveBeenCalledTimes(0);
     stateContainer.appState.getState = jest.fn(() => {
       return { columns: ['field1', 'field2'], index: 'the-data-view-id' };
     });

diff --git a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
@@ -324,7 +324,7 @@ export class SavedSearchEmbeddable
     const useTextBased = this.isTextBasedSearch(savedSearch);
 
     try {
-      // Request SQL data
+      // Request text based data
       if (useTextBased && query) {
         const result = await fetchTextBased(
           savedSearch.searchSource.getField('query')!,

diff --git a/src/plugins/unified_search/public/dataview_picker/change_dataview.tsx b/src/plugins/unified_search/public/dataview_picker/change_dataview.tsx
@@ -340,7 +340,7 @@ export function ChangeDataView({
             data-test-subj="select-text-based-language-panel"
           >
             {i18n.translate('unifiedSearch.query.queryBar.textBasedLanguagesTryLabel', {
-              defaultMessage: 'Try ES | QL',
+              defaultMessage: 'Try ES|QL',
             })}
             <EuiBadge color="hollow">
               {i18n.translate('unifiedSearch.query.queryBar.textBasedLanguagesTechPreviewLabel', {

diff --git a/...ctional/apps/discover/group2/_sql_view.ts → ...tional/apps/discover/group2/_esql_view.ts b/...ctional/apps/discover/group2/_sql_view.ts → ...tional/apps/discover/group2/_esql_view.ts
diff --git a/test/functional/apps/discover/group2/index.ts b/test/functional/apps/discover/group2/index.ts
@@ -32,7 +32,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./_data_grid_pagination'));
     loadTestFile(require.resolve('./_data_grid_footer'));
     loadTestFile(require.resolve('./_adhoc_data_views'));
-    loadTestFile(require.resolve('./_sql_view'));
+    loadTestFile(require.resolve('./_esql_view'));
     loadTestFile(require.resolve('./_indexpattern_with_unmapped_fields'));
     loadTestFile(require.resolve('./_runtime_fields_editor'));
     loadTestFile(require.resolve('./_huge_fields'));

diff --git a/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/lens_configuration_flyout.tsx b/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/lens_configuration_flyout.tsx
@@ -123,7 +123,7 @@ export function LensEditConfigurationFlyout({
               <EuiCallOut
                 size="s"
                 title={i18n.translate('xpack.lens.config.configFlyoutCallout', {
-                  defaultMessage: 'ESQL currently offers limited configuration options',
+                  defaultMessage: 'ES|QL currently offers limited configuration options',
                 })}
                 iconType="iInCircle"
               />

diff --git a/x-pack/plugins/lens/public/datasources/text_based/utils.test.ts b/x-pack/plugins/lens/public/datasources/text_based/utils.test.ts
@@ -69,7 +69,7 @@ describe('Text based languages utils', () => {
 
     it('should return the index pattern for es|ql query', () => {
       const indexPattern = getIndexPatternFromTextBasedQuery({
-        sql: 'from foo | keep bytes, memory ',
+        esql: 'from foo | keep bytes, memory ',
       });
 
       expect(indexPattern).toBe('foo');