Merge branch 'main' into fix/team-2022

Author: tsullivan

.gitignore

@@ -19,6 +19,7 @@ target
 /build
 .jruby
 .idea
+.claude
 .windsurf
 *.iml
 *.log

package.json

@@ -1148,7 +1148,7 @@
     "@langchain/langgraph": "^0.2.45",
     "@langchain/langgraph-checkpoint": "~0.0.17",
     "@langchain/openai": "^0.4.4",
-    "@launchdarkly/node-server-sdk": "^9.10.1",
+    "@launchdarkly/node-server-sdk": "^9.10.2",
     "@launchdarkly/openfeature-node-server": "^1.1.0",
     "@loaders.gl/core": "^3.4.7",
     "@loaders.gl/json": "^3.4.7",

packages/kbn-optimizer/limits.yml

@@ -11,7 +11,7 @@ pageLoadAssetSize:
   canvas: 15210
   cases: 153204
   charts: 40269
-  cloud: 8836
+  cloud: 9012
   cloudDataMigration: 5687
   cloudExperiments: 103984
   cloudFullStory: 4752

src/platform/packages/private/kbn-esql-editor/src/editor_footer/errors_warnings_popover.tsx

@@ -7,25 +7,26 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import React, { useCallback, useMemo } from 'react';
-import { i18n } from '@kbn/i18n';
 import {
+  EuiButtonEmpty,
+  EuiDescriptionList,
+  EuiDescriptionListDescription,
   EuiFlexGroup,
   EuiFlexItem,
   EuiIcon,
   EuiPopover,
-  EuiDescriptionList,
-  EuiDescriptionListDescription,
-  EuiButtonEmpty,
-  euiTextBreakWord,
   EuiSwitch,
   EuiText,
+  euiTextBreakWord,
   useEuiTheme,
 } from '@elastic/eui';
-import { css } from '@emotion/react';
 import { css as classNameCss } from '@emotion/css';
+import { css } from '@emotion/react';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { filterDataErrors, type MonacoMessage } from '../helpers';
+import React, { useCallback, useMemo } from 'react';
+import type { MonacoMessage } from '@kbn/monaco/src/languages/esql/language';
+import { filterDataErrors } from '../helpers';
 import type { DataErrorsControl } from '../types';
 
 interface TypeConsts {

src/platform/packages/private/kbn-esql-editor/src/editor_footer/index.tsx

@@ -7,32 +7,32 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import React, { memo, useState, useCallback, useMemo } from 'react';
-import { i18n } from '@kbn/i18n';
 import {
-  EuiText,
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiCode,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiCode,
-  EuiButtonIcon,
-  EuiButtonEmpty,
+  EuiText,
   EuiToolTip,
 } from '@elastic/eui';
 import type { Interpolation, Theme } from '@emotion/react';
 import { css } from '@emotion/react';
+import { getLimitFromESQLQuery } from '@kbn/esql-utils';
+import { i18n } from '@kbn/i18n';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
-  LanguageDocumentationInline,
   LanguageDocumentationFlyout,
+  LanguageDocumentationInline,
 } from '@kbn/language-documentation';
-import { getLimitFromESQLQuery } from '@kbn/esql-utils';
-import { type MonacoMessage } from '../helpers';
+import React, { memo, useCallback, useMemo, useState } from 'react';
+import type { MonacoMessage } from '@kbn/monaco/src/languages/esql/language';
+import type { DataErrorsControl, ESQLEditorDeps } from '../types';
 import { ErrorsWarningsFooterPopover } from './errors_warnings_popover';
-import { QueryHistoryAction, HistoryAndStarredQueriesTabs } from './history_starred_queries';
 import { SubmitFeedbackComponent } from './feedback_component';
-import { QueryWrapComponent } from './query_wrap_component';
+import { HistoryAndStarredQueriesTabs, QueryHistoryAction } from './history_starred_queries';
 import { KeyboardShortcuts } from './keyboard_shortcuts';
-import type { DataErrorsControl, ESQLEditorDeps } from '../types';
+import { QueryWrapComponent } from './query_wrap_component';
 
 const isMac = navigator.platform.toLowerCase().indexOf('mac') >= 0;
 const COMMAND_KEY = isMac ? '⌘' : '^';

src/platform/packages/private/kbn-esql-editor/src/esql_editor.test.tsx

@@ -7,19 +7,19 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import React from 'react';
-import userEvent from '@testing-library/user-event';
-import { BehaviorSubject } from 'rxjs';
+import type { SerializedStyles } from '@emotion/react';
 import type { IUiSettingsClient } from '@kbn/core/public';
-import { renderWithI18n } from '@kbn/test-jest-helpers';
-import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
-import { ESQLEditor } from './esql_editor';
-import type { ESQLEditorProps } from './types';
 import { coreMock } from '@kbn/core/public/mocks';
 import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { renderWithI18n } from '@kbn/test-jest-helpers';
 import { waitFor } from '@testing-library/dom';
 import { act } from '@testing-library/react';
