Merge branch 'master' into ml-transform-range-filter-editor

elastic · Aug 17, 2021 · 7e33871 · 7e33871
2 parents 14c1ea1 + 94f3508
commit 7e33871
Show file tree

Hide file tree

Showing 38 changed files with 426 additions and 11 deletions.
diff --git a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts
@@ -108,6 +108,7 @@ describe('kuery functions', () => {
         const node = nodeTypes.function.buildNode('geoBoundingBox', 'geo', params);
         const result = geoBoundingBox.toElasticsearchQuery(node, indexPattern);
 
+        // @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoBoundingBoxQuery
         expect(result.geo_bounding_box!.ignore_unmapped).toBe(true);
       });
 

diff --git a/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.ts b/packages/kbn-es-query/src/kuery/functions/geo_bounding_box.ts
@@ -53,6 +53,7 @@ export function toElasticsearchQuery(
   }
 
   return {
+    // @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoBoundingBoxQuery
     geo_bounding_box: {
       [fieldName]: queryParams,
       ignore_unmapped: true,

diff --git a/packages/kbn-es-query/src/kuery/functions/geo_polygon.ts b/packages/kbn-es-query/src/kuery/functions/geo_polygon.ts
@@ -49,6 +49,7 @@ export function toElasticsearchQuery(
   }
 
   return {
+    // @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoPolygonQuery
     geo_polygon: {
       [fieldName]: queryParams,
       ignore_unmapped: true,

diff --git a/src/dev/build/tasks/copy_source_task.ts b/src/dev/build/tasks/copy_source_task.ts
@@ -29,10 +29,11 @@ export const CopySource: Task = {
         '!src/cli/dev.js',
         '!src/functional_test_runner/**',
         '!src/dev/**',
+        '!**/jest.config.js',
         '!src/plugins/telemetry/schema/**', // Skip telemetry schemas
         // this is the dev-only entry
         '!src/setup_node_env/index.js',
-        '!**/public/**/*.{js,ts,tsx,json}',
+        '!**/public/**/*.{js,ts,tsx,json,scss}',
         'typings/**',
         'config/kibana.yml',
         'config/node.options',

diff --git a/x-pack/plugins/cases/public/components/case_view/index.tsx b/x-pack/plugins/cases/public/components/case_view/index.tsx
@@ -105,6 +105,7 @@ export const CaseComponent = React.memo<CaseComponentProps>(
     const [initLoadingData, setInitLoadingData] = useState(true);
     const init = useRef(true);
     const timelineUi = useTimelineContext()?.ui;
+    const alertConsumers = useTimelineContext()?.alertConsumers;
 
     const {
       caseUserActions,
@@ -486,7 +487,9 @@ export const CaseComponent = React.memo<CaseComponentProps>(
             </EuiFlexGroup>
           </ContentWrapper>
         </WhitePageWrapper>
-        {timelineUi?.renderTimelineDetailsPanel ? timelineUi.renderTimelineDetailsPanel() : null}
+        {timelineUi?.renderTimelineDetailsPanel
+          ? timelineUi.renderTimelineDetailsPanel({ alertConsumers })
+          : null}
       </>
     );
   }

diff --git a/x-pack/plugins/cases/public/components/timeline_context/index.tsx b/x-pack/plugins/cases/public/components/timeline_context/index.tsx
@@ -7,6 +7,7 @@
 
 import React, { useState } from 'react';
 import { EuiMarkdownEditorUiPlugin, EuiMarkdownAstNodePosition } from '@elastic/eui';
+import { AlertConsumers } from '@kbn/rule-data-utils';
 import { Plugin } from 'unified';
 /**
  * @description - manage the plugins, hooks, and ui components needed to enable timeline functionality within the cases plugin
@@ -28,6 +29,7 @@ interface TimelineProcessingPluginRendererProps {
 }
 
 export interface CasesTimelineIntegration {
+  alertConsumers?: AlertConsumers[];
   editor_plugins: {
     parsingPlugin: Plugin;
     processingPluginRenderer: React.FC<
@@ -43,7 +45,11 @@ export interface CasesTimelineIntegration {
   };
   ui?: {
     renderInvestigateInTimelineActionComponent?: (alertIds: string[]) => JSX.Element;
-    renderTimelineDetailsPanel?: () => JSX.Element;
+    renderTimelineDetailsPanel?: ({
+      alertConsumers,
+    }: {
+      alertConsumers?: AlertConsumers[];
+    }) => JSX.Element;
   };
 }
 

diff --git a/x-pack/plugins/lens/common/expressions/heatmap_chart/heatmap_legend.ts b/x-pack/plugins/lens/common/expressions/heatmap_chart/heatmap_legend.ts
@@ -19,6 +19,14 @@ export interface HeatmapLegendConfig {
    * Position of the legend relative to the chart
    */
   position: Position;
+  /**
+   * Defines the number of lines per legend item
+   */
+  maxLines?: number;
+  /**
+   * Defines if the legend items should be truncated
+   */
+  shouldTruncate?: boolean;
 }
 
 export type HeatmapLegendConfigResult = HeatmapLegendConfig & {
@@ -54,6 +62,19 @@ export const heatmapLegendConfig: ExpressionFunctionDefinition<
         defaultMessage: 'Specifies the legend position.',
       }),
     },
+    maxLines: {
+      types: ['number'],
+      help: i18n.translate('xpack.lens.heatmapChart.legend.maxLines.help', {
+        defaultMessage: 'Specifies the number of lines per legend item.',
+      }),
+    },
+    shouldTruncate: {
+      types: ['boolean'],
+      default: true,
+      help: i18n.translate('xpack.lens.heatmapChart.legend.shouldTruncate.help', {
+        defaultMessage: 'Specifies whether or not the legend items should be truncated.',
+      }),
+    },
   },
   fn(input, args) {
     return {

diff --git a/x-pack/plugins/lens/common/expressions/pie_chart/pie_chart.ts b/x-pack/plugins/lens/common/expressions/pie_chart/pie_chart.ts
@@ -74,6 +74,14 @@ export const pie: ExpressionFunctionDefinition<
       types: ['boolean'],
       help: '',
     },
+    legendMaxLines: {
+      types: ['number'],
+      help: '',
+    },
+    truncateLegend: {
+      types: ['boolean'],
+      help: '',
+    },
     legendPosition: {
       types: ['string'],
       options: [Position.Top, Position.Right, Position.Bottom, Position.Left],

diff --git a/x-pack/plugins/lens/common/expressions/pie_chart/types.ts b/x-pack/plugins/lens/common/expressions/pie_chart/types.ts
@@ -17,6 +17,8 @@ export interface SharedPieLayerState {
   legendPosition?: 'left' | 'right' | 'top' | 'bottom';
   nestedLegend?: boolean;
   percentDecimals?: number;
+  legendMaxLines?: number;
+  truncateLegend?: boolean;
 }
 
 export type PieLayerState = SharedPieLayerState & {

diff --git a/x-pack/plugins/lens/common/expressions/xy_chart/legend_config.ts b/x-pack/plugins/lens/common/expressions/xy_chart/legend_config.ts
@@ -37,6 +37,14 @@ export interface LegendConfig {
    * Number of columns when legend is set inside chart
    */
   floatingColumns?: number;
+  /**
+   * Maximum number of lines per legend item
+   */
+  maxLines?: number;
+  /**
+   * Flag whether the legend items are truncated or not
+   */
+  shouldTruncate?: boolean;
 }
 
 export type LegendConfigResult = LegendConfig & { type: 'lens_xy_legendConfig' };
@@ -100,6 +108,19 @@ export const legendConfig: ExpressionFunctionDefinition<
         defaultMessage: 'Specifies the number of columns when legend is displayed inside chart.',
       }),
     },
+    maxLines: {
+      types: ['number'],
+      help: i18n.translate('xpack.lens.xyChart.maxLines.help', {
+        defaultMessage: 'Specifies the number of lines per legend item.',
+      }),
+    },
+    shouldTruncate: {
+      types: ['boolean'],
+      default: true,
+      help: i18n.translate('xpack.lens.xyChart.shouldTruncate.help', {
+        defaultMessage: 'Specifies whether the legend items will be truncated or not',
+      }),
+    },
   },
   fn: function fn(input: unknown, args: LegendConfig) {
     return {

diff --git a/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
@@ -321,6 +321,12 @@ export const HeatmapComponent: FC<HeatmapRenderProps> = ({
         showLegend={args.legend.isVisible}
         legendPosition={args.legend.position}
         debugState={window._echDebugStateFlag ?? false}
+        theme={{
+          ...chartTheme,
+          legend: {
+            labelOptions: { maxLines: args.legend.shouldTruncate ? args.legend?.maxLines ?? 1 : 0 },
+          },
+        }}
       />
       <Heatmap
         id={tableId}

diff --git a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
@@ -65,6 +65,21 @@ export const HeatmapToolbar = memo(
                   legend: { ...state.legend, position: id as Position },
                 });
               }}
+              maxLines={state?.legend.maxLines}
+              onMaxLinesChange={(val) => {
+                setState({
+                  ...state,
+                  legend: { ...state.legend, maxLines: val },
+                });
+              }}
+              shouldTruncate={state?.legend.shouldTruncate ?? true}
+              onTruncateLegendChange={() => {
+                const current = state.legend.shouldTruncate ?? true;
+                setState({
+                  ...state,
+                  legend: { ...state.legend, shouldTruncate: !current },
+                });
+              }}
             />
           </EuiFlexGroup>
         </EuiFlexItem>

diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts b/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
@@ -32,6 +32,8 @@ function exampleState(): HeatmapVisualizationState {
       isVisible: true,
       position: Position.Right,
       type: LEGEND_FUNCTION,
+      maxLines: 1,
+      shouldTruncate: true,
     },
     gridConfig: {
       type: HEATMAP_GRID_FUNCTION,
@@ -63,6 +65,8 @@ describe('heatmap', () => {
           isVisible: true,
           position: Position.Right,
           type: LEGEND_FUNCTION,
+          maxLines: 1,
+          shouldTruncate: true,
         },
         gridConfig: {
           type: HEATMAP_GRID_FUNCTION,

diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx b/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
@@ -70,6 +70,8 @@ function getInitialState(): Omit<HeatmapVisualizationState, 'layerId' | 'layerTy
     legend: {
       isVisible: true,
       position: Position.Right,
+      maxLines: 1,
+      shouldTruncate: true,
       type: LEGEND_FUNCTION,
     },
     gridConfig: {

diff --git a/x-pack/plugins/lens/public/pie_visualization/render_function.test.tsx b/x-pack/plugins/lens/public/pie_visualization/render_function.test.tsx
@@ -62,6 +62,8 @@ describe('PieVisualization component', () => {
       numberDisplay: 'hidden',
       categoryDisplay: 'default',
       legendDisplay: 'default',
+      legendMaxLines: 1,
+      truncateLegend: true,
       nestedLegend: false,
       percentDecimals: 3,
       hideLabels: false,
@@ -106,6 +108,20 @@ describe('PieVisualization component', () => {
       expect(component.find(Settings).prop('showLegend')).toEqual(false);
     });
 
+    test('it sets the correct lines per legend item', () => {
+      const component = shallow(<PieComponent args={args} {...getDefaultArgs()} />);
+      expect(component.find(Settings).prop('theme')).toEqual({
+        background: {
+          color: undefined,
+        },
+        legend: {
+          labelOptions: {
+            maxLines: 1,
+          },
+        },
+      });
+    });
+
     test('it calls the color function with the right series layers', () => {
       const defaultArgs = getDefaultArgs();
       const component = shallow(

diff --git a/x-pack/plugins/lens/public/pie_visualization/render_function.tsx b/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
@@ -75,6 +75,8 @@ export function PieComponent(
     legendPosition,
     nestedLegend,
     percentDecimals,
+    legendMaxLines,
+    truncateLegend,
     hideLabels,
     palette,
   } = props.args;
@@ -297,6 +299,9 @@ export function PieComponent(
               ...chartTheme.background,
               color: undefined, // removes background for embeddables
             },
+            legend: {
+              labelOptions: { maxLines: truncateLegend ? legendMaxLines ?? 1 : 0 },
+            },
           }}
           baseTheme={chartBaseTheme}
         />

diff --git a/x-pack/plugins/lens/public/pie_visualization/suggestions.test.ts b/x-pack/plugins/lens/public/pie_visualization/suggestions.test.ts
@@ -494,6 +494,8 @@ describe('suggestions', () => {
                 categoryDisplay: 'inside',
                 legendDisplay: 'show',
                 percentDecimals: 0,
+                legendMaxLines: 1,
+                truncateLegend: true,
                 nestedLegend: true,
               },
             ],
@@ -516,6 +518,8 @@ describe('suggestions', () => {
                 categoryDisplay: 'inside',
                 legendDisplay: 'show',
                 percentDecimals: 0,
+                legendMaxLines: 1,
+                truncateLegend: true,
                 nestedLegend: true,
               },
             ],
@@ -684,6 +688,8 @@ describe('suggestions', () => {
                 categoryDisplay: 'inside',
                 legendDisplay: 'show',
                 percentDecimals: 0,
+                legendMaxLines: 1,
+                truncateLegend: true,
                 nestedLegend: true,
               },
             ],
@@ -705,6 +711,8 @@ describe('suggestions', () => {
                 categoryDisplay: 'default', // This is changed
                 legendDisplay: 'show',
                 percentDecimals: 0,
+                legendMaxLines: 1,
+                truncateLegend: true,
                 nestedLegend: true,
               },
             ],

diff --git a/x-pack/plugins/lens/public/pie_visualization/to_expression.ts b/x-pack/plugins/lens/public/pie_visualization/to_expression.ts
@@ -56,6 +56,8 @@ function expressionHelper(
           legendDisplay: [layer.legendDisplay],
           legendPosition: [layer.legendPosition || 'right'],
           percentDecimals: [layer.percentDecimals ?? DEFAULT_PERCENT_DECIMALS],
+          legendMaxLines: [layer.legendMaxLines ?? 1],
+          truncateLegend: [layer.truncateLegend ?? true],
           nestedLegend: [!!layer.nestedLegend],
           ...(state.palette
             ? {

diff --git a/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx b/x-pack/plugins/lens/public/pie_visualization/toolbar.tsx
@@ -220,6 +220,21 @@ export function PieToolbar(props: VisualizationToolbarProps<PieVisualizationStat
             layers: [{ ...layer, nestedLegend: !layer.nestedLegend }],
           });
         }}
+        shouldTruncate={layer.truncateLegend ?? true}
+        onTruncateLegendChange={() => {
+          const current = layer.truncateLegend ?? true;
+          setState({
+            ...state,
+            layers: [{ ...layer, truncateLegend: !current }],
+          });
+        }}
+        maxLines={layer?.legendMaxLines}
+        onMaxLinesChange={(val) => {
+          setState({
+            ...state,
+            layers: [{ ...layer, legendMaxLines: val }],
+          });
+        }}
       />
     </EuiFlexGroup>
   );