Merge branch 'main' into 150681-track-default-cloud-provider

.github/CODEOWNERS

@@ -583,7 +583,7 @@ packages/kbn-config-mocks @elastic/kibana-core
 packages/kbn-config-schema @elastic/kibana-core
 src/plugins/console @elastic/platform-deployment-management
 packages/content-management/content_editor @elastic/appex-sharedux
-src/plugins/content_management @elastic/kibana-global-experience
+src/plugins/content_management @elastic/appex-sharedux
 packages/content-management/table_list @elastic/appex-sharedux
 examples/controls_example @elastic/kibana-presentation
 src/plugins/controls @elastic/kibana-presentation

fleet_packages.json

@@ -20,7 +20,7 @@
 [
  {
  "name": "apm",
- "version": "8.7.0-preview-1675078021",
+ "version": "8.8.0-preview-1675842740",
  "forceAlignStackVersion": true
  },
  {
@@ -29,7 +29,7 @@
  },
  {
  "name": "endpoint",
- "version": "8.7.0-next"
+ "version": "8.7.0"
  },
  {
  "name": "fleet_server",

packages/core/chrome/core-chrome-browser-internal/src/ui/header/nav_link.tsx

@@ -94,7 +94,7 @@ export function createEuiButtonItem({
  navigateToUrl(url);
  },
  isDisabled: disabled,
- dataTestSubj: `collapsibleNavAppButton-${id}`,
+ 'data-test-subj': dataTestSubj || `collapsibleNavAppButton-${id}`,
  };
 }
 

packages/kbn-doc-links/src/get_doc_links.ts

@@ -124,6 +124,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
  },
  enterpriseSearch: {
  apiKeys: `${KIBANA_DOCS}api-keys.html`,
+ behavioralAnalytics: `${ENTERPRISE_SEARCH_DOCS}analytics-overview.html`,
  behavioralAnalyticsEvents: `${ENTERPRISE_SEARCH_DOCS}analytics-events.html`,
  bulkApi: `${ELASTICSEARCH_DOCS}docs-bulk.html`,
  configuration: `${ENTERPRISE_SEARCH_DOCS}configuration.html`,

packages/kbn-doc-links/src/types.ts

@@ -109,6 +109,7 @@ export interface DocLinks {
  };
  readonly enterpriseSearch: {
  readonly apiKeys: string;
+ readonly behavioralAnalytics: string;
  readonly behavioralAnalyticsEvents: string;
  readonly bulkApi: string;
  readonly configuration: string;

packages/kbn-plugin-generator/src/integration_tests/generate_plugin.test.ts

@@ -83,7 +83,6 @@ it('generates a plugin without UI', async () => {
  Array [
  <absolute path>/plugins/bar/.eslintrc.js,
  <absolute path>/plugins/bar/.gitignore,
- <absolute path>/plugins/bar/.i18nrc.json,
  <absolute path>/plugins/bar/common/index.ts,
  <absolute path>/plugins/bar/kibana.json,
  <absolute path>/plugins/bar/package.json,

packages/kbn-plugin-generator/src/render_template.ts

@@ -86,7 +86,7 @@ export async function renderTemplates({
  excludeFiles(
  ([] as string[]).concat(
  answers.ui ? [] : 'public/**/*',
- answers.ui && !answers.internal ? [] : ['translations/**/*', 'i18nrc.json'],
+ answers.ui && !answers.internal ? [] : ['translations/**/*', '.i18nrc.json'],
  answers.server ? [] : 'server/**/*',
  !answers.internal ? [] : ['.eslintrc.js', 'tsconfig.json', 'package.json', '.gitignore']
  )

src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx

@@ -278,7 +278,7 @@ export const getXyChartRenderer = ({
  uiState={handlers.uiState as PersistedState}
  renderComplete={renderComplete}
  />
- </div>{' '}
+ </div>
  </I18nProvider>
  </KibanaThemeProvider>,
  domNode

src/plugins/console/public/application/components/welcome_panel.tsx

@@ -9,7 +9,6 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-// @ts-ignore
 import {
  EuiFlyout,
  EuiFlyoutHeader,

src/plugins/console/public/application/containers/console_history/history_viewer.tsx

@@ -12,7 +12,6 @@ import { i18n } from '@kbn/i18n';
 import { DevToolsSettings } from '../../../services';
 import { subscribeResizeChecker } from '../editor/legacy/subscribe_console_resize_checker';
 
-// @ts-ignore
 import * as InputMode from '../../models/legacy_core_editor/mode/input';
 const inputMode = new InputMode.Mode();
 import * as editor from '../../models/legacy_core_editor';

src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts

@@ -21,8 +21,6 @@ import {
 import { AceTokensProvider } from '../../../lib/ace_token_provider';
 import * as curl from '../sense_editor/curl';
 import smartResize from './smart_resize';
-
-// @ts-ignore
 import * as InputMode from './mode/input';
 
 const _AceRange = ace.acequire('ace/range').Range;
@@ -40,6 +38,9 @@ export class LegacyCoreEditor implements CoreEditor {
  this.editor.setShowPrintMargin(false);
 
  const session = this.editor.getSession();
+ // @ts-expect-error
+ // ignore ts error here due to type definition mistake in brace for setMode(mode: string): void;
+ // this method accepts string or SyntaxMode which is an object. See https://github.com/ajaxorg/ace/blob/13dc911dbc0ea31ca343d5744b3f472767458fc3/ace.d.ts#L467
  session.setMode(new InputMode.Mode());
  (session as unknown as { setFoldStyle: (style: string) => void }).setFoldStyle('markbeginend');
  session.setTabSize(2);

src/plugins/console/public/application/models/legacy_core_editor/mode/input.js → src/plugins/console/public/application/models/legacy_core_editor/mode/input.ts

@@ -10,7 +10,6 @@ import ace from 'brace';
 import { workerModule } from './worker';
 import { ScriptMode } from './script';
 
-const oop = ace.acequire('ace/lib/oop');
 const TextMode = ace.acequire('ace/mode/text').Mode;
 
 const MatchingBraceOutdent = ace.acequire('ace/mode/matching_brace_outdent').MatchingBraceOutdent;
@@ -21,24 +20,26 @@ const AceTokenizer = ace.acequire('ace/tokenizer').Tokenizer;
 
 import { InputHighlightRules } from './input_highlight_rules';
 
-export function Mode() {
- this.$tokenizer = new AceTokenizer(new InputHighlightRules().getRules());
- this.$outdent = new MatchingBraceOutdent();
- this.$behaviour = new CstyleBehaviour();
- this.foldingRules = new CStyleFoldMode();
- this.createModeDelegates({
- 'script-': ScriptMode,
- });
+export class Mode extends TextMode {
+ constructor() {
+ super();
+ this.$tokenizer = new AceTokenizer(new InputHighlightRules().getRules());
+ this.$outdent = new MatchingBraceOutdent();
+ this.$behaviour = new CstyleBehaviour();
+ this.foldingRules = new CStyleFoldMode();
+ this.createModeDelegates({
+ 'script-': ScriptMode,
+ });
+ }
 }
-oop.inherits(Mode, TextMode);
 
-(function () {
+(function (this: Mode) {
  this.getCompletions = function () {
  // autocomplete is done by the autocomplete module.
  return [];
  };
 
- this.getNextLineIndent = function (state, line, tab) {
+ this.getNextLineIndent = function (state: string, line: string, tab: string) {
  let indent = this.$getIndent(line);
 
  if (state !== 'string_literal') {
@@ -51,21 +52,24 @@ oop.inherits(Mode, TextMode);
  return indent;
  };
 
- this.checkOutdent = function (state, line, input) {
+ this.checkOutdent = function (state: unknown, line: string, input: string) {
  return this.$outdent.checkOutdent(line, input);
  };
 
- this.autoOutdent = function (state, doc, row) {
+ this.autoOutdent = function (state: unknown, doc: string, row: string) {
  this.$outdent.autoOutdent(doc, row);
  };
- this.createWorker = function (session) {
+ this.createWorker = function (session: {
+ getDocument: () => string;
+ setAnnotations: (arg0: unknown) => void;
+ }) {
  const worker = new WorkerClient(['ace', 'sense_editor'], workerModule, 'SenseWorker');
  worker.attachToDocument(session.getDocument());
- worker.on('error', function (e) {
+ worker.on('error', function (e: { data: unknown }) {
  session.setAnnotations([e.data]);
  });
 
- worker.on('ok', function (anno) {
+ worker.on('ok', function (anno: { data: unknown }) {
  session.setAnnotations(anno.data);
  });