Merge branch 'main' into issue-116235-disable-aliases-after-delete-or…

…-unshare

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=16.11.1
+ARG NODE_VERSION=16.13.0
 
 FROM node:${NODE_VERSION} AS base
 

.node-version

@@ -1 +1 @@
-16.11.1
+16.13.0

.nvmrc

@@ -1 +1 @@
-16.11.1
+16.13.0

WORKSPACE.bazel

@@ -27,14 +27,14 @@ check_rules_nodejs_version(minimum_version_string = "3.8.0")
 # we can update that rule.
 node_repositories(
   node_repositories = {
-    "16.11.1-darwin_amd64": ("node-v16.11.1-darwin-x64.tar.gz", "node-v16.11.1-darwin-x64", "ba54b8ed504bd934d03eb860fefe991419b4209824280d4274f6a911588b5e45"),
-    "16.11.1-darwin_arm64": ("node-v16.11.1-darwin-arm64.tar.gz", "node-v16.11.1-darwin-arm64", "5e772e478390fab3001b7148a923e4f22fca50170000f18b28475337d3a97248"),
-    "16.11.1-linux_arm64": ("node-v16.11.1-linux-arm64.tar.xz", "node-v16.11.1-linux-arm64", "083fc51f0ea26de9041aaf9821874651a9fd3b20d1cf57071ce6b523a0436f17"),
-    "16.11.1-linux_s390x": ("node-v16.11.1-linux-s390x.tar.xz", "node-v16.11.1-linux-s390x", "855b5c83c2ccb05273d50bb04376335c68d47df57f3187cdebe1f22b972d2825"),
-    "16.11.1-linux_amd64": ("node-v16.11.1-linux-x64.tar.xz", "node-v16.11.1-linux-x64", "493bcc9b660eff983a6de65a0f032eb2717f57207edf74c745bcb86e360310b3"),
-    "16.11.1-windows_amd64": ("node-v16.11.1-win-x64.zip", "node-v16.11.1-win-x64", "4d3c179b82d42e66e321c3948a4e332ed78592917a69d38b86e3a242d7e62fb7"),
+    "16.13.0-darwin_amd64": ("node-v16.13.0-darwin-x64.tar.gz", "node-v16.13.0-darwin-x64", "37e09a8cf2352f340d1204c6154058d81362fef4ec488b0197b2ce36b3f0367a"),
+    "16.13.0-darwin_arm64": ("node-v16.13.0-darwin-arm64.tar.gz", "node-v16.13.0-darwin-arm64", "46d83fc0bd971db5050ef1b15afc44a6665dee40bd6c1cbaec23e1b40fa49e6d"),
+    "16.13.0-linux_arm64": ("node-v16.13.0-linux-arm64.tar.xz", "node-v16.13.0-linux-arm64", "93a0d03f9f802353cb7052bc97a02cd9642b49fa985671cdc16c99936c86d7d2"),
+    "16.13.0-linux_s390x": ("node-v16.13.0-linux-s390x.tar.xz", "node-v16.13.0-linux-s390x", "49e972bf3e969d621157df4c8f2fa18ff748c167d5ebd0efc87e1b9f0c6541cc"),
+    "16.13.0-linux_amd64": ("node-v16.13.0-linux-x64.tar.xz", "node-v16.13.0-linux-x64", "a876ce787133149abd1696afa54b0b5bc5ce3d5ae359081d407ff776e39b7ba8"),
+    "16.13.0-windows_amd64": ("node-v16.13.0-win-x64.zip", "node-v16.13.0-win-x64", "5a39ec5d4786c2814a6c04488bebac6423c2aaa12832b24f0882456f2e4674e1"),
   },
-  node_version = "16.11.1",
+  node_version = "16.13.0",
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],

package.json

