Merge branch 'main' into eui/41-2-0

elastic · Dec 2, 2021 · e78af33 · e78af33
2 parents 65290a9 + 9043979
commit e78af33
Show file tree

Hide file tree

Showing 195 changed files with 3,775 additions and 3,297 deletions.
diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
@@ -28,6 +28,11 @@ if [[ "${GITHUB_PR_LABELS:-}" == *"ci:deploy-cloud"* ]]; then
     --skip-docker-ubi \
     --skip-docker-centos \
     --skip-docker-contexts
+
+  CLOUD_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-cloud)
+  cat << EOF | buildkite-agent annotate --style "info" --context cloud-image
+    Cloud image: $CLOUD_IMAGE
+EOF
 fi
 
 echo "--- Archive Kibana Distribution"

diff --git a/packages/kbn-babel-preset/BUILD.bazel b/packages/kbn-babel-preset/BUILD.bazel
@@ -1,4 +1,5 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+load("//src/dev/bazel:index.bzl", "pkg_npm")
 
 PKG_BASE_NAME = "kbn-babel-preset"
 PKG_REQUIRE_NAME = "@kbn/babel-preset"
@@ -24,7 +25,7 @@ NPM_MODULE_EXTRA_FILES = [
   "README.md",
 ]
 
-DEPS = [
+RUNTIME_DEPS = [
   "@npm//@babel/plugin-proposal-class-properties",
   "@npm//@babel/plugin-proposal-export-namespace-from",
   "@npm//@babel/plugin-proposal-nullish-coalescing-operator",
@@ -46,7 +47,7 @@ js_library(
   srcs = NPM_MODULE_EXTRA_FILES + [
     ":srcs",
   ],
-  deps = DEPS,
+  deps = RUNTIME_DEPS,
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )

diff --git a/packages/kbn-react-field/BUILD.bazel b/packages/kbn-react-field/BUILD.bazel
@@ -42,7 +42,6 @@ RUNTIME_DEPS = [
 ]
 
 TYPES_DEPS = [
-  "//packages/kbn-babel-preset",
   "//packages/kbn-i18n",
   "@npm//tslib",
   "@npm//@types/jest",

diff --git a/packages/kbn-rule-data-utils/src/technical_field_names.ts b/packages/kbn-rule-data-utils/src/technical_field_names.ts
@@ -13,7 +13,6 @@ const KIBANA_NAMESPACE = 'kibana' as const;
 const ALERT_NAMESPACE = `${KIBANA_NAMESPACE}.alert` as const;
 const ALERT_RULE_NAMESPACE = `${ALERT_NAMESPACE}.rule` as const;
 
-const CONSUMERS = `${KIBANA_NAMESPACE}.consumers` as const;
 const ECS_VERSION = 'ecs.version' as const;
 const EVENT_ACTION = 'event.action' as const;
 const EVENT_KIND = 'event.kind' as const;
@@ -85,7 +84,6 @@ const namespaces = {
 };
 
 const fields = {
-  CONSUMERS,
   ECS_VERSION,
   EVENT_KIND,
   EVENT_ACTION,
@@ -187,7 +185,6 @@ export {
   ALERT_START,
   ALERT_SYSTEM_STATUS,
   ALERT_UUID,
-  CONSUMERS,
   ECS_VERSION,
   EVENT_ACTION,
   EVENT_KIND,

diff --git a/packages/kbn-ui-shared-deps-src/BUILD.bazel b/packages/kbn-ui-shared-deps-src/BUILD.bazel
@@ -45,7 +45,6 @@ TYPES_DEPS = [
   "//packages/elastic-datemath:npm_module_types",
   "//packages/elastic-safer-lodash-set",
   "//packages/kbn-analytics:npm_module_types",
-  "//packages/kbn-babel-preset",
   "//packages/kbn-i18n:npm_module_types",
   "//packages/kbn-i18n-react:npm_module_types",
   "//packages/kbn-monaco",

diff --git a/src/plugins/discover/public/application/context/context_app_content.tsx b/src/plugins/discover/public/application/context/context_app_content.tsx
@@ -15,14 +15,15 @@ import { SortDirection } from '../../../../data/public';
 import { LoadingStatus } from './services/context_query_state';
 import { ActionBar } from './components/action_bar/action_bar';
 import { DiscoverGrid } from '../../components/discover_grid/discover_grid';
-import { DocViewFilterFn, ElasticSearchHit } from '../../services/doc_views/doc_views_types';
+import { DocViewFilterFn } from '../../services/doc_views/doc_views_types';
 import { AppState } from './services/context_state';
 import { SurrDocType } from './services/context';
 import { DiscoverServices } from '../../build_services';
 import { MAX_CONTEXT_SIZE, MIN_CONTEXT_SIZE } from './services/constants';
 import { DocTableContext } from '../../components/doc_table/doc_table_context';
 import { EsHitRecordList } from '../types';
 import { SortPairArr } from '../../components/doc_table/lib/get_sort';
+import { ElasticSearchHit } from '../../types';
 
 export interface ContextAppContentProps {
   columns: string[];

diff --git a/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_documents.test.tsx
@@ -17,8 +17,8 @@ import { DataDocuments$ } from '../../utils/use_saved_search';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 import { FetchStatus } from '../../../types';
 import { DiscoverDocuments } from './discover_documents';
-import { ElasticSearchHit } from '../../../../services/doc_views/doc_views_types';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
+import { ElasticSearchHit } from 'src/plugins/discover/public/types';
 
 jest.mock('../../../../kibana_services', () => ({
   ...jest.requireActual('../../../../kibana_services'),

diff --git a/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx b/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
@@ -14,7 +14,7 @@ import {
   EuiScreenReaderOnly,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DocViewFilterFn, ElasticSearchHit } from '../../../../services/doc_views/doc_views_types';
+import { DocViewFilterFn } from '../../../../services/doc_views/doc_views_types';
 import { DiscoverGrid } from '../../../../components/discover_grid/discover_grid';
 import { FetchStatus } from '../../../types';
 import {
@@ -32,6 +32,7 @@ import { AppState, GetStateReturn } from '../../services/discover_state';
 import { useDataState } from '../../utils/use_data_state';
 import { DocTableInfinite } from '../../../../components/doc_table/doc_table_infinite';
 import { SortPairArr } from '../../../../components/doc_table/lib/get_sort';
+import { ElasticSearchHit } from '../../../../types';
 
 const DocTableInfiniteMemoized = React.memo(DocTableInfinite);
 const DataGridMemoized = React.memo(DiscoverGrid);
@@ -54,7 +55,7 @@ function DiscoverDocumentsComponent({
   onAddFilter: DocViewFilterFn;
   savedSearch: SavedSearch;
   services: DiscoverServices;
-  setExpandedDoc: (doc: ElasticSearchHit | undefined) => void;
+  setExpandedDoc: (doc?: ElasticSearchHit) => void;
   state: AppState;
   stateContainer: GetStateReturn;
 }) {

diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
@@ -28,10 +28,10 @@ import {
 } from '../../utils/use_saved_search';
 import { discoverServiceMock } from '../../../../__mocks__/services';
 import { FetchStatus } from '../../../types';
-import { ElasticSearchHit } from '../../../../services/doc_views/doc_views_types';
 import { RequestAdapter } from '../../../../../../inspector';
 import { Chart } from '../chart/point_series';
 import { DiscoverSidebar } from '../sidebar/discover_sidebar';
+import { ElasticSearchHit } from '../../../../types';
 
 jest.mock('../../../../kibana_services', () => ({
   ...jest.requireActual('../../../../kibana_services'),
@@ -150,6 +150,7 @@ function getProps(indexPattern: IndexPattern, wasSidebarClosed?: boolean): Disco
     services,
     state: { columns: [] },
     stateContainer: {} as GetStateReturn,
+    setExpandedDoc: jest.fn(),
   };
 }
 

diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
@@ -29,7 +29,7 @@ import { DiscoverLayoutProps } from './types';
 import { SEARCH_FIELDS_FROM_SOURCE, SHOW_FIELD_STATISTICS } from '../../../../../common';
 import { popularizeField } from '../../../../utils/popularize_field';
 import { DiscoverTopNav } from '../top_nav/discover_topnav';
-import { DocViewFilterFn, ElasticSearchHit } from '../../../../services/doc_views/doc_views_types';
+import { DocViewFilterFn } from '../../../../services/doc_views/doc_views_types';
 import { DiscoverChart } from '../chart';
 import { getResultState } from '../../utils/get_result_state';
 import { InspectorSession } from '../../../../../../inspector/public';
@@ -62,9 +62,11 @@ export function DiscoverLayout({
   indexPattern,
   indexPatternList,
   inspectorAdapters,
+  expandedDoc,
   navigateTo,
   onChangeIndexPattern,
   onUpdateQuery,
+  setExpandedDoc,
   savedSearchRefetch$,
   resetSavedSearch,
   savedSearchData$,
@@ -86,7 +88,6 @@ export function DiscoverLayout({
     spaces,
   } = services;
   const { main$, charts$, totalHits$ } = savedSearchData$;
-  const [expandedDoc, setExpandedDoc] = useState<ElasticSearchHit | undefined>(undefined);
   const [inspectorSession, setInspectorSession] = useState<InspectorSession | undefined>(undefined);
 
   const viewMode = useMemo(() => {

diff --git a/src/plugins/discover/public/application/main/components/layout/types.ts b/src/plugins/discover/public/application/main/components/layout/types.ts
@@ -19,6 +19,7 @@ import { DataRefetch$, SavedSearchData } from '../../utils/use_saved_search';
 import { DiscoverServices } from '../../../../build_services';
 import { SavedSearch } from '../../../../services/saved_searches';
 import { RequestAdapter } from '../../../../../../inspector';
+import { ElasticSearchHit } from '../../../../types';
 
 export interface DiscoverLayoutProps {
   indexPattern: IndexPattern;
@@ -28,6 +29,8 @@ export interface DiscoverLayoutProps {
   onChangeIndexPattern: (id: string) => void;
   onUpdateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
   resetSavedSearch: () => void;
+  expandedDoc?: ElasticSearchHit;
+  setExpandedDoc: (doc?: ElasticSearchHit) => void;
   savedSearch: SavedSearch;
   savedSearchData$: SavedSearchData;
   savedSearchRefetch$: DataRefetch$;

diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.test.tsx
@@ -19,10 +19,10 @@ import { flattenHit, IndexPatternAttributes } from '../../../../../../data/commo
 import { SavedObject } from '../../../../../../../core/types';
 import { getDefaultFieldFilter } from './lib/field_filter';
 import { DiscoverSidebarComponent as DiscoverSidebar } from './discover_sidebar';
-import { ElasticSearchHit } from '../../../../services/doc_views/doc_views_types';
 import { discoverServiceMock as mockDiscoverServices } from '../../../../__mocks__/services';
 import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
+import { ElasticSearchHit } from '../../../../types';
 
 jest.mock('../../../../kibana_services', () => ({
   getServices: () => mockDiscoverServices,

diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
@@ -39,8 +39,8 @@ import { FieldFilterState, getDefaultFieldFilter, setFieldFilterProp } from './l
 import { getIndexPatternFieldList } from './lib/get_index_pattern_field_list';
 import { DiscoverSidebarResponsiveProps } from './discover_sidebar_responsive';
 import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
-import { ElasticSearchHit } from '../../../../services/doc_views/doc_views_types';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
+import { ElasticSearchHit } from '../../../../types';
 
 /**
  * Default number of available fields displayed and added on scroll

diff --git a/.../discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx b/.../discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
@@ -22,11 +22,11 @@ import {
   DiscoverSidebarResponsiveProps,
 } from './discover_sidebar_responsive';
 import { DiscoverServices } from '../../../../build_services';
-import { ElasticSearchHit } from '../../../../services/doc_views/doc_views_types';
 import { FetchStatus } from '../../../types';
 import { DataDocuments$ } from '../../utils/use_saved_search';
 import { stubLogstashIndexPattern } from '../../../../../../data/common/stubs';
 import { VIEW_MODE } from '../../../../components/view_mode_toggle';
+import { ElasticSearchHit } from '../../../../types';
 
 const mockServices = {
   history: () => ({

diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/get_details.ts
@@ -9,7 +9,7 @@
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
 import { IndexPattern, IndexPatternField } from '../../../../../../../data/public';
-import { ElasticSearchHit } from '../../../../../services/doc_views/doc_views_types';
+import { ElasticSearchHit } from '../../../../../types';
 
 export function getDetails(
   field: IndexPatternField,

diff --git a/src/plugins/discover/public/application/main/discover_main_app.tsx b/src/plugins/discover/public/application/main/discover_main_app.tsx
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { History } from 'history';
 import { DiscoverLayout } from './components/layout';
 import { setBreadcrumbsTitle } from '../../utils/breadcrumbs';
@@ -15,6 +15,7 @@ import { useUrl } from './utils/use_url';
 import { IndexPatternAttributes, SavedObject } from '../../../../data/common';
 import { DiscoverServices } from '../../build_services';
 import { SavedSearch } from '../../services/saved_searches';
+import { ElasticSearchHit } from '../../types';
 
 const DiscoverLayoutMemoized = React.memo(DiscoverLayout);
 
@@ -40,6 +41,7 @@ export interface DiscoverMainProps {
 export function DiscoverMainApp(props: DiscoverMainProps) {
   const { savedSearch, services, history, indexPatternList } = props;
   const { chrome, docLinks, uiSettings: config, data } = services;
+  const [expandedDoc, setExpandedDoc] = useState<ElasticSearchHit | undefined>(undefined);
   const navigateTo = useCallback(
     (path: string) => {
       history.push(path);
@@ -65,6 +67,7 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
     services,
     history,
     savedSearch,
+    setExpandedDoc,
   });
 
   /**
@@ -100,9 +103,11 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
       indexPattern={indexPattern}
       indexPatternList={indexPatternList}
       inspectorAdapters={inspectorAdapters}
+      expandedDoc={expandedDoc}
       onChangeIndexPattern={onChangeIndexPattern}
       onUpdateQuery={onUpdateQuery}
       resetSavedSearch={resetCurrentSavedSearch}
+      setExpandedDoc={setExpandedDoc}
       navigateTo={navigateTo}
       savedSearch={savedSearch}
       savedSearchData$={data$}

diff --git a/src/plugins/discover/public/application/main/utils/calc_field_counts.test.ts b/src/plugins/discover/public/application/main/utils/calc_field_counts.test.ts
@@ -8,7 +8,7 @@
 
 import { calcFieldCounts } from './calc_field_counts';
 import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { ElasticSearchHit } from '../../../services/doc_views/doc_views_types';
+import { ElasticSearchHit } from '../../../types';
 
 describe('calcFieldCounts', () => {
   test('returns valid field count data', async () => {

diff --git a/src/plugins/discover/public/application/main/utils/calc_field_counts.ts b/src/plugins/discover/public/application/main/utils/calc_field_counts.ts
@@ -7,7 +7,7 @@
  */
 
 import { flattenHit, IndexPattern } from '../../../../../data/common';
-import { ElasticSearchHit } from '../../../services/doc_views/doc_views_types';
+import { ElasticSearchHit } from '../../../types';
 
 /**
  * This function is recording stats of the available fields, for usage in sidebar and sharing

diff --git a/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts b/src/plugins/discover/public/application/main/utils/use_discover_state.test.ts
@@ -37,6 +37,7 @@ describe('test useDiscoverState', () => {
         services: discoverServiceMock,
         history,
         savedSearch: savedSearchMock,
+        setExpandedDoc: jest.fn(),
       });
     });
     expect(result.current.state.index).toBe(indexPatternMock.id);
@@ -53,6 +54,7 @@ describe('test useDiscoverState', () => {
         services: discoverServiceMock,
         history,
         savedSearch: savedSearchMock,
+        setExpandedDoc: jest.fn(),
       });
     });
     await act(async () => {
@@ -69,6 +71,7 @@ describe('test useDiscoverState', () => {
         services: discoverServiceMock,
         history,
         savedSearch: savedSearchMock,
+        setExpandedDoc: jest.fn(),
       });
     });
 

diff --git a/src/plugins/discover/public/application/main/utils/use_discover_state.ts b/src/plugins/discover/public/application/main/utils/use_discover_state.ts
@@ -24,15 +24,18 @@ import { useSearchSession } from './use_search_session';
 import { FetchStatus } from '../../types';
 import { getSwitchIndexPatternAppState } from './get_switch_index_pattern_app_state';
 import { SortPairArr } from '../../../components/doc_table/lib/get_sort';
+import { ElasticSearchHit } from '../../../types';
 
 export function useDiscoverState({
   services,
   history,
   savedSearch,
+  setExpandedDoc,
 }: {
   services: DiscoverServices;
   savedSearch: SavedSearch;
   history: History;
+  setExpandedDoc: (doc?: ElasticSearchHit) => void;
 }) {
   const { uiSettings: config, data, filterManager, indexPatterns, storage } = services;
   const useNewFieldsApi = useMemo(() => !config.get(SEARCH_FIELDS_FROM_SOURCE), [config]);
@@ -186,8 +189,9 @@ export function useDiscoverState({
         );
         stateContainer.setAppState(nextAppState);
       }
+      setExpandedDoc(undefined);
     },
-    [config, indexPattern, indexPatterns, state.columns, state.sort, stateContainer]
+    [config, indexPattern, indexPatterns, setExpandedDoc, state.columns, state.sort, stateContainer]
   );
   /**
    * Function triggered when the user changes the query in the search bar

diff --git a/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts b/src/plugins/discover/public/application/main/utils/use_saved_search.test.ts
@@ -59,6 +59,7 @@ describe('test useSavedSearch', () => {
         services: discoverServiceMock,
         history,
         savedSearch: savedSearchMock,
+        setExpandedDoc: jest.fn(),
       });
     });
 
@@ -100,6 +101,7 @@ describe('test useSavedSearch', () => {
         services: discoverServiceMock,
         history,
         savedSearch: savedSearchMock,
+        setExpandedDoc: jest.fn(),
       });
     });
 

diff --git a/src/plugins/discover/public/application/main/utils/use_saved_search.ts b/src/plugins/discover/public/application/main/utils/use_saved_search.ts
@@ -11,7 +11,6 @@ import { DiscoverServices } from '../../../build_services';
 import { DiscoverSearchSessionManager } from '../services/discover_search_session';
 import { ISearchSource } from '../../../../../data/common';
 import { GetStateReturn } from '../services/discover_state';
-import { ElasticSearchHit } from '../../../services/doc_views/doc_views_types';
 import { RequestAdapter } from '../../../../../inspector/public';
 import type { AutoRefreshDoneFn } from '../../../../../data/public';
 import { validateTimeRange } from './validate_time_range';
@@ -23,6 +22,7 @@ import { fetchAll } from './fetch_all';
 import { useBehaviorSubject } from './use_behavior_subject';
 import { sendResetMsg } from './use_saved_search_messages';
 import { getFetch$ } from './get_fetch_observable';
+import { ElasticSearchHit } from '../../../types';
 
 export interface SavedSearchData {
   main$: DataMain$;

diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid.test.tsx
@@ -16,8 +16,8 @@ import { mountWithIntl } from '@kbn/test/jest';
 import { DiscoverGrid, DiscoverGridProps } from './discover_grid';
 import { uiSettingsMock } from '../../__mocks__/ui_settings';
 import { DiscoverServices } from '../../build_services';
-import { ElasticSearchHit } from '../../services/doc_views/doc_views_types';
 import { getDocId } from './discover_grid_document_selection';
+import { ElasticSearchHit } from '../../types';
 
 jest.mock('../../kibana_services', () => ({
   ...jest.requireActual('../../kibana_services'),