-import type { SerializedStyles } from '@emotion/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { BehaviorSubject } from 'rxjs';
+import { ESQLEditor } from './esql_editor';
+import type { ESQLEditorProps } from './types';
 
 const mockValidate = jest.fn().mockResolvedValue({ errors: [], warnings: [] });
 jest.mock('@kbn/monaco', () => ({
@@ -212,37 +212,68 @@ describe('ESQLEditor', () => {
     expect(queryByTestId('ESQLEditor-run-query-button')).not.toBeInTheDocument();
   });
 
-  it('should render the data errors switch if the dataErrorsControl prop is set', async () => {
-    const newProps = {
-      ...props,
-      dataErrorsControl: { enabled: true, onChange: jest.fn() },
-    };
-    mockValidate.mockResolvedValue({
-      errors: [{ message: 'Data error example', severity: 'error' }],
-      warnings: [],
-    });
-    const { queryByTestId } = renderWithI18n(renderESQLEditorComponent(newProps));
-    await waitFor(() => {
-      expect(queryByTestId('ESQLEditor-footerPopoverButton-error')).toBeInTheDocument();
-    });
-    act(() => {
-      queryByTestId('ESQLEditor-footerPopoverButton-error')?.click();
-    });
-    expect(queryByTestId('ESQLEditor-footerPopover-dataErrorsSwitch')).toBeInTheDocument();
-  });
+  describe('data errors switch', () => {
+    test('shown with errors enabled', async () => {
+      const newProps = {
+        ...props,
+        dataErrorsControl: { enabled: true, onChange: jest.fn() },
+      };
+      mockValidate.mockResolvedValue({
+        errors: [
+          { message: 'Data error example', severity: 'error', code: 'unknownColumn' },
+          { message: 'Data error example', severity: 'error', code: 'unknownIndex' },
+        ],
+        warnings: [],
+      });
+      const { queryByTestId, queryAllByText } = renderWithI18n(renderESQLEditorComponent(newProps));
+      await waitFor(() => {
+        expect(queryByTestId('ESQLEditor-footerPopoverButton-error')).toBeInTheDocument();
+      });
+      act(() => {
+        queryByTestId('ESQLEditor-footerPopoverButton-error')?.click();
+      });
+      expect(queryByTestId('ESQLEditor-footerPopover-dataErrorsSwitch')).toBeInTheDocument();
 
-  it('should not render the data errors switch if the dataErrorsControl prop is not set', async () => {
-    mockValidate.mockResolvedValue({
-      errors: [{ message: 'Data error example', severity: 'error' }],
-      warnings: [],
+      expect(queryAllByText('Data error example')).toHaveLength(2);
     });
-    const { queryByTestId } = renderWithI18n(renderESQLEditorComponent(props));
-    await waitFor(() => {
-      expect(queryByTestId('ESQLEditor-footerPopoverButton-error')).toBeInTheDocument();
+
+    test('shown with errors disabled', async () => {
+      const newProps = {
+        ...props,
+        dataErrorsControl: { enabled: false, onChange: jest.fn() },
+      };
+      mockValidate.mockResolvedValue({
+        errors: [
+          { message: 'Data error example', severity: 'error', code: 'unknownColumn' },
+          { message: 'Data error example', severity: 'error', code: 'unknownIndex' },
+        ],
+        warnings: [],
+      });
+      const { queryByTestId, queryAllByText } = renderWithI18n(renderESQLEditorComponent(newProps));
+      await waitFor(() => {
+        expect(queryByTestId('ESQLEditor-footerPopoverButton-error')).toBeInTheDocument();
+      });
+      act(() => {
+        queryByTestId('ESQLEditor-footerPopoverButton-error')?.click();
+      });
+      expect(queryByTestId('ESQLEditor-footerPopover-dataErrorsSwitch')).toBeInTheDocument();
+
+      expect(queryAllByText('Data error example')).toHaveLength(0);
     });
-    act(() => {
-      queryByTestId('ESQLEditor-footerPopoverButton-error')?.click();
+
+    test('not shown when prop not set', async () => {
+      mockValidate.mockResolvedValue({
+        errors: [{ message: 'Data error example', severity: 'error' }],
+        warnings: [],
+      });
+      const { queryByTestId } = renderWithI18n(renderESQLEditorComponent(props));
+      await waitFor(() => {
+        expect(queryByTestId('ESQLEditor-footerPopoverButton-error')).toBeInTheDocument();
+      });
+      act(() => {
+        queryByTestId('ESQLEditor-footerPopoverButton-error')?.click();
+      });
+      expect(queryByTestId('ESQLEditor-footerPopover-dataErrorsSwitch')).not.toBeInTheDocument();
     });
-    expect(queryByTestId('ESQLEditor-footerPopover-dataErrorsSwitch')).not.toBeInTheDocument();
   });
 });

src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx

@@ -8,74 +8,74 @@
  */
 
 import {
+  EuiButton,
+  EuiDatePicker,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiFormLabel,
   EuiOutsideClickDetector,
-  useEuiTheme,
-  EuiDatePicker,
   EuiToolTip,
-  EuiButton,
-  type EuiButtonColor,
+  useEuiTheme,
   useGeneratedHtmlId,
-  EuiFormLabel,
+  type EuiButtonColor,
 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import moment from 'moment';
-import { isEqual, memoize } from 'lodash';
+import { Global, css } from '@emotion/react';
 import type { CodeEditorProps } from '@kbn/code-editor';
 import { CodeEditor } from '@kbn/code-editor';
-import type { SerializedEnrichPolicy } from '@kbn/index-management-shared-types';
-import useObservable from 'react-use/lib/useObservable';
-import { KBN_FIELD_TYPES } from '@kbn/field-types';
 import type { CoreStart } from '@kbn/core/public';
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import type { AggregateQuery, TimeRange } from '@kbn/es-query';
+import type { FieldType } from '@kbn/esql-ast';
+import type { ESQLFieldWithMetadata } from '@kbn/esql-ast/src/commands_registry/types';
+import {
+  ESQLVariableType,
+  type ESQLControlVariable,
+  type IndicesAutocompleteResult,
+} from '@kbn/esql-types';
+import { fixESQLQueryWithVariables, getRemoteClustersFromESQLQuery } from '@kbn/esql-utils';
 import type { ExpressionsStart } from '@kbn/expressions-plugin/public';
+import { KBN_FIELD_TYPES } from '@kbn/field-types';
+import { i18n } from '@kbn/i18n';
+import type { SerializedEnrichPolicy } from '@kbn/index-management-shared-types';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import type { ILicense } from '@kbn/licensing-types';
 import { ESQLLang, ESQL_LANG_ID, monaco, type ESQLCallbacks } from '@kbn/monaco';
+import type { MonacoMessage } from '@kbn/monaco/src/languages/esql/language';
+import { isEqual, memoize } from 'lodash';
+import moment from 'moment';
 import type { ComponentProps } from 'react';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { fixESQLQueryWithVariables, getRemoteClustersFromESQLQuery } from '@kbn/esql-utils';
 import { createPortal } from 'react-dom';
-import { css, Global } from '@emotion/react';
-import {
-  ESQLVariableType,
-  type ESQLControlVariable,
-  type IndicesAutocompleteResult,
-} from '@kbn/esql-types';
-import type { ESQLFieldWithMetadata } from '@kbn/esql-ast/src/commands_registry/types';
-import type { FieldType } from '@kbn/esql-ast';
+import useObservable from 'react-use/lib/useObservable';
+import { useCanCreateLookupIndex, useLookupIndexCommand } from './custom_commands';
 import { EditorFooter } from './editor_footer';
+import {
+  EDITOR_INITIAL_HEIGHT,
+  EDITOR_INITIAL_HEIGHT_INLINE_EDITING,
+  EDITOR_MAX_HEIGHT,
+  RESIZABLE_CONTAINER_INITIAL_HEIGHT,
+  esqlEditorStyles,
+} from './esql_editor.styles';
 import { fetchFieldsFromESQL } from './fetch_fields_from_esql';
 import {
   clearCacheWhenOld,
+  filterDataErrors,
   getESQLSources,
+  getEditorOverwrites,
+  onKeyDownResizeHandler,
+  onMouseDownResizeHandler,
   parseErrors,
   parseWarning,
   useDebounceWithOptions,
-  onKeyDownResizeHandler,
-  onMouseDownResizeHandler,
-  getEditorOverwrites,
-  type MonacoMessage,
-  filterDataErrors,
 } from './helpers';
 import { addQueriesToCache } from './history_local_storage';
 import { ResizableButton } from './resizable_button';
-import {
-  EDITOR_INITIAL_HEIGHT,
-  EDITOR_INITIAL_HEIGHT_INLINE_EDITING,
-  RESIZABLE_CONTAINER_INITIAL_HEIGHT,
-  EDITOR_MAX_HEIGHT,
-  esqlEditorStyles,
-} from './esql_editor.styles';
+import { useRestorableState, withRestorableState } from './restorable_state';
 import type {
-  ESQLEditorProps as ESQLEditorPropsInternal,
-  ESQLEditorDeps,
   ControlsContext,
+  ESQLEditorDeps,
+  ESQLEditorProps as ESQLEditorPropsInternal,
 } from './types';
-import { useRestorableState, withRestorableState } from './restorable_state';
-import { useCanCreateLookupIndex, useLookupIndexCommand } from './custom_commands';
 
 // for editor width smaller than this value we want to start hiding some text
 const BREAKPOINT_WIDTH = 540;
@@ -687,7 +687,13 @@ const ESQLEditorInternal = function ESQLEditor({
       }
       if (active) {
         setEditorMessages({ errors: parserErrors, warnings: parserWarnings });
-        monaco.editor.setModelMarkers(editorModel.current, 'Unified search', markers);
+        monaco.editor.setModelMarkers(
+          editorModel.current,
+          'Unified search',
+          // don't show the code in the editor
+          // but we need it above
+          markers.map((m) => ({ ...m, code: undefined }))
+        );
         return;
       }
     },