@@ -87,7 +87,7 @@
     "**/underscore": "^1.13.1"
   },
   "engines": {
-    "node": "16.11.1",
+    "node": "16.13.0",
     "yarn": "^1.21.1"
   },
   "dependencies": {
@@ -98,7 +98,7 @@
     "@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
     "@elastic/apm-rum": "^5.9.1",
     "@elastic/apm-rum-react": "^1.3.1",
-    "@elastic/charts": "38.1.0",
+    "@elastic/charts": "38.1.3",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.35",
     "@elastic/ems-client": "8.0.0",

src/plugins/charts/common/index.ts

@@ -34,6 +34,7 @@ export {
   ColorMode,
   LabelRotation,
   defaultCountLabel,
+  MULTILAYER_TIME_AXIS_STYLE,
 } from './static';
 
 export { ColorSchemaParams, Labels, Style } from './types';

src/plugins/charts/common/static/index.ts

@@ -19,3 +19,5 @@ export {
 } from './color_maps';
 
 export { ColorMode, LabelRotation, defaultCountLabel } from './components';
+
+export * from './styles';

src/plugins/charts/common/static/styles/index.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from './multilayer_timeaxis';

src/plugins/charts/common/static/styles/multilayer_timeaxis.ts

@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Position, RecursivePartial, AxisStyle } from '@elastic/charts';
+
+export const MULTILAYER_TIME_AXIS_STYLE: RecursivePartial<AxisStyle> = {
+  tickLabel: {
+    visible: true,
+    padding: 0,
+    rotation: 0,
+    alignment: {
+      vertical: Position.Bottom,
+      horizontal: Position.Left,
+    },
+  },
+  tickLine: {
+    visible: true,
+    size: 0.0001,
+    padding: 4,
+  },
+};

src/plugins/charts/public/static/index.ts

@@ -9,3 +9,4 @@
 export * from './colors';
 export * from './components';
 export * from './utils';
+export * from '../../common/static/styles';

src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx

@@ -231,6 +231,7 @@ export default function QueryBarTopRow(props: QueryBarTopRowProps) {
         isDisabled={isDateRangeInvalid}
         isLoading={props.isLoading}
         onClick={onClickSubmitButton}
+        fill={false}
         data-test-subj="querySubmitButton"
       />
     );

src/plugins/discover/public/application/apps/context/context_app.tsx

@@ -19,7 +19,7 @@ import { IndexPattern, IndexPatternField } from '../../../../../data/common';
 import { LoadingStatus } from './services/context_query_state';
 import { getServices } from '../../../kibana_services';
 import { AppState, isEqualFilters } from './services/context_state';
-import { useDataGridColumns } from '../../helpers/use_data_grid_columns';
+import { useColumns } from '../../helpers/use_data_grid_columns';
 import { useContextAppState } from './utils/use_context_app_state';
 import { useContextAppFetch } from './utils/use_context_app_fetch';
 import { popularizeField } from '../../helpers/popularize_field';
@@ -84,7 +84,7 @@ export const ContextApp = ({ indexPattern, anchorId }: ContextAppProps) => {
     fetchedState.anchor._id,
   ]);
 
-  const { columns, onAddColumn, onRemoveColumn, onSetColumns } = useDataGridColumns({
+  const { columns, onAddColumn, onRemoveColumn, onSetColumns } = useColumns({
     capabilities,
     config: uiSettings,
     indexPattern,

src/plugins/discover/public/application/apps/context/context_app_content.tsx

@@ -28,7 +28,7 @@ export interface ContextAppContentProps {
   columns: string[];
   onAddColumn: (columnsName: string) => void;
   onRemoveColumn: (columnsName: string) => void;
-  onSetColumns: (columnsNames: string[]) => void;
+  onSetColumns: (columnsNames: string[], hideTimeColumn: boolean) => void;
   services: DiscoverServices;
   indexPattern: IndexPattern;
   predecessorCount: number;

src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx

@@ -23,9 +23,6 @@ import {
   Settings,
   TooltipType,
   XYChartElementEvent,
-  GridLineStyle,
-  AxisStyle,
-  RecursivePartial,
 } from '@elastic/charts';
 import { IUiSettingsClient } from 'kibana/public';
 import {
@@ -38,7 +35,7 @@ import { DataCharts$, DataChartsMessage } from '../../services/use_saved_search'
 import { FetchStatus } from '../../../../types';
 import { DiscoverServices } from '../../../../../build_services';
 import { useDataState } from '../../utils/use_data_state';
-import { LEGACY_TIME_AXIS } from '../../../../../../../charts/common';
+import { LEGACY_TIME_AXIS, MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../../charts/common';
 
 export interface DiscoverHistogramProps {
   savedSearchData$: DataCharts$;
@@ -184,46 +181,6 @@ export function DiscoverHistogram({
   const xAxisFormatter = services.data.fieldFormats.deserialize(chartData.yAxisFormat);
 
   const useLegacyTimeAxis = uiSettings.get(LEGACY_TIME_AXIS, false);
-  const gridLineStyle: RecursivePartial<GridLineStyle> = useLegacyTimeAxis
-    ? {}
-    : { strokeWidth: 0.1, stroke: isDarkMode ? 'white' : 'black' };
-  const verticalAxisStyle: RecursivePartial<AxisStyle> = useLegacyTimeAxis
-    ? {}
-    : {
-        axisLine: {
-          visible: false,
-        },
-        tickLabel: {
-          fontSize: 11,
-        },
-      };
-  const xAxisStyle: RecursivePartial<AxisStyle> = useLegacyTimeAxis
-    ? {}
-    : {
-        axisLine: {
-          stroke: isDarkMode ? 'lightgray' : 'darkgray',
-          strokeWidth: 1,
-        },
-        tickLine: {
-          size: 12,
-          strokeWidth: 0.15,
-          stroke: isDarkMode ? 'white' : 'black',
-          padding: -10,
-          visible: true,
-        },
-        tickLabel: {
-          fontSize: 11,
-          padding: 0,
-          alignment: {
-            vertical: Position.Bottom,
-            horizontal: Position.Left,
-          },
-          offset: {
-            x: 1.5,
-            y: 0,
-          },
-        },
-      };
 
   return (
     <React.Fragment>
@@ -244,16 +201,13 @@ export function DiscoverHistogram({
             ticks={2}
             integersOnly
             tickFormat={(value) => xAxisFormatter.convert(value)}
-            gridLine={gridLineStyle}
-            style={verticalAxisStyle}
           />
           <Axis
             id="discover-histogram-bottom-axis"
             position={Position.Bottom}
             tickFormat={formatXValue}
             timeAxisLayerCount={useLegacyTimeAxis ? 0 : 2}
-            gridLine={gridLineStyle}
-            style={xAxisStyle}
+            style={useLegacyTimeAxis ? {} : MULTILAYER_TIME_AXIS_STYLE}
           />
           <CurrentTime isDarkMode={isDarkMode} domainEnd={domainEnd} />
           <Endzones

src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.test.ts

@@ -64,7 +64,7 @@ describe('Test column actions', () => {
       sort: [],
     });
     setAppState.mockClear();
-    actions.onSetColumns(['first', 'second', 'third']);
+    actions.onSetColumns(['first', 'second', 'third'], true);
     expect(setAppState).toHaveBeenCalledWith({
       columns: ['first', 'second', 'third'],
     });

src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.ts

@@ -102,12 +102,13 @@ export function getStateColumnActions({
     setAppState({ columns });
   }
 
-  function onSetColumns(columns: string[]) {
-    // remove first element of columns if it's the configured timeFieldName, which is prepended automatically
+  function onSetColumns(columns: string[], hideTimeColumn: boolean) {
+    // The next line should gone when classic table will be removed
     const actualColumns =
-      indexPattern.timeFieldName && indexPattern.timeFieldName === columns[0]
+      !hideTimeColumn && indexPattern.timeFieldName && indexPattern.timeFieldName === columns[0]
         ? columns.slice(1)
         : columns;
+
     setAppState({ columns: actualColumns });
   }
   return {

src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx

@@ -23,7 +23,7 @@ import {
   SAMPLE_SIZE_SETTING,
   SEARCH_FIELDS_FROM_SOURCE,
 } from '../../../../../../common';
-import { useDataGridColumns } from '../../../../helpers/use_data_grid_columns';
+import { useColumns } from '../../../../helpers/use_data_grid_columns';
 import { IndexPattern } from '../../../../../../../data/common';
 import { SavedSearch } from '../../../../../saved_searches';
 import { DataDocumentsMsg, DataDocuments$ } from '../../services/use_saved_search';
@@ -69,7 +69,7 @@ function DiscoverDocumentsComponent({
 
   const rows = useMemo(() => documentState.result || [], [documentState.result]);
 
-  const { columns, onAddColumn, onRemoveColumn, onMoveColumn, onSetColumns } = useDataGridColumns({
+  const { columns, onAddColumn, onRemoveColumn, onMoveColumn, onSetColumns } = useColumns({
     capabilities,
     config: uiSettings,
     indexPattern,

src/plugins/discover/public/application/apps/main/components/layout/discover_layout.scss

@@ -82,8 +82,8 @@ discover-app {
 }
 
 .dscHistogram {
-  height: $euiSize * 8;
-  padding: $euiSizeS $euiSizeS $euiSizeS $euiSizeS;
+  height: $euiSize * 7;
+  padding: 0 $euiSizeS $euiSizeS * 2 $euiSizeS;
 }
 
 .dscHistogramTimeRange {

src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx

@@ -35,7 +35,7 @@ import { getResultState } from '../../utils/get_result_state';
 import { InspectorSession } from '../../../../../../../inspector/public';
 import { DiscoverUninitialized } from '../uninitialized/uninitialized';
 import { DataMainMsg } from '../../services/use_saved_search';
-import { useDataGridColumns } from '../../../../helpers/use_data_grid_columns';
+import { useColumns } from '../../../../helpers/use_data_grid_columns';
 import { DiscoverDocuments } from './discover_documents';
 import { FetchStatus } from '../../../../types';
 import { useDataState } from '../../utils/use_data_state';
@@ -141,7 +141,7 @@ export function DiscoverLayout({
     };
   }, [inspectorSession]);
 
-  const { columns, onAddColumn, onRemoveColumn } = useDataGridColumns({
+  const { columns, onAddColumn, onRemoveColumn } = useColumns({
     capabilities,
     config: uiSettings,
     indexPattern,

src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx

@@ -36,7 +36,11 @@ import {
 import { defaultPageSize, gridStyle, pageSizeArr, toolbarVisibility } from './constants';
 import { DiscoverServices } from '../../../build_services';
 import { getDisplayedColumns } from '../../helpers/columns';
-import { MAX_DOC_FIELDS_DISPLAYED, SHOW_MULTIFIELDS } from '../../../../common';
+import {
+  DOC_HIDE_TIME_COLUMN_SETTING,
+  MAX_DOC_FIELDS_DISPLAYED,
+  SHOW_MULTIFIELDS,
+} from '../../../../common';
 import { DiscoverGridDocumentToolbarBtn, getDocId } from './discover_grid_document_selection';
 import { SortPairArr } from '../../apps/main/components/doc_table/lib/get_sort';
 import { getFieldsToShow } from '../../helpers/get_fields_to_show';
@@ -91,7 +95,7 @@ export interface DiscoverGridProps {
   /**
    * Function to set all columns
    */
-  onSetColumns: (columns: string[]) => void;
+  onSetColumns: (columns: string[], hideTimeColumn: boolean) => void;
   /**
    * function to change sorting of the documents, skipped when isSortEnabled is set to false
    */
@@ -302,15 +306,19 @@ export const DiscoverGrid = ({
     [displayedColumns, indexPattern, showTimeCol, settings, defaultColumns, isSortEnabled]
   );
 
+  const hideTimeColumn = useMemo(
+    () => services.uiSettings.get(DOC_HIDE_TIME_COLUMN_SETTING, false),
+    [services.uiSettings]
+  );
   const schemaDetectors = useMemo(() => getSchemaDetectors(), []);
   const columnsVisibility = useMemo(
     () => ({
       visibleColumns: getVisibleColumns(displayedColumns, indexPattern, showTimeCol) as string[],
       setVisibleColumns: (newColumns: string[]) => {
-        onSetColumns(newColumns);
+        onSetColumns(newColumns, hideTimeColumn);
       },
     }),
-    [displayedColumns, indexPattern, showTimeCol, onSetColumns]
+    [displayedColumns, indexPattern, showTimeCol, hideTimeColumn, onSetColumns]
   );
   const sorting = useMemo(() => {
     if (isSortEnabled) {

src/plugins/discover/public/application/helpers/use_data_grid_columns.test.tsx

@@ -7,14 +7,14 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { useDataGridColumns } from './use_data_grid_columns';
+import { useColumns } from './use_data_grid_columns';
 import { indexPatternMock } from '../../__mocks__/index_pattern';
 import { configMock } from '../../__mocks__/config';
 import { indexPatternsMock } from '../../__mocks__/index_patterns';
 import { AppState } from '../apps/context/services/context_state';
 import { Capabilities } from '../../../../../core/types';
 
-describe('useDataGridColumns', () => {
+describe('useColumns', () => {
   const defaultProps = {
     capabilities: { discover: { save: true } } as unknown as Capabilities,
     config: configMock,
@@ -29,7 +29,7 @@ describe('useDataGridColumns', () => {
 
   test('should return valid result', () => {
     const { result } = renderHook(() => {
-      return useDataGridColumns(defaultProps);
+      return useColumns(defaultProps);
     });
 
     expect(result.current.columns).toEqual(['Time', 'message']);
@@ -41,7 +41,7 @@ describe('useDataGridColumns', () => {
 
   test('should skip _source column when useNewFieldsApi is set to true', () => {
     const { result } = renderHook(() => {
-      return useDataGridColumns({
+      return useColumns({
         ...defaultProps,
         state: {
           columns: ['Time', '_source'],
@@ -55,7 +55,7 @@ describe('useDataGridColumns', () => {
 
   test('should return empty columns array', () => {
     const { result } = renderHook(() => {
-      return useDataGridColumns({
+      return useColumns({
         ...defaultProps,
         state: {
           columns: [],